Update Android Expression handling (#1014)

* Update Android expression handling

* Fix ktlint

---------

Co-authored-by: Release SDK bot for Maps SDK team <[email protected]>

Author: pjleonard37

CHANGELOG.md

@@ -1,5 +1,7 @@
 ### main
 
+* Fix Mapbox expression handling on Android by converting List expressions starting with strings to JSON format. 
+
 ### 2.10.0
 
 * Update Maps SDK to v11.14.0

android/src/main/kotlin/com/mapbox/maps/mapbox_maps/Extentions.kt

@@ -988,6 +988,11 @@ fun Any.toValue(): Value {
     val valueArray = this.map { it?.toValue() }
     Value(valueArray)
   } else if (this is List<*>) {
+    // Any List starting with a string is potentially a Mapbox expression.
+    // Convert it to JSON string.
+    if (this.isNotEmpty() && this[0] is String) {
+      return Gson().toJson(this).toValue()
+    }
     val valueArray = this.map { it?.toValue() }
     Value(valueArray)
   } else if (this is HashMap<*, *>) {

example/integration_test/style/style_test.dart

@@ -765,6 +765,73 @@ void main() {
     expect(styleImports[1]?.type, "import");
     expect(styleImports.length, 2);
   });
+
+  testWidgets('Match expression with concat type mismatch', (WidgetTester tester) async {
+    final mapFuture = app.main();
+    await tester.pumpAndSettle();
+    final mapboxMap = await mapFuture;
+    var style = mapboxMap.style;
+
+    // Create a GeoJSON source with features that have numeric properties
+    var geoJsonData = {
+      "type": "FeatureCollection",
+      "features": [
+        {
+          "type": "Feature",
+          "properties": {
+            "testProperty": 123,
+            "testProperty2": 456
+          },
+          "geometry": {
+            "type": "Point",
+            "coordinates": [20, 60]
+          }
+        }
+      ]
+    };
+
+    var source = {
+      "type": "geojson",
+      "data": geoJsonData
+    };
+
+    await style.addStyleSource('test-source', json.encode(source));
+
+    var matchExpression = [
+      "match",
+      ["concat", ["get", "testProperty"], ["get", "testProperty2"]],
+      "123456", "red",      
+      "5234534", "green",  
+      "yellow"              
+    ];
+
+    // Create the layer without the expression
+    var layer = {
+      "id": "test-layer",
+      "type": "circle",
+      "source": "test-source",
+      "paint": {
+        "circle-radius": 10,
+      }
+    };
+    await style.addStyleLayer(json.encode(layer), null);
+
+    // Then set the expression using setStyleLayerProperty
+    // This now works on both iOS and Android after the fix
+    await style.setStyleLayerProperty("test-layer", "circle-color", matchExpression);
+    
+    // Verify that the expression was set correctly
+    var retrievedProperty = await style.getStyleLayerProperty("test-layer", "circle-color");
+    
+    var retrievedExpression = retrievedProperty.value as List;
+    expect(retrievedExpression[0], "match");  
+    expect(retrievedExpression[1], matchExpression[1]);  
+    expect(retrievedExpression[2], "123456"); 
+    expect(retrievedExpression[3], ['rgba', 255.0, 0.0, 0.0, 1.0]);  
+    expect(retrievedExpression[4], "5234534"); 
+    expect(retrievedExpression[5], ['rgba', 0.0, 128.0, 0.0, 1.0]); 
+    expect(retrievedExpression[6], ['rgba', 255.0, 255.0, 0.0, 1.0]);  
+  });
 }
 
 extension ToJSON on TransitionOptions {

example/pubspec.lock

@@ -269,7 +269,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.10.0-rc.1"
+    version: "2.10.0"
   matcher:
     dependency: transitive
     description: