tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] - correctly convert Android int colors with to-color expression (#11506)

Browse Source
This commit is contained in:
Tobrun
2018-03-23 09:54:22 -04:00
committed by GitHub
parent 9499a2bda7
commit c44fe25200
3 changed files with 18 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java
View File

@@ -135,7 +135,7 @@ public class Expression {
* @return the color expression
*/
public static Expression color(@ColorInt int color) {
return new ExpressionLiteral(new Color(color));
return toColor(literal(PropertyFactory.colorToRgbaString(color)));
}
/**
@@ -1735,9 +1735,7 @@ public class Expression {
*/
private Object toValue(ExpressionLiteral expressionValue) {
Object value = expressionValue.toValue();
if (value instanceof Expression.Color) {
return ((Expression.Color) value).convertColor();
} else if (value instanceof Expression.ExpressionLiteral) {
if (value instanceof Expression.ExpressionLiteral) {
return toValue((ExpressionLiteral) value);
} else if (value instanceof Expression) {
return ((Expression) value).toArray();
@@ -1893,32 +1891,6 @@ public class Expression {
}
}
/**
* Expression color type.
*/
public static class Color {
private int color;
/**
* Creates a color color type from a color int.
*
* @param color the int color
*/
public Color(@ColorInt int color) {
this.color = color;
}
/**
* Converts the int color to rgba(d, d, d, d) string representation
*
* @return the string representation of a color
*/
String convertColor() {
return PropertyFactory.colorToRgbaString(color);
}
}
/**
* Expression array type.
*/