Skip to content

Commit 66177de

Browse files
josxhajosxha
authored
feat: clean up pigeon on ios (#395)
- remove unused piegeon methods - dispose() needs to be reevaluated
1 parent 501251f commit 66177de

File tree

9 files changed

+2109
-1312
lines changed

9 files changed

+2109
-1312
lines changed

‎lib/src/platform/ios/map_state.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ final class MapLibreMapStateIos extends MapLibreMapStateNative
149149
@override
150150
void dispose() {
151151
style?.dispose();
152-
unawaited(_hostApi.dispose());
153152
super.dispose();
154153
}
155154

‎lib/src/platform/ios/style_controller.dart‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,9 @@ class StyleControllerIos extends StyleController {
1111
Future<void> addImage(String id, Uint8List bytes) async {
1212
// TODO Unhandled Exception: FailedToLoadClassException: Failed to load Objective-C class: NSImage
1313
// https://developer.apple.com/documentation/foundation/nsitemproviderreading/2919479-objectwithitemproviderdata
14-
/*_ffiStyle.setImage_forName_(
15-
NSImage.objectWithItemProviderData_typeIdentifier_error_(
16-
bytes.toNSData(),
17-
// The uniform type identifier (UTI) representing the data type of data.
18-
'public.image'.toNSString(),
19-
nullptr,
20-
)!,
21-
id.toNSString(),
22-
);*/
14+
/*final image = UIImage.imageWithData(bytes.toNSData());
15+
if (image == null) return;
16+
_ffiStyle.setImage(image, forName: id.toNSString());*/
2317
await _hostApi.addImage(id, bytes);
2418
}
2519

‎lib/src/platform/pigeon.g.dart‎

Lines changed: 0 additions & 364 deletions
Original file line numberDiff line numberDiff line change
@@ -696,370 +696,6 @@ class MapLibreHostApi {
696696

697697
final String pigeonVar_messageChannelSuffix;
698698

699-
Future<void> dispose() async {
700-
final String pigeonVar_channelName =
701-
'dev.flutter.pigeon.maplibre.MapLibreHostApi.dispose$pigeonVar_messageChannelSuffix';
702-
final BasicMessageChannel<Object?> pigeonVar_channel =
703-
BasicMessageChannel<Object?>(
704-
pigeonVar_channelName,
705-
pigeonChannelCodec,
706-
binaryMessenger: pigeonVar_binaryMessenger,
707-
);
708-
final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
709-
final List<Object?>? pigeonVar_replyList =
710-
await pigeonVar_sendFuture as List<Object?>?;
711-
if (pigeonVar_replyList == null) {
712-
throw _createConnectionError(pigeonVar_channelName);
713-
} else if (pigeonVar_replyList.length > 1) {
714-
throw PlatformException(
715-
code: pigeonVar_replyList[0]! as String,
716-
message: pigeonVar_replyList[1] as String?,
717-
details: pigeonVar_replyList[2],
718-
);
719-
} else {
720-
return;
721-
}
722-
}
723-
724-
/// Add a fill layer to the map style.
725-
Future<void> addFillLayer({
726-
required String id,
727-
required String sourceId,
728-
required Map<String, Object> layout,
729-
required Map<String, Object> paint,
730-
String? belowLayerId,
731-
}) async {
732-
final String pigeonVar_channelName =
733-
'dev.flutter.pigeon.maplibre.MapLibreHostApi.addFillLayer$pigeonVar_messageChannelSuffix';
734-
final BasicMessageChannel<Object?> pigeonVar_channel =
735-
BasicMessageChannel<Object?>(
736-
pigeonVar_channelName,
737-
pigeonChannelCodec,
738-
binaryMessenger: pigeonVar_binaryMessenger,
739-
);
740-
final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(
741-
<Object?>[id, sourceId, layout, paint, belowLayerId],
742-
);
743-
final List<Object?>? pigeonVar_replyList =
744-
await pigeonVar_sendFuture as List<Object?>?;
745-
if (pigeonVar_replyList == null) {
746-
throw _createConnectionError(pigeonVar_channelName);
747-
} else if (pigeonVar_replyList.length > 1) {
748-
throw PlatformException(
749-
code: pigeonVar_replyList[0]! as String,
750-
message: pigeonVar_replyList[1] as String?,
751-
details: pigeonVar_replyList[2],
752-
);
753-
} else {
754-
return;
755-
}
756-
}
757-
758-
/// Add a circle layer to the map style.
759-
Future<void> addCircleLayer({
760-
required String id,
761-
required String sourceId,
762-
required Map<String, Object> layout,
763-
required Map<String, Object> paint,
764-
String? belowLayerId,
765-
}) async {
766-
final String pigeonVar_channelName =
767-
'dev.flutter.pigeon.maplibre.MapLibreHostApi.addCircleLayer$pigeonVar_messageChannelSuffix';
768-
final BasicMessageChannel<Object?> pigeonVar_channel =
769-
BasicMessageChannel<Object?>(
770-
pigeonVar_channelName,
771-
pigeonChannelCodec,
772-
binaryMessenger: pigeonVar_binaryMessenger,
773-
);
774-
final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(
775-
<Object?>[id, sourceId, layout, paint, belowLayerId],
776-
);
777-
final List<Object?>? pigeonVar_replyList =
778-
await pigeonVar_sendFuture as List<Object?>?;
779-
if (pigeonVar_replyList == null) {
780-
throw _createConnectionError(pigeonVar_channelName);
781-
} else if (pigeonVar_replyList.length > 1) {
782-
throw PlatformException(
783-
code: pigeonVar_replyList[0]! as String,
784-
message: pigeonVar_replyList[1] as String?,
785-
details: pigeonVar_replyList[2],
786-
);
787-
} else {
788-
return;
789-
}
790-
}
791-
792-
/// Add a background layer to the map style.
793-
Future<void> addBackgroundLayer({
794-
required String id,
795-
required Map<String, Object> layout,
796-
required Map<String, Object> paint,
797-
String? belowLayerId,
798-
}) async {
799-
final String pigeonVar_channelName =
800-
'dev.flutter.pigeon.maplibre.MapLibreHostApi.addBackgroundLayer$pigeonVar_messageChannelSuffix';
801-
final BasicMessageChannel<Object?> pigeonVar_channel =
802-
BasicMessageChannel<Object?>(
803-
pigeonVar_channelName,
804-
pigeonChannelCodec,
805-
binaryMessenger: pigeonVar_binaryMessenger,
806-
);
807-
final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(
808-
<Object?>[id, layout, paint, belowLayerId],
809-
);
810-
final List<Object?>? pigeonVar_replyList =
811-
await pigeonVar_sendFuture as List<Object?>?;
812-
if (pigeonVar_replyList == null) {
813-
throw _createConnectionError(pigeonVar_channelName);
814-
} else if (pigeonVar_replyList.length > 1) {
815-
throw PlatformException(
816-
code: pigeonVar_replyList[0]! as String,
817-
message: pigeonVar_replyList[1] as String?,
818-
details: pigeonVar_replyList[2],
819-
);
820-
} else {
821-
return;
822-
}
823-
}
824-
825-
/// Add a fill extrusion layer to the map style.
826-
Future<void> addFillExtrusionLayer({
827-
required String id,
828-
required String sourceId,
829-
required Map<String, Object> layout,
830-
required Map<String, Object> paint,
831-
String? belowLayerId,
832-
}) async {
833-
final String pigeonVar_channelName =
834-
'dev.flutter.pigeon.maplibre.MapLibreHostApi.addFillExtrusionLayer$pigeonVar_messageChannelSuffix';
835-
final BasicMessageChannel<Object?> pigeonVar_channel =
836-
BasicMessageChannel<Object?>(
837-
pigeonVar_channelName,
838-
pigeonChannelCodec,
839-
binaryMessenger: pigeonVar_binaryMessenger,
840-
);
841-
final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(
842-
<Object?>[id, sourceId, layout, paint, belowLayerId],
843-
);
844-
final List<Object?>? pigeonVar_replyList =
845-
await pigeonVar_sendFuture as List<Object?>?;
846-
if (pigeonVar_replyList == null) {
847-
throw _createConnectionError(pigeonVar_channelName);
848-
} else if (pigeonVar_replyList.length > 1) {
849-
throw PlatformException(
850-
code: pigeonVar_replyList[0]! as String,
851-
message: pigeonVar_replyList[1] as String?,
852-
details: pigeonVar_replyList[2],
853-
);
854-
} else {
855-
return;
856-
}
857-
}
858-
859-
/// Add a heatmap layer to the map style.
860-
Future<void> addHeatmapLayer({
861-
required String id,
862-
required String sourceId,
863-
required Map<String, Object> layout,
864-
required Map<String, Object> paint,
865-
String? belowLayerId,
866-
}) async {
867-
final String pigeonVar_channelName =
868-
'dev.flutter.pigeon.maplibre.MapLibreHostApi.addHeatmapLayer$pigeonVar_messageChannelSuffix';
869-
final BasicMessageChannel<Object?> pigeonVar_channel =
870-
BasicMessageChannel<Object?>(
871-
pigeonVar_channelName,
872-
pigeonChannelCodec,
873-
binaryMessenger: pigeonVar_binaryMessenger,
874-
);
875-
final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(
876-
<Object?>[id, sourceId, layout, paint, belowLayerId],
877-
);
878-
final List<Object?>? pigeonVar_replyList =
879-
await pigeonVar_sendFuture as List<Object?>?;
880-
if (pigeonVar_replyList == null) {
881-
throw _createConnectionError(pigeonVar_channelName);
882-
} else if (pigeonVar_replyList.length > 1) {
883-
throw PlatformException(
884-
code: pigeonVar_replyList[0]! as String,
885-
message: pigeonVar_replyList[1] as String?,
886-
details: pigeonVar_replyList[2],
887-
);
888-
} else {
889-
return;
890-
}
891-
}
892-
893-
/// Add a hillshade layer to the map style.
894-
Future<void> addHillshadeLayer({
895-
required String id,
896-
required String sourceId,
897-
required Map<String, Object> layout,
898-
required Map<String, Object> paint,
899-
String? belowLayerId,
900-
}) async {
901-
final String pigeonVar_channelName =
902-
'dev.flutter.pigeon.maplibre.MapLibreHostApi.addHillshadeLayer$pigeonVar_messageChannelSuffix';
903-
final BasicMessageChannel<Object?> pigeonVar_channel =
904-
BasicMessageChannel<Object?>(
905-
pigeonVar_channelName,
906-
pigeonChannelCodec,
907-
binaryMessenger: pigeonVar_binaryMessenger,
908-
);
909-
final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(
910-
<Object?>[id, sourceId, layout, paint, belowLayerId],
911-
);
912-
final List<Object?>? pigeonVar_replyList =
913-
await pigeonVar_sendFuture as List<Object?>?;
914-
if (pigeonVar_replyList == null) {
915-
throw _createConnectionError(pigeonVar_channelName);
916-
} else if (pigeonVar_replyList.length > 1) {
917-
throw PlatformException(
918-
code: pigeonVar_replyList[0]! as String,
919-
message: pigeonVar_replyList[1] as String?,
920-
details: pigeonVar_replyList[2],
921-
);
922-
} else {
923-
return;
924-
}
925-
}
926-
927-
/// Add a line layer to the map style.
928-
Future<void> addLineLayer({
929-
required String id,
930-
required String sourceId,
931-
required Map<String, Object> layout,
932-
required Map<String, Object> paint,
933-
String? belowLayerId,
934-
}) async {
935-
final String pigeonVar_channelName =
936-
'dev.flutter.pigeon.maplibre.MapLibreHostApi.addLineLayer$pigeonVar_messageChannelSuffix';
937-
final BasicMessageChannel<Object?> pigeonVar_channel =
938-
BasicMessageChannel<Object?>(
939-
pigeonVar_channelName,
940-
pigeonChannelCodec,
941-
binaryMessenger: pigeonVar_binaryMessenger,
942-
);
943-
final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(
944-
<Object?>[id, sourceId, layout, paint, belowLayerId],
945-
);
946-
final List<Object?>? pigeonVar_replyList =
947-
await pigeonVar_sendFuture as List<Object?>?;
948-
if (pigeonVar_replyList == null) {
949-
throw _createConnectionError(pigeonVar_channelName);
950-
} else if (pigeonVar_replyList.length > 1) {
951-
throw PlatformException(
952-
code: pigeonVar_replyList[0]! as String,
953-
message: pigeonVar_replyList[1] as String?,
954-
details: pigeonVar_replyList[2],
955-
);
956-
} else {
957-
return;
958-
}
959-
}
960-
961-
/// Add a raster layer to the map style.
962-
Future<void> addRasterLayer({
963-
required String id,
964-
required String sourceId,
965-
required Map<String, Object> layout,
966-
required Map<String, Object> paint,
967-
String? belowLayerId,
968-
}) async {
969-
final String pigeonVar_channelName =
970-
'dev.flutter.pigeon.maplibre.MapLibreHostApi.addRasterLayer$pigeonVar_messageChannelSuffix';
971-
final BasicMessageChannel<Object?> pigeonVar_channel =
972-
BasicMessageChannel<Object?>(
973-
pigeonVar_channelName,
974-
pigeonChannelCodec,
975-
binaryMessenger: pigeonVar_binaryMessenger,
976-
);
977-
final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(
978-
<Object?>[id, sourceId, layout, paint, belowLayerId],
979-
);
980-
final List<Object?>? pigeonVar_replyList =
981-
await pigeonVar_sendFuture as List<Object?>?;
982-
if (pigeonVar_replyList == null) {
983-
throw _createConnectionError(pigeonVar_channelName);
984-
} else if (pigeonVar_replyList.length > 1) {
985-
throw PlatformException(
986-
code: pigeonVar_replyList[0]! as String,
987-
message: pigeonVar_replyList[1] as String?,
988-
details: pigeonVar_replyList[2],
989-
);
990-
} else {
991-
return;
992-
}
993-
}
994-
995-
/// Add a symbol layer to the map style.
996-
Future<void> addSymbolLayer({
997-
required String id,
998-
required String sourceId,
999-
required Map<String, Object> layout,
1000-
required Map<String, Object> paint,
1001-
String? belowLayerId,
1002-
}) async {
1003-
final String pigeonVar_channelName =
1004-
'dev.flutter.pigeon.maplibre.MapLibreHostApi.addSymbolLayer$pigeonVar_messageChannelSuffix';
1005-
final BasicMessageChannel<Object?> pigeonVar_channel =
1006-
BasicMessageChannel<Object?>(
1007-
pigeonVar_channelName,
1008-
pigeonChannelCodec,
1009-
binaryMessenger: pigeonVar_binaryMessenger,
1010-
);
1011-
final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(
1012-
<Object?>[id, sourceId, layout, paint, belowLayerId],
1013-
);
1014-
final List<Object?>? pigeonVar_replyList =
1015-
await pigeonVar_sendFuture as List<Object?>?;
1016-
if (pigeonVar_replyList == null) {
1017-
throw _createConnectionError(pigeonVar_channelName);
1018-
} else if (pigeonVar_replyList.length > 1) {
1019-
throw PlatformException(
1020-
code: pigeonVar_replyList[0]! as String,
1021-
message: pigeonVar_replyList[1] as String?,
1022-
details: pigeonVar_replyList[2],
1023-
);
1024-
} else {
1025-
return;
1026-
}
1027-
}
1028-
1029-
/// Loads an image to the map. An image needs to be loaded before it can
1030-
/// get used.
1031-
Future<Uint8List> loadImage(String url) async {
1032-
final String pigeonVar_channelName =
1033-
'dev.flutter.pigeon.maplibre.MapLibreHostApi.loadImage$pigeonVar_messageChannelSuffix';
1034-
final BasicMessageChannel<Object?> pigeonVar_channel =
1035-
BasicMessageChannel<Object?>(
1036-
pigeonVar_channelName,
1037-
pigeonChannelCodec,
1038-
binaryMessenger: pigeonVar_binaryMessenger,
1039-
);
1040-
final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(
1041-
<Object?>[url],
1042-
);
1043-
final List<Object?>? pigeonVar_replyList =
1044-
await pigeonVar_sendFuture as List<Object?>?;
1045-
if (pigeonVar_replyList == null) {
1046-
throw _createConnectionError(pigeonVar_channelName);
1047-
} else if (pigeonVar_replyList.length > 1) {
1048-
throw PlatformException(
1049-
code: pigeonVar_replyList[0]! as String,
1050-
message: pigeonVar_replyList[1] as String?,
1051-
details: pigeonVar_replyList[2],
1052-
);
1053-
} else if (pigeonVar_replyList[0] == null) {
1054-
throw PlatformException(
1055-
code: 'null-error',
1056-
message: 'Host platform returned null value for non-null return value.',
1057-
);
1058-
} else {
1059-
return (pigeonVar_replyList[0] as Uint8List?)!;
1060-
}
1061-
}
1062-
1063699
/// Add an image to the map.
1064700
Future<void> addImage(String id, Uint8List bytes) async {
1065701
final String pigeonVar_channelName =

0 commit comments

Comments
 (0)