Allow changing color of scalebar on iOS (#2614)

maplibre · Jul 15, 2024 · 3b19112 · 3b19112
1 parent 1ae14a5
commit 3b19112
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md
@@ -4,6 +4,7 @@ MapLibre welcomes participation and contributions from everyone. Please read [`C
 
 ## main
 
+- Allow changing color of scalebar on iOS ([#2614](https://github.com/maplibre/maplibre-native/pull/2614)).
 - Experimental API to toggle tile cache in map view ([#2590](https://github.com/maplibre/maplibre-native/pull/2590)). This can reduce memory usage at the cost of having to parse tile data again when the zoom level changes.
 
 ## 6.5.1

diff --git a/platform/ios/bazel/files.bzl b/platform/ios/bazel/files.bzl
@@ -11,6 +11,7 @@ MLN_IOS_SDK_HEADERS = [
     "src/MLNUserLocation.h",
     "src/MLNUserLocationAnnotationView.h",
     "src/MLNUserLocationAnnotationViewStyle.h",
+    "src/MLNScaleBar.h",
 ]
 
 MLN_IOS_PUBLIC_HEADERS = [
@@ -27,7 +28,6 @@ MLN_IOS_PRIVATE_HEADERS = [
     "src/MLNMapAccessibilityElement.h",
     "src/UIViewController+MLNAdditions.h",
     "src/UIView+MLNAdditions.h",
-    "src/MLNScaleBar.h",
     "src/MLNFaux3DUserLocationAnnotationView.h",
     "src/MLNUserLocationHeadingBeamLayer.h",
     "src/MLNAnnotationContainerView.h",

diff --git a/platform/ios/sdk-files.json b/platform/ios/sdk-files.json
@@ -190,6 +190,7 @@
         "MLNTilePyramidOfflineRegion.h": "platform/darwin/src/MLNTilePyramidOfflineRegion.h",
         "MLNVectorTileSource.h": "platform/darwin/src/MLNVectorTileSource.h",
         "MLNOfflineStorage.h": "platform/darwin/src/MLNOfflineStorage.h",
+        "MLNScaleBar.h": "platform/ios/src/MLNScaleBar.h",
         "MLNMapView.h": "platform/ios/src/MLNMapView.h",
         "Mapbox/Mapbox.h": "platform/ios/src/Mapbox.h"
     },
@@ -238,7 +239,6 @@
         "MLNLoggingConfiguration_Private.h": "platform/darwin/src/MLNLoggingConfiguration_Private.h",
         "NSComparisonPredicate+MLNAdditions.h": "platform/darwin/src/NSComparisonPredicate+MLNAdditions.h",
         "MLNMapAccessibilityElement.h": "platform/ios/src/MLNMapAccessibilityElement.h",
-        "MLNScaleBar.h": "platform/ios/src/MLNScaleBar.h",
         "MMEDate.h": "platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEDate.h",
         "NSString+MLNAdditions.h": "platform/darwin/src/NSString+MLNAdditions.h",
         "UIDevice+MLNAdditions.h": "platform/ios/src/UIDevice+MLNAdditions.h",

diff --git a/platform/ios/src/MLNMapView.h b/platform/ios/src/MLNMapView.h
@@ -16,6 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class MLNMapProjection;
 @class MLNPolyline;
 @class MLNPolygon;
+@class MLNScaleBar;
 @class MLNShape;
 
 @protocol MLNMapViewDelegate;
@@ -295,7 +296,7 @@ MLN_EXPORT
  A control indicating the scale of the map. The scale bar is positioned in the
  upper-left corner. Enable the scale bar via `showsScale`.
  */
-@property (nonatomic, readonly) UIView *scaleBar;
+@property (nonatomic, readonly) MLNScaleBar *scaleBar;
 
 /**
  Sets whether the scale uses styles that make it easier to read on a dark styled map

diff --git a/platform/ios/src/MLNScaleBar.h b/platform/ios/src/MLNScaleBar.h
@@ -12,4 +12,10 @@
 // Sets whether the scale uses metric
 @property (nonatomic, assign) BOOL usesMetricSystem;
 
+// Sets the primary color of the scale bar
+@property (nonatomic) UIColor *primaryColor;
+
+// Sets the secondary color of the scale bar
+@property (nonatomic) UIColor *secondaryColor;
+
 @end
diff --git a/platform/ios/src/MLNScaleBar.mm b/platform/ios/src/MLNScaleBar.mm
@@ -80,8 +80,6 @@ @interface MLNScaleBar()
 @property (nonatomic) UIView *containerView;
 @property (nonatomic) MLNDistanceFormatter *formatter;
 @property (nonatomic, assign) MLNRow row;
-@property (nonatomic) UIColor *primaryColor;
-@property (nonatomic) UIColor *secondaryColor;
 @property (nonatomic, assign) CGFloat borderWidth;
 @property (nonatomic) NSMutableDictionary* labelImageCache;
 @property (nonatomic) MLNScaleBarLabel* prototypeLabel;