Merge branch 'main' into rl/ios_flaky_tests_3_attemps

Author: evil159

android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/LocationComponentMappings.kt

@@ -55,11 +55,11 @@ fun LocationComponentSettingsInterface2.applyFromFLT(settings: FLTSettings.Locat
 fun LocationComponentSettingsInterface2.toFLT() = FLTSettings.LocationComponentSettings.Builder().let { settings ->
   settings.setEnabled(enabled)
   settings.setPulsingEnabled(pulsingEnabled)
-  settings.setPulsingColor(pulsingColor.toLong())
+  settings.setPulsingColor(pulsingColor.toUInt().toLong())
   settings.setPulsingMaxRadius(pulsingMaxRadius.toDouble())
   settings.setShowAccuracyRing(showAccuracyRing)
-  settings.setAccuracyRingColor(accuracyRingColor.toLong())
-  settings.setAccuracyRingBorderColor(accuracyRingBorderColor.toLong())
+  settings.setAccuracyRingColor(accuracyRingColor.toUInt().toLong())
+  settings.setAccuracyRingBorderColor(accuracyRingBorderColor.toUInt().toLong())
   settings.setLayerAbove(layerAbove)
   settings.setLayerBelow(layerBelow)
   settings.setPuckBearingEnabled(puckBearingEnabled)

android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/ScaleBarMappings.kt

@@ -34,9 +34,9 @@ fun ScaleBarSettingsInterface.toFLT() = FLTSettings.ScaleBarSettings.Builder().l
   settings.setMarginTop(marginTop.toDouble())
   settings.setMarginRight(marginRight.toDouble())
   settings.setMarginBottom(marginBottom.toDouble())
-  settings.setTextColor(textColor.toLong())
-  settings.setPrimaryColor(primaryColor.toLong())
-  settings.setSecondaryColor(secondaryColor.toLong())
+  settings.setTextColor(textColor.toUInt().toLong())
+  settings.setPrimaryColor(primaryColor.toUInt().toLong())
+  settings.setSecondaryColor(secondaryColor.toUInt().toLong())
   settings.setBorderWidth(borderWidth.toDouble())
   settings.setHeight(height.toDouble())
   settings.setTextBarMargin(textBarMargin.toDouble())

example/integration_test/location_test.dart

@@ -54,21 +54,19 @@ void main() {
 
     final updatedSettings = await location.getSettings();
     expect(updatedSettings.enabled, settings.enabled);
+    expect(updatedSettings.pulsingEnabled, settings.pulsingEnabled);
+    expect(updatedSettings.pulsingMaxRadius, settings.pulsingMaxRadius);
+    expect(updatedSettings.pulsingColor, settings.pulsingColor);
     if (Platform.isAndroid) {
-      expect(updatedSettings.pulsingEnabled, settings.pulsingEnabled);
-      expect(updatedSettings.pulsingMaxRadius, settings.pulsingMaxRadius);
-      // FIXME colors are parsed incorrectly
-      // expect(updatedSettings.pulsingColor, settings.pulsingColor);
       expect(updatedSettings.layerAbove, settings.layerAbove);
       expect(updatedSettings.layerBelow, settings.layerBelow);
     }
     expect(updatedSettings.puckBearingEnabled, settings.puckBearingEnabled);
     expect(updatedSettings.puckBearingSource, settings.puckBearingSource);
     expect(updatedSettings.showAccuracyRing, settings.showAccuracyRing);
     // FIXME bitmaps are decoded incorrectly for some reason
-    // expect(updatedSettings.accuracyRingBorderColor,
-    //     settings.accuracyRingBorderColor);
-    // expect(updatedSettings.accuracyRingColor, settings.accuracyRingColor);
+    expect(updatedSettings.accuracyRingBorderColor, settings.accuracyRingBorderColor);
+    expect(updatedSettings.accuracyRingColor, settings.accuracyRingColor);
     // expect(updatedSettings.locationPuck?.locationPuck2D?.bearingImage,
     //     settings.locationPuck?.locationPuck2D?.bearingImage);
     // expect(updatedSettings.locationPuck?.locationPuck2D?.topImage,

example/integration_test/scale_bar_test.dart

@@ -47,10 +47,10 @@ void main() {
       expect(updatedSettings.marginTop, 2);
       expect(updatedSettings.marginRight, 3);
       expect(updatedSettings.marginBottom, 4);
-      // FIXME colors are decoded incorrectly for some reason
-      // expect(updatedSettings.textColor, Colors.black.value);
-      // expect(updatedSettings.primaryColor, Colors.red.value);
-      // expect(updatedSettings.secondaryColor, Colors.blue.value);
+      // iOS doesn't support these settings
+      expect(updatedSettings.textColor, Colors.black.value);
+      expect(updatedSettings.primaryColor, Colors.red.value);
+      expect(updatedSettings.secondaryColor, Colors.blue.value);
       expect(updatedSettings.borderWidth, 2);
       expect(updatedSettings.height, 10);
       expect(updatedSettings.textBarMargin, 1);

ios/Classes/LocationController.swift

@@ -84,6 +84,18 @@ extension LocationOptions {
                 if let showAccuracyRing = settings.showAccuracyRing {
                     configuration.showsAccuracyRing = showAccuracyRing.boolValue
                 }
+                if settings.pulsingEnabled?.boolValue ?? false {
+                    var pulsing = Puck2DConfiguration.Pulsing()
+
+                    if let radius = settings.pulsingMaxRadius?.intValue {
+                        // -1 indicates "accuracy" mode(from Android)
+                        pulsing.radius = radius == -1 ? .accuracy : .constant(Double(radius))
+                    }
+                    if let color = settings.pulsingColor?.intValue {
+                        pulsing.color = uiColorFromHex(rgbValue: color)
+                    }
+                    configuration.pulsing = pulsing
+                }
 
                 options.puckType = .puck2D(configuration)
             }
@@ -102,6 +114,9 @@ extension LocationOptions {
         var accuracyRingColor: NSNumber?
         var accuracyRingBorderColor: NSNumber?
         var showAccuracyRing: NSNumber?
+        var pulsingEnabled: NSNumber?
+        var pulsingRadius: NSNumber?
+        var pulsingColor: NSNumber?
         let locationPuck2D = FLT_SETTINGSLocationPuck2D.init()
         let locationPuck3D = FLT_SETTINGSLocationPuck3D.init()
         let locationPuck = FLT_SETTINGSLocationPuck.make(with: locationPuck2D, locationPuck3D: locationPuck3D)
@@ -123,6 +138,16 @@ extension LocationOptions {
                 let encoded = try! JSONEncoder().encode(scaleData)
                 locationPuck2D.scaleExpression = String(data: encoded, encoding: .utf8)
             }
+            if let pulsing = oldConfiguration.pulsing {
+                pulsingEnabled = NSNumber(value: true)
+                switch pulsing.radius {
+                case .accuracy:
+                    pulsingRadius = NSNumber(value: -1)
+                case .constant(let radius):
+                    pulsingRadius = NSNumber(value: radius)
+                }
+                pulsingColor = NSNumber(value: pulsing.color.rgb())
+            }
         }
         if case .puck3D(let oldConfiguration) = self.puckType {
             locationPuck3D.modelUri = oldConfiguration.model.uri?.absoluteString
@@ -144,9 +169,9 @@ extension LocationOptions {
 
         return FLT_SETTINGSLocationComponentSettings.make(
             withEnabled: enabled,
-            pulsingEnabled: nil,
-            pulsingColor: nil,
-            pulsingMaxRadius: nil,
+            pulsingEnabled: pulsingEnabled,
+            pulsingColor: pulsingColor,
+            pulsingMaxRadius: pulsingRadius,
             showAccuracyRing: showAccuracyRing,
             accuracyRingColor: accuracyRingColor,
             accuracyRingBorderColor: accuracyRingBorderColor,