diff options
author | Tobrun <tobrun@mapbox.com> | 2018-03-23 09:54:22 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-23 09:54:22 -0400 |
commit | c44fe25200a16294e42d73acff6168c8b778eda8 (patch) | |
tree | 4fff16944cdcfdc39d0762ee129050672cb60681 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java | |
parent | 9499a2bda7eed68f8a11cdecce0130b1be2054a4 (diff) | |
download | qtlocation-mapboxgl-c44fe25200a16294e42d73acff6168c8b778eda8.tar.gz |
[android] - correctly convert Android int colors with to-color expression (#11506)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java index dee8b043b8..531c1af420 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java @@ -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(); @@ -1894,32 +1892,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. */ public static class Array { |