From 4d9cd75d2dc228b1abdd578898627d32982e210a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Paczos?= Date: Mon, 28 May 2018 16:01:26 +0200 Subject: [android] - allow literal expression property arguments --- .../com/mapbox/mapboxsdk/style/expressions/Expression.java | 6 ++++++ .../main/java/com/mapbox/mapboxsdk/style/layers/Layer.java | 3 +-- .../com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java | 11 +++++++++++ 3 files changed, 18 insertions(+), 2 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 e32cdffc93..c8f848f4d7 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 @@ -3582,6 +3582,12 @@ public class Expression { return literal; } + @NonNull + @Override + public Object[] toArray() { + return new Object[] {"literal", literal}; + } + /** * Returns a string representation of the expression literal. * diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java index 0de9234b7f..3edc202c8e 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java @@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.style.layers; import android.support.annotation.NonNull; -import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.mapbox.mapboxsdk.style.expressions.Expression; import com.mapbox.mapboxsdk.utils.ThreadUtils; @@ -27,7 +26,7 @@ public abstract class Layer { /** * Validates if layer interaction is happening on the UI thread */ - protected void checkThread(){ + protected void checkThread() { ThreadUtils.checkThread("Layer"); } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java index c4ff79b053..baa8262e71 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java @@ -177,6 +177,17 @@ public class ExpressionTest extends BaseActivityTest { }); } + @Test + public void testLiteralProperty() { + validateTestSetup(); + setupStyle(); + invoke(mapboxMap, (uiController, mapboxMap) -> { + layer.setProperties( + fillColor(literal("#4286f4")) + ); + }); + } + private void setupStyle() { invoke(mapboxMap, (uiController, mapboxMap) -> { // Add a source -- cgit v1.2.1