Skip to content

Fixing resetting image tintColor on Android #31114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+32 −3
Closed

Fixing resetting image tintColor on Android #31114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand All @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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();
Expand Down