[android] - allow literal expression property arguments

mapbox · May 28, 2018 · 6f5fe86 · 6f5fe86
1 parent 22741a0
commit 6f5fe86
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/...d/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java b/...d/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java
@@ -3582,6 +3582,12 @@ Object toValue() {
       return literal;
     }
 
+    @NonNull
+    @Override
+    public Object[] toArray() {
+      return new Object[] {"literal", literal};
+    }
+
     /**
      * Returns a string representation of the expression literal.
      *

diff --git a/...orm/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java b/...orm/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java
@@ -2,7 +2,6 @@
 
 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 Layer() {
   /**
    * Validates if layer interaction is happening on the UI thread
    */
-  protected void checkThread(){
+  protected void checkThread() {
     ThreadUtils.checkThread("Layer");
   }
 

diff --git a/...oidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java b/...oidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java
@@ -177,6 +177,17 @@ public void testCompositeFunction() {
     });
   }
 
+  @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