diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style')
5 files changed, 11 insertions, 67 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 edf4577288..7bb918fb4f 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 @@ -21,6 +21,8 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import static com.mapbox.mapboxsdk.utils.ColorUtils.colorToRgbaArray; + /** * The value for any layout property, paint property, or filter may be specified as an expression. * An expression defines a formula for computing the value of the property using the operators described below. @@ -220,7 +222,7 @@ public class Expression { * @return the color expression */ public static Expression color(@ColorInt int color) { - float[] rgba = PropertyFactory.colorToRgbaArray(color); + float[] rgba = colorToRgbaArray(color); return rgba(rgba[0], rgba[1], rgba[2], rgba[3]); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java index 670548f12e..bf5fd35fa5 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java @@ -5,7 +5,7 @@ package com.mapbox.mapboxsdk.style.layers; import android.support.annotation.ColorInt; import com.mapbox.mapboxsdk.style.expressions.Expression; -import com.mapbox.mapboxsdk.utils.ColorUtils; +import static com.mapbox.mapboxsdk.utils.ColorUtils.colorToRgbaString; /** * Constructs paint/layout properties for Layers @@ -2444,33 +2444,4 @@ public class PropertyFactory { return new LayoutPropertyValue<>("text-optional", value); } - /** - * Converts Android color int to "rbga(r, g, b, a)" String equivalent. - * <p> - * Alpha value will be converted from 0-255 range to 0-1. - * </p> - * - * @param color Android color int - * @return String rgba color - * @deprecated use {@link com.mapbox.mapboxsdk.utils.ColorUtils#colorToRgbaString(int)} instead - */ - @Deprecated - public static String colorToRgbaString(@ColorInt int color) { - return ColorUtils.colorToRgbaString(color); - } - - /** - * Converts Android color int to rgba float array. - * <p> - * Alpha value will be converted from 0-255 range to 0-1. - * </p> - * - * @param color Android color int - * @return int rgba array - * @deprecated use {@link com.mapbox.mapboxsdk.utils.ColorUtils#colorToRgbaArray(int)} instead - */ - @Deprecated - public static float[] colorToRgbaArray(@ColorInt int color) { - return ColorUtils.colorToRgbaArray(color); - } -}
\ No newline at end of file +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs index 27bb66aa08..697021b2d5 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs @@ -9,7 +9,7 @@ package com.mapbox.mapboxsdk.style.layers; import android.support.annotation.ColorInt; import com.mapbox.mapboxsdk.style.expressions.Expression; -import com.mapbox.mapboxsdk.utils.ColorUtils; +import static com.mapbox.mapboxsdk.utils.ColorUtils.colorToRgbaString; /** * Constructs paint/layout properties for Layers @@ -84,33 +84,4 @@ public class PropertyFactory { } <% } -%> - /** - * Converts Android color int to "rbga(r, g, b, a)" String equivalent. - * <p> - * Alpha value will be converted from 0-255 range to 0-1. - * </p> - * - * @param color Android color int - * @return String rgba color - * @deprecated use {@link com.mapbox.mapboxsdk.utils.ColorUtils#colorToRgbaString(int)} instead - */ - @Deprecated - public static String colorToRgbaString(@ColorInt int color) { - return ColorUtils.colorToRgbaString(color); - } - - /** - * Converts Android color int to rgba float array. - * <p> - * Alpha value will be converted from 0-255 range to 0-1. - * </p> - * - * @param color Android color int - * @return int rgba array - * @deprecated use {@link com.mapbox.mapboxsdk.utils.ColorUtils#colorToRgbaArray(int)} instead - */ - @Deprecated - public static float[] colorToRgbaArray(@ColorInt int color) { - return ColorUtils.colorToRgbaArray(color); - } -}
\ No newline at end of file +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java index 985a054d0d..24831f1ccf 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java @@ -8,8 +8,8 @@ import android.support.annotation.NonNull; import android.support.annotation.UiThread; import com.mapbox.mapboxsdk.style.layers.Property; -import com.mapbox.mapboxsdk.style.layers.PropertyFactory; import com.mapbox.mapboxsdk.style.layers.TransitionOptions; +import com.mapbox.mapboxsdk.utils.ColorUtils; import com.mapbox.mapboxsdk.utils.ThreadUtils; /** @@ -104,7 +104,7 @@ public class Light { */ public void setColor(@ColorInt int color) { checkThread(); - nativeSetColor(PropertyFactory.colorToRgbaString(color)); + nativeSetColor(ColorUtils.colorToRgbaString(color)); } /** diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs index 223a75911e..8cec440126 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs @@ -12,8 +12,8 @@ import android.support.annotation.NonNull; import android.support.annotation.UiThread; import com.mapbox.mapboxsdk.style.layers.Property; -import com.mapbox.mapboxsdk.style.layers.PropertyFactory; import com.mapbox.mapboxsdk.style.layers.TransitionOptions; +import com.mapbox.mapboxsdk.utils.ColorUtils; import com.mapbox.mapboxsdk.utils.ThreadUtils; /** @@ -70,7 +70,7 @@ public class Light { */ public void set<%- camelize(property.name) %>(@ColorInt int <%- property.name %>) { checkThread(); - nativeSet<%- camelize(property.name) %>(PropertyFactory.colorToRgbaString(<%- property.name %>)); + nativeSet<%- camelize(property.name) %>(ColorUtils.colorToRgbaString(<%- property.name %>)); } <% } -%> |