Skip to content

Commit

Permalink
Update ColorPropConverterto support color function values (facebook#4…
Browse files Browse the repository at this point in the history
…3031)

Summary:
This adds support for color function values to ColorPropConverter per the wide gamut color [RFC](react-native-community/discussions-and-proposals#738). It updates the color conversion code so that it returns a Color instance before ultimately being converted to an Integer in preparation for returning long values as needed.

bypass-github-export-checks

## Changelog:

[ANDROID] [ADDED] - Update ColorPropConverter to support color function values

Pull Request resolved: facebook#43031

Test Plan:
Colors should work exactly the same as before.

Follow test steps from facebook#42831 to test support for color() function syntax.

While colors specified with color() function syntax will not yet render in DisplayP3 color space they will not be misrecognized as resource path colors but will instead fallback to their sRGB color space values.

Differential Revision: D55749058
  • Loading branch information
ryanlntn authored and facebook-github-bot committed Apr 23, 2024
1 parent d59de54 commit 8661085
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 7 deletions.
1 change: 1 addition & 0 deletions packages/react-native/ReactAndroid/api/ReactAndroid.api
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,7 @@ public class com/facebook/react/bridge/ColorPropConverter {
public fun <init> ()V
public static fun getColor (Ljava/lang/Object;Landroid/content/Context;)Ljava/lang/Integer;
public static fun getColor (Ljava/lang/Object;Landroid/content/Context;I)Ljava/lang/Integer;
public static fun getColorInstance (Ljava/lang/Object;Landroid/content/Context;)Landroid/graphics/Color;
public static fun resolveResourcePath (Landroid/content/Context;Ljava/lang/String;)Ljava/lang/Integer;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@

import android.content.Context;
import android.content.res.Resources;
import android.graphics.Color;
import android.graphics.ColorSpace;
import android.os.Build;
import android.util.TypedValue;
import androidx.annotation.ColorLong;
import androidx.annotation.Nullable;
import androidx.core.content.res.ResourcesCompat;
import com.facebook.common.logging.FLog;
Expand All @@ -24,13 +28,17 @@ public class ColorPropConverter {
private static final String ATTR = "attr";
private static final String ATTR_SEGMENT = "attr/";

public static Integer getColor(Object value, Context context) {
private static Boolean apiSupportWideGamut() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
}

public static Color getColorInstance(Object value, Context context) {
if (value == null) {
return null;
}

if (value instanceof Double) {
return ((Double) value).intValue();
if (apiSupportWideGamut() && value instanceof Double) {
return Color.valueOf(((Double) value).intValue());
}

if (context == null) {
Expand All @@ -39,6 +47,22 @@ public static Integer getColor(Object value, Context context) {

if (value instanceof ReadableMap) {
ReadableMap map = (ReadableMap) value;

// handle color(space r g b a) value
if (apiSupportWideGamut() && map.hasKey("space")) {
String rawColorSpace = map.getString("space");
boolean isDisplayP3 = rawColorSpace.equals("display-p3");
ColorSpace space =
ColorSpace.get(isDisplayP3 ? ColorSpace.Named.DISPLAY_P3 : ColorSpace.Named.SRGB);
float r = (float) map.getDouble("r");
float g = (float) map.getDouble("g");
float b = (float) map.getDouble("b");
float a = (float) map.getDouble("a");

@ColorLong long color = Color.pack(r, g, b, a, space);
return Color.valueOf(color);
}

ReadableArray resourcePaths = map.getArray(JSON_KEY);

if (resourcePaths == null) {
Expand All @@ -48,8 +72,8 @@ public static Integer getColor(Object value, Context context) {

for (int i = 0; i < resourcePaths.size(); i++) {
Integer result = resolveResourcePath(context, resourcePaths.getString(i));
if (result != null) {
return result;
if (apiSupportWideGamut() && result != null) {
return Color.valueOf(result);
}
}

Expand All @@ -63,6 +87,17 @@ public static Integer getColor(Object value, Context context) {
"ColorValue: the value must be a number or Object.");
}

public static Integer getColor(Object value, Context context) {
Color color = getColorInstance(value, context);
if (color == null) {
return null;
}
if (apiSupportWideGamut()) {
return color.toArgb();
}
return null;
}

public static Integer getColor(Object value, Context context, int defaultInt) {
try {
return getColor(value, context);
Expand All @@ -89,8 +124,9 @@ public static Integer resolveResourcePath(Context context, @Nullable String reso
return resolveThemeAttribute(context, resourcePath);
}
} catch (Resources.NotFoundException exception) {
// The resource could not be found so do nothing to allow the for loop to continue and
// try the next fallback resource in the array. If none of the fallbacks are
// The resource could not be found so do nothing to allow the for loop to
// continue and
// try the next fallback resource in the array. If none of the fallbacks are
// found then the exception immediately after the for loop will be thrown.
}
return null;
Expand Down

0 comments on commit 8661085

Please sign in to comment.