Skip to content

feat: ffigen v20, objective_c v9 #375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
josxha wants to merge 8 commits into from
Closed

feat: ffigen v20, objective_c v9 #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f1d3409
bump versions
josxha Sep 23, 2025
b9c6deb
run ffigen
josxha Sep 23, 2025
b59f7d0
remove MLNMapView renamings
josxha Sep 23, 2025
798adb0
remove UIPointerStyle workaround (compile error)
josxha Sep 23, 2025
d7a2c74
Merge branch 'main' into test/ffigen-20-objective_c-9
josxha Oct 17, 2025
1a61fe4
Merge branch 'main' into test/ffigen-20-objective_c-9
josxha Oct 22, 2025
de1b309
Merge branch 'main' into test/ffigen-20-objective_c-9
josxha Nov 2, 2025
48b53d3
use packages from git
josxha Nov 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions example/lib/features_query_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'dart:math';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:maplibre/maplibre.dart';
import 'package:maplibre_example/utils/map_styles.dart';

@immutable
class FeaturesQueryPage extends StatefulWidget {
Expand All @@ -23,9 +24,10 @@ class _FeaturesQueryPageState extends State<FeaturesQueryPage> {
return Scaffold(
appBar: AppBar(title: const Text('Query Features')),
body: MapLibreMap(
options: const MapOptions(
options: MapOptions(
initZoom: 7,
initCenter: Geographic(lon: 0.1, lat: 0.1),
initCenter: const Geographic(lon: 0.1, lat: 0.1),
initStyle: MapStyles.openMapTilesBright.uri,
),
onMapCreated: (controller) => _controller = controller,
onStyleLoaded: _onStyleLoaded,
Expand Down
7 changes: 4 additions & 3 deletions lib/src/platform/ios/map_state.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ final class MapLibreMapStateIos extends MapLibreMapStateNative
if (center != null) {
ffiCamera.centerCoordinate = center.toCLLocationCoordinate2D();
}
_mapView.flyToCamera$1(
_mapView.flyToCamera$2(
ffiCamera,
withDuration: nativeDuration.inMicroseconds / 1000000,
);
Expand Down Expand Up @@ -200,7 +200,8 @@ final class MapLibreMapStateIos extends MapLibreMapStateNative
} else if (NSString.isInstance(object)) {
return NSString.castFrom(object).toDartString();
} else if (NSNumber.isInstance(object)) {
return NSNumber.castFrom(object).intValue;
final number = NSNumber.castFrom(object);
return number.longLongValue;
}
return null;
}
Expand Down Expand Up @@ -330,7 +331,7 @@ final class MapLibreMapStateIos extends MapLibreMapStateNative

@override
Geographic toLngLat(Offset screenLocation) => _mapView
.convertPoint_(screenLocation.toCGPoint(), view: _mapView)
.convertPoint$2(screenLocation.toCGPoint(), toCoordinateFromView: _mapView)
.toGeographic();

@override
Expand Down
10 changes: 5 additions & 5 deletions lib/src/platform/ios/style_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class StyleControllerIos extends StyleController {
case BackgroundStyleLayer():
ffiStyleLayer = MLNBackgroundStyleLayer.new$()
..initWithIdentifier(ffiId)
..backgroundColor = NSExpression.expressionWithFormat$1(
..backgroundColor = NSExpression.expressionWithFormat(
layer.color.toHexString().toNSString(),
);
case StyleLayerWithSource():
Expand Down Expand Up @@ -96,15 +96,15 @@ class StyleControllerIos extends StyleController {
if (belowLayer == null) {
throw Exception('Layer "$id" does not exist.');
}
_ffiStyle.insertLayer$1(ffiStyleLayer, belowLayer: belowLayer);
_ffiStyle.insertLayer$2(ffiStyleLayer, belowLayer: belowLayer);
} else if (aboveLayerId case final String id) {
final aboveLayer = _ffiStyle.layerWithIdentifier(id.toNSString());
if (aboveLayer == null) {
throw Exception('Layer "$id" does not exist.');
}
_ffiStyle.insertLayer$2(ffiStyleLayer, aboveLayer: aboveLayer);
_ffiStyle.insertLayer(ffiStyleLayer, aboveLayer: aboveLayer);
} else if (atIndex case final int index) {
_ffiStyle.insertLayer(ffiStyleLayer, atIndex: index);
_ffiStyle.insertLayer$1(ffiStyleLayer, atIndex: index);
} else {
_ffiStyle.addLayer(ffiStyleLayer);
}
Expand All @@ -125,7 +125,7 @@ class StyleControllerIos extends StyleController {
case GeoJsonSource():
final shapeSource = MLNShapeSource.new$();
if (source.data.startsWith('{')) {
shapeSource.initWithIdentifier$1(
shapeSource.initWithIdentifier$2(
ffiId,
shape: MLNShape.shapeWithData(
source.data.toNSDataUTF8()!,
Expand Down
Loading
Loading