chore: update gen swift headers script (#392)

- split `Helpers` class in its own file
- regenerate headers
- add `SafeArea` to events example page

Author: josxha

example/lib/events_page.dart

@@ -26,13 +26,15 @@ class _EventsPageState extends State<EventsPage> {
             ),
             onEvent: _onEvent,
           ),
-          IgnorePointer(
-            child: Container(
-              padding: const EdgeInsets.all(8),
-              alignment: Alignment.bottomLeft,
-              child: Text(
-                _events.map(eventToString).join('\n'),
-                style: const TextStyle(color: Colors.black),
+          SafeArea(
+            child: IgnorePointer(
+              child: Container(
+                padding: const EdgeInsets.all(8),
+                alignment: Alignment.bottomLeft,
+                child: Text(
+                  _events.map(eventToString).join('\n'),
+                  style: const TextStyle(color: Colors.black),
+                ),
               ),
             ),
           ),

maplibre_ios/ios/maplibre_ios/Sources/maplibre_ios/Extensions.swift

@@ -1,4 +1,10 @@
+import Foundation
 import MapLibre
+import UIKit
+
+// Update the header file for this class like this:
+// cd maplibre_ios/ios/maplibre_ios/Sources/maplibre_ios/
+// ./gen_swift_headers.sh
 
 public extension UIColor {
   convenience init?(hexString: String) {

maplibre_ios/ios/maplibre_ios/Sources/maplibre_ios/Helpers.swift

@@ -0,0 +1,75 @@
+import Foundation
+import MapLibre
+import UIKit
+
+// Update the header file for this class like this:
+// cd maplibre_ios/ios/maplibre_ios/Sources/maplibre_ios/
+// ./gen_swift_headers.sh
+
+@objc public class Helpers: NSObject {
+  @objc public static func addImageToStyle(
+    target: NSObject, field: String, expression: NSExpression
+  ) {
+    do {
+      target.setValue(expression, forKey: field)
+    } catch {
+      print("Couldn't set expression in Helpers.addImageToStyle()")
+    }
+  }
+
+  @objc public static func setExpression(
+    target: NSObject, field: String, expression: NSExpression
+  ) {
+    do {
+      // https://developer.apple.com/documentation/objectivec/nsobject/1418139-setvalue
+      try target.setValue(expression, forKey: field)
+    } catch {
+      print("Couldn't set expression in Helpers.setExpression()")
+    }
+  }
+
+  @objc public static func parseExpression(
+    propertyName: String, expression: String
+  ) -> NSExpression? {
+    print("\(propertyName): \(expression)")
+    do {
+      // can't create an Expression using the default method if the data is a hex string
+      if propertyName.contains("color"), expression.first == "#" {
+        let color = UIColor(hexString: expression)
+        return NSExpression(forConstantValue: color)
+      }
+      if expression.starts(with: "[") {
+        // can't create an Expression if the data of a literal is an array
+        let json = try JSONSerialization.jsonObject(
+          with: expression.data(using: .utf8)!,
+          options: .fragmentsAllowed
+        )
+        // print("json: \(json)")
+        if let offset = json as? [Any] {
+          if offset.count == 2, offset.first is String,
+             offset.first as? String == "literal"
+          {
+            if let vector = offset.last as? [Any] {
+              if vector.count == 2 {
+                if let x = vector.first as? Double,
+                   let y = vector.last as? Double
+                {
+                  return NSExpression(
+                    forConstantValue: NSValue(
+                      cgVector: CGVector(dx: x, dy: y)))
+                }
+              }
+            }
+          }
+        }
+        return NSExpression(mglJSONObject: json)
+      }
+      // parse as a constant value
+      return NSExpression(forConstantValue: expression)
+
+    } catch {
+      print("Couldn't parse Expression: " + expression)
+    }
+    return nil
+  }
+}

maplibre_ios/ios/maplibre_ios/Sources/maplibre_ios/MapLibreRegistry.h renamed to maplibre_ios/ios/maplibre_ios/Sources/maplibre_ios/MapLibreIos.h

@@ -4,7 +4,7 @@ import UIKit
 
 // Update the header file for this class like this:
 // cd maplibre_ios/ios/maplibre_ios/Sources/maplibre_ios/
-// swiftc -c MapLibreRegistry.swift -module-name maplibre_ios -emit-objc-header-path MapLibreRegistry.h -emit-library -o libmaplibreios.dylib -target arm64-apple-ios18.1-simulator -sdk $(xcrun --sdk iphonesimulator --show-sdk-path) -F /Users/joscha/Library/Caches/CocoaPods/Pods/Release/MapLibre/6.8.1-46c5f/MapLibre.xcframework/ios-arm64_x86_64-simulator
+// ./gen_swift_headers.sh
 
 @objc public class MapLibreRegistry: NSObject {
   private static var mapRegistry: [Int64: AnyObject] = [:]
@@ -30,71 +30,3 @@ import UIKit
   // Warning: Storing Context in a static field may lead to memory leaks.
   @objc public static var context: AnyObject?
 }
-
-@objc public class Helpers: NSObject {
-  @objc public static func addImageToStyle(
-    target: NSObject, field: String, expression: NSExpression
-  ) {
-    do {
-      target.setValue(expression, forKey: field)
-    } catch {
-      print("Couldn't set expression in Helpers.setExpression()")
-    }
-  }
-
-  @objc public static func setExpression(
-    target: NSObject, field: String, expression: NSExpression
-  ) {
-    do {
-      // https://developer.apple.com/documentation/objectivec/nsobject/1418139-setvalue
-      try target.setValue(expression, forKey: field)
-    } catch {
-      print("Couldn't set expression in Helpers.setExpression()")
-    }
-  }
-
-  @objc public static func parseExpression(
-    propertyName: String, expression: String
-  ) -> NSExpression? {
-    print("\(propertyName): \(expression)")
-    do {
-      // can't create an Expression using the default method if the data is a hex string
-      if propertyName.contains("color"), expression.first == "#" {
-        var color = UIColor(hexString: expression)
-        return NSExpression(forConstantValue: color)
-      }
-      if expression.starts(with: "[") {
-        // can't create an Expression if the data of a literal is an array
-        let json = try JSONSerialization.jsonObject(
-          with: expression.data(using: .utf8)!,
-          options: .fragmentsAllowed
-        )
-        // print("json: \(json)")
-        if let offset = json as? [Any] {
-          if offset.count == 2, offset.first is String,
-             offset.first as? String == "literal"
-          {
-            if let vector = offset.last as? [Any] {
-              if vector.count == 2 {
-                if let x = vector.first as? Double,
-                   let y = vector.last as? Double
-                {
-                  return NSExpression(
-                    forConstantValue: NSValue(
-                      cgVector: CGVector(dx: x, dy: y)))
-                }
-              }
-            }
-          }
-        }
-        return NSExpression(mglJSONObject: json)
-      }
-      // parse as a constant value
-      return NSExpression(forConstantValue: expression)
-
-    } catch {
-      print("Couldn't parse Expression: " + expression)
-    }
-    return nil
-  }
-}

maplibre_ios/ios/maplibre_ios/Sources/maplibre_ios/MapLibreRegistry.swift

@@ -1,10 +1,18 @@
 #!/usr/bin/env bash
 
+# Use for -target the same ios version that is returned by xcrun
+# Build the MapLibre iOS SDK before running this script
+
+xcrun --sdk iphonesimulator --show-sdk-path
+
 swiftc \
     -c MapLibreRegistry.swift \
+    -c Extensions.swift \
+    -c Helpers.swift \
     -module-name maplibre_ios \
-    -emit-objc-header-path MapLibreRegistry.h \
+    -emit-objc-header-path MapLibreIos.h \
     -emit-library -o libmaplibreios.dylib \
-    -target arm64-apple-ios18.1-simulator \
+    -target arm64-apple-ios18.5-simulator \
     -sdk $(xcrun --sdk iphonesimulator --show-sdk-path) \
-    -F ../../../.build/MapLibre.xcframework/ios-arm64_x86_64-simulator/
+    -F ../../../.build/MapLibre.xcframework/ios-arm64_x86_64-simulator/ \
+    -framework MapLibre

maplibre_ios/ios/maplibre_ios/Sources/maplibre_ios/gen_swift_headers.sh

@@ -1,7 +1,7 @@
 #include <stdint.h>
 #import <Foundation/Foundation.h>
 #import <objc/message.h>
-#import "../ios/maplibre_ios/Sources/maplibre_ios/MapLibreRegistry.h"
+#import "../ios/maplibre_ios/Sources/maplibre_ios/MapLibreIos.h"
 #import "../MapLibre.h"
 
 #if !__has_feature(objc_arc)

maplibre_ios/ios/maplibre_ios/Sources/maplibre_ios/libmaplibreios.dylib

@@ -40,7 +40,6 @@ ffigen:
   objc-interfaces:
     include:
       - 'NSString'
-      - 'MapLibreRegistry'
       - 'CLLocationCoordinate2D'
       - 'NSAttributedString'
       - 'NSImage'
@@ -55,10 +54,13 @@ ffigen:
       - 'UIViewConfigurationState'
       - 'NSExpression'
       - 'Helpers'
+      - 'MapLibreRegistry'
+      - 'Extensions'
       - 'MLN.*'
     module:
       'MapLibreRegistry': 'maplibre_ios'
       'Helpers': 'maplibre_ios'
+      'Extensions': 'maplibre_ios'
       'MLNMapView': 'MapLibre'
       'MLNMapCamera': 'MapLibre'
       'MLNVectorTileSource': 'MapLibre'
@@ -86,7 +88,7 @@ ffigen:
     - '-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk'
   headers:
     entry-points:
-      - 'ios/maplibre_ios/Sources/maplibre_ios/MapLibreRegistry.h'
+      - 'ios/maplibre_ios/Sources/maplibre_ios/MapLibreIos.h'
       - 'MapLibre.h'
   preamble: |
     // ignore_for_file: type=lint, unused_element, unused_field |