Merge branch 'main' into rl/puck_pulsing_ios

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

@@ -65,9 +65,8 @@ void main() {
     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);