From df26c73ef08d4a7f7d1f6e9e4ffed7734588f5e7 Mon Sep 17 00:00:00 2001 From: Mai Mai Date: Mon, 5 May 2025 14:25:39 +0300 Subject: [PATCH 01/16] make mapbox_maps_flutter_mobile --- mapbox_maps_flutter_mobile/.gitignore | 33 ++++++++++++++++++ mapbox_maps_flutter_mobile/.metadata | 33 ++++++++++++++++++ .../CHANGELOG.md | 0 LICENSE => mapbox_maps_flutter_mobile/LICENSE | 0 .../README.md | 0 .../analysis_options.yaml | 0 .../android}/.editorconfig | 0 .../android}/.gitignore | 0 .../android}/build.gradle | 0 .../android}/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.properties | 0 .../android}/settings.gradle | 0 .../android}/src/main/AndroidManifest.xml | 0 .../com/mapbox/maps/mapbox_maps/Accessors.kt | 0 .../maps/mapbox_maps/AnimationController.kt | 0 .../maps/mapbox_maps/AttributionController.kt | 0 .../maps/mapbox_maps/CameraController.kt | 0 .../maps/mapbox_maps/CompassController.kt | 0 .../mapbox/maps/mapbox_maps/EventHandler.kt | 0 .../com/mapbox/maps/mapbox_maps/Extentions.kt | 0 .../maps/mapbox_maps/GestureController.kt | 0 .../mapbox_maps/InteractionsController.kt | 0 .../LocationComponentController.kt | 0 .../maps/mapbox_maps/LoggingController.kt | 0 .../mapbox/maps/mapbox_maps/LogoController.kt | 0 .../mapbox_maps/MapInterfaceController.kt | 0 .../mapbox_maps/MapProjectionController.kt | 0 .../maps/mapbox_maps/MapboxMapController.kt | 0 .../maps/mapbox_maps/MapboxMapFactory.kt | 0 .../maps/mapbox_maps/MapboxMapsPlugin.kt | 0 .../mapbox_maps/MapboxOptionsController.kt | 0 .../PerformanceStatisticsController.kt | 0 .../maps/mapbox_maps/ScaleBarController.kt | 0 .../maps/mapbox_maps/StyleController.kt | 0 .../maps/mapbox_maps/ViewportController.kt | 0 .../annotation/AnnotationController.kt | 0 .../annotation/CircleAnnotationController.kt | 0 .../CircleAnnotationEnumsExtensions.kt | 0 .../annotation/ControllerDelegate.kt | 0 .../annotation/PointAnnotationController.kt | 0 .../PointAnnotationEnumsExtensions.kt | 0 .../annotation/PolygonAnnotationController.kt | 0 .../PolygonAnnotationEnumsExtensions.kt | 0 .../PolylineAnnotationController.kt | 0 .../PolylineAnnotationEnumsExtensions.kt | 0 .../http/CustomHttpServiceInterceptor.kt | 0 .../mapping/AttributionMappings.kt | 0 .../mapbox_maps/mapping/CompassMappings.kt | 0 .../mapbox_maps/mapping/GesturesMappings.kt | 0 .../mapping/LocationComponentMappings.kt | 0 .../maps/mapbox_maps/mapping/LogoMappings.kt | 0 .../mapping/OrnamentPositionMapping.kt | 0 .../mapbox_maps/mapping/ScaleBarMappings.kt | 0 .../mapbox_maps/mapping/turf/TurfAdapters.kt | 0 .../mapbox_maps/offline/OfflineController.kt | 0 .../offline/OfflineMapInstanceManager.kt | 0 .../maps/mapbox_maps/offline/OfflineSwitch.kt | 0 .../offline/TileStoreController.kt | 0 .../pigeons/CircleAnnotationMessenger.kt | 0 .../mapbox_maps/pigeons/GestureListeners.kt | 0 .../maps/mapbox_maps/pigeons/LogBackend.kt | 0 .../maps/mapbox_maps/pigeons/MapInterfaces.kt | 0 .../mapbox_maps/pigeons/OfflineMessenger.kt | 0 .../pigeons/PerformaceStatistics.kt | 0 .../pigeons/PointAnnotationMessenger.kt | 0 .../pigeons/PolygonAnnotationMessenger.kt | 0 .../pigeons/PolylineAnnotationMessenger.kt | 0 .../maps/mapbox_maps/pigeons/Settings.kt | 0 .../pigeons/SnapshotterMessenger.kt | 0 .../mapbox_maps/pigeons/ViewportInternal.kt | 0 .../snapshotter/SnapshotterController.kt | 0 .../snapshotter/SnapshotterInstanceManager.kt | 0 .../example}/.gitignore | 0 .../example}/.metadata | 0 .../example}/README.md | 0 .../example}/android/.gitignore | 0 .../example}/android/app/build.gradle | 0 .../mapbox_maps_example/MainActivityTest.java | 0 .../android/app/src/debug/AndroidManifest.xml | 0 .../android/app/src/main/AndroidManifest.xml | 0 .../maps/mapbox_maps_example/MainActivity.kt | 0 .../res/drawable-v21/launch_background.xml | 0 .../main/res/drawable/launch_background.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../app/src/main/res/values-night/styles.xml | 0 .../app/src/main/res/values/styles.xml | 0 .../app/src/profile/AndroidManifest.xml | 0 .../example}/android/build.gradle | 0 .../example}/android/gradle.properties | 0 .../example}/android/gradle/ktlint.gradle | 0 .../example}/android/gradle/lint.gradle | 0 .../android/gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../example}/android/gradlew | 0 .../example}/android/settings.gradle | 0 .../assets/cluster/cluster_count_layer.json | 0 .../assets/cluster/cluster_layer.json | 0 .../assets/cluster/cluster_source.json | 0 .../cluster/unclustered_point_layer.json | 0 .../example}/assets/featuresetsStyle.json | 0 .../assets/fragment_realestate_NY.json | 0 .../from_crema_to_council_crest.geojson | 0 .../assets/geojson_source_large_points.json | 0 .../example}/assets/layer.json | 0 .../example}/assets/miami_beach.png | Bin .../example}/assets/point_layer.json | 0 .../example}/assets/raster_array_layers.json | 0 .../example}/assets/sf_airport_route.geojson | 0 .../example}/assets/source.json | 0 .../example}/assets/sportcar.glb | Bin .../example}/assets/style.json | 0 .../assets/symbols/2.0x/custom-icon.png | Bin .../assets/symbols/3.0x/custom-icon.png | Bin .../example}/assets/symbols/custom-icon.png | Bin .../example}/integration_test/all_test.dart | 0 .../integration_test/animation_test.dart | 0 .../circle_annotation_manager_test.dart | 0 .../annotations/circle_annotation_test.dart | 0 .../point_annotation_manager_test.dart | 0 .../annotations/point_annotation_test.dart | 0 .../polygon_annotation_manager_test.dart | 0 .../annotations/polygon_annotation_test.dart | 0 .../polyline_annotation_manager_test.dart | 0 .../annotations/polyline_annotation_test.dart | 0 .../integration_test/attribution_test.dart | 0 .../integration_test/camera_test.dart | 0 .../integration_test/compass_test.dart | 0 .../integration_test/empty_map_widget.dart | 0 .../integration_test/gestures_test.dart | 0 .../interactive_features_test.dart | 0 .../integration_test/location_test.dart | 0 .../example}/integration_test/logo_test.dart | 0 .../integration_test/map_interface_test.dart | 0 .../integration_test/offline_test.dart | 0 .../integration_test/projection_test.dart | 0 .../integration_test/scale_bar_test.dart | 0 .../snapshotter/snapshotter_test.dart | 0 .../style/layer/background_layer_test.dart | 0 .../style/layer/circle_layer_test.dart | 0 .../style/layer/clip_layer_test.dart | 0 .../layer/fill_extrusion_layer_test.dart | 0 .../style/layer/fill_layer_test.dart | 0 .../style/layer/heatmap_layer_test.dart | 0 .../style/layer/hillshade_layer_test.dart | 0 .../style/layer/line_layer_test.dart | 0 .../layer/location_indicator_layer_test.dart | 0 .../style/layer/model_layer_test.dart | 0 .../style/layer/raster_layer_test.dart | 0 .../layer/raster_particle_layer_test.dart | 0 .../style/layer/sky_layer_test.dart | 0 .../style/layer/slot_layer_test.dart | 0 .../style/layer/symbol_layer_test.dart | 0 .../style/source/geojson_source_test.dart | 0 .../style/source/image_source_test.dart | 0 .../style/source/raster_source_test.dart | 0 .../style/source/rasterarray_source_test.dart | 0 .../style/source/rasterdem_source_test.dart | 0 .../style/source/vector_source_test.dart | 0 .../integration_test/style/style_test.dart | 0 .../utils/list_close_to_matcher.dart | 0 .../integration_test/viewport_test.dart | 0 .../example}/ios/.gitignore | 0 .../ios/Flutter/AppFrameworkInfo.plist | 0 .../example}/ios/Flutter/Debug.xcconfig | 0 .../example}/ios/Flutter/Release.xcconfig | 0 .../ios/Runner.xcodeproj/project.pbxproj | 0 .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcshareddata/WorkspaceSettings.xcsettings | 0 .../xcshareddata/swiftpm/Package.resolved | 0 .../xcshareddata/xcschemes/Runner.xcscheme | 0 .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcshareddata/WorkspaceSettings.xcsettings | 0 .../xcshareddata/swiftpm/Package.resolved | 0 .../example}/ios/Runner/AppDelegate.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../Icon-App-1024x1024@1x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin .../Icon-App-83.5x83.5@2x.png | Bin .../LaunchImage.imageset/Contents.json | 0 .../LaunchImage.imageset/LaunchImage.png | Bin .../LaunchImage.imageset/LaunchImage@2x.png | Bin .../LaunchImage.imageset/LaunchImage@3x.png | Bin .../LaunchImage.imageset/README.md | 0 .../Runner/Base.lproj/LaunchScreen.storyboard | 0 .../ios/Runner/Base.lproj/Main.storyboard | 0 .../example}/ios/Runner/Info.plist | 0 .../ios/Runner/Runner-Bridging-Header.h | 0 .../example}/ios/RunnerTests/RunnerTests.m | 0 .../example}/lib/animated_route_example.dart | 0 .../example}/lib/animation_example.dart | 0 .../example}/lib/camera_example.dart | 0 .../lib/circle_annotations_example.dart | 0 .../example}/lib/cluster_example.dart | 0 .../example}/lib/custom_header_example.dart | 0 .../example}/lib/debug_options_example.dart | 0 .../lib/draggable-annotations-example.dart | 0 .../example}/lib/edit_polygon_example.dart | 0 .../example}/lib/example.dart | 0 .../example}/lib/full_map_example.dart | 0 .../example}/lib/geojson_line_example.dart | 0 .../example}/lib/gestures_example.dart | 0 .../example}/lib/image_source_example.dart | 0 .../example}/lib/location_example.dart | 0 .../example}/lib/main.dart | 0 .../example}/lib/map_interface_example.dart | 0 .../example}/lib/model_layer_example.dart | 0 .../lib/model_layer_interactions_example.dart | 0 .../example}/lib/offline_map_example.dart | 0 .../example}/lib/ornaments_example.dart | 0 .../lib/point_annotations_example.dart | 0 .../lib/polygon_annotations_example.dart | 0 .../lib/polyline_annotations_example.dart | 0 .../example}/lib/projection_example.dart | 0 .../example}/lib/simple_map_example.dart | 0 .../example}/lib/snapshotter_example.dart | 0 .../example}/lib/spinning_globe_example.dart | 0 .../lib/standard_style_import_example.dart | 0 .../standard_style_interactions_example.dart | 0 .../example}/lib/style_example.dart | 0 .../example}/lib/tile_json_example.dart | 0 .../example}/lib/traffic_layer_example.dart | 0 .../lib/traffic_route_line_example.dart | 0 .../example}/lib/utils.dart | 0 .../lib/vector_tile_source_example.dart | 0 .../example}/lib/viewport_example.dart | 0 .../example}/pubspec.lock | 0 .../example}/pubspec.yaml | 0 .../test_driver/integration_test.dart | 0 .../ios}/.gitignore | 0 .../ios}/mapbox_maps_flutter.podspec | 0 .../ios}/mapbox_maps_flutter/.swiftlint.yml | 0 .../ios}/mapbox_maps_flutter/Package.resolved | 0 .../ios}/mapbox_maps_flutter/Package.swift | 0 .../Classes/AnimationController.swift | 0 .../Annotations/AnnotationController.swift | 0 .../Annotations/BaseAnnotationMessenger.swift | 0 .../CircleAnnotationController.swift | 0 .../PointAnnotationController.swift | 0 .../PolygonAnnotationController.swift | 0 .../PolylineAnnotationController.swift | 0 .../Classes/AnyFlutterStreamHandler.swift | 0 .../Classes/AttributionController.swift | 0 .../Classes/CameraController.swift | 0 .../Classes/CompassController.swift | 0 .../CustomHttpServiceInterceptor.swift | 0 .../Classes/EnumsMapping.swift | 0 .../Classes/EventHandler.swift | 0 .../Classes/Extensions.swift | 0 .../Generated/CircleAnnotationMessenger.swift | 0 .../Classes/Generated/GestureListeners.swift | 0 .../Classes/Generated/LogBackend.swift | 0 .../Classes/Generated/MapInterfaces.swift | 0 .../Classes/Generated/OfflineMessenger.swift | 0 .../Generated/PerformaceStatistics.swift | 0 .../Generated/PointAnnotationMessenger.swift | 0 .../PolygonAnnotationMessenger.swift | 0 .../PolylineAnnotationMessenger.swift | 0 .../Classes/Generated/Settings.swift | 0 .../Generated/SnapshotterMessenger.swift | 0 .../Classes/Generated/ViewportInternal.swift | 0 .../Classes/GesturesController.swift | 0 .../Classes/InteractionsController.swift | 0 .../Classes/LocationController.swift | 0 .../Classes/LoggingController.swift | 0 .../Classes/LogoController.swift | 0 .../Classes/MapEvents+JSON.swift | 0 .../Classes/MapInterfaceController.swift | 0 .../Classes/MapProjectionController.swift | 0 .../Classes/MapboxMapController.swift | 0 .../Classes/MapboxMapFactory.swift | 0 .../Classes/MapboxMapsPlugin.swift | 0 .../Classes/MapboxOptionsController.swift | 0 .../Classes/Offline/OfflineController.swift | 0 .../Offline/OfflineMapInstanceManager.swift | 0 .../Classes/Offline/TileStoreController.swift | 0 .../PerformanceStatisticsController.swift | 0 .../Classes/ScalebarController.swift | 0 .../Snapshotter/SnapshotterController.swift | 0 .../SnapshotterInstanceManager.swift | 0 .../Classes/StyleController.swift | 0 .../Classes/StyleLights.swift | 0 .../Classes/TurfAdapters.swift | 0 .../Classes/Viewport/States.swift | 0 .../Classes/Viewport/Transitions.swift | 0 .../Classes/Viewport/ViewportController.swift | 0 .../Classes/mapbox_maps_flutter.h | 0 .../lib}/mapbox_maps_flutter.dart | 0 .../src/annotation/annotation_manager.dart | 0 .../annotation/circle_annotation_manager.dart | 0 .../annotation/point_annotation_manager.dart | 0 .../polygon_annotation_manager.dart | 0 .../polyline_annotation_manager.dart | 0 .../lib}/src/callbacks.dart | 0 .../lib}/src/cancelable.dart | 0 .../lib}/src/events.dart | 0 .../lib}/src/extensions.dart | 0 .../lib}/src/http/http_service.dart | 0 .../lib}/src/location_settings.dart | 0 .../lib}/src/log_configuration.dart | 0 .../lib}/src/map_events.dart | 0 .../lib}/src/map_widget.dart | 0 .../lib}/src/mapbox_map.dart | 0 .../lib}/src/mapbox_maps_options.dart | 0 .../lib}/src/mapbox_maps_platform.dart | 0 .../lib}/src/offline/offline_manager.dart | 0 .../lib}/src/offline/offline_messenger.dart | 0 .../lib}/src/offline/offline_switch.dart | 0 .../lib}/src/offline/tile_store.dart | 0 .../lib}/src/package_info.dart | 0 .../pigeons/circle_annotation_messenger.dart | 0 .../lib}/src/pigeons/gesture_listeners.dart | 0 .../lib}/src/pigeons/log_backend.dart | 0 .../lib}/src/pigeons/map_interfaces.dart | 0 .../src/pigeons/performace_statistics.dart | 0 .../pigeons/point_annotation_messenger.dart | 0 .../pigeons/polygon_annotation_messenger.dart | 0 .../polyline_annotation_messenger.dart | 0 .../lib}/src/pigeons/settings.dart | 0 .../lib}/src/snapshotter/snapshotter.dart | 0 .../snapshotter/snapshotter_messenger.dart | 0 .../interactive_features.dart | 0 .../standard_buildings.dart | 0 .../standard_place_labels.dart | 0 .../interactive_features/standard_poi.dart | 0 .../src/style/layer/background_layer.dart | 0 .../lib}/src/style/layer/circle_layer.dart | 0 .../lib}/src/style/layer/clip_layer.dart | 0 .../src/style/layer/fill_extrusion_layer.dart | 0 .../lib}/src/style/layer/fill_layer.dart | 0 .../lib}/src/style/layer/heatmap_layer.dart | 0 .../lib}/src/style/layer/hillshade_layer.dart | 0 .../lib}/src/style/layer/line_layer.dart | 0 .../style/layer/location_indicator_layer.dart | 0 .../lib}/src/style/layer/model_layer.dart | 0 .../lib}/src/style/layer/raster_layer.dart | 0 .../style/layer/raster_particle_layer.dart | 0 .../lib}/src/style/layer/sky_layer.dart | 0 .../lib}/src/style/layer/slot_layer.dart | 0 .../lib}/src/style/layer/symbol_layer.dart | 0 .../lib}/src/style/mapbox_styles.dart | 0 .../lib}/src/style/source/geojson_source.dart | 0 .../lib}/src/style/source/image_source.dart | 0 .../lib}/src/style/source/raster_source.dart | 0 .../src/style/source/rasterarray_source.dart | 0 .../src/style/source/rasterdem_source.dart | 0 .../lib}/src/style/source/vector_source.dart | 0 .../lib}/src/style/style.dart | 0 .../lib}/src/turf_adapters.dart | 0 .../lib}/src/utils.dart | 0 .../viewport/state_viewport_extension.dart | 0 .../states/camera_viewport_state.dart | 0 .../states/follow_puck_viewport_state.dart | 0 .../viewport/states/idle_viewport_state.dart | 0 .../states/overview_viewport_state.dart | 0 .../states/style_default_viewport_state.dart | 0 .../src/viewport/states/viewport_state.dart | 0 .../default_viewport_transition.dart | 0 .../easing_viewport_transition.dart | 0 .../transitions/fly_viewport_transition.dart | 0 .../transitions/viewport_transition.dart | 0 .../lib}/src/viewport/viewport_internal.dart | 0 .../pubspec.yaml | 0 .../test}/events_test.dart | 0 381 files changed, 66 insertions(+) create mode 100644 mapbox_maps_flutter_mobile/.gitignore create mode 100644 mapbox_maps_flutter_mobile/.metadata rename CHANGELOG.md => mapbox_maps_flutter_mobile/CHANGELOG.md (100%) rename LICENSE => mapbox_maps_flutter_mobile/LICENSE (100%) rename README.md => mapbox_maps_flutter_mobile/README.md (100%) rename analysis_options.yaml => mapbox_maps_flutter_mobile/analysis_options.yaml (100%) rename {android => mapbox_maps_flutter_mobile/android}/.editorconfig (100%) rename {android => mapbox_maps_flutter_mobile/android}/.gitignore (100%) rename {android => mapbox_maps_flutter_mobile/android}/build.gradle (100%) rename {android => mapbox_maps_flutter_mobile/android}/gradle.properties (100%) rename {android => mapbox_maps_flutter_mobile/android}/gradle/wrapper/gradle-wrapper.properties (100%) rename {android => mapbox_maps_flutter_mobile/android}/settings.gradle (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/AndroidManifest.xml (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/Accessors.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/AnimationController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/AttributionController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/CameraController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/CompassController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/EventHandler.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/Extentions.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/GestureController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/InteractionsController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/LocationComponentController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/LoggingController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/LogoController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapInterfaceController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapProjectionController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxMapController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxMapFactory.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxMapsPlugin.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxOptionsController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/PerformanceStatisticsController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/ScaleBarController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/StyleController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/ViewportController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/AnnotationController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/CircleAnnotationController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/CircleAnnotationEnumsExtensions.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/ControllerDelegate.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PointAnnotationController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PointAnnotationEnumsExtensions.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolygonAnnotationController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolygonAnnotationEnumsExtensions.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolylineAnnotationController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolylineAnnotationEnumsExtensions.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/http/CustomHttpServiceInterceptor.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/AttributionMappings.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/CompassMappings.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/GesturesMappings.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/LocationComponentMappings.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/LogoMappings.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/OrnamentPositionMapping.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/ScaleBarMappings.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/turf/TurfAdapters.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/offline/OfflineController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/offline/OfflineMapInstanceManager.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/offline/OfflineSwitch.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/offline/TileStoreController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/CircleAnnotationMessenger.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/GestureListeners.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/LogBackend.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/MapInterfaces.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/OfflineMessenger.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PerformaceStatistics.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PointAnnotationMessenger.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PolygonAnnotationMessenger.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PolylineAnnotationMessenger.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/Settings.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/SnapshotterMessenger.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/ViewportInternal.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/snapshotter/SnapshotterController.kt (100%) rename {android => mapbox_maps_flutter_mobile/android}/src/main/kotlin/com/mapbox/maps/mapbox_maps/snapshotter/SnapshotterInstanceManager.kt (100%) rename {example => mapbox_maps_flutter_mobile/example}/.gitignore (100%) rename {example => mapbox_maps_flutter_mobile/example}/.metadata (100%) rename {example => mapbox_maps_flutter_mobile/example}/README.md (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/.gitignore (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/app/build.gradle (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/app/src/androidTest/java/com/mapbox/maps/mapbox_maps_example/MainActivityTest.java (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/app/src/debug/AndroidManifest.xml (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/app/src/main/AndroidManifest.xml (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/app/src/main/kotlin/com/mapbox/maps/mapbox_maps_example/MainActivity.kt (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/app/src/main/res/drawable-v21/launch_background.xml (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/app/src/main/res/drawable/launch_background.xml (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/app/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/app/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/app/src/main/res/values-night/styles.xml (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/app/src/main/res/values/styles.xml (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/app/src/profile/AndroidManifest.xml (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/build.gradle (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/gradle.properties (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/gradle/ktlint.gradle (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/gradle/lint.gradle (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/gradle/wrapper/gradle-wrapper.jar (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/gradle/wrapper/gradle-wrapper.properties (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/gradlew (100%) rename {example => mapbox_maps_flutter_mobile/example}/android/settings.gradle (100%) rename {example => mapbox_maps_flutter_mobile/example}/assets/cluster/cluster_count_layer.json (100%) rename {example => mapbox_maps_flutter_mobile/example}/assets/cluster/cluster_layer.json (100%) rename {example => mapbox_maps_flutter_mobile/example}/assets/cluster/cluster_source.json (100%) rename {example => mapbox_maps_flutter_mobile/example}/assets/cluster/unclustered_point_layer.json (100%) rename {example => mapbox_maps_flutter_mobile/example}/assets/featuresetsStyle.json (100%) rename {example => mapbox_maps_flutter_mobile/example}/assets/fragment_realestate_NY.json (100%) rename {example => mapbox_maps_flutter_mobile/example}/assets/from_crema_to_council_crest.geojson (100%) rename {example => mapbox_maps_flutter_mobile/example}/assets/geojson_source_large_points.json (100%) rename {example => mapbox_maps_flutter_mobile/example}/assets/layer.json (100%) rename {example => mapbox_maps_flutter_mobile/example}/assets/miami_beach.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/assets/point_layer.json (100%) rename {example => mapbox_maps_flutter_mobile/example}/assets/raster_array_layers.json (100%) rename {example => mapbox_maps_flutter_mobile/example}/assets/sf_airport_route.geojson (100%) rename {example => mapbox_maps_flutter_mobile/example}/assets/source.json (100%) rename {example => mapbox_maps_flutter_mobile/example}/assets/sportcar.glb (100%) rename {example => mapbox_maps_flutter_mobile/example}/assets/style.json (100%) rename {example => mapbox_maps_flutter_mobile/example}/assets/symbols/2.0x/custom-icon.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/assets/symbols/3.0x/custom-icon.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/assets/symbols/custom-icon.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/all_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/animation_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/annotations/circle_annotation_manager_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/annotations/circle_annotation_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/annotations/point_annotation_manager_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/annotations/point_annotation_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/annotations/polygon_annotation_manager_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/annotations/polygon_annotation_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/annotations/polyline_annotation_manager_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/annotations/polyline_annotation_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/attribution_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/camera_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/compass_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/empty_map_widget.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/gestures_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/interactive_features_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/location_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/logo_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/map_interface_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/offline_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/projection_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/scale_bar_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/snapshotter/snapshotter_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/layer/background_layer_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/layer/circle_layer_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/layer/clip_layer_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/layer/fill_extrusion_layer_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/layer/fill_layer_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/layer/heatmap_layer_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/layer/hillshade_layer_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/layer/line_layer_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/layer/location_indicator_layer_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/layer/model_layer_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/layer/raster_layer_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/layer/raster_particle_layer_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/layer/sky_layer_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/layer/slot_layer_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/layer/symbol_layer_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/source/geojson_source_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/source/image_source_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/source/raster_source_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/source/rasterarray_source_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/source/rasterdem_source_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/source/vector_source_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/style/style_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/utils/list_close_to_matcher.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/integration_test/viewport_test.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/.gitignore (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Flutter/AppFrameworkInfo.plist (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Flutter/Debug.xcconfig (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Flutter/Release.xcconfig (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner.xcodeproj/project.pbxproj (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner.xcworkspace/contents.xcworkspacedata (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/AppDelegate.swift (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Base.lproj/LaunchScreen.storyboard (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Base.lproj/Main.storyboard (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Info.plist (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/Runner/Runner-Bridging-Header.h (100%) rename {example => mapbox_maps_flutter_mobile/example}/ios/RunnerTests/RunnerTests.m (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/animated_route_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/animation_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/camera_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/circle_annotations_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/cluster_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/custom_header_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/debug_options_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/draggable-annotations-example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/edit_polygon_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/full_map_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/geojson_line_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/gestures_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/image_source_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/location_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/main.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/map_interface_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/model_layer_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/model_layer_interactions_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/offline_map_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/ornaments_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/point_annotations_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/polygon_annotations_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/polyline_annotations_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/projection_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/simple_map_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/snapshotter_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/spinning_globe_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/standard_style_import_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/standard_style_interactions_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/style_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/tile_json_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/traffic_layer_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/traffic_route_line_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/utils.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/vector_tile_source_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/lib/viewport_example.dart (100%) rename {example => mapbox_maps_flutter_mobile/example}/pubspec.lock (100%) rename {example => mapbox_maps_flutter_mobile/example}/pubspec.yaml (100%) rename {example => mapbox_maps_flutter_mobile/example}/test_driver/integration_test.dart (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/.gitignore (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter.podspec (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/.swiftlint.yml (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Package.resolved (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Package.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/AnimationController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/AnnotationController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/BaseAnnotationMessenger.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/CircleAnnotationController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/PointAnnotationController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/PolygonAnnotationController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/PolylineAnnotationController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/AnyFlutterStreamHandler.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/AttributionController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/CameraController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/CompassController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/CustomHttpServiceInterceptor.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/EnumsMapping.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/EventHandler.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Extensions.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/CircleAnnotationMessenger.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/GestureListeners.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/LogBackend.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/MapInterfaces.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/OfflineMessenger.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PerformaceStatistics.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PointAnnotationMessenger.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PolygonAnnotationMessenger.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PolylineAnnotationMessenger.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/Settings.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/SnapshotterMessenger.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/ViewportInternal.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/GesturesController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/InteractionsController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/LocationController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/LoggingController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/LogoController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapEvents+JSON.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapInterfaceController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapProjectionController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapboxMapController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapboxMapFactory.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapboxMapsPlugin.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapboxOptionsController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Offline/OfflineController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Offline/OfflineMapInstanceManager.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Offline/TileStoreController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/PerformanceStatisticsController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/ScalebarController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Snapshotter/SnapshotterController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Snapshotter/SnapshotterInstanceManager.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/StyleController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/StyleLights.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/TurfAdapters.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Viewport/States.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Viewport/Transitions.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Viewport/ViewportController.swift (100%) rename {ios => mapbox_maps_flutter_mobile/ios}/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/mapbox_maps_flutter.h (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/mapbox_maps_flutter.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/annotation/annotation_manager.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/annotation/circle_annotation_manager.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/annotation/point_annotation_manager.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/annotation/polygon_annotation_manager.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/annotation/polyline_annotation_manager.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/callbacks.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/cancelable.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/events.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/extensions.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/http/http_service.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/location_settings.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/log_configuration.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/map_events.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/map_widget.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/mapbox_map.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/mapbox_maps_options.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/mapbox_maps_platform.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/offline/offline_manager.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/offline/offline_messenger.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/offline/offline_switch.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/offline/tile_store.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/package_info.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/pigeons/circle_annotation_messenger.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/pigeons/gesture_listeners.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/pigeons/log_backend.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/pigeons/map_interfaces.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/pigeons/performace_statistics.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/pigeons/point_annotation_messenger.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/pigeons/polygon_annotation_messenger.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/pigeons/polyline_annotation_messenger.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/pigeons/settings.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/snapshotter/snapshotter.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/snapshotter/snapshotter_messenger.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/interactive_features/interactive_features.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/interactive_features/standard_buildings.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/interactive_features/standard_place_labels.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/interactive_features/standard_poi.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/layer/background_layer.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/layer/circle_layer.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/layer/clip_layer.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/layer/fill_extrusion_layer.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/layer/fill_layer.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/layer/heatmap_layer.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/layer/hillshade_layer.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/layer/line_layer.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/layer/location_indicator_layer.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/layer/model_layer.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/layer/raster_layer.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/layer/raster_particle_layer.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/layer/sky_layer.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/layer/slot_layer.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/layer/symbol_layer.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/mapbox_styles.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/source/geojson_source.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/source/image_source.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/source/raster_source.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/source/rasterarray_source.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/source/rasterdem_source.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/source/vector_source.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/style/style.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/turf_adapters.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/utils.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/viewport/state_viewport_extension.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/viewport/states/camera_viewport_state.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/viewport/states/follow_puck_viewport_state.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/viewport/states/idle_viewport_state.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/viewport/states/overview_viewport_state.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/viewport/states/style_default_viewport_state.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/viewport/states/viewport_state.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/viewport/transitions/default_viewport_transition.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/viewport/transitions/easing_viewport_transition.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/viewport/transitions/fly_viewport_transition.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/viewport/transitions/viewport_transition.dart (100%) rename {lib => mapbox_maps_flutter_mobile/lib}/src/viewport/viewport_internal.dart (100%) rename pubspec.yaml => mapbox_maps_flutter_mobile/pubspec.yaml (100%) rename {test => mapbox_maps_flutter_mobile/test}/events_test.dart (100%) diff --git a/mapbox_maps_flutter_mobile/.gitignore b/mapbox_maps_flutter_mobile/.gitignore new file mode 100644 index 000000000..e7d347d9d --- /dev/null +++ b/mapbox_maps_flutter_mobile/.gitignore @@ -0,0 +1,33 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.build/ +.buildlog/ +.history +.svn/ +.swiftpm/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. +/pubspec.lock +**/doc/api/ +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +build/ diff --git a/mapbox_maps_flutter_mobile/.metadata b/mapbox_maps_flutter_mobile/.metadata new file mode 100644 index 000000000..cff4c42e1 --- /dev/null +++ b/mapbox_maps_flutter_mobile/.metadata @@ -0,0 +1,33 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "c23637390482d4cf9598c3ce3f2be31aa7332daf" + channel: "stable" + +project_type: plugin + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + - platform: android + create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + - platform: ios + create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/CHANGELOG.md b/mapbox_maps_flutter_mobile/CHANGELOG.md similarity index 100% rename from CHANGELOG.md rename to mapbox_maps_flutter_mobile/CHANGELOG.md diff --git a/LICENSE b/mapbox_maps_flutter_mobile/LICENSE similarity index 100% rename from LICENSE rename to mapbox_maps_flutter_mobile/LICENSE diff --git a/README.md b/mapbox_maps_flutter_mobile/README.md similarity index 100% rename from README.md rename to mapbox_maps_flutter_mobile/README.md diff --git a/analysis_options.yaml b/mapbox_maps_flutter_mobile/analysis_options.yaml similarity index 100% rename from analysis_options.yaml rename to mapbox_maps_flutter_mobile/analysis_options.yaml diff --git a/android/.editorconfig b/mapbox_maps_flutter_mobile/android/.editorconfig similarity index 100% rename from android/.editorconfig rename to mapbox_maps_flutter_mobile/android/.editorconfig diff --git a/android/.gitignore b/mapbox_maps_flutter_mobile/android/.gitignore similarity index 100% rename from android/.gitignore rename to mapbox_maps_flutter_mobile/android/.gitignore diff --git a/android/build.gradle b/mapbox_maps_flutter_mobile/android/build.gradle similarity index 100% rename from android/build.gradle rename to mapbox_maps_flutter_mobile/android/build.gradle diff --git a/android/gradle.properties b/mapbox_maps_flutter_mobile/android/gradle.properties similarity index 100% rename from android/gradle.properties rename to mapbox_maps_flutter_mobile/android/gradle.properties diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/mapbox_maps_flutter_mobile/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from android/gradle/wrapper/gradle-wrapper.properties rename to mapbox_maps_flutter_mobile/android/gradle/wrapper/gradle-wrapper.properties diff --git a/android/settings.gradle b/mapbox_maps_flutter_mobile/android/settings.gradle similarity index 100% rename from android/settings.gradle rename to mapbox_maps_flutter_mobile/android/settings.gradle diff --git a/android/src/main/AndroidManifest.xml b/mapbox_maps_flutter_mobile/android/src/main/AndroidManifest.xml similarity index 100% rename from android/src/main/AndroidManifest.xml rename to mapbox_maps_flutter_mobile/android/src/main/AndroidManifest.xml diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/Accessors.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/Accessors.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/Accessors.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/Accessors.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/AnimationController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/AnimationController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/AnimationController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/AnimationController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/AttributionController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/AttributionController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/AttributionController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/AttributionController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/CameraController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/CameraController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/CameraController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/CameraController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/CompassController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/CompassController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/CompassController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/CompassController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/EventHandler.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/EventHandler.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/EventHandler.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/EventHandler.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/Extentions.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/Extentions.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/Extentions.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/Extentions.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/GestureController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/GestureController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/GestureController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/GestureController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/InteractionsController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/InteractionsController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/InteractionsController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/InteractionsController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/LocationComponentController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/LocationComponentController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/LocationComponentController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/LocationComponentController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/LoggingController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/LoggingController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/LoggingController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/LoggingController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/LogoController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/LogoController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/LogoController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/LogoController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapInterfaceController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapInterfaceController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapInterfaceController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapInterfaceController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapProjectionController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapProjectionController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapProjectionController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapProjectionController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxMapController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxMapController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxMapController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxMapController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxMapFactory.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxMapFactory.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxMapFactory.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxMapFactory.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxMapsPlugin.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxMapsPlugin.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxMapsPlugin.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxMapsPlugin.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxOptionsController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxOptionsController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxOptionsController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxOptionsController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/PerformanceStatisticsController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/PerformanceStatisticsController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/PerformanceStatisticsController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/PerformanceStatisticsController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/ScaleBarController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/ScaleBarController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/ScaleBarController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/ScaleBarController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/StyleController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/StyleController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/StyleController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/StyleController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/ViewportController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/ViewportController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/ViewportController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/ViewportController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/AnnotationController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/AnnotationController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/AnnotationController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/AnnotationController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/CircleAnnotationController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/CircleAnnotationController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/CircleAnnotationController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/CircleAnnotationController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/CircleAnnotationEnumsExtensions.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/CircleAnnotationEnumsExtensions.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/CircleAnnotationEnumsExtensions.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/CircleAnnotationEnumsExtensions.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/ControllerDelegate.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/ControllerDelegate.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/ControllerDelegate.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/ControllerDelegate.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PointAnnotationController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PointAnnotationController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PointAnnotationController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PointAnnotationController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PointAnnotationEnumsExtensions.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PointAnnotationEnumsExtensions.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PointAnnotationEnumsExtensions.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PointAnnotationEnumsExtensions.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolygonAnnotationController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolygonAnnotationController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolygonAnnotationController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolygonAnnotationController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolygonAnnotationEnumsExtensions.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolygonAnnotationEnumsExtensions.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolygonAnnotationEnumsExtensions.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolygonAnnotationEnumsExtensions.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolylineAnnotationController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolylineAnnotationController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolylineAnnotationController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolylineAnnotationController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolylineAnnotationEnumsExtensions.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolylineAnnotationEnumsExtensions.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolylineAnnotationEnumsExtensions.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolylineAnnotationEnumsExtensions.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/http/CustomHttpServiceInterceptor.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/http/CustomHttpServiceInterceptor.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/http/CustomHttpServiceInterceptor.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/http/CustomHttpServiceInterceptor.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/AttributionMappings.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/AttributionMappings.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/AttributionMappings.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/AttributionMappings.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/CompassMappings.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/CompassMappings.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/CompassMappings.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/CompassMappings.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/GesturesMappings.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/GesturesMappings.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/GesturesMappings.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/GesturesMappings.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/LocationComponentMappings.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/LocationComponentMappings.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/LocationComponentMappings.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/LocationComponentMappings.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/LogoMappings.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/LogoMappings.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/LogoMappings.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/LogoMappings.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/OrnamentPositionMapping.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/OrnamentPositionMapping.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/OrnamentPositionMapping.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/OrnamentPositionMapping.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/ScaleBarMappings.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/ScaleBarMappings.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/ScaleBarMappings.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/ScaleBarMappings.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/turf/TurfAdapters.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/turf/TurfAdapters.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/turf/TurfAdapters.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/turf/TurfAdapters.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/offline/OfflineController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/offline/OfflineController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/offline/OfflineController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/offline/OfflineController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/offline/OfflineMapInstanceManager.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/offline/OfflineMapInstanceManager.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/offline/OfflineMapInstanceManager.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/offline/OfflineMapInstanceManager.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/offline/OfflineSwitch.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/offline/OfflineSwitch.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/offline/OfflineSwitch.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/offline/OfflineSwitch.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/offline/TileStoreController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/offline/TileStoreController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/offline/TileStoreController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/offline/TileStoreController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/CircleAnnotationMessenger.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/CircleAnnotationMessenger.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/CircleAnnotationMessenger.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/CircleAnnotationMessenger.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/GestureListeners.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/GestureListeners.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/GestureListeners.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/GestureListeners.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/LogBackend.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/LogBackend.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/LogBackend.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/LogBackend.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/MapInterfaces.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/MapInterfaces.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/MapInterfaces.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/MapInterfaces.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/OfflineMessenger.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/OfflineMessenger.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/OfflineMessenger.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/OfflineMessenger.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PerformaceStatistics.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PerformaceStatistics.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PerformaceStatistics.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PerformaceStatistics.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PointAnnotationMessenger.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PointAnnotationMessenger.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PointAnnotationMessenger.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PointAnnotationMessenger.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PolygonAnnotationMessenger.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PolygonAnnotationMessenger.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PolygonAnnotationMessenger.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PolygonAnnotationMessenger.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PolylineAnnotationMessenger.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PolylineAnnotationMessenger.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PolylineAnnotationMessenger.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PolylineAnnotationMessenger.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/Settings.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/Settings.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/Settings.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/Settings.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/SnapshotterMessenger.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/SnapshotterMessenger.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/SnapshotterMessenger.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/SnapshotterMessenger.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/ViewportInternal.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/ViewportInternal.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/ViewportInternal.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/ViewportInternal.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/snapshotter/SnapshotterController.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/snapshotter/SnapshotterController.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/snapshotter/SnapshotterController.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/snapshotter/SnapshotterController.kt diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/snapshotter/SnapshotterInstanceManager.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/snapshotter/SnapshotterInstanceManager.kt similarity index 100% rename from android/src/main/kotlin/com/mapbox/maps/mapbox_maps/snapshotter/SnapshotterInstanceManager.kt rename to mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/snapshotter/SnapshotterInstanceManager.kt diff --git a/example/.gitignore b/mapbox_maps_flutter_mobile/example/.gitignore similarity index 100% rename from example/.gitignore rename to mapbox_maps_flutter_mobile/example/.gitignore diff --git a/example/.metadata b/mapbox_maps_flutter_mobile/example/.metadata similarity index 100% rename from example/.metadata rename to mapbox_maps_flutter_mobile/example/.metadata diff --git a/example/README.md b/mapbox_maps_flutter_mobile/example/README.md similarity index 100% rename from example/README.md rename to mapbox_maps_flutter_mobile/example/README.md diff --git a/example/android/.gitignore b/mapbox_maps_flutter_mobile/example/android/.gitignore similarity index 100% rename from example/android/.gitignore rename to mapbox_maps_flutter_mobile/example/android/.gitignore diff --git a/example/android/app/build.gradle b/mapbox_maps_flutter_mobile/example/android/app/build.gradle similarity index 100% rename from example/android/app/build.gradle rename to mapbox_maps_flutter_mobile/example/android/app/build.gradle diff --git a/example/android/app/src/androidTest/java/com/mapbox/maps/mapbox_maps_example/MainActivityTest.java b/mapbox_maps_flutter_mobile/example/android/app/src/androidTest/java/com/mapbox/maps/mapbox_maps_example/MainActivityTest.java similarity index 100% rename from example/android/app/src/androidTest/java/com/mapbox/maps/mapbox_maps_example/MainActivityTest.java rename to mapbox_maps_flutter_mobile/example/android/app/src/androidTest/java/com/mapbox/maps/mapbox_maps_example/MainActivityTest.java diff --git a/example/android/app/src/debug/AndroidManifest.xml b/mapbox_maps_flutter_mobile/example/android/app/src/debug/AndroidManifest.xml similarity index 100% rename from example/android/app/src/debug/AndroidManifest.xml rename to mapbox_maps_flutter_mobile/example/android/app/src/debug/AndroidManifest.xml diff --git a/example/android/app/src/main/AndroidManifest.xml b/mapbox_maps_flutter_mobile/example/android/app/src/main/AndroidManifest.xml similarity index 100% rename from example/android/app/src/main/AndroidManifest.xml rename to mapbox_maps_flutter_mobile/example/android/app/src/main/AndroidManifest.xml diff --git a/example/android/app/src/main/kotlin/com/mapbox/maps/mapbox_maps_example/MainActivity.kt b/mapbox_maps_flutter_mobile/example/android/app/src/main/kotlin/com/mapbox/maps/mapbox_maps_example/MainActivity.kt similarity index 100% rename from example/android/app/src/main/kotlin/com/mapbox/maps/mapbox_maps_example/MainActivity.kt rename to mapbox_maps_flutter_mobile/example/android/app/src/main/kotlin/com/mapbox/maps/mapbox_maps_example/MainActivity.kt diff --git a/example/android/app/src/main/res/drawable-v21/launch_background.xml b/mapbox_maps_flutter_mobile/example/android/app/src/main/res/drawable-v21/launch_background.xml similarity index 100% rename from example/android/app/src/main/res/drawable-v21/launch_background.xml rename to mapbox_maps_flutter_mobile/example/android/app/src/main/res/drawable-v21/launch_background.xml diff --git a/example/android/app/src/main/res/drawable/launch_background.xml b/mapbox_maps_flutter_mobile/example/android/app/src/main/res/drawable/launch_background.xml similarity index 100% rename from example/android/app/src/main/res/drawable/launch_background.xml rename to mapbox_maps_flutter_mobile/example/android/app/src/main/res/drawable/launch_background.xml diff --git a/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/mapbox_maps_flutter_mobile/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to mapbox_maps_flutter_mobile/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/mapbox_maps_flutter_mobile/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to mapbox_maps_flutter_mobile/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/mapbox_maps_flutter_mobile/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to mapbox_maps_flutter_mobile/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/mapbox_maps_flutter_mobile/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to mapbox_maps_flutter_mobile/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/mapbox_maps_flutter_mobile/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to mapbox_maps_flutter_mobile/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/example/android/app/src/main/res/values-night/styles.xml b/mapbox_maps_flutter_mobile/example/android/app/src/main/res/values-night/styles.xml similarity index 100% rename from example/android/app/src/main/res/values-night/styles.xml rename to mapbox_maps_flutter_mobile/example/android/app/src/main/res/values-night/styles.xml diff --git a/example/android/app/src/main/res/values/styles.xml b/mapbox_maps_flutter_mobile/example/android/app/src/main/res/values/styles.xml similarity index 100% rename from example/android/app/src/main/res/values/styles.xml rename to mapbox_maps_flutter_mobile/example/android/app/src/main/res/values/styles.xml diff --git a/example/android/app/src/profile/AndroidManifest.xml b/mapbox_maps_flutter_mobile/example/android/app/src/profile/AndroidManifest.xml similarity index 100% rename from example/android/app/src/profile/AndroidManifest.xml rename to mapbox_maps_flutter_mobile/example/android/app/src/profile/AndroidManifest.xml diff --git a/example/android/build.gradle b/mapbox_maps_flutter_mobile/example/android/build.gradle similarity index 100% rename from example/android/build.gradle rename to mapbox_maps_flutter_mobile/example/android/build.gradle diff --git a/example/android/gradle.properties b/mapbox_maps_flutter_mobile/example/android/gradle.properties similarity index 100% rename from example/android/gradle.properties rename to mapbox_maps_flutter_mobile/example/android/gradle.properties diff --git a/example/android/gradle/ktlint.gradle b/mapbox_maps_flutter_mobile/example/android/gradle/ktlint.gradle similarity index 100% rename from example/android/gradle/ktlint.gradle rename to mapbox_maps_flutter_mobile/example/android/gradle/ktlint.gradle diff --git a/example/android/gradle/lint.gradle b/mapbox_maps_flutter_mobile/example/android/gradle/lint.gradle similarity index 100% rename from example/android/gradle/lint.gradle rename to mapbox_maps_flutter_mobile/example/android/gradle/lint.gradle diff --git a/example/android/gradle/wrapper/gradle-wrapper.jar b/mapbox_maps_flutter_mobile/example/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from example/android/gradle/wrapper/gradle-wrapper.jar rename to mapbox_maps_flutter_mobile/example/android/gradle/wrapper/gradle-wrapper.jar diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/mapbox_maps_flutter_mobile/example/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from example/android/gradle/wrapper/gradle-wrapper.properties rename to mapbox_maps_flutter_mobile/example/android/gradle/wrapper/gradle-wrapper.properties diff --git a/example/android/gradlew b/mapbox_maps_flutter_mobile/example/android/gradlew similarity index 100% rename from example/android/gradlew rename to mapbox_maps_flutter_mobile/example/android/gradlew diff --git a/example/android/settings.gradle b/mapbox_maps_flutter_mobile/example/android/settings.gradle similarity index 100% rename from example/android/settings.gradle rename to mapbox_maps_flutter_mobile/example/android/settings.gradle diff --git a/example/assets/cluster/cluster_count_layer.json b/mapbox_maps_flutter_mobile/example/assets/cluster/cluster_count_layer.json similarity index 100% rename from example/assets/cluster/cluster_count_layer.json rename to mapbox_maps_flutter_mobile/example/assets/cluster/cluster_count_layer.json diff --git a/example/assets/cluster/cluster_layer.json b/mapbox_maps_flutter_mobile/example/assets/cluster/cluster_layer.json similarity index 100% rename from example/assets/cluster/cluster_layer.json rename to mapbox_maps_flutter_mobile/example/assets/cluster/cluster_layer.json diff --git a/example/assets/cluster/cluster_source.json b/mapbox_maps_flutter_mobile/example/assets/cluster/cluster_source.json similarity index 100% rename from example/assets/cluster/cluster_source.json rename to mapbox_maps_flutter_mobile/example/assets/cluster/cluster_source.json diff --git a/example/assets/cluster/unclustered_point_layer.json b/mapbox_maps_flutter_mobile/example/assets/cluster/unclustered_point_layer.json similarity index 100% rename from example/assets/cluster/unclustered_point_layer.json rename to mapbox_maps_flutter_mobile/example/assets/cluster/unclustered_point_layer.json diff --git a/example/assets/featuresetsStyle.json b/mapbox_maps_flutter_mobile/example/assets/featuresetsStyle.json similarity index 100% rename from example/assets/featuresetsStyle.json rename to mapbox_maps_flutter_mobile/example/assets/featuresetsStyle.json diff --git a/example/assets/fragment_realestate_NY.json b/mapbox_maps_flutter_mobile/example/assets/fragment_realestate_NY.json similarity index 100% rename from example/assets/fragment_realestate_NY.json rename to mapbox_maps_flutter_mobile/example/assets/fragment_realestate_NY.json diff --git a/example/assets/from_crema_to_council_crest.geojson b/mapbox_maps_flutter_mobile/example/assets/from_crema_to_council_crest.geojson similarity index 100% rename from example/assets/from_crema_to_council_crest.geojson rename to mapbox_maps_flutter_mobile/example/assets/from_crema_to_council_crest.geojson diff --git a/example/assets/geojson_source_large_points.json b/mapbox_maps_flutter_mobile/example/assets/geojson_source_large_points.json similarity index 100% rename from example/assets/geojson_source_large_points.json rename to mapbox_maps_flutter_mobile/example/assets/geojson_source_large_points.json diff --git a/example/assets/layer.json b/mapbox_maps_flutter_mobile/example/assets/layer.json similarity index 100% rename from example/assets/layer.json rename to mapbox_maps_flutter_mobile/example/assets/layer.json diff --git a/example/assets/miami_beach.png b/mapbox_maps_flutter_mobile/example/assets/miami_beach.png similarity index 100% rename from example/assets/miami_beach.png rename to mapbox_maps_flutter_mobile/example/assets/miami_beach.png diff --git a/example/assets/point_layer.json b/mapbox_maps_flutter_mobile/example/assets/point_layer.json similarity index 100% rename from example/assets/point_layer.json rename to mapbox_maps_flutter_mobile/example/assets/point_layer.json diff --git a/example/assets/raster_array_layers.json b/mapbox_maps_flutter_mobile/example/assets/raster_array_layers.json similarity index 100% rename from example/assets/raster_array_layers.json rename to mapbox_maps_flutter_mobile/example/assets/raster_array_layers.json diff --git a/example/assets/sf_airport_route.geojson b/mapbox_maps_flutter_mobile/example/assets/sf_airport_route.geojson similarity index 100% rename from example/assets/sf_airport_route.geojson rename to mapbox_maps_flutter_mobile/example/assets/sf_airport_route.geojson diff --git a/example/assets/source.json b/mapbox_maps_flutter_mobile/example/assets/source.json similarity index 100% rename from example/assets/source.json rename to mapbox_maps_flutter_mobile/example/assets/source.json diff --git a/example/assets/sportcar.glb b/mapbox_maps_flutter_mobile/example/assets/sportcar.glb similarity index 100% rename from example/assets/sportcar.glb rename to mapbox_maps_flutter_mobile/example/assets/sportcar.glb diff --git a/example/assets/style.json b/mapbox_maps_flutter_mobile/example/assets/style.json similarity index 100% rename from example/assets/style.json rename to mapbox_maps_flutter_mobile/example/assets/style.json diff --git a/example/assets/symbols/2.0x/custom-icon.png b/mapbox_maps_flutter_mobile/example/assets/symbols/2.0x/custom-icon.png similarity index 100% rename from example/assets/symbols/2.0x/custom-icon.png rename to mapbox_maps_flutter_mobile/example/assets/symbols/2.0x/custom-icon.png diff --git a/example/assets/symbols/3.0x/custom-icon.png b/mapbox_maps_flutter_mobile/example/assets/symbols/3.0x/custom-icon.png similarity index 100% rename from example/assets/symbols/3.0x/custom-icon.png rename to mapbox_maps_flutter_mobile/example/assets/symbols/3.0x/custom-icon.png diff --git a/example/assets/symbols/custom-icon.png b/mapbox_maps_flutter_mobile/example/assets/symbols/custom-icon.png similarity index 100% rename from example/assets/symbols/custom-icon.png rename to mapbox_maps_flutter_mobile/example/assets/symbols/custom-icon.png diff --git a/example/integration_test/all_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/all_test.dart similarity index 100% rename from example/integration_test/all_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/all_test.dart diff --git a/example/integration_test/animation_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/animation_test.dart similarity index 100% rename from example/integration_test/animation_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/animation_test.dart diff --git a/example/integration_test/annotations/circle_annotation_manager_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/annotations/circle_annotation_manager_test.dart similarity index 100% rename from example/integration_test/annotations/circle_annotation_manager_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/annotations/circle_annotation_manager_test.dart diff --git a/example/integration_test/annotations/circle_annotation_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/annotations/circle_annotation_test.dart similarity index 100% rename from example/integration_test/annotations/circle_annotation_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/annotations/circle_annotation_test.dart diff --git a/example/integration_test/annotations/point_annotation_manager_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/annotations/point_annotation_manager_test.dart similarity index 100% rename from example/integration_test/annotations/point_annotation_manager_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/annotations/point_annotation_manager_test.dart diff --git a/example/integration_test/annotations/point_annotation_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/annotations/point_annotation_test.dart similarity index 100% rename from example/integration_test/annotations/point_annotation_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/annotations/point_annotation_test.dart diff --git a/example/integration_test/annotations/polygon_annotation_manager_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/annotations/polygon_annotation_manager_test.dart similarity index 100% rename from example/integration_test/annotations/polygon_annotation_manager_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/annotations/polygon_annotation_manager_test.dart diff --git a/example/integration_test/annotations/polygon_annotation_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/annotations/polygon_annotation_test.dart similarity index 100% rename from example/integration_test/annotations/polygon_annotation_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/annotations/polygon_annotation_test.dart diff --git a/example/integration_test/annotations/polyline_annotation_manager_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/annotations/polyline_annotation_manager_test.dart similarity index 100% rename from example/integration_test/annotations/polyline_annotation_manager_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/annotations/polyline_annotation_manager_test.dart diff --git a/example/integration_test/annotations/polyline_annotation_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/annotations/polyline_annotation_test.dart similarity index 100% rename from example/integration_test/annotations/polyline_annotation_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/annotations/polyline_annotation_test.dart diff --git a/example/integration_test/attribution_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/attribution_test.dart similarity index 100% rename from example/integration_test/attribution_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/attribution_test.dart diff --git a/example/integration_test/camera_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/camera_test.dart similarity index 100% rename from example/integration_test/camera_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/camera_test.dart diff --git a/example/integration_test/compass_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/compass_test.dart similarity index 100% rename from example/integration_test/compass_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/compass_test.dart diff --git a/example/integration_test/empty_map_widget.dart b/mapbox_maps_flutter_mobile/example/integration_test/empty_map_widget.dart similarity index 100% rename from example/integration_test/empty_map_widget.dart rename to mapbox_maps_flutter_mobile/example/integration_test/empty_map_widget.dart diff --git a/example/integration_test/gestures_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/gestures_test.dart similarity index 100% rename from example/integration_test/gestures_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/gestures_test.dart diff --git a/example/integration_test/interactive_features_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/interactive_features_test.dart similarity index 100% rename from example/integration_test/interactive_features_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/interactive_features_test.dart diff --git a/example/integration_test/location_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/location_test.dart similarity index 100% rename from example/integration_test/location_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/location_test.dart diff --git a/example/integration_test/logo_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/logo_test.dart similarity index 100% rename from example/integration_test/logo_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/logo_test.dart diff --git a/example/integration_test/map_interface_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/map_interface_test.dart similarity index 100% rename from example/integration_test/map_interface_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/map_interface_test.dart diff --git a/example/integration_test/offline_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/offline_test.dart similarity index 100% rename from example/integration_test/offline_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/offline_test.dart diff --git a/example/integration_test/projection_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/projection_test.dart similarity index 100% rename from example/integration_test/projection_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/projection_test.dart diff --git a/example/integration_test/scale_bar_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/scale_bar_test.dart similarity index 100% rename from example/integration_test/scale_bar_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/scale_bar_test.dart diff --git a/example/integration_test/snapshotter/snapshotter_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/snapshotter/snapshotter_test.dart similarity index 100% rename from example/integration_test/snapshotter/snapshotter_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/snapshotter/snapshotter_test.dart diff --git a/example/integration_test/style/layer/background_layer_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/layer/background_layer_test.dart similarity index 100% rename from example/integration_test/style/layer/background_layer_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/layer/background_layer_test.dart diff --git a/example/integration_test/style/layer/circle_layer_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/layer/circle_layer_test.dart similarity index 100% rename from example/integration_test/style/layer/circle_layer_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/layer/circle_layer_test.dart diff --git a/example/integration_test/style/layer/clip_layer_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/layer/clip_layer_test.dart similarity index 100% rename from example/integration_test/style/layer/clip_layer_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/layer/clip_layer_test.dart diff --git a/example/integration_test/style/layer/fill_extrusion_layer_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/layer/fill_extrusion_layer_test.dart similarity index 100% rename from example/integration_test/style/layer/fill_extrusion_layer_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/layer/fill_extrusion_layer_test.dart diff --git a/example/integration_test/style/layer/fill_layer_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/layer/fill_layer_test.dart similarity index 100% rename from example/integration_test/style/layer/fill_layer_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/layer/fill_layer_test.dart diff --git a/example/integration_test/style/layer/heatmap_layer_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/layer/heatmap_layer_test.dart similarity index 100% rename from example/integration_test/style/layer/heatmap_layer_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/layer/heatmap_layer_test.dart diff --git a/example/integration_test/style/layer/hillshade_layer_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/layer/hillshade_layer_test.dart similarity index 100% rename from example/integration_test/style/layer/hillshade_layer_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/layer/hillshade_layer_test.dart diff --git a/example/integration_test/style/layer/line_layer_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/layer/line_layer_test.dart similarity index 100% rename from example/integration_test/style/layer/line_layer_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/layer/line_layer_test.dart diff --git a/example/integration_test/style/layer/location_indicator_layer_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/layer/location_indicator_layer_test.dart similarity index 100% rename from example/integration_test/style/layer/location_indicator_layer_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/layer/location_indicator_layer_test.dart diff --git a/example/integration_test/style/layer/model_layer_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/layer/model_layer_test.dart similarity index 100% rename from example/integration_test/style/layer/model_layer_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/layer/model_layer_test.dart diff --git a/example/integration_test/style/layer/raster_layer_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/layer/raster_layer_test.dart similarity index 100% rename from example/integration_test/style/layer/raster_layer_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/layer/raster_layer_test.dart diff --git a/example/integration_test/style/layer/raster_particle_layer_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/layer/raster_particle_layer_test.dart similarity index 100% rename from example/integration_test/style/layer/raster_particle_layer_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/layer/raster_particle_layer_test.dart diff --git a/example/integration_test/style/layer/sky_layer_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/layer/sky_layer_test.dart similarity index 100% rename from example/integration_test/style/layer/sky_layer_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/layer/sky_layer_test.dart diff --git a/example/integration_test/style/layer/slot_layer_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/layer/slot_layer_test.dart similarity index 100% rename from example/integration_test/style/layer/slot_layer_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/layer/slot_layer_test.dart diff --git a/example/integration_test/style/layer/symbol_layer_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/layer/symbol_layer_test.dart similarity index 100% rename from example/integration_test/style/layer/symbol_layer_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/layer/symbol_layer_test.dart diff --git a/example/integration_test/style/source/geojson_source_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/source/geojson_source_test.dart similarity index 100% rename from example/integration_test/style/source/geojson_source_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/source/geojson_source_test.dart diff --git a/example/integration_test/style/source/image_source_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/source/image_source_test.dart similarity index 100% rename from example/integration_test/style/source/image_source_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/source/image_source_test.dart diff --git a/example/integration_test/style/source/raster_source_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/source/raster_source_test.dart similarity index 100% rename from example/integration_test/style/source/raster_source_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/source/raster_source_test.dart diff --git a/example/integration_test/style/source/rasterarray_source_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/source/rasterarray_source_test.dart similarity index 100% rename from example/integration_test/style/source/rasterarray_source_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/source/rasterarray_source_test.dart diff --git a/example/integration_test/style/source/rasterdem_source_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/source/rasterdem_source_test.dart similarity index 100% rename from example/integration_test/style/source/rasterdem_source_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/source/rasterdem_source_test.dart diff --git a/example/integration_test/style/source/vector_source_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/source/vector_source_test.dart similarity index 100% rename from example/integration_test/style/source/vector_source_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/source/vector_source_test.dart diff --git a/example/integration_test/style/style_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/style/style_test.dart similarity index 100% rename from example/integration_test/style/style_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/style/style_test.dart diff --git a/example/integration_test/utils/list_close_to_matcher.dart b/mapbox_maps_flutter_mobile/example/integration_test/utils/list_close_to_matcher.dart similarity index 100% rename from example/integration_test/utils/list_close_to_matcher.dart rename to mapbox_maps_flutter_mobile/example/integration_test/utils/list_close_to_matcher.dart diff --git a/example/integration_test/viewport_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/viewport_test.dart similarity index 100% rename from example/integration_test/viewport_test.dart rename to mapbox_maps_flutter_mobile/example/integration_test/viewport_test.dart diff --git a/example/ios/.gitignore b/mapbox_maps_flutter_mobile/example/ios/.gitignore similarity index 100% rename from example/ios/.gitignore rename to mapbox_maps_flutter_mobile/example/ios/.gitignore diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/mapbox_maps_flutter_mobile/example/ios/Flutter/AppFrameworkInfo.plist similarity index 100% rename from example/ios/Flutter/AppFrameworkInfo.plist rename to mapbox_maps_flutter_mobile/example/ios/Flutter/AppFrameworkInfo.plist diff --git a/example/ios/Flutter/Debug.xcconfig b/mapbox_maps_flutter_mobile/example/ios/Flutter/Debug.xcconfig similarity index 100% rename from example/ios/Flutter/Debug.xcconfig rename to mapbox_maps_flutter_mobile/example/ios/Flutter/Debug.xcconfig diff --git a/example/ios/Flutter/Release.xcconfig b/mapbox_maps_flutter_mobile/example/ios/Flutter/Release.xcconfig similarity index 100% rename from example/ios/Flutter/Release.xcconfig rename to mapbox_maps_flutter_mobile/example/ios/Flutter/Release.xcconfig diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/mapbox_maps_flutter_mobile/example/ios/Runner.xcodeproj/project.pbxproj similarity index 100% rename from example/ios/Runner.xcodeproj/project.pbxproj rename to mapbox_maps_flutter_mobile/example/ios/Runner.xcodeproj/project.pbxproj diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/mapbox_maps_flutter_mobile/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to mapbox_maps_flutter_mobile/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mapbox_maps_flutter_mobile/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to mapbox_maps_flutter_mobile/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/mapbox_maps_flutter_mobile/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to mapbox_maps_flutter_mobile/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/mapbox_maps_flutter_mobile/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved similarity index 100% rename from example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved rename to mapbox_maps_flutter_mobile/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/mapbox_maps_flutter_mobile/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to mapbox_maps_flutter_mobile/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/mapbox_maps_flutter_mobile/example/ios/Runner.xcworkspace/contents.xcworkspacedata similarity index 100% rename from example/ios/Runner.xcworkspace/contents.xcworkspacedata rename to mapbox_maps_flutter_mobile/example/ios/Runner.xcworkspace/contents.xcworkspacedata diff --git a/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mapbox_maps_flutter_mobile/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to mapbox_maps_flutter_mobile/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/mapbox_maps_flutter_mobile/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to mapbox_maps_flutter_mobile/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/mapbox_maps_flutter_mobile/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved similarity index 100% rename from example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved rename to mapbox_maps_flutter_mobile/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/example/ios/Runner/AppDelegate.swift b/mapbox_maps_flutter_mobile/example/ios/Runner/AppDelegate.swift similarity index 100% rename from example/ios/Runner/AppDelegate.swift rename to mapbox_maps_flutter_mobile/example/ios/Runner/AppDelegate.swift diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png similarity index 100% rename from example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png similarity index 100% rename from example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png similarity index 100% rename from example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png similarity index 100% rename from example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png similarity index 100% rename from example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png similarity index 100% rename from example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png similarity index 100% rename from example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png similarity index 100% rename from example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png similarity index 100% rename from example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png similarity index 100% rename from example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png similarity index 100% rename from example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png similarity index 100% rename from example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png similarity index 100% rename from example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png similarity index 100% rename from example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png similarity index 100% rename from example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png diff --git a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json similarity index 100% rename from example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json diff --git a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png similarity index 100% rename from example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png diff --git a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png similarity index 100% rename from example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png diff --git a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png similarity index 100% rename from example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png diff --git a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md similarity index 100% rename from example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md rename to mapbox_maps_flutter_mobile/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md diff --git a/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/mapbox_maps_flutter_mobile/example/ios/Runner/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from example/ios/Runner/Base.lproj/LaunchScreen.storyboard rename to mapbox_maps_flutter_mobile/example/ios/Runner/Base.lproj/LaunchScreen.storyboard diff --git a/example/ios/Runner/Base.lproj/Main.storyboard b/mapbox_maps_flutter_mobile/example/ios/Runner/Base.lproj/Main.storyboard similarity index 100% rename from example/ios/Runner/Base.lproj/Main.storyboard rename to mapbox_maps_flutter_mobile/example/ios/Runner/Base.lproj/Main.storyboard diff --git a/example/ios/Runner/Info.plist b/mapbox_maps_flutter_mobile/example/ios/Runner/Info.plist similarity index 100% rename from example/ios/Runner/Info.plist rename to mapbox_maps_flutter_mobile/example/ios/Runner/Info.plist diff --git a/example/ios/Runner/Runner-Bridging-Header.h b/mapbox_maps_flutter_mobile/example/ios/Runner/Runner-Bridging-Header.h similarity index 100% rename from example/ios/Runner/Runner-Bridging-Header.h rename to mapbox_maps_flutter_mobile/example/ios/Runner/Runner-Bridging-Header.h diff --git a/example/ios/RunnerTests/RunnerTests.m b/mapbox_maps_flutter_mobile/example/ios/RunnerTests/RunnerTests.m similarity index 100% rename from example/ios/RunnerTests/RunnerTests.m rename to mapbox_maps_flutter_mobile/example/ios/RunnerTests/RunnerTests.m diff --git a/example/lib/animated_route_example.dart b/mapbox_maps_flutter_mobile/example/lib/animated_route_example.dart similarity index 100% rename from example/lib/animated_route_example.dart rename to mapbox_maps_flutter_mobile/example/lib/animated_route_example.dart diff --git a/example/lib/animation_example.dart b/mapbox_maps_flutter_mobile/example/lib/animation_example.dart similarity index 100% rename from example/lib/animation_example.dart rename to mapbox_maps_flutter_mobile/example/lib/animation_example.dart diff --git a/example/lib/camera_example.dart b/mapbox_maps_flutter_mobile/example/lib/camera_example.dart similarity index 100% rename from example/lib/camera_example.dart rename to mapbox_maps_flutter_mobile/example/lib/camera_example.dart diff --git a/example/lib/circle_annotations_example.dart b/mapbox_maps_flutter_mobile/example/lib/circle_annotations_example.dart similarity index 100% rename from example/lib/circle_annotations_example.dart rename to mapbox_maps_flutter_mobile/example/lib/circle_annotations_example.dart diff --git a/example/lib/cluster_example.dart b/mapbox_maps_flutter_mobile/example/lib/cluster_example.dart similarity index 100% rename from example/lib/cluster_example.dart rename to mapbox_maps_flutter_mobile/example/lib/cluster_example.dart diff --git a/example/lib/custom_header_example.dart b/mapbox_maps_flutter_mobile/example/lib/custom_header_example.dart similarity index 100% rename from example/lib/custom_header_example.dart rename to mapbox_maps_flutter_mobile/example/lib/custom_header_example.dart diff --git a/example/lib/debug_options_example.dart b/mapbox_maps_flutter_mobile/example/lib/debug_options_example.dart similarity index 100% rename from example/lib/debug_options_example.dart rename to mapbox_maps_flutter_mobile/example/lib/debug_options_example.dart diff --git a/example/lib/draggable-annotations-example.dart b/mapbox_maps_flutter_mobile/example/lib/draggable-annotations-example.dart similarity index 100% rename from example/lib/draggable-annotations-example.dart rename to mapbox_maps_flutter_mobile/example/lib/draggable-annotations-example.dart diff --git a/example/lib/edit_polygon_example.dart b/mapbox_maps_flutter_mobile/example/lib/edit_polygon_example.dart similarity index 100% rename from example/lib/edit_polygon_example.dart rename to mapbox_maps_flutter_mobile/example/lib/edit_polygon_example.dart diff --git a/example/lib/example.dart b/mapbox_maps_flutter_mobile/example/lib/example.dart similarity index 100% rename from example/lib/example.dart rename to mapbox_maps_flutter_mobile/example/lib/example.dart diff --git a/example/lib/full_map_example.dart b/mapbox_maps_flutter_mobile/example/lib/full_map_example.dart similarity index 100% rename from example/lib/full_map_example.dart rename to mapbox_maps_flutter_mobile/example/lib/full_map_example.dart diff --git a/example/lib/geojson_line_example.dart b/mapbox_maps_flutter_mobile/example/lib/geojson_line_example.dart similarity index 100% rename from example/lib/geojson_line_example.dart rename to mapbox_maps_flutter_mobile/example/lib/geojson_line_example.dart diff --git a/example/lib/gestures_example.dart b/mapbox_maps_flutter_mobile/example/lib/gestures_example.dart similarity index 100% rename from example/lib/gestures_example.dart rename to mapbox_maps_flutter_mobile/example/lib/gestures_example.dart diff --git a/example/lib/image_source_example.dart b/mapbox_maps_flutter_mobile/example/lib/image_source_example.dart similarity index 100% rename from example/lib/image_source_example.dart rename to mapbox_maps_flutter_mobile/example/lib/image_source_example.dart diff --git a/example/lib/location_example.dart b/mapbox_maps_flutter_mobile/example/lib/location_example.dart similarity index 100% rename from example/lib/location_example.dart rename to mapbox_maps_flutter_mobile/example/lib/location_example.dart diff --git a/example/lib/main.dart b/mapbox_maps_flutter_mobile/example/lib/main.dart similarity index 100% rename from example/lib/main.dart rename to mapbox_maps_flutter_mobile/example/lib/main.dart diff --git a/example/lib/map_interface_example.dart b/mapbox_maps_flutter_mobile/example/lib/map_interface_example.dart similarity index 100% rename from example/lib/map_interface_example.dart rename to mapbox_maps_flutter_mobile/example/lib/map_interface_example.dart diff --git a/example/lib/model_layer_example.dart b/mapbox_maps_flutter_mobile/example/lib/model_layer_example.dart similarity index 100% rename from example/lib/model_layer_example.dart rename to mapbox_maps_flutter_mobile/example/lib/model_layer_example.dart diff --git a/example/lib/model_layer_interactions_example.dart b/mapbox_maps_flutter_mobile/example/lib/model_layer_interactions_example.dart similarity index 100% rename from example/lib/model_layer_interactions_example.dart rename to mapbox_maps_flutter_mobile/example/lib/model_layer_interactions_example.dart diff --git a/example/lib/offline_map_example.dart b/mapbox_maps_flutter_mobile/example/lib/offline_map_example.dart similarity index 100% rename from example/lib/offline_map_example.dart rename to mapbox_maps_flutter_mobile/example/lib/offline_map_example.dart diff --git a/example/lib/ornaments_example.dart b/mapbox_maps_flutter_mobile/example/lib/ornaments_example.dart similarity index 100% rename from example/lib/ornaments_example.dart rename to mapbox_maps_flutter_mobile/example/lib/ornaments_example.dart diff --git a/example/lib/point_annotations_example.dart b/mapbox_maps_flutter_mobile/example/lib/point_annotations_example.dart similarity index 100% rename from example/lib/point_annotations_example.dart rename to mapbox_maps_flutter_mobile/example/lib/point_annotations_example.dart diff --git a/example/lib/polygon_annotations_example.dart b/mapbox_maps_flutter_mobile/example/lib/polygon_annotations_example.dart similarity index 100% rename from example/lib/polygon_annotations_example.dart rename to mapbox_maps_flutter_mobile/example/lib/polygon_annotations_example.dart diff --git a/example/lib/polyline_annotations_example.dart b/mapbox_maps_flutter_mobile/example/lib/polyline_annotations_example.dart similarity index 100% rename from example/lib/polyline_annotations_example.dart rename to mapbox_maps_flutter_mobile/example/lib/polyline_annotations_example.dart diff --git a/example/lib/projection_example.dart b/mapbox_maps_flutter_mobile/example/lib/projection_example.dart similarity index 100% rename from example/lib/projection_example.dart rename to mapbox_maps_flutter_mobile/example/lib/projection_example.dart diff --git a/example/lib/simple_map_example.dart b/mapbox_maps_flutter_mobile/example/lib/simple_map_example.dart similarity index 100% rename from example/lib/simple_map_example.dart rename to mapbox_maps_flutter_mobile/example/lib/simple_map_example.dart diff --git a/example/lib/snapshotter_example.dart b/mapbox_maps_flutter_mobile/example/lib/snapshotter_example.dart similarity index 100% rename from example/lib/snapshotter_example.dart rename to mapbox_maps_flutter_mobile/example/lib/snapshotter_example.dart diff --git a/example/lib/spinning_globe_example.dart b/mapbox_maps_flutter_mobile/example/lib/spinning_globe_example.dart similarity index 100% rename from example/lib/spinning_globe_example.dart rename to mapbox_maps_flutter_mobile/example/lib/spinning_globe_example.dart diff --git a/example/lib/standard_style_import_example.dart b/mapbox_maps_flutter_mobile/example/lib/standard_style_import_example.dart similarity index 100% rename from example/lib/standard_style_import_example.dart rename to mapbox_maps_flutter_mobile/example/lib/standard_style_import_example.dart diff --git a/example/lib/standard_style_interactions_example.dart b/mapbox_maps_flutter_mobile/example/lib/standard_style_interactions_example.dart similarity index 100% rename from example/lib/standard_style_interactions_example.dart rename to mapbox_maps_flutter_mobile/example/lib/standard_style_interactions_example.dart diff --git a/example/lib/style_example.dart b/mapbox_maps_flutter_mobile/example/lib/style_example.dart similarity index 100% rename from example/lib/style_example.dart rename to mapbox_maps_flutter_mobile/example/lib/style_example.dart diff --git a/example/lib/tile_json_example.dart b/mapbox_maps_flutter_mobile/example/lib/tile_json_example.dart similarity index 100% rename from example/lib/tile_json_example.dart rename to mapbox_maps_flutter_mobile/example/lib/tile_json_example.dart diff --git a/example/lib/traffic_layer_example.dart b/mapbox_maps_flutter_mobile/example/lib/traffic_layer_example.dart similarity index 100% rename from example/lib/traffic_layer_example.dart rename to mapbox_maps_flutter_mobile/example/lib/traffic_layer_example.dart diff --git a/example/lib/traffic_route_line_example.dart b/mapbox_maps_flutter_mobile/example/lib/traffic_route_line_example.dart similarity index 100% rename from example/lib/traffic_route_line_example.dart rename to mapbox_maps_flutter_mobile/example/lib/traffic_route_line_example.dart diff --git a/example/lib/utils.dart b/mapbox_maps_flutter_mobile/example/lib/utils.dart similarity index 100% rename from example/lib/utils.dart rename to mapbox_maps_flutter_mobile/example/lib/utils.dart diff --git a/example/lib/vector_tile_source_example.dart b/mapbox_maps_flutter_mobile/example/lib/vector_tile_source_example.dart similarity index 100% rename from example/lib/vector_tile_source_example.dart rename to mapbox_maps_flutter_mobile/example/lib/vector_tile_source_example.dart diff --git a/example/lib/viewport_example.dart b/mapbox_maps_flutter_mobile/example/lib/viewport_example.dart similarity index 100% rename from example/lib/viewport_example.dart rename to mapbox_maps_flutter_mobile/example/lib/viewport_example.dart diff --git a/example/pubspec.lock b/mapbox_maps_flutter_mobile/example/pubspec.lock similarity index 100% rename from example/pubspec.lock rename to mapbox_maps_flutter_mobile/example/pubspec.lock diff --git a/example/pubspec.yaml b/mapbox_maps_flutter_mobile/example/pubspec.yaml similarity index 100% rename from example/pubspec.yaml rename to mapbox_maps_flutter_mobile/example/pubspec.yaml diff --git a/example/test_driver/integration_test.dart b/mapbox_maps_flutter_mobile/example/test_driver/integration_test.dart similarity index 100% rename from example/test_driver/integration_test.dart rename to mapbox_maps_flutter_mobile/example/test_driver/integration_test.dart diff --git a/ios/.gitignore b/mapbox_maps_flutter_mobile/ios/.gitignore similarity index 100% rename from ios/.gitignore rename to mapbox_maps_flutter_mobile/ios/.gitignore diff --git a/ios/mapbox_maps_flutter.podspec b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter.podspec similarity index 100% rename from ios/mapbox_maps_flutter.podspec rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter.podspec diff --git a/ios/mapbox_maps_flutter/.swiftlint.yml b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/.swiftlint.yml similarity index 100% rename from ios/mapbox_maps_flutter/.swiftlint.yml rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/.swiftlint.yml diff --git a/ios/mapbox_maps_flutter/Package.resolved b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Package.resolved similarity index 100% rename from ios/mapbox_maps_flutter/Package.resolved rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Package.resolved diff --git a/ios/mapbox_maps_flutter/Package.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Package.swift similarity index 100% rename from ios/mapbox_maps_flutter/Package.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Package.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/AnimationController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/AnimationController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/AnimationController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/AnimationController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/AnnotationController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/AnnotationController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/AnnotationController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/AnnotationController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/BaseAnnotationMessenger.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/BaseAnnotationMessenger.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/BaseAnnotationMessenger.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/BaseAnnotationMessenger.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/CircleAnnotationController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/CircleAnnotationController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/CircleAnnotationController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/CircleAnnotationController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/PointAnnotationController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/PointAnnotationController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/PointAnnotationController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/PointAnnotationController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/PolygonAnnotationController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/PolygonAnnotationController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/PolygonAnnotationController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/PolygonAnnotationController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/PolylineAnnotationController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/PolylineAnnotationController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/PolylineAnnotationController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Annotations/PolylineAnnotationController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/AnyFlutterStreamHandler.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/AnyFlutterStreamHandler.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/AnyFlutterStreamHandler.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/AnyFlutterStreamHandler.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/AttributionController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/AttributionController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/AttributionController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/AttributionController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/CameraController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/CameraController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/CameraController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/CameraController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/CompassController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/CompassController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/CompassController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/CompassController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/CustomHttpServiceInterceptor.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/CustomHttpServiceInterceptor.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/CustomHttpServiceInterceptor.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/CustomHttpServiceInterceptor.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/EnumsMapping.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/EnumsMapping.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/EnumsMapping.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/EnumsMapping.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/EventHandler.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/EventHandler.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/EventHandler.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/EventHandler.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Extensions.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Extensions.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Extensions.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Extensions.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/CircleAnnotationMessenger.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/CircleAnnotationMessenger.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/CircleAnnotationMessenger.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/CircleAnnotationMessenger.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/GestureListeners.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/GestureListeners.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/GestureListeners.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/GestureListeners.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/LogBackend.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/LogBackend.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/LogBackend.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/LogBackend.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/MapInterfaces.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/MapInterfaces.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/MapInterfaces.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/MapInterfaces.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/OfflineMessenger.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/OfflineMessenger.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/OfflineMessenger.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/OfflineMessenger.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PerformaceStatistics.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PerformaceStatistics.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PerformaceStatistics.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PerformaceStatistics.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PointAnnotationMessenger.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PointAnnotationMessenger.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PointAnnotationMessenger.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PointAnnotationMessenger.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PolygonAnnotationMessenger.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PolygonAnnotationMessenger.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PolygonAnnotationMessenger.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PolygonAnnotationMessenger.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PolylineAnnotationMessenger.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PolylineAnnotationMessenger.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PolylineAnnotationMessenger.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PolylineAnnotationMessenger.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/Settings.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/Settings.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/Settings.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/Settings.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/SnapshotterMessenger.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/SnapshotterMessenger.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/SnapshotterMessenger.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/SnapshotterMessenger.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/ViewportInternal.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/ViewportInternal.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/ViewportInternal.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/ViewportInternal.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/GesturesController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/GesturesController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/GesturesController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/GesturesController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/InteractionsController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/InteractionsController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/InteractionsController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/InteractionsController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/LocationController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/LocationController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/LocationController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/LocationController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/LoggingController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/LoggingController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/LoggingController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/LoggingController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/LogoController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/LogoController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/LogoController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/LogoController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapEvents+JSON.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapEvents+JSON.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapEvents+JSON.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapEvents+JSON.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapInterfaceController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapInterfaceController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapInterfaceController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapInterfaceController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapProjectionController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapProjectionController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapProjectionController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapProjectionController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapboxMapController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapboxMapController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapboxMapController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapboxMapController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapboxMapFactory.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapboxMapFactory.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapboxMapFactory.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapboxMapFactory.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapboxMapsPlugin.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapboxMapsPlugin.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapboxMapsPlugin.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapboxMapsPlugin.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapboxOptionsController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapboxOptionsController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapboxOptionsController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/MapboxOptionsController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Offline/OfflineController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Offline/OfflineController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Offline/OfflineController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Offline/OfflineController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Offline/OfflineMapInstanceManager.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Offline/OfflineMapInstanceManager.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Offline/OfflineMapInstanceManager.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Offline/OfflineMapInstanceManager.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Offline/TileStoreController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Offline/TileStoreController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Offline/TileStoreController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Offline/TileStoreController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/PerformanceStatisticsController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/PerformanceStatisticsController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/PerformanceStatisticsController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/PerformanceStatisticsController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/ScalebarController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/ScalebarController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/ScalebarController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/ScalebarController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Snapshotter/SnapshotterController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Snapshotter/SnapshotterController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Snapshotter/SnapshotterController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Snapshotter/SnapshotterController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Snapshotter/SnapshotterInstanceManager.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Snapshotter/SnapshotterInstanceManager.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Snapshotter/SnapshotterInstanceManager.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Snapshotter/SnapshotterInstanceManager.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/StyleController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/StyleController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/StyleController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/StyleController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/StyleLights.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/StyleLights.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/StyleLights.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/StyleLights.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/TurfAdapters.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/TurfAdapters.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/TurfAdapters.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/TurfAdapters.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Viewport/States.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Viewport/States.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Viewport/States.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Viewport/States.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Viewport/Transitions.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Viewport/Transitions.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Viewport/Transitions.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Viewport/Transitions.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Viewport/ViewportController.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Viewport/ViewportController.swift similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Viewport/ViewportController.swift rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Viewport/ViewportController.swift diff --git a/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/mapbox_maps_flutter.h b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/mapbox_maps_flutter.h similarity index 100% rename from ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/mapbox_maps_flutter.h rename to mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/mapbox_maps_flutter.h diff --git a/lib/mapbox_maps_flutter.dart b/mapbox_maps_flutter_mobile/lib/mapbox_maps_flutter.dart similarity index 100% rename from lib/mapbox_maps_flutter.dart rename to mapbox_maps_flutter_mobile/lib/mapbox_maps_flutter.dart diff --git a/lib/src/annotation/annotation_manager.dart b/mapbox_maps_flutter_mobile/lib/src/annotation/annotation_manager.dart similarity index 100% rename from lib/src/annotation/annotation_manager.dart rename to mapbox_maps_flutter_mobile/lib/src/annotation/annotation_manager.dart diff --git a/lib/src/annotation/circle_annotation_manager.dart b/mapbox_maps_flutter_mobile/lib/src/annotation/circle_annotation_manager.dart similarity index 100% rename from lib/src/annotation/circle_annotation_manager.dart rename to mapbox_maps_flutter_mobile/lib/src/annotation/circle_annotation_manager.dart diff --git a/lib/src/annotation/point_annotation_manager.dart b/mapbox_maps_flutter_mobile/lib/src/annotation/point_annotation_manager.dart similarity index 100% rename from lib/src/annotation/point_annotation_manager.dart rename to mapbox_maps_flutter_mobile/lib/src/annotation/point_annotation_manager.dart diff --git a/lib/src/annotation/polygon_annotation_manager.dart b/mapbox_maps_flutter_mobile/lib/src/annotation/polygon_annotation_manager.dart similarity index 100% rename from lib/src/annotation/polygon_annotation_manager.dart rename to mapbox_maps_flutter_mobile/lib/src/annotation/polygon_annotation_manager.dart diff --git a/lib/src/annotation/polyline_annotation_manager.dart b/mapbox_maps_flutter_mobile/lib/src/annotation/polyline_annotation_manager.dart similarity index 100% rename from lib/src/annotation/polyline_annotation_manager.dart rename to mapbox_maps_flutter_mobile/lib/src/annotation/polyline_annotation_manager.dart diff --git a/lib/src/callbacks.dart b/mapbox_maps_flutter_mobile/lib/src/callbacks.dart similarity index 100% rename from lib/src/callbacks.dart rename to mapbox_maps_flutter_mobile/lib/src/callbacks.dart diff --git a/lib/src/cancelable.dart b/mapbox_maps_flutter_mobile/lib/src/cancelable.dart similarity index 100% rename from lib/src/cancelable.dart rename to mapbox_maps_flutter_mobile/lib/src/cancelable.dart diff --git a/lib/src/events.dart b/mapbox_maps_flutter_mobile/lib/src/events.dart similarity index 100% rename from lib/src/events.dart rename to mapbox_maps_flutter_mobile/lib/src/events.dart diff --git a/lib/src/extensions.dart b/mapbox_maps_flutter_mobile/lib/src/extensions.dart similarity index 100% rename from lib/src/extensions.dart rename to mapbox_maps_flutter_mobile/lib/src/extensions.dart diff --git a/lib/src/http/http_service.dart b/mapbox_maps_flutter_mobile/lib/src/http/http_service.dart similarity index 100% rename from lib/src/http/http_service.dart rename to mapbox_maps_flutter_mobile/lib/src/http/http_service.dart diff --git a/lib/src/location_settings.dart b/mapbox_maps_flutter_mobile/lib/src/location_settings.dart similarity index 100% rename from lib/src/location_settings.dart rename to mapbox_maps_flutter_mobile/lib/src/location_settings.dart diff --git a/lib/src/log_configuration.dart b/mapbox_maps_flutter_mobile/lib/src/log_configuration.dart similarity index 100% rename from lib/src/log_configuration.dart rename to mapbox_maps_flutter_mobile/lib/src/log_configuration.dart diff --git a/lib/src/map_events.dart b/mapbox_maps_flutter_mobile/lib/src/map_events.dart similarity index 100% rename from lib/src/map_events.dart rename to mapbox_maps_flutter_mobile/lib/src/map_events.dart diff --git a/lib/src/map_widget.dart b/mapbox_maps_flutter_mobile/lib/src/map_widget.dart similarity index 100% rename from lib/src/map_widget.dart rename to mapbox_maps_flutter_mobile/lib/src/map_widget.dart diff --git a/lib/src/mapbox_map.dart b/mapbox_maps_flutter_mobile/lib/src/mapbox_map.dart similarity index 100% rename from lib/src/mapbox_map.dart rename to mapbox_maps_flutter_mobile/lib/src/mapbox_map.dart diff --git a/lib/src/mapbox_maps_options.dart b/mapbox_maps_flutter_mobile/lib/src/mapbox_maps_options.dart similarity index 100% rename from lib/src/mapbox_maps_options.dart rename to mapbox_maps_flutter_mobile/lib/src/mapbox_maps_options.dart diff --git a/lib/src/mapbox_maps_platform.dart b/mapbox_maps_flutter_mobile/lib/src/mapbox_maps_platform.dart similarity index 100% rename from lib/src/mapbox_maps_platform.dart rename to mapbox_maps_flutter_mobile/lib/src/mapbox_maps_platform.dart diff --git a/lib/src/offline/offline_manager.dart b/mapbox_maps_flutter_mobile/lib/src/offline/offline_manager.dart similarity index 100% rename from lib/src/offline/offline_manager.dart rename to mapbox_maps_flutter_mobile/lib/src/offline/offline_manager.dart diff --git a/lib/src/offline/offline_messenger.dart b/mapbox_maps_flutter_mobile/lib/src/offline/offline_messenger.dart similarity index 100% rename from lib/src/offline/offline_messenger.dart rename to mapbox_maps_flutter_mobile/lib/src/offline/offline_messenger.dart diff --git a/lib/src/offline/offline_switch.dart b/mapbox_maps_flutter_mobile/lib/src/offline/offline_switch.dart similarity index 100% rename from lib/src/offline/offline_switch.dart rename to mapbox_maps_flutter_mobile/lib/src/offline/offline_switch.dart diff --git a/lib/src/offline/tile_store.dart b/mapbox_maps_flutter_mobile/lib/src/offline/tile_store.dart similarity index 100% rename from lib/src/offline/tile_store.dart rename to mapbox_maps_flutter_mobile/lib/src/offline/tile_store.dart diff --git a/lib/src/package_info.dart b/mapbox_maps_flutter_mobile/lib/src/package_info.dart similarity index 100% rename from lib/src/package_info.dart rename to mapbox_maps_flutter_mobile/lib/src/package_info.dart diff --git a/lib/src/pigeons/circle_annotation_messenger.dart b/mapbox_maps_flutter_mobile/lib/src/pigeons/circle_annotation_messenger.dart similarity index 100% rename from lib/src/pigeons/circle_annotation_messenger.dart rename to mapbox_maps_flutter_mobile/lib/src/pigeons/circle_annotation_messenger.dart diff --git a/lib/src/pigeons/gesture_listeners.dart b/mapbox_maps_flutter_mobile/lib/src/pigeons/gesture_listeners.dart similarity index 100% rename from lib/src/pigeons/gesture_listeners.dart rename to mapbox_maps_flutter_mobile/lib/src/pigeons/gesture_listeners.dart diff --git a/lib/src/pigeons/log_backend.dart b/mapbox_maps_flutter_mobile/lib/src/pigeons/log_backend.dart similarity index 100% rename from lib/src/pigeons/log_backend.dart rename to mapbox_maps_flutter_mobile/lib/src/pigeons/log_backend.dart diff --git a/lib/src/pigeons/map_interfaces.dart b/mapbox_maps_flutter_mobile/lib/src/pigeons/map_interfaces.dart similarity index 100% rename from lib/src/pigeons/map_interfaces.dart rename to mapbox_maps_flutter_mobile/lib/src/pigeons/map_interfaces.dart diff --git a/lib/src/pigeons/performace_statistics.dart b/mapbox_maps_flutter_mobile/lib/src/pigeons/performace_statistics.dart similarity index 100% rename from lib/src/pigeons/performace_statistics.dart rename to mapbox_maps_flutter_mobile/lib/src/pigeons/performace_statistics.dart diff --git a/lib/src/pigeons/point_annotation_messenger.dart b/mapbox_maps_flutter_mobile/lib/src/pigeons/point_annotation_messenger.dart similarity index 100% rename from lib/src/pigeons/point_annotation_messenger.dart rename to mapbox_maps_flutter_mobile/lib/src/pigeons/point_annotation_messenger.dart diff --git a/lib/src/pigeons/polygon_annotation_messenger.dart b/mapbox_maps_flutter_mobile/lib/src/pigeons/polygon_annotation_messenger.dart similarity index 100% rename from lib/src/pigeons/polygon_annotation_messenger.dart rename to mapbox_maps_flutter_mobile/lib/src/pigeons/polygon_annotation_messenger.dart diff --git a/lib/src/pigeons/polyline_annotation_messenger.dart b/mapbox_maps_flutter_mobile/lib/src/pigeons/polyline_annotation_messenger.dart similarity index 100% rename from lib/src/pigeons/polyline_annotation_messenger.dart rename to mapbox_maps_flutter_mobile/lib/src/pigeons/polyline_annotation_messenger.dart diff --git a/lib/src/pigeons/settings.dart b/mapbox_maps_flutter_mobile/lib/src/pigeons/settings.dart similarity index 100% rename from lib/src/pigeons/settings.dart rename to mapbox_maps_flutter_mobile/lib/src/pigeons/settings.dart diff --git a/lib/src/snapshotter/snapshotter.dart b/mapbox_maps_flutter_mobile/lib/src/snapshotter/snapshotter.dart similarity index 100% rename from lib/src/snapshotter/snapshotter.dart rename to mapbox_maps_flutter_mobile/lib/src/snapshotter/snapshotter.dart diff --git a/lib/src/snapshotter/snapshotter_messenger.dart b/mapbox_maps_flutter_mobile/lib/src/snapshotter/snapshotter_messenger.dart similarity index 100% rename from lib/src/snapshotter/snapshotter_messenger.dart rename to mapbox_maps_flutter_mobile/lib/src/snapshotter/snapshotter_messenger.dart diff --git a/lib/src/style/interactive_features/interactive_features.dart b/mapbox_maps_flutter_mobile/lib/src/style/interactive_features/interactive_features.dart similarity index 100% rename from lib/src/style/interactive_features/interactive_features.dart rename to mapbox_maps_flutter_mobile/lib/src/style/interactive_features/interactive_features.dart diff --git a/lib/src/style/interactive_features/standard_buildings.dart b/mapbox_maps_flutter_mobile/lib/src/style/interactive_features/standard_buildings.dart similarity index 100% rename from lib/src/style/interactive_features/standard_buildings.dart rename to mapbox_maps_flutter_mobile/lib/src/style/interactive_features/standard_buildings.dart diff --git a/lib/src/style/interactive_features/standard_place_labels.dart b/mapbox_maps_flutter_mobile/lib/src/style/interactive_features/standard_place_labels.dart similarity index 100% rename from lib/src/style/interactive_features/standard_place_labels.dart rename to mapbox_maps_flutter_mobile/lib/src/style/interactive_features/standard_place_labels.dart diff --git a/lib/src/style/interactive_features/standard_poi.dart b/mapbox_maps_flutter_mobile/lib/src/style/interactive_features/standard_poi.dart similarity index 100% rename from lib/src/style/interactive_features/standard_poi.dart rename to mapbox_maps_flutter_mobile/lib/src/style/interactive_features/standard_poi.dart diff --git a/lib/src/style/layer/background_layer.dart b/mapbox_maps_flutter_mobile/lib/src/style/layer/background_layer.dart similarity index 100% rename from lib/src/style/layer/background_layer.dart rename to mapbox_maps_flutter_mobile/lib/src/style/layer/background_layer.dart diff --git a/lib/src/style/layer/circle_layer.dart b/mapbox_maps_flutter_mobile/lib/src/style/layer/circle_layer.dart similarity index 100% rename from lib/src/style/layer/circle_layer.dart rename to mapbox_maps_flutter_mobile/lib/src/style/layer/circle_layer.dart diff --git a/lib/src/style/layer/clip_layer.dart b/mapbox_maps_flutter_mobile/lib/src/style/layer/clip_layer.dart similarity index 100% rename from lib/src/style/layer/clip_layer.dart rename to mapbox_maps_flutter_mobile/lib/src/style/layer/clip_layer.dart diff --git a/lib/src/style/layer/fill_extrusion_layer.dart b/mapbox_maps_flutter_mobile/lib/src/style/layer/fill_extrusion_layer.dart similarity index 100% rename from lib/src/style/layer/fill_extrusion_layer.dart rename to mapbox_maps_flutter_mobile/lib/src/style/layer/fill_extrusion_layer.dart diff --git a/lib/src/style/layer/fill_layer.dart b/mapbox_maps_flutter_mobile/lib/src/style/layer/fill_layer.dart similarity index 100% rename from lib/src/style/layer/fill_layer.dart rename to mapbox_maps_flutter_mobile/lib/src/style/layer/fill_layer.dart diff --git a/lib/src/style/layer/heatmap_layer.dart b/mapbox_maps_flutter_mobile/lib/src/style/layer/heatmap_layer.dart similarity index 100% rename from lib/src/style/layer/heatmap_layer.dart rename to mapbox_maps_flutter_mobile/lib/src/style/layer/heatmap_layer.dart diff --git a/lib/src/style/layer/hillshade_layer.dart b/mapbox_maps_flutter_mobile/lib/src/style/layer/hillshade_layer.dart similarity index 100% rename from lib/src/style/layer/hillshade_layer.dart rename to mapbox_maps_flutter_mobile/lib/src/style/layer/hillshade_layer.dart diff --git a/lib/src/style/layer/line_layer.dart b/mapbox_maps_flutter_mobile/lib/src/style/layer/line_layer.dart similarity index 100% rename from lib/src/style/layer/line_layer.dart rename to mapbox_maps_flutter_mobile/lib/src/style/layer/line_layer.dart diff --git a/lib/src/style/layer/location_indicator_layer.dart b/mapbox_maps_flutter_mobile/lib/src/style/layer/location_indicator_layer.dart similarity index 100% rename from lib/src/style/layer/location_indicator_layer.dart rename to mapbox_maps_flutter_mobile/lib/src/style/layer/location_indicator_layer.dart diff --git a/lib/src/style/layer/model_layer.dart b/mapbox_maps_flutter_mobile/lib/src/style/layer/model_layer.dart similarity index 100% rename from lib/src/style/layer/model_layer.dart rename to mapbox_maps_flutter_mobile/lib/src/style/layer/model_layer.dart diff --git a/lib/src/style/layer/raster_layer.dart b/mapbox_maps_flutter_mobile/lib/src/style/layer/raster_layer.dart similarity index 100% rename from lib/src/style/layer/raster_layer.dart rename to mapbox_maps_flutter_mobile/lib/src/style/layer/raster_layer.dart diff --git a/lib/src/style/layer/raster_particle_layer.dart b/mapbox_maps_flutter_mobile/lib/src/style/layer/raster_particle_layer.dart similarity index 100% rename from lib/src/style/layer/raster_particle_layer.dart rename to mapbox_maps_flutter_mobile/lib/src/style/layer/raster_particle_layer.dart diff --git a/lib/src/style/layer/sky_layer.dart b/mapbox_maps_flutter_mobile/lib/src/style/layer/sky_layer.dart similarity index 100% rename from lib/src/style/layer/sky_layer.dart rename to mapbox_maps_flutter_mobile/lib/src/style/layer/sky_layer.dart diff --git a/lib/src/style/layer/slot_layer.dart b/mapbox_maps_flutter_mobile/lib/src/style/layer/slot_layer.dart similarity index 100% rename from lib/src/style/layer/slot_layer.dart rename to mapbox_maps_flutter_mobile/lib/src/style/layer/slot_layer.dart diff --git a/lib/src/style/layer/symbol_layer.dart b/mapbox_maps_flutter_mobile/lib/src/style/layer/symbol_layer.dart similarity index 100% rename from lib/src/style/layer/symbol_layer.dart rename to mapbox_maps_flutter_mobile/lib/src/style/layer/symbol_layer.dart diff --git a/lib/src/style/mapbox_styles.dart b/mapbox_maps_flutter_mobile/lib/src/style/mapbox_styles.dart similarity index 100% rename from lib/src/style/mapbox_styles.dart rename to mapbox_maps_flutter_mobile/lib/src/style/mapbox_styles.dart diff --git a/lib/src/style/source/geojson_source.dart b/mapbox_maps_flutter_mobile/lib/src/style/source/geojson_source.dart similarity index 100% rename from lib/src/style/source/geojson_source.dart rename to mapbox_maps_flutter_mobile/lib/src/style/source/geojson_source.dart diff --git a/lib/src/style/source/image_source.dart b/mapbox_maps_flutter_mobile/lib/src/style/source/image_source.dart similarity index 100% rename from lib/src/style/source/image_source.dart rename to mapbox_maps_flutter_mobile/lib/src/style/source/image_source.dart diff --git a/lib/src/style/source/raster_source.dart b/mapbox_maps_flutter_mobile/lib/src/style/source/raster_source.dart similarity index 100% rename from lib/src/style/source/raster_source.dart rename to mapbox_maps_flutter_mobile/lib/src/style/source/raster_source.dart diff --git a/lib/src/style/source/rasterarray_source.dart b/mapbox_maps_flutter_mobile/lib/src/style/source/rasterarray_source.dart similarity index 100% rename from lib/src/style/source/rasterarray_source.dart rename to mapbox_maps_flutter_mobile/lib/src/style/source/rasterarray_source.dart diff --git a/lib/src/style/source/rasterdem_source.dart b/mapbox_maps_flutter_mobile/lib/src/style/source/rasterdem_source.dart similarity index 100% rename from lib/src/style/source/rasterdem_source.dart rename to mapbox_maps_flutter_mobile/lib/src/style/source/rasterdem_source.dart diff --git a/lib/src/style/source/vector_source.dart b/mapbox_maps_flutter_mobile/lib/src/style/source/vector_source.dart similarity index 100% rename from lib/src/style/source/vector_source.dart rename to mapbox_maps_flutter_mobile/lib/src/style/source/vector_source.dart diff --git a/lib/src/style/style.dart b/mapbox_maps_flutter_mobile/lib/src/style/style.dart similarity index 100% rename from lib/src/style/style.dart rename to mapbox_maps_flutter_mobile/lib/src/style/style.dart diff --git a/lib/src/turf_adapters.dart b/mapbox_maps_flutter_mobile/lib/src/turf_adapters.dart similarity index 100% rename from lib/src/turf_adapters.dart rename to mapbox_maps_flutter_mobile/lib/src/turf_adapters.dart diff --git a/lib/src/utils.dart b/mapbox_maps_flutter_mobile/lib/src/utils.dart similarity index 100% rename from lib/src/utils.dart rename to mapbox_maps_flutter_mobile/lib/src/utils.dart diff --git a/lib/src/viewport/state_viewport_extension.dart b/mapbox_maps_flutter_mobile/lib/src/viewport/state_viewport_extension.dart similarity index 100% rename from lib/src/viewport/state_viewport_extension.dart rename to mapbox_maps_flutter_mobile/lib/src/viewport/state_viewport_extension.dart diff --git a/lib/src/viewport/states/camera_viewport_state.dart b/mapbox_maps_flutter_mobile/lib/src/viewport/states/camera_viewport_state.dart similarity index 100% rename from lib/src/viewport/states/camera_viewport_state.dart rename to mapbox_maps_flutter_mobile/lib/src/viewport/states/camera_viewport_state.dart diff --git a/lib/src/viewport/states/follow_puck_viewport_state.dart b/mapbox_maps_flutter_mobile/lib/src/viewport/states/follow_puck_viewport_state.dart similarity index 100% rename from lib/src/viewport/states/follow_puck_viewport_state.dart rename to mapbox_maps_flutter_mobile/lib/src/viewport/states/follow_puck_viewport_state.dart diff --git a/lib/src/viewport/states/idle_viewport_state.dart b/mapbox_maps_flutter_mobile/lib/src/viewport/states/idle_viewport_state.dart similarity index 100% rename from lib/src/viewport/states/idle_viewport_state.dart rename to mapbox_maps_flutter_mobile/lib/src/viewport/states/idle_viewport_state.dart diff --git a/lib/src/viewport/states/overview_viewport_state.dart b/mapbox_maps_flutter_mobile/lib/src/viewport/states/overview_viewport_state.dart similarity index 100% rename from lib/src/viewport/states/overview_viewport_state.dart rename to mapbox_maps_flutter_mobile/lib/src/viewport/states/overview_viewport_state.dart diff --git a/lib/src/viewport/states/style_default_viewport_state.dart b/mapbox_maps_flutter_mobile/lib/src/viewport/states/style_default_viewport_state.dart similarity index 100% rename from lib/src/viewport/states/style_default_viewport_state.dart rename to mapbox_maps_flutter_mobile/lib/src/viewport/states/style_default_viewport_state.dart diff --git a/lib/src/viewport/states/viewport_state.dart b/mapbox_maps_flutter_mobile/lib/src/viewport/states/viewport_state.dart similarity index 100% rename from lib/src/viewport/states/viewport_state.dart rename to mapbox_maps_flutter_mobile/lib/src/viewport/states/viewport_state.dart diff --git a/lib/src/viewport/transitions/default_viewport_transition.dart b/mapbox_maps_flutter_mobile/lib/src/viewport/transitions/default_viewport_transition.dart similarity index 100% rename from lib/src/viewport/transitions/default_viewport_transition.dart rename to mapbox_maps_flutter_mobile/lib/src/viewport/transitions/default_viewport_transition.dart diff --git a/lib/src/viewport/transitions/easing_viewport_transition.dart b/mapbox_maps_flutter_mobile/lib/src/viewport/transitions/easing_viewport_transition.dart similarity index 100% rename from lib/src/viewport/transitions/easing_viewport_transition.dart rename to mapbox_maps_flutter_mobile/lib/src/viewport/transitions/easing_viewport_transition.dart diff --git a/lib/src/viewport/transitions/fly_viewport_transition.dart b/mapbox_maps_flutter_mobile/lib/src/viewport/transitions/fly_viewport_transition.dart similarity index 100% rename from lib/src/viewport/transitions/fly_viewport_transition.dart rename to mapbox_maps_flutter_mobile/lib/src/viewport/transitions/fly_viewport_transition.dart diff --git a/lib/src/viewport/transitions/viewport_transition.dart b/mapbox_maps_flutter_mobile/lib/src/viewport/transitions/viewport_transition.dart similarity index 100% rename from lib/src/viewport/transitions/viewport_transition.dart rename to mapbox_maps_flutter_mobile/lib/src/viewport/transitions/viewport_transition.dart diff --git a/lib/src/viewport/viewport_internal.dart b/mapbox_maps_flutter_mobile/lib/src/viewport/viewport_internal.dart similarity index 100% rename from lib/src/viewport/viewport_internal.dart rename to mapbox_maps_flutter_mobile/lib/src/viewport/viewport_internal.dart diff --git a/pubspec.yaml b/mapbox_maps_flutter_mobile/pubspec.yaml similarity index 100% rename from pubspec.yaml rename to mapbox_maps_flutter_mobile/pubspec.yaml diff --git a/test/events_test.dart b/mapbox_maps_flutter_mobile/test/events_test.dart similarity index 100% rename from test/events_test.dart rename to mapbox_maps_flutter_mobile/test/events_test.dart From ff546a134eb399de492734120746e43d1321ed2d Mon Sep 17 00:00:00 2001 From: Mai Mai Date: Mon, 5 May 2025 14:35:32 +0300 Subject: [PATCH 02/16] update gitignore --- .gitignore | 2 ++ mapbox_maps_flutter_mobile/.gitignore | 33 --------------------------- 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 mapbox_maps_flutter_mobile/.gitignore diff --git a/.gitignore b/.gitignore index a4ded0a57..84fe6e96a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,8 @@ .buildlog/ .history .svn/ +**/.cxx + # IntelliJ related *.iml diff --git a/mapbox_maps_flutter_mobile/.gitignore b/mapbox_maps_flutter_mobile/.gitignore deleted file mode 100644 index e7d347d9d..000000000 --- a/mapbox_maps_flutter_mobile/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.build/ -.buildlog/ -.history -.svn/ -.swiftpm/ -migrate_working_dir/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.idea/ - -# The .vscode folder contains launch configuration and tasks you configure in -# VS Code which you may wish to be included in version control, so this line -# is commented out by default. -#.vscode/ - -# Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -/pubspec.lock -**/doc/api/ -.dart_tool/ -.flutter-plugins -.flutter-plugins-dependencies -build/ From 9440c024267e36e771050e3289495372e960b179 Mon Sep 17 00:00:00 2001 From: Mai Mai Date: Tue, 6 May 2025 10:40:26 +0300 Subject: [PATCH 03/16] define mapbox_maps_flutter_interface --- mapbox_maps_flutter_interface/.metadata | 10 ++++ mapbox_maps_flutter_interface/CHANGELOG.md | 3 ++ mapbox_maps_flutter_interface/LICENSE | 1 + mapbox_maps_flutter_interface/README.md | 39 ++++++++++++++ .../analysis_options.yaml | 8 +++ .../lib/mapbox_maps_flutter_interface.dart | 6 +++ .../lib/src/callbacks.dart | 3 ++ ...apbox_maps_flutter_platform_interface.dart | 49 +++++++++++++++++ mapbox_maps_flutter_interface/pubspec.yaml | 54 +++++++++++++++++++ .../mapbox_maps_flutter_interface_test.dart | 5 ++ 10 files changed, 178 insertions(+) create mode 100644 mapbox_maps_flutter_interface/.metadata create mode 100644 mapbox_maps_flutter_interface/CHANGELOG.md create mode 100644 mapbox_maps_flutter_interface/LICENSE create mode 100644 mapbox_maps_flutter_interface/README.md create mode 100644 mapbox_maps_flutter_interface/analysis_options.yaml create mode 100644 mapbox_maps_flutter_interface/lib/mapbox_maps_flutter_interface.dart create mode 100644 mapbox_maps_flutter_interface/lib/src/callbacks.dart create mode 100644 mapbox_maps_flutter_interface/lib/src/mapbox_maps_flutter_platform_interface.dart create mode 100644 mapbox_maps_flutter_interface/pubspec.yaml create mode 100644 mapbox_maps_flutter_interface/test/mapbox_maps_flutter_interface_test.dart diff --git a/mapbox_maps_flutter_interface/.metadata b/mapbox_maps_flutter_interface/.metadata new file mode 100644 index 000000000..69723fa27 --- /dev/null +++ b/mapbox_maps_flutter_interface/.metadata @@ -0,0 +1,10 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "c23637390482d4cf9598c3ce3f2be31aa7332daf" + channel: "stable" + +project_type: package diff --git a/mapbox_maps_flutter_interface/CHANGELOG.md b/mapbox_maps_flutter_interface/CHANGELOG.md new file mode 100644 index 000000000..41cc7d819 --- /dev/null +++ b/mapbox_maps_flutter_interface/CHANGELOG.md @@ -0,0 +1,3 @@ +## 0.0.1 + +* TODO: Describe initial release. diff --git a/mapbox_maps_flutter_interface/LICENSE b/mapbox_maps_flutter_interface/LICENSE new file mode 100644 index 000000000..ba75c69f7 --- /dev/null +++ b/mapbox_maps_flutter_interface/LICENSE @@ -0,0 +1 @@ +TODO: Add your license here. diff --git a/mapbox_maps_flutter_interface/README.md b/mapbox_maps_flutter_interface/README.md new file mode 100644 index 000000000..4a260d8d2 --- /dev/null +++ b/mapbox_maps_flutter_interface/README.md @@ -0,0 +1,39 @@ + + +TODO: Put a short description of the package here that helps potential users +know whether this package might be useful for them. + +## Features + +TODO: List what your package can do. Maybe include images, gifs, or videos. + +## Getting started + +TODO: List prerequisites and provide or point to information on how to +start using the package. + +## Usage + +TODO: Include short and useful examples for package users. Add longer examples +to `/example` folder. + +```dart +const like = 'sample'; +``` + +## Additional information + +TODO: Tell users more about the package: where to find more information, how to +contribute to the package, how to file issues, what response they can expect +from the package authors, and more. diff --git a/mapbox_maps_flutter_interface/analysis_options.yaml b/mapbox_maps_flutter_interface/analysis_options.yaml new file mode 100644 index 000000000..a92e54317 --- /dev/null +++ b/mapbox_maps_flutter_interface/analysis_options.yaml @@ -0,0 +1,8 @@ +include: package:flutter_lints/flutter.yaml + +analyzer: + errors: + library_private_types_in_public_api: error + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/mapbox_maps_flutter_interface/lib/mapbox_maps_flutter_interface.dart b/mapbox_maps_flutter_interface/lib/mapbox_maps_flutter_interface.dart new file mode 100644 index 000000000..cfcbba884 --- /dev/null +++ b/mapbox_maps_flutter_interface/lib/mapbox_maps_flutter_interface.dart @@ -0,0 +1,6 @@ +library; + +import 'package:flutter/cupertino.dart'; + +part 'src/mapbox_maps_flutter_platform_interface.dart'; +part 'src/callbacks.dart'; diff --git a/mapbox_maps_flutter_interface/lib/src/callbacks.dart b/mapbox_maps_flutter_interface/lib/src/callbacks.dart new file mode 100644 index 000000000..815e6a300 --- /dev/null +++ b/mapbox_maps_flutter_interface/lib/src/callbacks.dart @@ -0,0 +1,3 @@ +part of 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; + +typedef OnPlatformViewCreated = void Function(int id); diff --git a/mapbox_maps_flutter_interface/lib/src/mapbox_maps_flutter_platform_interface.dart b/mapbox_maps_flutter_interface/lib/src/mapbox_maps_flutter_platform_interface.dart new file mode 100644 index 000000000..a9bc0cdeb --- /dev/null +++ b/mapbox_maps_flutter_interface/lib/src/mapbox_maps_flutter_platform_interface.dart @@ -0,0 +1,49 @@ +part of 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; + +abstract base class MapboxMapsFlutterPlatform { + static MapboxMapsFlutterPlatform? _instance; + + /// The default instance of [MapboxMapsFlutterPlatform] to use. + /// + /// This is the default instance that will be used by the [MapboxMapsFlutterPlatform] class. + static MapboxMapsFlutterPlatform get instance { + if (_instance == null) { + throw Exception( + 'No default instance of MapboxMapsFlutterPlatform has been set. ' + 'Ensure that you have called MapboxMapsFlutterPlatform.setInstance() ' + 'before using the MapboxMapsFlutterPlatform instance.', + ); + } + return _instance!; + } + + static set instance(MapboxMapsFlutterPlatform instance) { + _instance = instance; + } + + MapboxMapsFlutterPlatform._(); + + /// The public access token that is used to access resources provided by Mapbox services. + /// For more information about public access tokens, see + /// [Mapbox Access Tokens](https://docs.mapbox.com/help/getting-started/access-tokens/#public-tokens). + Future getAccessToken(); + + /// The public access token that is used to access resources provided by Mapbox services. + /// For more information about public access tokens, see + /// [Mapbox Access Tokens](https://docs.mapbox.com/help/getting-started/access-tokens/#public-tokens). + void setAccessToken(String token); + + /// Builds a platform-specific view for displaying the map. + /// + /// This method is responsible for creating the widget that integrates + /// with the underlying platform's view system to render the map. + /// + /// The [onPlatformViewCreated] callback is invoked when the platform-specific + /// view is created. It provides a way to interact with the platform view + /// after it has been initialized. + /// + /// - [onPlatformViewCreated]: A callback function that is triggered when the + /// platform view is created. It can be used to perform additional setup + /// or configuration. + Widget buildView({OnPlatformViewCreated? onPlatformViewCreated}); +} diff --git a/mapbox_maps_flutter_interface/pubspec.yaml b/mapbox_maps_flutter_interface/pubspec.yaml new file mode 100644 index 000000000..b75204943 --- /dev/null +++ b/mapbox_maps_flutter_interface/pubspec.yaml @@ -0,0 +1,54 @@ +name: mapbox_maps_flutter_interface +description: "A new Flutter package project." +version: 0.0.1 +homepage: + +environment: + sdk: ^3.7.2 + flutter: ">=1.17.0" + +dependencies: + flutter: + sdk: flutter + +dev_dependencies: + flutter_test: + sdk: flutter + flutter_lints: ^5.0.0 + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter packages. +flutter: + + # To add assets to your package, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + # + # For details regarding assets in packages, see + # https://flutter.dev/to/asset-from-package + # + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/to/resolution-aware-images + + # To add custom fonts to your package, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts in packages, see + # https://flutter.dev/to/font-from-package diff --git a/mapbox_maps_flutter_interface/test/mapbox_maps_flutter_interface_test.dart b/mapbox_maps_flutter_interface/test/mapbox_maps_flutter_interface_test.dart new file mode 100644 index 000000000..92778e501 --- /dev/null +++ b/mapbox_maps_flutter_interface/test/mapbox_maps_flutter_interface_test.dart @@ -0,0 +1,5 @@ +import 'package:flutter_test/flutter_test.dart'; + +import 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; + +void main() {} From 4291d2d5161eac8e6f103c48d1140652c6fd3256 Mon Sep 17 00:00:00 2001 From: Mai Mai Date: Tue, 6 May 2025 15:53:49 +0300 Subject: [PATCH 04/16] create mapbox_maps_flutter_interface package --- ...apbox_maps_flutter_platform_interface.dart | 3 +- mapbox_maps_flutter_interface/pubspec.yaml | 2 +- .../example/pubspec.lock | 7 + .../example/pubspec_overrides.yaml | 3 + .../lib/mapbox_maps_flutter.dart | 2 + .../lib/src/mapbox_maps_flutter_mobile.dart | 29 + mapbox_maps_flutter_mobile/pubspec.yaml | 4 + .../pubspec_overrides.yaml | 3 + mapbox_maps_flutter_v3/.gitignore | 33 + mapbox_maps_flutter_v3/.metadata | 33 + mapbox_maps_flutter_v3/CHANGELOG.md | 3 + mapbox_maps_flutter_v3/LICENSE | 1 + mapbox_maps_flutter_v3/README.md | 15 + mapbox_maps_flutter_v3/analysis_options.yaml | 4 + mapbox_maps_flutter_v3/android/.gitignore | 9 + mapbox_maps_flutter_v3/android/build.gradle | 66 ++ .../android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + mapbox_maps_flutter_v3/android/gradlew | 252 +++++++ .../android/settings.gradle | 1 + .../android/src/main/AndroidManifest.xml | 3 + .../MapboxMapsFlutterV3Plugin.kt | 33 + .../MapboxMapsFlutterV3PluginTest.kt | 27 + mapbox_maps_flutter_v3/example/.gitignore | 45 ++ mapbox_maps_flutter_v3/example/README.md | 16 + .../example/analysis_options.yaml | 28 + .../example/android/.gitignore | 14 + .../example/android/app/build.gradle.kts | 44 ++ .../android/app/src/debug/AndroidManifest.xml | 7 + .../android/app/src/main/AndroidManifest.xml | 45 ++ .../MainActivity.kt | 5 + .../res/drawable-v21/launch_background.xml | 12 + .../main/res/drawable/launch_background.xml | 12 + .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 544 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 442 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 721 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 1031 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 1443 bytes .../app/src/main/res/values-night/styles.xml | 18 + .../app/src/main/res/values/styles.xml | 18 + .../app/src/profile/AndroidManifest.xml | 7 + .../example/android/build.gradle.kts | 21 + .../example/android/gradle.properties | 3 + .../gradle/wrapper/gradle-wrapper.properties | 5 + .../example/android/settings.gradle.kts | 25 + mapbox_maps_flutter_v3/example/ios/.gitignore | 34 + .../ios/Flutter/AppFrameworkInfo.plist | 26 + .../example/ios/Flutter/Debug.xcconfig | 1 + .../example/ios/Flutter/Release.xcconfig | 1 + .../ios/Runner.xcodeproj/project.pbxproj | 638 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/WorkspaceSettings.xcsettings | 8 + .../xcshareddata/swiftpm/Package.resolved | 42 ++ .../xcshareddata/xcschemes/Runner.xcscheme | 117 ++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/WorkspaceSettings.xcsettings | 8 + .../xcshareddata/swiftpm/Package.resolved | 42 ++ .../example/ios/Runner/AppDelegate.swift | 13 + .../AppIcon.appiconset/Contents.json | 122 ++++ .../Icon-App-1024x1024@1x.png | Bin 0 -> 10932 bytes .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin 0 -> 295 bytes .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin 0 -> 406 bytes .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin 0 -> 450 bytes .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin 0 -> 282 bytes .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin 0 -> 462 bytes .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin 0 -> 704 bytes .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin 0 -> 406 bytes .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin 0 -> 586 bytes .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin 0 -> 862 bytes .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin 0 -> 862 bytes .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin 0 -> 1674 bytes .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin 0 -> 762 bytes .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin 0 -> 1226 bytes .../Icon-App-83.5x83.5@2x.png | Bin 0 -> 1418 bytes .../LaunchImage.imageset/Contents.json | 23 + .../LaunchImage.imageset/LaunchImage.png | Bin 0 -> 68 bytes .../LaunchImage.imageset/LaunchImage@2x.png | Bin 0 -> 68 bytes .../LaunchImage.imageset/LaunchImage@3x.png | Bin 0 -> 68 bytes .../LaunchImage.imageset/README.md | 5 + .../Runner/Base.lproj/LaunchScreen.storyboard | 37 + .../ios/Runner/Base.lproj/Main.storyboard | 26 + .../example/ios/Runner/Info.plist | 49 ++ .../ios/Runner/Runner-Bridging-Header.h | 1 + .../example/ios/RunnerTests/RunnerTests.swift | 29 + mapbox_maps_flutter_v3/example/lib/main.dart | 31 + mapbox_maps_flutter_v3/example/pubspec.lock | 385 +++++++++++ mapbox_maps_flutter_v3/example/pubspec.yaml | 85 +++ .../example/pubspec_overrides.yaml | 5 + .../example/test/widget_test.dart | 27 + mapbox_maps_flutter_v3/ios/.gitignore | 38 ++ .../ios/mapbox_maps_flutter_v3.podspec | 29 + .../ios/mapbox_maps_flutter_v3/Package.swift | 32 + .../MapboxMapsFlutterV3Plugin.swift | 19 + .../PrivacyInfo.xcprivacy | 14 + .../lib/mapbox_maps_flutter_v3.dart | 9 + .../lib/src/map_widget.dart | 12 + .../lib/src/mapbox_options.dart | 22 + mapbox_maps_flutter_v3/pubspec.yaml | 62 ++ mapbox_maps_flutter_v3/pubspec_overrides.yaml | 5 + 101 files changed, 2890 insertions(+), 2 deletions(-) create mode 100644 mapbox_maps_flutter_mobile/example/pubspec_overrides.yaml create mode 100644 mapbox_maps_flutter_mobile/lib/src/mapbox_maps_flutter_mobile.dart create mode 100644 mapbox_maps_flutter_mobile/pubspec_overrides.yaml create mode 100644 mapbox_maps_flutter_v3/.gitignore create mode 100644 mapbox_maps_flutter_v3/.metadata create mode 100644 mapbox_maps_flutter_v3/CHANGELOG.md create mode 100644 mapbox_maps_flutter_v3/LICENSE create mode 100644 mapbox_maps_flutter_v3/README.md create mode 100644 mapbox_maps_flutter_v3/analysis_options.yaml create mode 100644 mapbox_maps_flutter_v3/android/.gitignore create mode 100644 mapbox_maps_flutter_v3/android/build.gradle create mode 100644 mapbox_maps_flutter_v3/android/gradle/wrapper/gradle-wrapper.jar create mode 100644 mapbox_maps_flutter_v3/android/gradle/wrapper/gradle-wrapper.properties create mode 100755 mapbox_maps_flutter_v3/android/gradlew create mode 100644 mapbox_maps_flutter_v3/android/settings.gradle create mode 100644 mapbox_maps_flutter_v3/android/src/main/AndroidManifest.xml create mode 100644 mapbox_maps_flutter_v3/android/src/main/kotlin/com/example/mapbox_maps_flutter_v3/MapboxMapsFlutterV3Plugin.kt create mode 100644 mapbox_maps_flutter_v3/android/src/test/kotlin/com/example/mapbox_maps_flutter_v3/MapboxMapsFlutterV3PluginTest.kt create mode 100644 mapbox_maps_flutter_v3/example/.gitignore create mode 100644 mapbox_maps_flutter_v3/example/README.md create mode 100644 mapbox_maps_flutter_v3/example/analysis_options.yaml create mode 100644 mapbox_maps_flutter_v3/example/android/.gitignore create mode 100644 mapbox_maps_flutter_v3/example/android/app/build.gradle.kts create mode 100644 mapbox_maps_flutter_v3/example/android/app/src/debug/AndroidManifest.xml create mode 100644 mapbox_maps_flutter_v3/example/android/app/src/main/AndroidManifest.xml create mode 100644 mapbox_maps_flutter_v3/example/android/app/src/main/kotlin/com/example/mapbox_maps_flutter_v3_example/MainActivity.kt create mode 100644 mapbox_maps_flutter_v3/example/android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 mapbox_maps_flutter_v3/example/android/app/src/main/res/drawable/launch_background.xml create mode 100644 mapbox_maps_flutter_v3/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 mapbox_maps_flutter_v3/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 mapbox_maps_flutter_v3/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 mapbox_maps_flutter_v3/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 mapbox_maps_flutter_v3/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 mapbox_maps_flutter_v3/example/android/app/src/main/res/values-night/styles.xml create mode 100644 mapbox_maps_flutter_v3/example/android/app/src/main/res/values/styles.xml create mode 100644 mapbox_maps_flutter_v3/example/android/app/src/profile/AndroidManifest.xml create mode 100644 mapbox_maps_flutter_v3/example/android/build.gradle.kts create mode 100644 mapbox_maps_flutter_v3/example/android/gradle.properties create mode 100644 mapbox_maps_flutter_v3/example/android/gradle/wrapper/gradle-wrapper.properties create mode 100644 mapbox_maps_flutter_v3/example/android/settings.gradle.kts create mode 100644 mapbox_maps_flutter_v3/example/ios/.gitignore create mode 100644 mapbox_maps_flutter_v3/example/ios/Flutter/AppFrameworkInfo.plist create mode 100644 mapbox_maps_flutter_v3/example/ios/Flutter/Debug.xcconfig create mode 100644 mapbox_maps_flutter_v3/example/ios/Flutter/Release.xcconfig create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.pbxproj create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/AppDelegate.swift create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Base.lproj/LaunchScreen.storyboard create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Base.lproj/Main.storyboard create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Info.plist create mode 100644 mapbox_maps_flutter_v3/example/ios/Runner/Runner-Bridging-Header.h create mode 100644 mapbox_maps_flutter_v3/example/ios/RunnerTests/RunnerTests.swift create mode 100644 mapbox_maps_flutter_v3/example/lib/main.dart create mode 100644 mapbox_maps_flutter_v3/example/pubspec.lock create mode 100644 mapbox_maps_flutter_v3/example/pubspec.yaml create mode 100644 mapbox_maps_flutter_v3/example/pubspec_overrides.yaml create mode 100644 mapbox_maps_flutter_v3/example/test/widget_test.dart create mode 100644 mapbox_maps_flutter_v3/ios/.gitignore create mode 100644 mapbox_maps_flutter_v3/ios/mapbox_maps_flutter_v3.podspec create mode 100644 mapbox_maps_flutter_v3/ios/mapbox_maps_flutter_v3/Package.swift create mode 100644 mapbox_maps_flutter_v3/ios/mapbox_maps_flutter_v3/Sources/mapbox_maps_flutter_v3/MapboxMapsFlutterV3Plugin.swift create mode 100644 mapbox_maps_flutter_v3/ios/mapbox_maps_flutter_v3/Sources/mapbox_maps_flutter_v3/PrivacyInfo.xcprivacy create mode 100644 mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3.dart create mode 100644 mapbox_maps_flutter_v3/lib/src/map_widget.dart create mode 100644 mapbox_maps_flutter_v3/lib/src/mapbox_options.dart create mode 100644 mapbox_maps_flutter_v3/pubspec.yaml create mode 100644 mapbox_maps_flutter_v3/pubspec_overrides.yaml diff --git a/mapbox_maps_flutter_interface/lib/src/mapbox_maps_flutter_platform_interface.dart b/mapbox_maps_flutter_interface/lib/src/mapbox_maps_flutter_platform_interface.dart index a9bc0cdeb..aaf464e4d 100644 --- a/mapbox_maps_flutter_interface/lib/src/mapbox_maps_flutter_platform_interface.dart +++ b/mapbox_maps_flutter_interface/lib/src/mapbox_maps_flutter_platform_interface.dart @@ -21,7 +21,8 @@ abstract base class MapboxMapsFlutterPlatform { _instance = instance; } - MapboxMapsFlutterPlatform._(); + /// Constructs a MapboxMapsFlutterPlatform. + MapboxMapsFlutterPlatform(); /// The public access token that is used to access resources provided by Mapbox services. /// For more information about public access tokens, see diff --git a/mapbox_maps_flutter_interface/pubspec.yaml b/mapbox_maps_flutter_interface/pubspec.yaml index b75204943..ec26e9c0f 100644 --- a/mapbox_maps_flutter_interface/pubspec.yaml +++ b/mapbox_maps_flutter_interface/pubspec.yaml @@ -1,5 +1,5 @@ name: mapbox_maps_flutter_interface -description: "A new Flutter package project." +description: "A common package that defines an interface for the MapboxMaps Flutter plugin, enabling seamless integration of MapboxMaps into Flutter applications." version: 0.0.1 homepage: diff --git a/mapbox_maps_flutter_mobile/example/pubspec.lock b/mapbox_maps_flutter_mobile/example/pubspec.lock index 5f7f9c0c3..19d810e5d 100644 --- a/mapbox_maps_flutter_mobile/example/pubspec.lock +++ b/mapbox_maps_flutter_mobile/example/pubspec.lock @@ -270,6 +270,13 @@ packages: relative: true source: path version: "2.8.0-rc.1" + mapbox_maps_flutter_interface: + dependency: "direct overridden" + description: + path: "../../mapbox_maps_flutter_interface" + relative: true + source: path + version: "0.0.1" matcher: dependency: transitive description: diff --git a/mapbox_maps_flutter_mobile/example/pubspec_overrides.yaml b/mapbox_maps_flutter_mobile/example/pubspec_overrides.yaml new file mode 100644 index 000000000..dd2f69e3d --- /dev/null +++ b/mapbox_maps_flutter_mobile/example/pubspec_overrides.yaml @@ -0,0 +1,3 @@ +dependency_overrides: + mapbox_maps_flutter_interface: + path: ../../mapbox_maps_flutter_interface \ No newline at end of file diff --git a/mapbox_maps_flutter_mobile/lib/mapbox_maps_flutter.dart b/mapbox_maps_flutter_mobile/lib/mapbox_maps_flutter.dart index b37cb73d8..a60585993 100644 --- a/mapbox_maps_flutter_mobile/lib/mapbox_maps_flutter.dart +++ b/mapbox_maps_flutter_mobile/lib/mapbox_maps_flutter.dart @@ -9,6 +9,7 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/services.dart'; +import 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; import 'package:meta/meta.dart'; import 'package:turf/turf.dart' as turf; @@ -88,3 +89,4 @@ part 'src/viewport/transitions/easing_viewport_transition.dart'; part 'src/package_info.dart'; part 'src/http/http_service.dart'; part 'src/cancelable.dart'; +part 'src/mapbox_maps_flutter_mobile.dart'; diff --git a/mapbox_maps_flutter_mobile/lib/src/mapbox_maps_flutter_mobile.dart b/mapbox_maps_flutter_mobile/lib/src/mapbox_maps_flutter_mobile.dart new file mode 100644 index 000000000..dc081e2da --- /dev/null +++ b/mapbox_maps_flutter_mobile/lib/src/mapbox_maps_flutter_mobile.dart @@ -0,0 +1,29 @@ +part of 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; + +base class MapboxMapsFlutterMobile extends MapboxMapsFlutterPlatform { + late final MapboxMap _mapboxMap; + + @override + Widget buildView({OnPlatformViewCreated? onPlatformViewCreated}) { + return MapWidget( + onMapCreated: (MapboxMap mapboxMap) { + _mapboxMap = mapboxMap; + }, + ); + } + + @override + Future getAccessToken() { + return MapboxOptions.getAccessToken(); + } + + @override + void setAccessToken(String token) { + MapboxOptions.setAccessToken(token); + } + + /// Registers the platform implementation. + static void registerWith() { + MapboxMapsFlutterPlatform.instance = MapboxMapsFlutterMobile(); + } +} diff --git a/mapbox_maps_flutter_mobile/pubspec.yaml b/mapbox_maps_flutter_mobile/pubspec.yaml index da5b1344e..43503208a 100644 --- a/mapbox_maps_flutter_mobile/pubspec.yaml +++ b/mapbox_maps_flutter_mobile/pubspec.yaml @@ -14,6 +14,7 @@ dependencies: turf: ^0.0.8 typed_data: ^1.3.0 meta: ^1.9.1 + mapbox_maps_flutter_interface: any dev_dependencies: integration_test: @@ -29,9 +30,12 @@ dev_dependencies: # The following section is specific to Flutter. flutter: plugin: + implements: mapbox_maps_flutter_interface platforms: android: package: com.mapbox.maps.mapbox_maps pluginClass: MapboxMapsPlugin + dartPluginClass: MapboxMapsFlutterMobile ios: pluginClass: MapboxMapsPlugin + dartPluginClass: MapboxMapsFlutterMobile diff --git a/mapbox_maps_flutter_mobile/pubspec_overrides.yaml b/mapbox_maps_flutter_mobile/pubspec_overrides.yaml new file mode 100644 index 000000000..93a8127cf --- /dev/null +++ b/mapbox_maps_flutter_mobile/pubspec_overrides.yaml @@ -0,0 +1,3 @@ +dependency_overrides: + mapbox_maps_flutter_interface: + path: ../mapbox_maps_flutter_interface \ No newline at end of file diff --git a/mapbox_maps_flutter_v3/.gitignore b/mapbox_maps_flutter_v3/.gitignore new file mode 100644 index 000000000..3cc3abfad --- /dev/null +++ b/mapbox_maps_flutter_v3/.gitignore @@ -0,0 +1,33 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.build/ +.buildlog/ +.history +.svn/ +.swiftpm/ +migrate_working_dir/ +**/mapbox_access_token.xml +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. +/pubspec.lock +**/doc/api/ +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +build/ diff --git a/mapbox_maps_flutter_v3/.metadata b/mapbox_maps_flutter_v3/.metadata new file mode 100644 index 000000000..cff4c42e1 --- /dev/null +++ b/mapbox_maps_flutter_v3/.metadata @@ -0,0 +1,33 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "c23637390482d4cf9598c3ce3f2be31aa7332daf" + channel: "stable" + +project_type: plugin + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + - platform: android + create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + - platform: ios + create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/mapbox_maps_flutter_v3/CHANGELOG.md b/mapbox_maps_flutter_v3/CHANGELOG.md new file mode 100644 index 000000000..41cc7d819 --- /dev/null +++ b/mapbox_maps_flutter_v3/CHANGELOG.md @@ -0,0 +1,3 @@ +## 0.0.1 + +* TODO: Describe initial release. diff --git a/mapbox_maps_flutter_v3/LICENSE b/mapbox_maps_flutter_v3/LICENSE new file mode 100644 index 000000000..ba75c69f7 --- /dev/null +++ b/mapbox_maps_flutter_v3/LICENSE @@ -0,0 +1 @@ +TODO: Add your license here. diff --git a/mapbox_maps_flutter_v3/README.md b/mapbox_maps_flutter_v3/README.md new file mode 100644 index 000000000..59d83aaa7 --- /dev/null +++ b/mapbox_maps_flutter_v3/README.md @@ -0,0 +1,15 @@ +# mapbox_maps_flutter_v3 + +A new Flutter plugin project. + +## Getting Started + +This project is a starting point for a Flutter +[plug-in package](https://flutter.dev/to/develop-plugins), +a specialized package that includes platform-specific implementation code for +Android and/or iOS. + +For help getting started with Flutter development, view the +[online documentation](https://docs.flutter.dev), which offers tutorials, +samples, guidance on mobile development, and a full API reference. + diff --git a/mapbox_maps_flutter_v3/analysis_options.yaml b/mapbox_maps_flutter_v3/analysis_options.yaml new file mode 100644 index 000000000..a5744c1cf --- /dev/null +++ b/mapbox_maps_flutter_v3/analysis_options.yaml @@ -0,0 +1,4 @@ +include: package:flutter_lints/flutter.yaml + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/mapbox_maps_flutter_v3/android/.gitignore b/mapbox_maps_flutter_v3/android/.gitignore new file mode 100644 index 000000000..161bdcdaf --- /dev/null +++ b/mapbox_maps_flutter_v3/android/.gitignore @@ -0,0 +1,9 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures +.cxx diff --git a/mapbox_maps_flutter_v3/android/build.gradle b/mapbox_maps_flutter_v3/android/build.gradle new file mode 100644 index 000000000..298da94c5 --- /dev/null +++ b/mapbox_maps_flutter_v3/android/build.gradle @@ -0,0 +1,66 @@ +group = "com.example.mapbox_maps_flutter_v3" +version = "1.0-SNAPSHOT" + +buildscript { + ext.kotlin_version = "1.8.22" + repositories { + google() + mavenCentral() + } + + dependencies { + classpath("com.android.tools.build:gradle:8.7.0") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") + } +} + +allprojects { + repositories { + google() + mavenCentral() + } +} + +apply plugin: "com.android.library" +apply plugin: "kotlin-android" + +android { + namespace = "com.example.mapbox_maps_flutter_v3" + + compileSdk = 35 + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_11 + } + + sourceSets { + main.java.srcDirs += "src/main/kotlin" + test.java.srcDirs += "src/test/kotlin" + } + + defaultConfig { + minSdk = 21 + } + + dependencies { + testImplementation("org.jetbrains.kotlin:kotlin-test") + testImplementation("org.mockito:mockito-core:5.0.0") + } + + testOptions { + unitTests.all { + useJUnitPlatform() + + testLogging { + events "passed", "skipped", "failed", "standardOut", "standardError" + outputs.upToDateWhen {false} + showStandardStreams = true + } + } + } +} diff --git a/mapbox_maps_flutter_v3/android/gradle/wrapper/gradle-wrapper.jar b/mapbox_maps_flutter_v3/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 zcma&N1CXTcmMvW9vTb(Rwr$&4wr$(C?dmSu>@vG-+vuvg^_??!{yS%8zW-#zn-LkA z5&1^$^{lnmUON?}LBF8_K|(?T0Ra(xUH{($5eN!MR#ZihR#HxkUPe+_R8Cn`RRs(P z_^*#_XlXmGv7!4;*Y%p4nw?{bNp@UZHv1?Um8r6)Fei3p@ClJn0ECfg1hkeuUU@Or zDaPa;U3fE=3L}DooL;8f;P0ipPt0Z~9P0)lbStMS)ag54=uL9ia-Lm3nh|@(Y?B`; zx_#arJIpXH!U{fbCbI^17}6Ri*H<>OLR%c|^mh8+)*h~K8Z!9)DPf zR2h?lbDZQ`p9P;&DQ4F0sur@TMa!Y}S8irn(%d-gi0*WxxCSk*A?3lGh=gcYN?FGl z7D=Js!i~0=u3rox^eO3i@$0=n{K1lPNU zwmfjRVmLOCRfe=seV&P*1Iq=^i`502keY8Uy-WNPwVNNtJFx?IwAyRPZo2Wo1+S(xF37LJZ~%i)kpFQ3Fw=mXfd@>%+)RpYQLnr}B~~zoof(JVm^^&f zxKV^+3D3$A1G;qh4gPVjhrC8e(VYUHv#dy^)(RoUFM?o%W-EHxufuWf(l*@-l+7vt z=l`qmR56K~F|v<^Pd*p~1_y^P0P^aPC##d8+HqX4IR1gu+7w#~TBFphJxF)T$2WEa zxa?H&6=Qe7d(#tha?_1uQys2KtHQ{)Qco)qwGjrdNL7thd^G5i8Os)CHqc>iOidS} z%nFEDdm=GXBw=yXe1W-ShHHFb?Cc70+$W~z_+}nAoHFYI1MV1wZegw*0y^tC*s%3h zhD3tN8b=Gv&rj}!SUM6|ajSPp*58KR7MPpI{oAJCtY~JECm)*m_x>AZEu>DFgUcby z1Qaw8lU4jZpQ_$;*7RME+gq1KySGG#Wql>aL~k9tLrSO()LWn*q&YxHEuzmwd1?aAtI zBJ>P=&$=l1efe1CDU;`Fd+_;&wI07?V0aAIgc(!{a z0Jg6Y=inXc3^n!U0Atk`iCFIQooHqcWhO(qrieUOW8X(x?(RD}iYDLMjSwffH2~tB z)oDgNBLB^AJBM1M^c5HdRx6fBfka`(LD-qrlh5jqH~);#nw|iyp)()xVYak3;Ybik z0j`(+69aK*B>)e_p%=wu8XC&9e{AO4c~O1U`5X9}?0mrd*m$_EUek{R?DNSh(=br# z#Q61gBzEpmy`$pA*6!87 zSDD+=@fTY7<4A?GLqpA?Pb2z$pbCc4B4zL{BeZ?F-8`s$?>*lXXtn*NC61>|*w7J* z$?!iB{6R-0=KFmyp1nnEmLsA-H0a6l+1uaH^g%c(p{iT&YFrbQ$&PRb8Up#X3@Zsk zD^^&LK~111%cqlP%!_gFNa^dTYT?rhkGl}5=fL{a`UViaXWI$k-UcHJwmaH1s=S$4 z%4)PdWJX;hh5UoK?6aWoyLxX&NhNRqKam7tcOkLh{%j3K^4Mgx1@i|Pi&}<^5>hs5 zm8?uOS>%)NzT(%PjVPGa?X%`N2TQCKbeH2l;cTnHiHppPSJ<7y-yEIiC!P*ikl&!B z%+?>VttCOQM@ShFguHVjxX^?mHX^hSaO_;pnyh^v9EumqSZTi+#f&_Vaija0Q-e*| z7ulQj6Fs*bbmsWp{`auM04gGwsYYdNNZcg|ph0OgD>7O}Asn7^Z=eI>`$2*v78;sj-}oMoEj&@)9+ycEOo92xSyY344^ z11Hb8^kdOvbf^GNAK++bYioknrpdN>+u8R?JxG=!2Kd9r=YWCOJYXYuM0cOq^FhEd zBg2puKy__7VT3-r*dG4c62Wgxi52EMCQ`bKgf*#*ou(D4-ZN$+mg&7$u!! z-^+Z%;-3IDwqZ|K=ah85OLwkO zKxNBh+4QHh)u9D?MFtpbl)us}9+V!D%w9jfAMYEb>%$A;u)rrI zuBudh;5PN}_6J_}l55P3l_)&RMlH{m!)ai-i$g)&*M`eN$XQMw{v^r@-125^RRCF0 z^2>|DxhQw(mtNEI2Kj(;KblC7x=JlK$@78`O~>V!`|1Lm-^JR$-5pUANAnb(5}B}JGjBsliK4& zk6y(;$e&h)lh2)L=bvZKbvh@>vLlreBdH8No2>$#%_Wp1U0N7Ank!6$dFSi#xzh|( zRi{Uw%-4W!{IXZ)fWx@XX6;&(m_F%c6~X8hx=BN1&q}*( zoaNjWabE{oUPb!Bt$eyd#$5j9rItB-h*5JiNi(v^e|XKAj*8(k<5-2$&ZBR5fF|JA z9&m4fbzNQnAU}r8ab>fFV%J0z5awe#UZ|bz?Ur)U9bCIKWEzi2%A+5CLqh?}K4JHi z4vtM;+uPsVz{Lfr;78W78gC;z*yTch~4YkLr&m-7%-xc ztw6Mh2d>_iO*$Rd8(-Cr1_V8EO1f*^@wRoSozS) zy1UoC@pruAaC8Z_7~_w4Q6n*&B0AjOmMWa;sIav&gu z|J5&|{=a@vR!~k-OjKEgPFCzcJ>#A1uL&7xTDn;{XBdeM}V=l3B8fE1--DHjSaxoSjNKEM9|U9#m2<3>n{Iuo`r3UZp;>GkT2YBNAh|b z^jTq-hJp(ebZh#Lk8hVBP%qXwv-@vbvoREX$TqRGTgEi$%_F9tZES@z8Bx}$#5eeG zk^UsLBH{bc2VBW)*EdS({yw=?qmevwi?BL6*=12k9zM5gJv1>y#ML4!)iiPzVaH9% zgSImetD@dam~e>{LvVh!phhzpW+iFvWpGT#CVE5TQ40n%F|p(sP5mXxna+Ev7PDwA zamaV4m*^~*xV+&p;W749xhb_X=$|LD;FHuB&JL5?*Y2-oIT(wYY2;73<^#46S~Gx| z^cez%V7x$81}UWqS13Gz80379Rj;6~WdiXWOSsdmzY39L;Hg3MH43o*y8ibNBBH`(av4|u;YPq%{R;IuYow<+GEsf@R?=@tT@!}?#>zIIn0CoyV!hq3mw zHj>OOjfJM3F{RG#6ujzo?y32m^tgSXf@v=J$ELdJ+=5j|=F-~hP$G&}tDZsZE?5rX ztGj`!S>)CFmdkccxM9eGIcGnS2AfK#gXwj%esuIBNJQP1WV~b~+D7PJTmWGTSDrR` zEAu4B8l>NPuhsk5a`rReSya2nfV1EK01+G!x8aBdTs3Io$u5!6n6KX%uv@DxAp3F@{4UYg4SWJtQ-W~0MDb|j-$lwVn znAm*Pl!?Ps&3wO=R115RWKb*JKoexo*)uhhHBncEDMSVa_PyA>k{Zm2(wMQ(5NM3# z)jkza|GoWEQo4^s*wE(gHz?Xsg4`}HUAcs42cM1-qq_=+=!Gk^y710j=66(cSWqUe zklbm8+zB_syQv5A2rj!Vbw8;|$@C!vfNmNV!yJIWDQ>{+2x zKjuFX`~~HKG~^6h5FntRpnnHt=D&rq0>IJ9#F0eM)Y-)GpRjiN7gkA8wvnG#K=q{q z9dBn8_~wm4J<3J_vl|9H{7q6u2A!cW{bp#r*-f{gOV^e=8S{nc1DxMHFwuM$;aVI^ zz6A*}m8N-&x8;aunp1w7_vtB*pa+OYBw=TMc6QK=mbA-|Cf* zvyh8D4LRJImooUaSb7t*fVfih<97Gf@VE0|z>NcBwBQze);Rh!k3K_sfunToZY;f2 z^HmC4KjHRVg+eKYj;PRN^|E0>Gj_zagfRbrki68I^#~6-HaHg3BUW%+clM1xQEdPYt_g<2K+z!$>*$9nQ>; zf9Bei{?zY^-e{q_*|W#2rJG`2fy@{%6u0i_VEWTq$*(ZN37|8lFFFt)nCG({r!q#9 z5VK_kkSJ3?zOH)OezMT{!YkCuSSn!K#-Rhl$uUM(bq*jY? zi1xbMVthJ`E>d>(f3)~fozjg^@eheMF6<)I`oeJYx4*+M&%c9VArn(OM-wp%M<-`x z7sLP1&3^%Nld9Dhm@$3f2}87!quhI@nwd@3~fZl_3LYW-B?Ia>ui`ELg z&Qfe!7m6ze=mZ`Ia9$z|ARSw|IdMpooY4YiPN8K z4B(ts3p%2i(Td=tgEHX z0UQ_>URBtG+-?0E;E7Ld^dyZ;jjw0}XZ(}-QzC6+NN=40oDb2^v!L1g9xRvE#@IBR zO!b-2N7wVfLV;mhEaXQ9XAU+>=XVA6f&T4Z-@AX!leJ8obP^P^wP0aICND?~w&NykJ#54x3_@r7IDMdRNy4Hh;h*!u(Ol(#0bJdwEo$5437-UBjQ+j=Ic>Q2z` zJNDf0yO6@mr6y1#n3)s(W|$iE_i8r@Gd@!DWDqZ7J&~gAm1#~maIGJ1sls^gxL9LLG_NhU!pTGty!TbhzQnu)I*S^54U6Yu%ZeCg`R>Q zhBv$n5j0v%O_j{QYWG!R9W?5_b&67KB$t}&e2LdMvd(PxN6Ir!H4>PNlerpBL>Zvyy!yw z-SOo8caEpDt(}|gKPBd$qND5#a5nju^O>V&;f890?yEOfkSG^HQVmEbM3Ugzu+UtH zC(INPDdraBN?P%kE;*Ae%Wto&sgw(crfZ#Qy(<4nk;S|hD3j{IQRI6Yq|f^basLY; z-HB&Je%Gg}Jt@={_C{L$!RM;$$|iD6vu#3w?v?*;&()uB|I-XqEKqZPS!reW9JkLewLb!70T7n`i!gNtb1%vN- zySZj{8-1>6E%H&=V}LM#xmt`J3XQoaD|@XygXjdZ1+P77-=;=eYpoEQ01B@L*a(uW zrZeZz?HJsw_4g0vhUgkg@VF8<-X$B8pOqCuWAl28uB|@r`19DTUQQsb^pfqB6QtiT z*`_UZ`fT}vtUY#%sq2{rchyfu*pCg;uec2$-$N_xgjZcoumE5vSI{+s@iLWoz^Mf; zuI8kDP{!XY6OP~q5}%1&L}CtfH^N<3o4L@J@zg1-mt{9L`s^z$Vgb|mr{@WiwAqKg zp#t-lhrU>F8o0s1q_9y`gQNf~Vb!F%70f}$>i7o4ho$`uciNf=xgJ>&!gSt0g;M>*x4-`U)ysFW&Vs^Vk6m%?iuWU+o&m(2Jm26Y(3%TL; zA7T)BP{WS!&xmxNw%J=$MPfn(9*^*TV;$JwRy8Zl*yUZi8jWYF>==j~&S|Xinsb%c z2?B+kpet*muEW7@AzjBA^wAJBY8i|#C{WtO_or&Nj2{=6JTTX05}|H>N2B|Wf!*3_ z7hW*j6p3TvpghEc6-wufFiY!%-GvOx*bZrhZu+7?iSrZL5q9}igiF^*R3%DE4aCHZ zqu>xS8LkW+Auv%z-<1Xs92u23R$nk@Pk}MU5!gT|c7vGlEA%G^2th&Q*zfg%-D^=f z&J_}jskj|Q;73NP4<4k*Y%pXPU2Thoqr+5uH1yEYM|VtBPW6lXaetokD0u z9qVek6Q&wk)tFbQ8(^HGf3Wp16gKmr>G;#G(HRBx?F`9AIRboK+;OfHaLJ(P>IP0w zyTbTkx_THEOs%Q&aPrxbZrJlio+hCC_HK<4%f3ZoSAyG7Dn`=X=&h@m*|UYO-4Hq0 z-Bq&+Ie!S##4A6OGoC~>ZW`Y5J)*ouaFl_e9GA*VSL!O_@xGiBw!AF}1{tB)z(w%c zS1Hmrb9OC8>0a_$BzeiN?rkPLc9%&;1CZW*4}CDDNr2gcl_3z+WC15&H1Zc2{o~i) z)LLW=WQ{?ricmC`G1GfJ0Yp4Dy~Ba;j6ZV4r{8xRs`13{dD!xXmr^Aga|C=iSmor% z8hi|pTXH)5Yf&v~exp3o+sY4B^^b*eYkkCYl*T{*=-0HniSA_1F53eCb{x~1k3*`W zr~};p1A`k{1DV9=UPnLDgz{aJH=-LQo<5%+Em!DNN252xwIf*wF_zS^!(XSm(9eoj z=*dXG&n0>)_)N5oc6v!>-bd(2ragD8O=M|wGW z!xJQS<)u70m&6OmrF0WSsr@I%T*c#Qo#Ha4d3COcX+9}hM5!7JIGF>7<~C(Ear^Sn zm^ZFkV6~Ula6+8S?oOROOA6$C&q&dp`>oR-2Ym3(HT@O7Sd5c~+kjrmM)YmgPH*tL zX+znN>`tv;5eOfX?h{AuX^LK~V#gPCu=)Tigtq9&?7Xh$qN|%A$?V*v=&-2F$zTUv z`C#WyIrChS5|Kgm_GeudCFf;)!WH7FI60j^0o#65o6`w*S7R@)88n$1nrgU(oU0M9 zx+EuMkC>(4j1;m6NoGqEkpJYJ?vc|B zOlwT3t&UgL!pX_P*6g36`ZXQ; z9~Cv}ANFnJGp(;ZhS(@FT;3e)0)Kp;h^x;$*xZn*k0U6-&FwI=uOGaODdrsp-!K$Ac32^c{+FhI-HkYd5v=`PGsg%6I`4d9Jy)uW0y%) zm&j^9WBAp*P8#kGJUhB!L?a%h$hJgQrx!6KCB_TRo%9{t0J7KW8!o1B!NC)VGLM5! zpZy5Jc{`r{1e(jd%jsG7k%I+m#CGS*BPA65ZVW~fLYw0dA-H_}O zrkGFL&P1PG9p2(%QiEWm6x;U-U&I#;Em$nx-_I^wtgw3xUPVVu zqSuKnx&dIT-XT+T10p;yjo1Y)z(x1fb8Dzfn8e yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/android/gradle/wrapper/gradle-wrapper.properties b/mapbox_maps_flutter_v3/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..9355b4155 --- /dev/null +++ b/mapbox_maps_flutter_v3/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/mapbox_maps_flutter_v3/android/gradlew b/mapbox_maps_flutter_v3/android/gradlew new file mode 100755 index 000000000..f5feea6d6 --- /dev/null +++ b/mapbox_maps_flutter_v3/android/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/mapbox_maps_flutter_v3/android/settings.gradle b/mapbox_maps_flutter_v3/android/settings.gradle new file mode 100644 index 000000000..47f14e0ca --- /dev/null +++ b/mapbox_maps_flutter_v3/android/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'mapbox_maps_flutter_v3' diff --git a/mapbox_maps_flutter_v3/android/src/main/AndroidManifest.xml b/mapbox_maps_flutter_v3/android/src/main/AndroidManifest.xml new file mode 100644 index 000000000..f8098cf27 --- /dev/null +++ b/mapbox_maps_flutter_v3/android/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + diff --git a/mapbox_maps_flutter_v3/android/src/main/kotlin/com/example/mapbox_maps_flutter_v3/MapboxMapsFlutterV3Plugin.kt b/mapbox_maps_flutter_v3/android/src/main/kotlin/com/example/mapbox_maps_flutter_v3/MapboxMapsFlutterV3Plugin.kt new file mode 100644 index 000000000..e91054090 --- /dev/null +++ b/mapbox_maps_flutter_v3/android/src/main/kotlin/com/example/mapbox_maps_flutter_v3/MapboxMapsFlutterV3Plugin.kt @@ -0,0 +1,33 @@ +package com.example.mapbox_maps_flutter_v3 + +import io.flutter.embedding.engine.plugins.FlutterPlugin +import io.flutter.plugin.common.MethodCall +import io.flutter.plugin.common.MethodChannel +import io.flutter.plugin.common.MethodChannel.MethodCallHandler +import io.flutter.plugin.common.MethodChannel.Result + +/** MapboxMapsFlutterV3Plugin */ +class MapboxMapsFlutterV3Plugin: FlutterPlugin, MethodCallHandler { + /// The MethodChannel that will the communication between Flutter and native Android + /// + /// This local reference serves to register the plugin with the Flutter Engine and unregister it + /// when the Flutter Engine is detached from the Activity + private lateinit var channel : MethodChannel + + override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) { + channel = MethodChannel(flutterPluginBinding.binaryMessenger, "mapbox_maps_flutter_v3") + channel.setMethodCallHandler(this) + } + + override fun onMethodCall(call: MethodCall, result: Result) { + if (call.method == "getPlatformVersion") { + result.success("Android ${android.os.Build.VERSION.RELEASE}") + } else { + result.notImplemented() + } + } + + override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) { + channel.setMethodCallHandler(null) + } +} diff --git a/mapbox_maps_flutter_v3/android/src/test/kotlin/com/example/mapbox_maps_flutter_v3/MapboxMapsFlutterV3PluginTest.kt b/mapbox_maps_flutter_v3/android/src/test/kotlin/com/example/mapbox_maps_flutter_v3/MapboxMapsFlutterV3PluginTest.kt new file mode 100644 index 000000000..6390f4c8e --- /dev/null +++ b/mapbox_maps_flutter_v3/android/src/test/kotlin/com/example/mapbox_maps_flutter_v3/MapboxMapsFlutterV3PluginTest.kt @@ -0,0 +1,27 @@ +package com.example.mapbox_maps_flutter_v3 + +import io.flutter.plugin.common.MethodCall +import io.flutter.plugin.common.MethodChannel +import kotlin.test.Test +import org.mockito.Mockito + +/* + * This demonstrates a simple unit test of the Kotlin portion of this plugin's implementation. + * + * Once you have built the plugin's example app, you can run these tests from the command + * line by running `./gradlew testDebugUnitTest` in the `example/android/` directory, or + * you can run them directly from IDEs that support JUnit such as Android Studio. + */ + +internal class MapboxMapsFlutterV3PluginTest { + @Test + fun onMethodCall_getPlatformVersion_returnsExpectedValue() { + val plugin = MapboxMapsFlutterV3Plugin() + + val call = MethodCall("getPlatformVersion", null) + val mockResult: MethodChannel.Result = Mockito.mock(MethodChannel.Result::class.java) + plugin.onMethodCall(call, mockResult) + + Mockito.verify(mockResult).success("Android " + android.os.Build.VERSION.RELEASE) + } +} diff --git a/mapbox_maps_flutter_v3/example/.gitignore b/mapbox_maps_flutter_v3/example/.gitignore new file mode 100644 index 000000000..79c113f9b --- /dev/null +++ b/mapbox_maps_flutter_v3/example/.gitignore @@ -0,0 +1,45 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.build/ +.buildlog/ +.history +.svn/ +.swiftpm/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/mapbox_maps_flutter_v3/example/README.md b/mapbox_maps_flutter_v3/example/README.md new file mode 100644 index 000000000..1a62cc578 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/README.md @@ -0,0 +1,16 @@ +# mapbox_maps_flutter_v3_example + +Demonstrates how to use the mapbox_maps_flutter_v3 plugin. + +## Getting Started + +This project is a starting point for a Flutter application. + +A few resources to get you started if this is your first Flutter project: + +- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) +- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) + +For help getting started with Flutter development, view the +[online documentation](https://docs.flutter.dev/), which offers tutorials, +samples, guidance on mobile development, and a full API reference. diff --git a/mapbox_maps_flutter_v3/example/analysis_options.yaml b/mapbox_maps_flutter_v3/example/analysis_options.yaml new file mode 100644 index 000000000..0d2902135 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/analysis_options.yaml @@ -0,0 +1,28 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at https://dart.dev/lints. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/mapbox_maps_flutter_v3/example/android/.gitignore b/mapbox_maps_flutter_v3/example/android/.gitignore new file mode 100644 index 000000000..be3943c96 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/android/.gitignore @@ -0,0 +1,14 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java +.cxx/ + +# Remember to never publicly share your keystore. +# See https://flutter.dev/to/reference-keystore +key.properties +**/*.keystore +**/*.jks diff --git a/mapbox_maps_flutter_v3/example/android/app/build.gradle.kts b/mapbox_maps_flutter_v3/example/android/app/build.gradle.kts new file mode 100644 index 000000000..58372065c --- /dev/null +++ b/mapbox_maps_flutter_v3/example/android/app/build.gradle.kts @@ -0,0 +1,44 @@ +plugins { + id("com.android.application") + id("kotlin-android") + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id("dev.flutter.flutter-gradle-plugin") +} + +android { + namespace = "com.example.mapbox_maps_flutter_v3_example" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_11.toString() + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "com.example.mapbox_maps_flutter_v3_example" + // You can update the following values to match your application needs. + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutter.versionCode + versionName = flutter.versionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig = signingConfigs.getByName("debug") + } + } +} + +flutter { + source = "../.." +} diff --git a/mapbox_maps_flutter_v3/example/android/app/src/debug/AndroidManifest.xml b/mapbox_maps_flutter_v3/example/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 000000000..399f6981d --- /dev/null +++ b/mapbox_maps_flutter_v3/example/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/mapbox_maps_flutter_v3/example/android/app/src/main/AndroidManifest.xml b/mapbox_maps_flutter_v3/example/android/app/src/main/AndroidManifest.xml new file mode 100644 index 000000000..0a8e78ab3 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/mapbox_maps_flutter_v3/example/android/app/src/main/kotlin/com/example/mapbox_maps_flutter_v3_example/MainActivity.kt b/mapbox_maps_flutter_v3/example/android/app/src/main/kotlin/com/example/mapbox_maps_flutter_v3_example/MainActivity.kt new file mode 100644 index 000000000..9641dec1b --- /dev/null +++ b/mapbox_maps_flutter_v3/example/android/app/src/main/kotlin/com/example/mapbox_maps_flutter_v3_example/MainActivity.kt @@ -0,0 +1,5 @@ +package com.example.mapbox_maps_flutter_v3_example + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity : FlutterActivity() diff --git a/mapbox_maps_flutter_v3/example/android/app/src/main/res/drawable-v21/launch_background.xml b/mapbox_maps_flutter_v3/example/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 000000000..f74085f3f --- /dev/null +++ b/mapbox_maps_flutter_v3/example/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/mapbox_maps_flutter_v3/example/android/app/src/main/res/drawable/launch_background.xml b/mapbox_maps_flutter_v3/example/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 000000000..304732f88 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/mapbox_maps_flutter_v3/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/mapbox_maps_flutter_v3/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..db77bb4b7b0906d62b1847e87f15cdcacf6a4f29 GIT binary patch literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/mapbox_maps_flutter_v3/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..17987b79bb8a35cc66c3c1fd44f5a5526c1b78be GIT binary patch literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q03KywUtLX8Ua?`H+NMzkczFPK3lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l zytQ?X=U+MF$@3 zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+ yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@Uy!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/mapbox_maps_flutter_v3/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..d5f1c8d34e7a88e3f88bea192c3a370d44689c3c GIT binary patch literal 1031 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xjc(B0U1_% zz5^97Xt*%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3 zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc z$|q_opQ^2TrnVZ0o~wh<3t%W&flvYGe#$xqda2bR_R zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2 z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b zpQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o zo~|9I;xof literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/mapbox_maps_flutter_v3/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6372eebdb28e45604e46eeda8dd24651419bc0 GIT binary patch literal 1443 zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`YV6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY zB_MsH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~Lo9vl;Zfs+W#BydUw zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3 z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w! zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%4Q8~Mad z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt* zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW zu72MW`|?8ht^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf< zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$ zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+ zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f z%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP z(1P?z~7YxD~Rf<(a@_y` literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/android/app/src/main/res/values-night/styles.xml b/mapbox_maps_flutter_v3/example/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 000000000..06952be74 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/mapbox_maps_flutter_v3/example/android/app/src/main/res/values/styles.xml b/mapbox_maps_flutter_v3/example/android/app/src/main/res/values/styles.xml new file mode 100644 index 000000000..cb1ef8805 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/mapbox_maps_flutter_v3/example/android/app/src/profile/AndroidManifest.xml b/mapbox_maps_flutter_v3/example/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 000000000..399f6981d --- /dev/null +++ b/mapbox_maps_flutter_v3/example/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/mapbox_maps_flutter_v3/example/android/build.gradle.kts b/mapbox_maps_flutter_v3/example/android/build.gradle.kts new file mode 100644 index 000000000..89176ef44 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/android/build.gradle.kts @@ -0,0 +1,21 @@ +allprojects { + repositories { + google() + mavenCentral() + } +} + +val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get() +rootProject.layout.buildDirectory.value(newBuildDir) + +subprojects { + val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name) + project.layout.buildDirectory.value(newSubprojectBuildDir) +} +subprojects { + project.evaluationDependsOn(":app") +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/mapbox_maps_flutter_v3/example/android/gradle.properties b/mapbox_maps_flutter_v3/example/android/gradle.properties new file mode 100644 index 000000000..f018a6181 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/android/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError +android.useAndroidX=true +android.enableJetifier=true diff --git a/mapbox_maps_flutter_v3/example/android/gradle/wrapper/gradle-wrapper.properties b/mapbox_maps_flutter_v3/example/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..afa1e8eb0 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip diff --git a/mapbox_maps_flutter_v3/example/android/settings.gradle.kts b/mapbox_maps_flutter_v3/example/android/settings.gradle.kts new file mode 100644 index 000000000..a439442c2 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/android/settings.gradle.kts @@ -0,0 +1,25 @@ +pluginManagement { + val flutterSdkPath = run { + val properties = java.util.Properties() + file("local.properties").inputStream().use { properties.load(it) } + val flutterSdkPath = properties.getProperty("flutter.sdk") + require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" } + flutterSdkPath + } + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id("dev.flutter.flutter-plugin-loader") version "1.0.0" + id("com.android.application") version "8.7.0" apply false + id("org.jetbrains.kotlin.android") version "1.8.22" apply false +} + +include(":app") diff --git a/mapbox_maps_flutter_v3/example/ios/.gitignore b/mapbox_maps_flutter_v3/example/ios/.gitignore new file mode 100644 index 000000000..7a7f9873a --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/.gitignore @@ -0,0 +1,34 @@ +**/dgph +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/ephemeral/ +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/mapbox_maps_flutter_v3/example/ios/Flutter/AppFrameworkInfo.plist b/mapbox_maps_flutter_v3/example/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 000000000..7c5696400 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Flutter/AppFrameworkInfo.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + MinimumOSVersion + 12.0 + + diff --git a/mapbox_maps_flutter_v3/example/ios/Flutter/Debug.xcconfig b/mapbox_maps_flutter_v3/example/ios/Flutter/Debug.xcconfig new file mode 100644 index 000000000..592ceee85 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Flutter/Debug.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/mapbox_maps_flutter_v3/example/ios/Flutter/Release.xcconfig b/mapbox_maps_flutter_v3/example/ios/Flutter/Release.xcconfig new file mode 100644 index 000000000..592ceee85 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Flutter/Release.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.pbxproj b/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 000000000..0ecc7a678 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,638 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 97C146E61CF9000F007C117D /* Project object */; + proxyType = 1; + remoteGlobalIDString = 97C146ED1CF9000F007C117D; + remoteInfo = Runner; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9705A1C41CF9048500538489 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; + 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; + 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 9740EEB11CF90186004384FC /* Flutter */ = { + isa = PBXGroup; + children = ( + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 9740EEB31CF90195004384FC /* Generated.xcconfig */, + ); + name = Flutter; + sourceTree = ""; + }; + 97C146E51CF9000F007C117D = { + isa = PBXGroup; + children = ( + 9740EEB11CF90186004384FC /* Flutter */, + 97C146F01CF9000F007C117D /* Runner */, + 97C146EF1CF9000F007C117D /* Products */, + 331C8082294A63A400263BE5 /* RunnerTests */, + ); + sourceTree = ""; + }; + 97C146EF1CF9000F007C117D /* Products */ = { + isa = PBXGroup; + children = ( + 97C146EE1CF9000F007C117D /* Runner.app */, + 331C8081294A63A400263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 97C146F01CF9000F007C117D /* Runner */ = { + isa = PBXGroup; + children = ( + 97C146FA1CF9000F007C117D /* Main.storyboard */, + 97C146FD1CF9000F007C117D /* Assets.xcassets */, + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, + 97C147021CF9000F007C117D /* Info.plist */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, + ); + path = Runner; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C8080294A63A400263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 331C807D294A63A400263BE5 /* Sources */, + 331C807F294A63A400263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C8086294A63A400263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 97C146ED1CF9000F007C117D /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); + productName = Runner; + productReference = 97C146EE1CF9000F007C117D /* Runner.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 97C146E61CF9000F007C117D /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1510; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C8080294A63A400263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 97C146ED1CF9000F007C117D; + }; + 97C146ED1CF9000F007C117D = { + CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 1100; + }; + }; + }; + buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */, + ); + productRefGroup = 97C146EF1CF9000F007C117D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 97C146ED1CF9000F007C117D /* Runner */, + 331C8080294A63A400263BE5 /* RunnerTests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C807F294A63A400263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EC1CF9000F007C117D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C807D294A63A400263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EA1CF9000F007C117D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C8086294A63A400263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 97C146ED1CF9000F007C117D /* Runner */; + targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 97C146FA1CF9000F007C117D /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C146FB1CF9000F007C117D /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C147001CF9000F007C117D /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 249021D3217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Profile; + }; + 249021D4217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.mapboxMapsFlutterV3Example; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Profile; + }; + 331C8088294A63A400263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.mapboxMapsFlutterV3Example.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Debug; + }; + 331C8089294A63A400263BE5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.mapboxMapsFlutterV3Example.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Release; + }; + 331C808A294A63A400263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.mapboxMapsFlutterV3Example.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Profile; + }; + 97C147031CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 97C147041CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 97C147061CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.mapboxMapsFlutterV3Example; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.mapboxMapsFlutterV3Example; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C8088294A63A400263BE5 /* Debug */, + 331C8089294A63A400263BE5 /* Release */, + 331C808A294A63A400263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147031CF9000F007C117D /* Debug */, + 97C147041CF9000F007C117D /* Release */, + 249021D3217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147061CF9000F007C117D /* Debug */, + 97C147071CF9000F007C117D /* Release */, + 249021D4217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ + }; + rootObject = 97C146E61CF9000F007C117D /* Project object */; +} diff --git a/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..919434a62 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 000000000..f9b0d7c5e --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 000000000..f0bf926d2 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,42 @@ +{ + "originHash" : "b80c6b13a9882c3fecf9cc3faa0bcbb0bc18462e6e58d2f8552acc6c4492081c", + "pins" : [ + { + "identity" : "mapbox-common-ios", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mapbox/mapbox-common-ios.git", + "state" : { + "revision" : "6efcdd6ca3ded3647f3ff897845c679d52dd625a", + "version" : "24.12.0-rc.1" + } + }, + { + "identity" : "mapbox-core-maps-ios", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git", + "state" : { + "revision" : "bfb41b136ecd52b45e35fe25b1b4840309a3994d", + "version" : "11.12.0-rc.1" + } + }, + { + "identity" : "mapbox-maps-ios", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mapbox/mapbox-maps-ios.git", + "state" : { + "revision" : "5f46396a6816c6d89a4ca8df39c22db2f9f9e3d2", + "version" : "11.12.0-rc.1" + } + }, + { + "identity" : "turf-swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mapbox/turf-swift.git", + "state" : { + "revision" : "bf840e6b9529d105687840fe2c9dcd74197d46d1", + "version" : "4.0.0" + } + } + ], + "version" : 3 +} diff --git a/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 000000000..d795332e1 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mapbox_maps_flutter_v3/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/mapbox_maps_flutter_v3/example/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..1d526a16e --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/mapbox_maps_flutter_v3/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mapbox_maps_flutter_v3/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/mapbox_maps_flutter_v3/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/mapbox_maps_flutter_v3/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 000000000..f9b0d7c5e --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/mapbox_maps_flutter_v3/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/mapbox_maps_flutter_v3/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 000000000..f0bf926d2 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,42 @@ +{ + "originHash" : "b80c6b13a9882c3fecf9cc3faa0bcbb0bc18462e6e58d2f8552acc6c4492081c", + "pins" : [ + { + "identity" : "mapbox-common-ios", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mapbox/mapbox-common-ios.git", + "state" : { + "revision" : "6efcdd6ca3ded3647f3ff897845c679d52dd625a", + "version" : "24.12.0-rc.1" + } + }, + { + "identity" : "mapbox-core-maps-ios", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git", + "state" : { + "revision" : "bfb41b136ecd52b45e35fe25b1b4840309a3994d", + "version" : "11.12.0-rc.1" + } + }, + { + "identity" : "mapbox-maps-ios", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mapbox/mapbox-maps-ios.git", + "state" : { + "revision" : "5f46396a6816c6d89a4ca8df39c22db2f9f9e3d2", + "version" : "11.12.0-rc.1" + } + }, + { + "identity" : "turf-swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mapbox/turf-swift.git", + "state" : { + "revision" : "bf840e6b9529d105687840fe2c9dcd74197d46d1", + "version" : "4.0.0" + } + } + ], + "version" : 3 +} diff --git a/mapbox_maps_flutter_v3/example/ios/Runner/AppDelegate.swift b/mapbox_maps_flutter_v3/example/ios/Runner/AppDelegate.swift new file mode 100644 index 000000000..626664468 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import Flutter +import UIKit + +@main +@objc class AppDelegate: FlutterAppDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + GeneratedPluginRegistrant.register(with: self) + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } +} diff --git a/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 000000000..d36b1fab2 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,122 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Icon-App-1024x1024@1x.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..dc9ada4725e9b0ddb1deab583e5b5102493aa332 GIT binary patch literal 10932 zcmeHN2~<R zh`|8`A_PQ1nSu(UMFx?8j8PC!!VDphaL#`F42fd#7Vlc`zIE4n%Y~eiz4y1j|NDpi z?<@|pSJ-HM`qifhf@m%MamgwK83`XpBA<+azdF#2QsT{X@z0A9Bq>~TVErigKH1~P zRX-!h-f0NJ4Mh++{D}J+K>~~rq}d%o%+4dogzXp7RxX4C>Km5XEI|PAFDmo;DFm6G zzjVoB`@qW98Yl0Kvc-9w09^PrsobmG*Eju^=3f?0o-t$U)TL1B3;sZ^!++3&bGZ!o-*6w?;oOhf z=A+Qb$scV5!RbG+&2S}BQ6YH!FKb0``VVX~T$dzzeSZ$&9=X$3)_7Z{SspSYJ!lGE z7yig_41zpQ)%5dr4ff0rh$@ky3-JLRk&DK)NEIHecf9c*?Z1bUB4%pZjQ7hD!A0r-@NF(^WKdr(LXj|=UE7?gBYGgGQV zidf2`ZT@pzXf7}!NH4q(0IMcxsUGDih(0{kRSez&z?CFA0RVXsVFw3^u=^KMtt95q z43q$b*6#uQDLoiCAF_{RFc{!H^moH_cmll#Fc^KXi{9GDl{>%+3qyfOE5;Zq|6#Hb zp^#1G+z^AXfRKaa9HK;%b3Ux~U@q?xg<2DXP%6k!3E)PA<#4$ui8eDy5|9hA5&{?v z(-;*1%(1~-NTQ`Is1_MGdQ{+i*ccd96ab$R$T3=% zw_KuNF@vI!A>>Y_2pl9L{9h1-C6H8<)J4gKI6{WzGBi<@u3P6hNsXG=bRq5c+z;Gc3VUCe;LIIFDmQAGy+=mRyF++u=drBWV8-^>0yE9N&*05XHZpPlE zxu@?8(ZNy7rm?|<+UNe0Vs6&o?l`Pt>P&WaL~M&#Eh%`rg@Mbb)J&@DA-wheQ>hRV z<(XhigZAT z>=M;URcdCaiO3d^?H<^EiEMDV+7HsTiOhoaMX%P65E<(5xMPJKxf!0u>U~uVqnPN7T!X!o@_gs3Ct1 zlZ_$5QXP4{Aj645wG_SNT&6m|O6~Tsl$q?nK*)(`{J4b=(yb^nOATtF1_aS978$x3 zx>Q@s4i3~IT*+l{@dx~Hst21fR*+5}S1@cf>&8*uLw-0^zK(+OpW?cS-YG1QBZ5q! zgTAgivzoF#`cSz&HL>Ti!!v#?36I1*l^mkrx7Y|K6L#n!-~5=d3;K<;Zqi|gpNUn_ z_^GaQDEQ*jfzh;`j&KXb66fWEk1K7vxQIMQ_#Wu_%3 z4Oeb7FJ`8I>Px;^S?)}2+4D_83gHEq>8qSQY0PVP?o)zAv3K~;R$fnwTmI-=ZLK`= zTm+0h*e+Yfr(IlH3i7gUclNH^!MU>id$Jw>O?2i0Cila#v|twub21@e{S2v}8Z13( zNDrTXZVgris|qYm<0NU(tAPouG!QF4ZNpZPkX~{tVf8xY690JqY1NVdiTtW+NqyRP zZ&;T0ikb8V{wxmFhlLTQ&?OP7 z;(z*<+?J2~z*6asSe7h`$8~Se(@t(#%?BGLVs$p``;CyvcT?7Y!{tIPva$LxCQ&4W z6v#F*);|RXvI%qnoOY&i4S*EL&h%hP3O zLsrFZhv&Hu5tF$Lx!8(hs&?!Kx5&L(fdu}UI5d*wn~A`nPUhG&Rv z2#ixiJdhSF-K2tpVL=)5UkXRuPAFrEW}7mW=uAmtVQ&pGE-&az6@#-(Te^n*lrH^m@X-ftVcwO_#7{WI)5v(?>uC9GG{lcGXYJ~Q8q zbMFl7;t+kV;|;KkBW2!P_o%Czhw&Q(nXlxK9ak&6r5t_KH8#1Mr-*0}2h8R9XNkr zto5-b7P_auqTJb(TJlmJ9xreA=6d=d)CVbYP-r4$hDn5|TIhB>SReMfh&OVLkMk-T zYf%$taLF0OqYF?V{+6Xkn>iX@TuqQ?&cN6UjC9YF&%q{Ut3zv{U2)~$>-3;Dp)*(? zg*$mu8^i=-e#acaj*T$pNowo{xiGEk$%DusaQiS!KjJH96XZ-hXv+jk%ard#fu=@Q z$AM)YWvE^{%tDfK%nD49=PI|wYu}lYVbB#a7wtN^Nml@CE@{Gv7+jo{_V?I*jkdLD zJE|jfdrmVbkfS>rN*+`#l%ZUi5_bMS<>=MBDNlpiSb_tAF|Zy`K7kcp@|d?yaTmB^ zo?(vg;B$vxS|SszusORgDg-*Uitzdi{dUV+glA~R8V(?`3GZIl^egW{a919!j#>f` znL1o_^-b`}xnU0+~KIFLQ)$Q6#ym%)(GYC`^XM*{g zv3AM5$+TtDRs%`2TyR^$(hqE7Y1b&`Jd6dS6B#hDVbJlUXcG3y*439D8MrK!2D~6gn>UD4Imctb z+IvAt0iaW73Iq$K?4}H`7wq6YkTMm`tcktXgK0lKPmh=>h+l}Y+pDtvHnG>uqBA)l zAH6BV4F}v$(o$8Gfo*PB>IuaY1*^*`OTx4|hM8jZ?B6HY;F6p4{`OcZZ(us-RVwDx zUzJrCQlp@mz1ZFiSZ*$yX3c_#h9J;yBE$2g%xjmGF4ca z&yL`nGVs!Zxsh^j6i%$a*I3ZD2SoNT`{D%mU=LKaEwbN(_J5%i-6Va?@*>=3(dQy` zOv%$_9lcy9+(t>qohkuU4r_P=R^6ME+wFu&LA9tw9RA?azGhjrVJKy&8=*qZT5Dr8g--d+S8zAyJ$1HlW3Olryt`yE zFIph~Z6oF&o64rw{>lgZISC6p^CBer9C5G6yq%?8tC+)7*d+ib^?fU!JRFxynRLEZ zj;?PwtS}Ao#9whV@KEmwQgM0TVP{hs>dg(1*DiMUOKHdQGIqa0`yZnHk9mtbPfoLx zo;^V6pKUJ!5#n`w2D&381#5#_t}AlTGEgDz$^;u;-vxDN?^#5!zN9ngytY@oTv!nc zp1Xn8uR$1Z;7vY`-<*?DfPHB;x|GUi_fI9@I9SVRv1)qETbNU_8{5U|(>Du84qP#7 z*l9Y$SgA&wGbj>R1YeT9vYjZuC@|{rajTL0f%N@>3$DFU=`lSPl=Iv;EjuGjBa$Gw zHD-;%YOE@<-!7-Mn`0WuO3oWuL6tB2cpPw~Nvuj|KM@))ixuDK`9;jGMe2d)7gHin zS<>k@!x;!TJEc#HdL#RF(`|4W+H88d4V%zlh(7#{q2d0OQX9*FW^`^_<3r$kabWAB z$9BONo5}*(%kx zOXi-yM_cmB3>inPpI~)duvZykJ@^^aWzQ=eQ&STUa}2uT@lV&WoRzkUoE`rR0)`=l zFT%f|LA9fCw>`enm$p7W^E@U7RNBtsh{_-7vVz3DtB*y#*~(L9+x9*wn8VjWw|Q~q zKFsj1Yl>;}%MG3=PY`$g$_mnyhuV&~O~u~)968$0b2!Jkd;2MtAP#ZDYw9hmK_+M$ zb3pxyYC&|CuAbtiG8HZjj?MZJBFbt`ryf+c1dXFuC z0*ZQhBzNBd*}s6K_G}(|Z_9NDV162#y%WSNe|FTDDhx)K!c(mMJh@h87@8(^YdK$&d*^WQe8Z53 z(|@MRJ$Lk-&ii74MPIs80WsOFZ(NX23oR-?As+*aq6b?~62@fSVmM-_*cb1RzZ)`5$agEiL`-E9s7{GM2?(KNPgK1(+c*|-FKoy}X(D_b#etO|YR z(BGZ)0Ntfv-7R4GHoXp?l5g#*={S1{u-QzxCGng*oWr~@X-5f~RA14b8~B+pLKvr4 zfgL|7I>jlak9>D4=(i(cqYf7#318!OSR=^`xxvI!bBlS??`xxWeg?+|>MxaIdH1U~#1tHu zB{QMR?EGRmQ_l4p6YXJ{o(hh-7Tdm>TAX380TZZZyVkqHNzjUn*_|cb?T? zt;d2s-?B#Mc>T-gvBmQZx(y_cfkXZO~{N zT6rP7SD6g~n9QJ)8F*8uHxTLCAZ{l1Y&?6v)BOJZ)=R-pY=Y=&1}jE7fQ>USS}xP#exo57uND0i*rEk@$;nLvRB@u~s^dwRf?G?_enN@$t* zbL%JO=rV(3Ju8#GqUpeE3l_Wu1lN9Y{D4uaUe`g>zlj$1ER$6S6@{m1!~V|bYkhZA z%CvrDRTkHuajMU8;&RZ&itnC~iYLW4DVkP<$}>#&(`UO>!n)Po;Mt(SY8Yb`AS9lt znbX^i?Oe9r_o=?})IHKHoQGKXsps_SE{hwrg?6dMI|^+$CeC&z@*LuF+P`7LfZ*yr+KN8B4{Nzv<`A(wyR@!|gw{zB6Ha ziwPAYh)oJ(nlqSknu(8g9N&1hu0$vFK$W#mp%>X~AU1ay+EKWcFdif{% z#4!4aoVVJ;ULmkQf!ke2}3hqxLK>eq|-d7Ly7-J9zMpT`?dxo6HdfJA|t)?qPEVBDv z{y_b?4^|YA4%WW0VZd8C(ZgQzRI5(I^)=Ub`Y#MHc@nv0w-DaJAqsbEHDWG8Ia6ju zo-iyr*sq((gEwCC&^TYBWt4_@|81?=B-?#P6NMff(*^re zYqvDuO`K@`mjm_Jd;mW_tP`3$cS?R$jR1ZN09$YO%_iBqh5ftzSpMQQtxKFU=FYmP zeY^jph+g<4>YO;U^O>-NFLn~-RqlHvnZl2yd2A{Yc1G@Ga$d+Q&(f^tnPf+Z7serIU};17+2DU_f4Z z@GaPFut27d?!YiD+QP@)T=77cR9~MK@bd~pY%X(h%L={{OIb8IQmf-!xmZkm8A0Ga zQSWONI17_ru5wpHg3jI@i9D+_Y|pCqVuHJNdHUauTD=R$JcD2K_liQisqG$(sm=k9;L* z!L?*4B~ql7uioSX$zWJ?;q-SWXRFhz2Jt4%fOHA=Bwf|RzhwqdXGr78y$J)LR7&3T zE1WWz*>GPWKZ0%|@%6=fyx)5rzUpI;bCj>3RKzNG_1w$fIFCZ&UR0(7S?g}`&Pg$M zf`SLsz8wK82Vyj7;RyKmY{a8G{2BHG%w!^T|Njr!h9TO2LaP^_f22Q1=l$QiU84ao zHe_#{S6;qrC6w~7{y(hs-?-j?lbOfgH^E=XcSgnwW*eEz{_Z<_xN#0001NP)t-s|Ns9~ z#rXRE|M&d=0au&!`~QyF`q}dRnBDt}*!qXo`c{v z{Djr|@Adh0(D_%#_&mM$D6{kE_x{oE{l@J5@%H*?%=t~i_`ufYOPkAEn!pfkr2$fs z652Tz0001XNklqeeKN4RM4i{jKqmiC$?+xN>3Apn^ z0QfuZLym_5b<*QdmkHjHlj811{If)dl(Z2K0A+ekGtrFJb?g|wt#k#pV-#A~bK=OT ts8>{%cPtyC${m|1#B1A6#u!Q;umknL1chzTM$P~L002ovPDHLkV1lTfnu!1a literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..797d452e458972bab9d994556c8305db4c827017 GIT binary patch literal 406 zcmV;H0crk;P))>cdjpWt&rLJgVp-t?DREyuq1A%0Z4)6_WsQ7{nzjN zo!X zGXV)2i3kcZIL~_j>uIKPK_zib+3T+Nt3Mb&Br)s)UIaA}@p{wDda>7=Q|mGRp7pqY zkJ!7E{MNz$9nOwoVqpFb)}$IP24Wn2JJ=Cw(!`OXJBr45rP>>AQr$6c7slJWvbpNW z@KTwna6d?PP>hvXCcp=4F;=GR@R4E7{4VU^0p4F>v^#A|>07*qoM6N<$f*5nx ACIA2c literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..6ed2d933e1120817fe9182483a228007b18ab6ae GIT binary patch literal 450 zcmV;z0X_bSP)iGWQ_5NJQ_~rNh*z)}eT%KUb z`7gNk0#AwF^#0T0?hIa^`~Ck;!}#m+_uT050aTR(J!bU#|IzRL%^UsMS#KsYnTF*!YeDOytlP4VhV?b} z%rz_<=#CPc)tU1MZTq~*2=8~iZ!lSa<{9b@2Jl;?IEV8)=fG217*|@)CCYgFze-x? zIFODUIA>nWKpE+bn~n7;-89sa>#DR>TSlqWk*!2hSN6D~Qb#VqbP~4Fk&m`@1$JGr zXPIdeRE&b2Thd#{MtDK$px*d3-Wx``>!oimf%|A-&-q*6KAH)e$3|6JV%HX{Hig)k suLT-RhftRq8b9;(V=235Wa|I=027H2wCDra;{X5v07*qoM6N<$f;9x^2LJ#7 literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..4cd7b0099ca80c806f8fe495613e8d6c69460d76 GIT binary patch literal 282 zcmV+#0p(^bcu7P-R4C8Q z&e;xxFbF_Vrezo%_kH*OKhshZ6BFpG-Y1e10`QXJKbND7AMQ&cMj60B5TNObaZxYybcN07*qoM6N<$g3m;S%K!iX literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..fe730945a01f64a61e2235dbe3f45b08f7729182 GIT binary patch literal 462 zcmV;<0WtoGP)-}iV`2<;=$?g5M=KQbZ{F&YRNy7Nn@%_*5{gvDM0aKI4?ESmw z{NnZg)A0R`+4?NF_RZexyVB&^^ZvN!{I28tr{Vje;QNTz`dG&Jz0~Ek&f2;*Z7>B|cg}xYpxEFY+0YrKLF;^Q+-HreN0P{&i zK~zY`?b7ECf-n?@;d<&orQ*Q7KoR%4|C>{W^h6@&01>0SKS`dn{Q}GT%Qj_{PLZ_& zs`MFI#j-(>?bvdZ!8^xTwlY{qA)T4QLbY@j(!YJ7aXJervHy6HaG_2SB`6CC{He}f zHVw(fJWApwPq!6VY7r1w-Fs)@ox~N+q|w~e;JI~C4Vf^@d>Wvj=fl`^u9x9wd9 zR%3*Q+)t%S!MU_`id^@&Y{y7-r98lZX0?YrHlfmwb?#}^1b{8g&KzmkE(L>Z&)179 zp<)v6Y}pRl100G2FL_t(o!|l{-Q-VMg#&MKg7c{O0 z2wJImOS3Gy*Z2Qifdv~JYOp;v+U)a|nLoc7hNH;I$;lzDt$}rkaFw1mYK5_0Q(Sut zvbEloxON7$+HSOgC9Z8ltuC&0OSF!-mXv5caV>#bc3@hBPX@I$58-z}(ZZE!t-aOG zpjNkbau@>yEzH(5Yj4kZiMH32XI!4~gVXNnjAvRx;Sdg^`>2DpUEwoMhTs_st8pKG z(%SHyHdU&v%f36~uERh!bd`!T2dw;z6PrOTQ7Vt*#9F2uHlUVnb#ev_o^fh}Dzmq} zWtlk35}k=?xj28uO|5>>$yXadTUE@@IPpgH`gJ~Ro4>jd1IF|(+IX>8M4Ps{PNvmI zNj4D+XgN83gPt_Gm}`Ybv{;+&yu-C(Grdiahmo~BjG-l&mWM+{e5M1sm&=xduwgM9 z`8OEh`=F3r`^E{n_;%9weN{cf2%7=VzC@cYj+lg>+3|D|_1C@{hcU(DyQG_BvBWe? zvTv``=%b1zrol#=R`JB)>cdjpWt&rLJgVp-t?DREyuq1A%0Z4)6_WsQ7{nzjN zo!X zGXV)2i3kcZIL~_j>uIKPK_zib+3T+Nt3Mb&Br)s)UIaA}@p{wDda>7=Q|mGRp7pqY zkJ!7E{MNz$9nOwoVqpFb)}$IP24Wn2JJ=Cw(!`OXJBr45rP>>AQr$6c7slJWvbpNW z@KTwna6d?PP>hvXCcp=4F;=GR@R4E7{4VU^0p4F>v^#A|>07*qoM6N<$f*5nx ACIA2c literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..502f463a9bc882b461c96aadf492d1729e49e725 GIT binary patch literal 586 zcmV-Q0=4~#P)+}#`wDE{8-2Mebf5<{{PqV{TgVcv*r8?UZ3{-|G?_}T*&y;@cqf{ z{Q*~+qr%%p!1pS*_Uicl#q9lc(D`!D`LN62sNwq{oYw(Wmhk)k<@f$!$@ng~_5)Ru z0Z)trIA5^j{DIW^c+vT2%lW+2<(RtE2wR;4O@)Tm`Xr*?A(qYoM}7i5Yxw>D(&6ou zxz!_Xr~yNF+waPe00049Nkl*;a!v6h%{rlvIH#gW3s8p;bFr=l}mRqpW2h zw=OA%hdyL~z+UHOzl0eKhEr$YYOL-c-%Y<)=j?(bzDweB7{b+%_ypvm_cG{SvM=DK zhv{K@m>#Bw>2W$eUI#iU)Wdgs8Y3U+A$Gd&{+j)d)BmGKx+43U_!tik_YlN)>$7G! zhkE!s;%oku3;IwG3U^2kw?z+HM)jB{@zFhK8P#KMSytSthr+4!c(5c%+^UBn`0X*2 zy3(k600_CSZj?O$Qu%&$;|TGUJrptR(HzyIx>5E(2r{eA(<6t3e3I0B)7d6s7?Z5J zZ!rtKvA{MiEBm&KFtoifx>5P^Z=vl)95XJn()aS5%ad(s?4-=Tkis9IGu{`Fy8r+H07*qoM6N<$f20Z)wqMt%V?S?~D#06};F zA3KcL`Wb+>5ObvgQIG&ig8(;V04hz?@cqy3{mSh8o!|U|)cI!1_+!fWH@o*8vh^CU z^ws0;(c$gI+2~q^tO#GDHf@=;DncUw00J^eL_t(&-tE|HQ`%4vfZ;WsBqu-$0nu1R zq^Vj;p$clf^?twn|KHO+IGt^q#a3X?w9dXC@*yxhv&l}F322(8Y1&=P&I}~G@#h6; z1CV9ecD9ZEe87{{NtI*)_aJ<`kJa z?5=RBtFF50s;jQLFil-`)m2wrb=6h(&brpj%nG_U&ut~$?8Rokzxi8zJoWr#2dto5 zOX_URcc<1`Iky+jc;A%Vzx}1QU{2$|cKPom2Vf1{8m`vja4{F>HS?^Nc^rp}xo+Nh zxd}eOm`fm3@MQC1< zIk&aCjb~Yh%5+Yq0`)D;q{#-Uqlv*o+Oor zE!I71Z@ASH3grl8&P^L0WpavHoP|UX4e?!igT`4?AZk$hu*@%6WJ;zDOGlw7kj@ zY5!B-0ft0f?Lgb>C;$Ke07*qoM6N<$f~t1N9smFU literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0ec303439225b78712f49115768196d8d76f6790 GIT binary patch literal 862 zcmV-k1EKthP)20Z)wqMt%V?S?~D#06};F zA3KcL`Wb+>5ObvgQIG&ig8(;V04hz?@cqy3{mSh8o!|U|)cI!1_+!fWH@o*8vh^CU z^ws0;(c$gI+2~q^tO#GDHf@=;DncUw00J^eL_t(&-tE|HQ`%4vfZ;WsBqu-$0nu1R zq^Vj;p$clf^?twn|KHO+IGt^q#a3X?w9dXC@*yxhv&l}F322(8Y1&=P&I}~G@#h6; z1CV9ecD9ZEe87{{NtI*)_aJ<`kJa z?5=RBtFF50s;jQLFil-`)m2wrb=6h(&brpj%nG_U&ut~$?8Rokzxi8zJoWr#2dto5 zOX_URcc<1`Iky+jc;A%Vzx}1QU{2$|cKPom2Vf1{8m`vja4{F>HS?^Nc^rp}xo+Nh zxd}eOm`fm3@MQC1< zIk&aCjb~Yh%5+Yq0`)D;q{#-Uqlv*o+Oor zE!I71Z@ASH3grl8&P^L0WpavHoP|UX4e?!igT`4?AZk$hu*@%6WJ;zDOGlw7kj@ zY5!B-0ft0f?Lgb>C;$Ke07*qoM6N<$f~t1N9smFU literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..e9f5fea27c705180eb716271f41b582e76dcbd90 GIT binary patch literal 1674 zcmV;526g#~P){YQnis^a@{&-nmRmq)<&%Mztj67_#M}W?l>kYSliK<%xAp;0j{!}J0!o7b zE>q9${Lb$D&h7k=+4=!ek^n+`0zq>LL1O?lVyea53S5x`Nqqo2YyeuIrQrJj9XjOp z{;T5qbj3}&1vg1VK~#9!?b~^C5-}JC@Pyrv-6dSEqJqT}#j9#dJ@GzT@B8}x zU&J@bBI>f6w6en+CeI)3^kC*U?}X%OD8$Fd$H&LV$H&LV$H&LV#|K5~mLYf|VqzOc zkc7qL~0sOYuM{tG`rYEDV{DWY`Z8&)kW*hc2VkBuY+^Yx&92j&StN}Wp=LD zxoGxXw6f&8sB^u})h@b@z0RBeD`K7RMR9deyL(ZJu#39Z>rT)^>v}Khq8U-IbIvT> z?4pV9qGj=2)TNH3d)=De<+^w;>S7m_eFKTvzeaBeir45xY!^m!FmxnljbSS_3o=g( z->^wC9%qkR{kbGnW8MfFew_o9h3(r55Is`L$8KI@d+*%{=Nx+FXJ98L0PjFIu;rGnnfY zn1R5Qnp<{Jq0M1vX=X&F8gtLmcWv$1*M@4ZfF^9``()#hGTeKeP`1!iED ztNE(TN}M5}3Bbc*d=FIv`DNv&@|C6yYj{sSqUj5oo$#*0$7pu|Dd2TLI>t5%I zIa4Dvr(iayb+5x=j*Vum9&irk)xV1`t509lnPO0%skL8_1c#Xbamh(2@f?4yUI zhhuT5<#8RJhGz4%b$`PJwKPAudsm|at?u;*hGgnA zU1;9gnxVBC)wA(BsB`AW54N{|qmikJR*%x0c`{LGsSfa|NK61pYH(r-UQ4_JXd!Rsz)=k zL{GMc5{h138)fF5CzHEDM>+FqY)$pdN3}Ml+riTgJOLN0F*Vh?{9ESR{SVVg>*>=# zix;VJHPtvFFCRY$Ks*F;VX~%*r9F)W`PmPE9F!(&s#x07n2<}?S{(ygpXgX-&B&OM zONY&BRQ(#%0%jeQs?oJ4P!p*R98>qCy5p8w>_gpuh39NcOlp)(wOoz0sY-Qz55eB~ z7OC-fKBaD1sE3$l-6QgBJO!n?QOTza`!S_YK z_v-lm^7{VO^8Q@M_^8F)09Ki6%=s?2_5eupee(w1FB%aqSweusQ-T+CH0Xt{` zFjMvW{@C&TB)k25()nh~_yJ9coBRL(0oO@HK~z}7?bm5j;y@69;bvlHb2tf!$ReA~x{22wTq550 z?f?Hnw(;m3ip30;QzdV~7pi!wyMYhDtXW#cO7T>|f=bdFhu+F!zMZ2UFj;GUKX7tI z;hv3{q~!*pMj75WP_c}>6)IWvg5_yyg<9Op()eD1hWC19M@?_9_MHec{Z8n3FaF{8 z;u`Mw0ly(uE>*CgQYv{be6ab2LWhlaH1^iLIM{olnag$78^Fd}%dR7;JECQ+hmk|o z!u2&!3MqPfP5ChDSkFSH8F2WVOEf0(E_M(JL17G}Y+fg0_IuW%WQ zG(mG&u?|->YSdk0;8rc{yw2@2Z&GA}z{Wb91Ooz9VhA{b2DYE7RmG zjL}?eq#iX%3#k;JWMx_{^2nNax`xPhByFiDX+a7uTGU|otOvIAUy|dEKkXOm-`aWS z27pUzD{a)Ct<6p{{3)+lq@i`t@%>-wT4r?*S}k)58e09WZYP0{{R3FC5Sl00039P)t-s|Ns9~ z#rP?<_5oL$Q^olD{r_0T`27C={r>*`|Nj71npVa5OTzc(_WfbW_({R{p56NV{r*M2 z_xt?)2V0#0NsfV0u>{42ctGP(8vQj-Btk1n|O0ZD=YLwd&R{Ko41Gr9H= zY@z@@bOAMB5Ltl$E>bJJ{>JP30ZxkmI%?eW{k`b?Wy<&gOo;dS`~CR$Vwb@XWtR|N zi~t=w02?-0&j0TD{>bb6sNwsK*!p?V`RMQUl(*DVjk-9Cx+-z1KXab|Ka2oXhX5f% z`$|e!000AhNklrxs)5QTeTVRiEmz~MKK1WAjCw(c-JK6eox;2O)?`? zTG`AHia671e^vgmp!llKp|=5sVHk#C7=~epA~VAf-~%aPC=%Qw01h8mnSZ|p?hz91 z7p83F3%LVu9;S$tSI$C^%^yud1dfTM_6p2|+5Ejp$bd`GDvbR|xit>i!ZD&F>@CJrPmu*UjD&?DfZs=$@e3FQA(vNiU+$A*%a} z?`XcG2jDxJ_ZQ#Md`H{4Lpf6QBDp81_KWZ6Tk#yCy1)32zO#3<7>b`eT7UyYH1eGz z;O(rH$=QR*L%%ZcBpc=eGua?N55nD^K(8<#gl2+pN_j~b2MHs4#mcLmv%DkspS-3< zpI1F=^9siI0s-;IN_IrA;5xm~3?3!StX}pUv0vkxMaqm+zxrg7X7(I&*N~&dEd0kD z-FRV|g=|QuUsuh>-xCI}vD2imzYIOIdcCVV=$Bz@*u0+Bs<|L^)32nN*=wu3n%Ynw z@1|eLG>!8ruU1pFXUfb`j>(=Gy~?Rn4QJ-c3%3T|(Frd!bI`9u&zAnyFYTqlG#&J7 zAkD(jpw|oZLNiA>;>hgp1KX7-wxC~31II47gc zHcehD6Uxlf%+M^^uN5Wc*G%^;>D5qT{>=uxUhX%WJu^Z*(_Wq9y}npFO{Hhb>s6<9 zNi0pHXWFaVZnb)1+RS&F)xOv6&aeILcI)`k#0YE+?e)5&#r7J#c`3Z7x!LpTc01dx zrdC3{Z;joZ^KN&))zB_i)I9fWedoN>Zl-6_Iz+^G&*ak2jpF07*qoM6N<$f;w%0(f|Me literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0467bf12aa4d28f374bb26596605a46dcbb3e7c8 GIT binary patch literal 1418 zcmV;51$Fv~P)q zKfU)WzW*n(@|xWGCA9ScMt*e9`2kdxPQ&&>|-UCa7_51w+ zLUsW@ZzZSW0y$)Hp~e9%PvP|a03ks1`~K?q{u;6NC8*{AOqIUq{CL&;p56Lf$oQGq z^={4hPQv)y=I|4n+?>7Fim=dxt1 z2H+Dm+1+fh+IF>G0SjJMkQQre1x4|G*Z==(Ot&kCnUrL4I(rf(ucITwmuHf^hXiJT zkdTm&kdTm&kdTm&kdP`esgWG0BcWCVkVZ&2dUwN`cgM8QJb`Z7Z~e<&Yj2(}>Tmf` zm1{eLgw!b{bXkjWbF%dTkTZEJWyWOb##Lfw4EK2}<0d6%>AGS{po>WCOy&f$Tay_> z?NBlkpo@s-O;0V%Y_Xa-G#_O08q5LR*~F%&)}{}r&L%Sbs8AS4t7Y0NEx*{soY=0MZExqA5XHQkqi#4gW3 zqODM^iyZl;dvf)-bOXtOru(s)Uc7~BFx{w-FK;2{`VA?(g&@3z&bfLFyctOH!cVsF z7IL=fo-qBndRUm;kAdXR4e6>k-z|21AaN%ubeVrHl*<|s&Ax@W-t?LR(P-24A5=>a z*R9#QvjzF8n%@1Nw@?CG@6(%>+-0ASK~jEmCV|&a*7-GKT72W<(TbSjf)&Eme6nGE z>Gkj4Sq&2e+-G%|+NM8OOm5zVl9{Z8Dd8A5z3y8mZ=4Bv4%>as_{9cN#bm~;h>62( zdqY93Zy}v&c4n($Vv!UybR8ocs7#zbfX1IY-*w~)p}XyZ-SFC~4w>BvMVr`dFbelV{lLL0bx7@*ZZdebr3`sP;? zVImji)kG)(6Juv0lz@q`F!k1FE;CQ(D0iG$wchPbKZQELlsZ#~rt8#90Y_Xh&3U-< z{s<&cCV_1`^TD^ia9!*mQDq& zn2{r`j};V|uV%_wsP!zB?m%;FeaRe+X47K0e+KE!8C{gAWF8)lCd1u1%~|M!XNRvw zvtqy3iz0WSpWdhn6$hP8PaRBmp)q`#PCA`Vd#Tc$@f1tAcM>f_I@bC)hkI9|o(Iqv zo}Piadq!j76}004RBio<`)70k^`K1NK)q>w?p^C6J2ZC!+UppiK6&y3Kmbv&O!oYF z34$0Z;QO!JOY#!`qyGH<3Pd}Pt@q*A0V=3SVtWKRR8d8Z&@)3qLPA19LPA19LPEUC YUoZo%k(ykuW&i*H07*qoM6N<$f+CH{y8r+H literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json new file mode 100644 index 000000000..0bedcf2fd --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "LaunchImage.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png new file mode 100644 index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file mode 100644 index 000000000..89c2725b7 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md @@ -0,0 +1,5 @@ +# Launch Screen Assets + +You can customize the launch screen with your own desired assets by replacing the image files in this directory. + +You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/mapbox_maps_flutter_v3/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/mapbox_maps_flutter_v3/example/ios/Runner/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 000000000..f2e259c7c --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mapbox_maps_flutter_v3/example/ios/Runner/Base.lproj/Main.storyboard b/mapbox_maps_flutter_v3/example/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 000000000..f3c28516f --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mapbox_maps_flutter_v3/example/ios/Runner/Info.plist b/mapbox_maps_flutter_v3/example/ios/Runner/Info.plist new file mode 100644 index 000000000..a460020f5 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Runner/Info.plist @@ -0,0 +1,49 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Mapbox Maps Flutter V3 + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + mapbox_maps_flutter_v3_example + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + CADisableMinimumFrameDurationOnPhone + + UIApplicationSupportsIndirectInputEvents + + + diff --git a/mapbox_maps_flutter_v3/example/ios/Runner/Runner-Bridging-Header.h b/mapbox_maps_flutter_v3/example/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 000000000..308a2a560 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/mapbox_maps_flutter_v3/example/ios/RunnerTests/RunnerTests.swift b/mapbox_maps_flutter_v3/example/ios/RunnerTests/RunnerTests.swift new file mode 100644 index 000000000..06fc4392f --- /dev/null +++ b/mapbox_maps_flutter_v3/example/ios/RunnerTests/RunnerTests.swift @@ -0,0 +1,29 @@ +import Flutter +import UIKit +import XCTest + +// If your plugin has been explicitly set to "type: .dynamic" in the Package.swift, +// you will need to add your plugin as a dependency of RunnerTests within Xcode. + +@testable import mapbox_maps_flutter_v3 + +// This demonstrates a simple unit test of the Swift portion of this plugin's implementation. +// +// See https://developer.apple.com/documentation/xctest for more information about using XCTest. + +class RunnerTests: XCTestCase { + + func testGetPlatformVersion() { + let plugin = MapboxMapsFlutterV3Plugin() + + let call = FlutterMethodCall(methodName: "getPlatformVersion", arguments: []) + + let resultExpectation = expectation(description: "result block must be called.") + plugin.handle(call) { result in + XCTAssertEqual(result as! String, "iOS " + UIDevice.current.systemVersion) + resultExpectation.fulfill() + } + waitForExpectations(timeout: 1) + } + +} diff --git a/mapbox_maps_flutter_v3/example/lib/main.dart b/mapbox_maps_flutter_v3/example/lib/main.dart new file mode 100644 index 000000000..4734c2d67 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/lib/main.dart @@ -0,0 +1,31 @@ +import 'package:flutter/material.dart'; +import 'package:mapbox_maps_flutter_v3/mapbox_maps_flutter_v3.dart'; + +void main() { + WidgetsFlutterBinding.ensureInitialized(); + runApp(const MyApp()); +} + +class MyApp extends StatefulWidget { + const MyApp({super.key}); + + @override + State createState() => _MyAppState(); +} + +class _MyAppState extends State { + @override + void initState() { + super.initState(); + } + + @override + Widget build(BuildContext context) { + return MaterialApp( + home: Scaffold( + appBar: AppBar(title: const Text('Example app')), + body: Center(child: MapWidget()), + ), + ); + } +} diff --git a/mapbox_maps_flutter_v3/example/pubspec.lock b/mapbox_maps_flutter_v3/example/pubspec.lock new file mode 100644 index 000000000..41b6f105c --- /dev/null +++ b/mapbox_maps_flutter_v3/example/pubspec.lock @@ -0,0 +1,385 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + args: + dependency: transitive + description: + name: args + sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 + url: "https://pub.dev" + source: hosted + version: "2.7.0" + async: + dependency: transitive + description: + name: async + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" + url: "https://pub.dev" + source: hosted + version: "2.13.0" + benchmark: + dependency: transitive + description: + name: benchmark + sha256: cb3eeea01e3f054df76ee9775ca680f3afa5f19f39b2bb426ba78ba27654493b + url: "https://pub.dev" + source: hosted + version: "0.3.0" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + characters: + dependency: transitive + description: + name: characters + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + clock: + dependency: transitive + description: + name: clock + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b + url: "https://pub.dev" + source: hosted + version: "1.1.2" + collection: + dependency: transitive + description: + name: collection + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://pub.dev" + source: hosted + version: "1.19.1" + cupertino_icons: + dependency: "direct main" + description: + name: cupertino_icons + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 + url: "https://pub.dev" + source: hosted + version: "1.0.8" + dart_sort_queue: + dependency: transitive + description: + name: dart_sort_queue + sha256: f3353ba8b4850e072d3368757f62edb79af34a9703c3e3df9c59342721f5f5b1 + url: "https://pub.dev" + source: hosted + version: "0.0.2+3" + fake_async: + dependency: transitive + description: + name: fake_async + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" + url: "https://pub.dev" + source: hosted + version: "1.3.3" + file: + dependency: transitive + description: + name: file + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 + url: "https://pub.dev" + source: hosted + version: "7.0.1" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_driver: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" + url: "https://pub.dev" + source: hosted + version: "5.0.0" + flutter_plugin_android_lifecycle: + dependency: transitive + description: + name: flutter_plugin_android_lifecycle + sha256: f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e + url: "https://pub.dev" + source: hosted + version: "2.0.28" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + fuchsia_remote_debug_protocol: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + geotypes: + dependency: transitive + description: + name: geotypes + sha256: "5bedf57de92283133dd221e363812ef50eaaba414f0823b1974ef7d84b86991f" + url: "https://pub.dev" + source: hosted + version: "0.0.2" + integration_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" + url: "https://pub.dev" + source: hosted + version: "4.9.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec + url: "https://pub.dev" + source: hosted + version: "10.0.8" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 + url: "https://pub.dev" + source: hosted + version: "3.0.9" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" + lints: + dependency: transitive + description: + name: lints + sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 + url: "https://pub.dev" + source: hosted + version: "5.1.1" + mapbox_maps_flutter: + dependency: "direct overridden" + description: + path: "../../mapbox_maps_flutter_mobile" + relative: true + source: path + version: "2.8.0-rc.1" + mapbox_maps_flutter_interface: + dependency: "direct overridden" + description: + path: "../../mapbox_maps_flutter_interface" + relative: true + source: path + version: "0.0.1" + mapbox_maps_flutter_v3: + dependency: "direct main" + description: + path: ".." + relative: true + source: path + version: "0.0.1" + matcher: + dependency: transitive + description: + name: matcher + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + url: "https://pub.dev" + source: hosted + version: "0.12.17" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + url: "https://pub.dev" + source: hosted + version: "0.11.1" + meta: + dependency: transitive + description: + name: meta + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + url: "https://pub.dev" + source: hosted + version: "1.16.0" + path: + dependency: transitive + description: + name: path + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + platform: + dependency: transitive + description: + name: platform + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" + url: "https://pub.dev" + source: hosted + version: "3.1.6" + process: + dependency: transitive + description: + name: process + sha256: "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d" + url: "https://pub.dev" + source: hosted + version: "5.0.3" + rbush: + dependency: transitive + description: + name: rbush + sha256: "48b683421b4afb43a642f82c6aa31911e54f3069143d31c7d33cbe329df13403" + url: "https://pub.dev" + source: hosted + version: "1.1.1" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + source_span: + dependency: transitive + description: + name: source_span + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" + url: "https://pub.dev" + source: hosted + version: "1.10.1" + stack_trace: + dependency: transitive + description: + name: stack_trace + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + url: "https://pub.dev" + source: hosted + version: "1.12.1" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + url: "https://pub.dev" + source: hosted + version: "1.4.1" + sweepline_intersections: + dependency: transitive + description: + name: sweepline_intersections + sha256: a665c707200a4f07140a4029b41a7c4883beb3f04322cd8e08ebf650f69e1176 + url: "https://pub.dev" + source: hosted + version: "0.0.4" + sync_http: + dependency: transitive + description: + name: sync_http + sha256: "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961" + url: "https://pub.dev" + source: hosted + version: "0.3.1" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + url: "https://pub.dev" + source: hosted + version: "1.2.2" + test_api: + dependency: transitive + description: + name: test_api + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + url: "https://pub.dev" + source: hosted + version: "0.7.4" + turf: + dependency: transitive + description: + name: turf + sha256: "75347c45a5c1de805db7cb182286f05a3770e01546626c4dc292709d15cbe436" + url: "https://pub.dev" + source: hosted + version: "0.0.10" + turf_equality: + dependency: transitive + description: + name: turf_equality + sha256: f0f44ffe389547941358e0d3d4a747db2bd56115b32ff1cede5e5bdf3126a3e2 + url: "https://pub.dev" + source: hosted + version: "0.1.0" + turf_pip: + dependency: transitive + description: + name: turf_pip + sha256: ba4fd414baffd5d7b30880658ad6db82461c49ec023f8ffd0c23d398ad8b14be + url: "https://pub.dev" + source: hosted + version: "0.0.2" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + vector_math: + dependency: transitive + description: + name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" + url: "https://pub.dev" + source: hosted + version: "14.3.1" + webdriver: + dependency: transitive + description: + name: webdriver + sha256: "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade" + url: "https://pub.dev" + source: hosted + version: "3.1.0" +sdks: + dart: ">=3.7.2 <4.0.0" + flutter: ">=3.27.0" diff --git a/mapbox_maps_flutter_v3/example/pubspec.yaml b/mapbox_maps_flutter_v3/example/pubspec.yaml new file mode 100644 index 000000000..d213d8eee --- /dev/null +++ b/mapbox_maps_flutter_v3/example/pubspec.yaml @@ -0,0 +1,85 @@ +name: mapbox_maps_flutter_v3_example +description: "Demonstrates how to use the mapbox_maps_flutter_v3 plugin." +# The following line prevents the package from being accidentally published to +# pub.dev using `flutter pub publish`. This is preferred for private packages. +publish_to: 'none' # Remove this line if you wish to publish to pub.dev + +environment: + sdk: ^3.7.2 + +# Dependencies specify other packages that your package needs in order to work. +# To automatically upgrade your package dependencies to the latest versions +# consider running `flutter pub upgrade --major-versions`. Alternatively, +# dependencies can be manually updated by changing the version numbers below to +# the latest version available on pub.dev. To see which dependencies have newer +# versions available, run `flutter pub outdated`. +dependencies: + flutter: + sdk: flutter + + mapbox_maps_flutter_v3: + # When depending on this package from a real application you should use: + # mapbox_maps_flutter_v3: ^x.y.z + # See https://dart.dev/tools/pub/dependencies#version-constraints + # The example app is bundled with the plugin so we use a path dependency on + # the parent directory to use the current plugin's version. + path: ../ + + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^1.0.8 + +dev_dependencies: + integration_test: + sdk: flutter + flutter_test: + sdk: flutter + + # The "flutter_lints" package below contains a set of recommended lints to + # encourage good coding practices. The lint set provided by the package is + # activated in the `analysis_options.yaml` file located at the root of your + # package. See that file for information about deactivating specific lint + # rules and activating additional ones. + flutter_lints: ^5.0.0 + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter packages. +flutter: + + # The following line ensures that the Material Icons font is + # included with your application, so that you can use the icons in + # the material Icons class. + uses-material-design: true + + # To add assets to your application, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/to/resolution-aware-images + + # For details regarding adding assets from package dependencies, see + # https://flutter.dev/to/asset-from-package + + # To add custom fonts to your application, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts from package dependencies, + # see https://flutter.dev/to/font-from-package diff --git a/mapbox_maps_flutter_v3/example/pubspec_overrides.yaml b/mapbox_maps_flutter_v3/example/pubspec_overrides.yaml new file mode 100644 index 000000000..83092298e --- /dev/null +++ b/mapbox_maps_flutter_v3/example/pubspec_overrides.yaml @@ -0,0 +1,5 @@ +dependency_overrides: + mapbox_maps_flutter_interface: + path: ../../mapbox_maps_flutter_interface + mapbox_maps_flutter: + path: ../../mapbox_maps_flutter_mobile \ No newline at end of file diff --git a/mapbox_maps_flutter_v3/example/test/widget_test.dart b/mapbox_maps_flutter_v3/example/test/widget_test.dart new file mode 100644 index 000000000..c4bfe976d --- /dev/null +++ b/mapbox_maps_flutter_v3/example/test/widget_test.dart @@ -0,0 +1,27 @@ +// This is a basic Flutter widget test. +// +// To perform an interaction with a widget in your test, use the WidgetTester +// utility in the flutter_test package. For example, you can send tap and scroll +// gestures. You can also use WidgetTester to find child widgets in the widget +// tree, read text, and verify that the values of widget properties are correct. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +import 'package:mapbox_maps_flutter_v3_example/main.dart'; + +void main() { + testWidgets('Verify Platform version', (WidgetTester tester) async { + // Build our app and trigger a frame. + await tester.pumpWidget(const MyApp()); + + // Verify that platform version is retrieved. + expect( + find.byWidgetPredicate( + (Widget widget) => widget is Text && + widget.data!.startsWith('Running on:'), + ), + findsOneWidget, + ); + }); +} diff --git a/mapbox_maps_flutter_v3/ios/.gitignore b/mapbox_maps_flutter_v3/ios/.gitignore new file mode 100644 index 000000000..034771fc9 --- /dev/null +++ b/mapbox_maps_flutter_v3/ios/.gitignore @@ -0,0 +1,38 @@ +.idea/ +.vagrant/ +.sconsign.dblite +.svn/ + +.DS_Store +*.swp +profile + +DerivedData/ +build/ +GeneratedPluginRegistrant.h +GeneratedPluginRegistrant.m + +.generated/ + +*.pbxuser +*.mode1v3 +*.mode2v3 +*.perspectivev3 + +!default.pbxuser +!default.mode1v3 +!default.mode2v3 +!default.perspectivev3 + +xcuserdata + +*.moved-aside + +*.pyc +*sync/ +Icon? +.tags* + +/Flutter/Generated.xcconfig +/Flutter/ephemeral/ +/Flutter/flutter_export_environment.sh diff --git a/mapbox_maps_flutter_v3/ios/mapbox_maps_flutter_v3.podspec b/mapbox_maps_flutter_v3/ios/mapbox_maps_flutter_v3.podspec new file mode 100644 index 000000000..0a0b20abf --- /dev/null +++ b/mapbox_maps_flutter_v3/ios/mapbox_maps_flutter_v3.podspec @@ -0,0 +1,29 @@ +# +# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html. +# Run `pod lib lint mapbox_maps_flutter_v3.podspec` to validate before publishing. +# +Pod::Spec.new do |s| + s.name = 'mapbox_maps_flutter_v3' + s.version = '0.0.1' + s.summary = 'A new Flutter plugin project.' + s.description = <<-DESC +A new Flutter plugin project. + DESC + s.homepage = 'http://example.com' + s.license = { :file => '../LICENSE' } + s.author = { 'Your Company' => 'email@example.com' } + s.source = { :path => '.' } + s.source_files = 'mapbox_maps_flutter_v3/Sources/mapbox_maps_flutter_v3/**/*' + s.dependency 'Flutter' + s.platform = :ios, '12.0' + + # Flutter.framework does not contain a i386 slice. + s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' } + s.swift_version = '5.0' + + # If your plugin requires a privacy manifest, for example if it uses any + # required reason APIs, update the PrivacyInfo.xcprivacy file to describe your + # plugin's privacy impact, and then uncomment this line. For more information, + # see https://developer.apple.com/documentation/bundleresources/privacy_manifest_files + # s.resource_bundles = {'mapbox_maps_flutter_v3_privacy' => ['mapbox_maps_flutter_v3/Sources/mapbox_maps_flutter_v3/PrivacyInfo.xcprivacy']} +end diff --git a/mapbox_maps_flutter_v3/ios/mapbox_maps_flutter_v3/Package.swift b/mapbox_maps_flutter_v3/ios/mapbox_maps_flutter_v3/Package.swift new file mode 100644 index 000000000..c5f0a5e10 --- /dev/null +++ b/mapbox_maps_flutter_v3/ios/mapbox_maps_flutter_v3/Package.swift @@ -0,0 +1,32 @@ +// swift-tools-version: 5.9 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "mapbox_maps_flutter_v3", + platforms: [ + .iOS("12.0") + ], + products: [ + .library(name: "mapbox-maps-flutter-v3", targets: ["mapbox_maps_flutter_v3"]) + ], + dependencies: [], + targets: [ + .target( + name: "mapbox_maps_flutter_v3", + dependencies: [], + resources: [ + // If your plugin requires a privacy manifest, for example if it uses any required + // reason APIs, update the PrivacyInfo.xcprivacy file to describe your plugin's + // privacy impact, and then uncomment these lines. For more information, see + // https://developer.apple.com/documentation/bundleresources/privacy_manifest_files + // .process("PrivacyInfo.xcprivacy"), + + // If you have other resources that need to be bundled with your plugin, refer to + // the following instructions to add them: + // https://developer.apple.com/documentation/xcode/bundling-resources-with-a-swift-package + ] + ) + ] +) diff --git a/mapbox_maps_flutter_v3/ios/mapbox_maps_flutter_v3/Sources/mapbox_maps_flutter_v3/MapboxMapsFlutterV3Plugin.swift b/mapbox_maps_flutter_v3/ios/mapbox_maps_flutter_v3/Sources/mapbox_maps_flutter_v3/MapboxMapsFlutterV3Plugin.swift new file mode 100644 index 000000000..39f6ca50a --- /dev/null +++ b/mapbox_maps_flutter_v3/ios/mapbox_maps_flutter_v3/Sources/mapbox_maps_flutter_v3/MapboxMapsFlutterV3Plugin.swift @@ -0,0 +1,19 @@ +import Flutter +import UIKit + +public class MapboxMapsFlutterV3Plugin: NSObject, FlutterPlugin { + public static func register(with registrar: FlutterPluginRegistrar) { + let channel = FlutterMethodChannel(name: "mapbox_maps_flutter_v3", binaryMessenger: registrar.messenger()) + let instance = MapboxMapsFlutterV3Plugin() + registrar.addMethodCallDelegate(instance, channel: channel) + } + + public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) { + switch call.method { + case "getPlatformVersion": + result("iOS " + UIDevice.current.systemVersion) + default: + result(FlutterMethodNotImplemented) + } + } +} diff --git a/mapbox_maps_flutter_v3/ios/mapbox_maps_flutter_v3/Sources/mapbox_maps_flutter_v3/PrivacyInfo.xcprivacy b/mapbox_maps_flutter_v3/ios/mapbox_maps_flutter_v3/Sources/mapbox_maps_flutter_v3/PrivacyInfo.xcprivacy new file mode 100644 index 000000000..a34b7e2e6 --- /dev/null +++ b/mapbox_maps_flutter_v3/ios/mapbox_maps_flutter_v3/Sources/mapbox_maps_flutter_v3/PrivacyInfo.xcprivacy @@ -0,0 +1,14 @@ + + + + + NSPrivacyTrackingDomains + + NSPrivacyAccessedAPITypes + + NSPrivacyCollectedDataTypes + + NSPrivacyTracking + + + diff --git a/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3.dart b/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3.dart new file mode 100644 index 000000000..f10cc7014 --- /dev/null +++ b/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3.dart @@ -0,0 +1,9 @@ +library; + +import 'dart:io'; + +import 'package:flutter/material.dart'; +import 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; + +part 'src/map_widget.dart'; +part 'src/mapbox_options.dart'; diff --git a/mapbox_maps_flutter_v3/lib/src/map_widget.dart b/mapbox_maps_flutter_v3/lib/src/map_widget.dart new file mode 100644 index 000000000..ec6181ee7 --- /dev/null +++ b/mapbox_maps_flutter_v3/lib/src/map_widget.dart @@ -0,0 +1,12 @@ +part of 'package:mapbox_maps_flutter_v3/mapbox_maps_flutter_v3.dart'; + +class MapWidget extends StatelessWidget { + final MapboxMapsFlutterPlatform _platform; + + MapWidget({super.key}) : _platform = MapboxMapsFlutterPlatform.instance; + + @override + Widget build(BuildContext context) { + return _platform.buildView(); + } +} diff --git a/mapbox_maps_flutter_v3/lib/src/mapbox_options.dart b/mapbox_maps_flutter_v3/lib/src/mapbox_options.dart new file mode 100644 index 000000000..bb65344bf --- /dev/null +++ b/mapbox_maps_flutter_v3/lib/src/mapbox_options.dart @@ -0,0 +1,22 @@ +part of 'package:mapbox_maps_flutter_v3/mapbox_maps_flutter_v3.dart'; + +/// A class that provides options and configurations for Mapbox services. +/// +/// This class includes methods to get and set the public access token, which is +/// required to access Mapbox resources. The access token can be retrieved or +/// updated using the static methods provided. +final class MapboxOptions { + /// The public access token that is used to access resources provided by Mapbox services. + /// For more information about public access tokens, see + /// [Mapbox Access Tokens](https://docs.mapbox.com/help/getting-started/access-tokens/#public-tokens). + static Future get accessToken async { + return MapboxMapsFlutterPlatform.instance.getAccessToken(); + } + + /// The public access token that is used to access resources provided by Mapbox services. + /// For more information about public access tokens, see + /// [Mapbox Access Tokens](https://docs.mapbox.com/help/getting-started/access-tokens/#public-tokens). + static setAccessToken(String token) { + MapboxMapsFlutterPlatform.instance.setAccessToken(token); + } +} diff --git a/mapbox_maps_flutter_v3/pubspec.yaml b/mapbox_maps_flutter_v3/pubspec.yaml new file mode 100644 index 000000000..21020d546 --- /dev/null +++ b/mapbox_maps_flutter_v3/pubspec.yaml @@ -0,0 +1,62 @@ +name: mapbox_maps_flutter_v3 # Update this name +description: "A new Flutter package project." +version: 0.0.1 +homepage: + +environment: + sdk: ^3.7.2 + flutter: ">=1.17.0" + +dependencies: + flutter: + sdk: flutter + mapbox_maps_flutter: any # Update this + mapbox_maps_flutter_interface: any + +dev_dependencies: + flutter_test: + sdk: flutter + flutter_lints: ^5.0.0 + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter packages. +flutter: + plugin: + platforms: + android: + default_package: mapbox_maps_flutter + ios: + default_package: mapbox_maps_flutter + + # To add assets to your package, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + # + # For details regarding assets in packages, see + # https://flutter.dev/to/asset-from-package + # + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/to/resolution-aware-images + + # To add custom fonts to your package, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts in packages, see + # https://flutter.dev/to/font-from-package diff --git a/mapbox_maps_flutter_v3/pubspec_overrides.yaml b/mapbox_maps_flutter_v3/pubspec_overrides.yaml new file mode 100644 index 000000000..982dd428a --- /dev/null +++ b/mapbox_maps_flutter_v3/pubspec_overrides.yaml @@ -0,0 +1,5 @@ +dependency_overrides: + mapbox_maps_flutter_interface: + path: ../mapbox_maps_flutter_interface + mapbox_maps_flutter: + path: ../mapbox_maps_flutter_mobile \ No newline at end of file From 2af57943ffd30104666778681ceea93bbeab8b73 Mon Sep 17 00:00:00 2001 From: Mai Mai Date: Thu, 8 May 2025 10:58:59 +0300 Subject: [PATCH 05/16] create mapbox_maps_flutter_web --- .../example/pubspec.yaml | 4 + mapbox_maps_flutter_v3/.metadata | 3 + mapbox_maps_flutter_v3/example/lib/main.dart | 5 + mapbox_maps_flutter_v3/example/pubspec.lock | 28 ++ mapbox_maps_flutter_v3/example/pubspec.yaml | 8 + .../example/pubspec_overrides.yaml | 5 - .../example/web/favicon.png | Bin 0 -> 917 bytes .../example/web/icons/Icon-192.png | Bin 0 -> 5292 bytes .../example/web/icons/Icon-512.png | Bin 0 -> 8252 bytes .../example/web/icons/Icon-maskable-192.png | Bin 0 -> 5594 bytes .../example/web/icons/Icon-maskable-512.png | Bin 0 -> 20998 bytes mapbox_maps_flutter_v3/example/web/index.html | 40 +++ .../example/web/manifest.json | 35 ++ ...mapbox_maps_flutter_v3_method_channel.dart | 17 + ...ox_maps_flutter_v3_platform_interface.dart | 29 ++ .../lib/mapbox_maps_flutter_v3_web.dart | 26 ++ mapbox_maps_flutter_v3/pubspec.yaml | 3 + mapbox_maps_flutter_v3/pubspec_overrides.yaml | 4 +- mapbox_maps_flutter_web/.gitignore | 33 ++ mapbox_maps_flutter_web/.metadata | 30 ++ mapbox_maps_flutter_web/CHANGELOG.md | 3 + mapbox_maps_flutter_web/LICENSE | 1 + mapbox_maps_flutter_web/README.md | 15 + mapbox_maps_flutter_web/analysis_options.yaml | 4 + mapbox_maps_flutter_web/example/.gitignore | 45 +++ mapbox_maps_flutter_web/example/README.md | 16 + .../example/analysis_options.yaml | 28 ++ mapbox_maps_flutter_web/example/lib/main.dart | 58 ++++ mapbox_maps_flutter_web/example/pubspec.lock | 303 ++++++++++++++++++ mapbox_maps_flutter_web/example/pubspec.yaml | 89 +++++ .../example/test/widget_test.dart | 27 ++ .../example/web/favicon.png | Bin 0 -> 917 bytes .../example/web/icons/Icon-192.png | Bin 0 -> 5292 bytes .../example/web/icons/Icon-512.png | Bin 0 -> 8252 bytes .../example/web/icons/Icon-maskable-192.png | Bin 0 -> 5594 bytes .../example/web/icons/Icon-maskable-512.png | Bin 0 -> 20998 bytes .../example/web/index.html | 38 +++ .../example/web/manifest.json | 35 ++ .../lib/mapbox_maps_flutter_web.dart | 3 + mapbox_maps_flutter_web/lib/src/bindings.dart | 20 ++ .../lib/src/mapbox_maps_flutter_web.dart | 72 +++++ mapbox_maps_flutter_web/pubspec.yaml | 75 +++++ .../pubspec_overrides.yaml | 2 +- 43 files changed, 1097 insertions(+), 7 deletions(-) delete mode 100644 mapbox_maps_flutter_v3/example/pubspec_overrides.yaml create mode 100644 mapbox_maps_flutter_v3/example/web/favicon.png create mode 100644 mapbox_maps_flutter_v3/example/web/icons/Icon-192.png create mode 100644 mapbox_maps_flutter_v3/example/web/icons/Icon-512.png create mode 100644 mapbox_maps_flutter_v3/example/web/icons/Icon-maskable-192.png create mode 100644 mapbox_maps_flutter_v3/example/web/icons/Icon-maskable-512.png create mode 100644 mapbox_maps_flutter_v3/example/web/index.html create mode 100644 mapbox_maps_flutter_v3/example/web/manifest.json create mode 100644 mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_method_channel.dart create mode 100644 mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_platform_interface.dart create mode 100644 mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_web.dart create mode 100644 mapbox_maps_flutter_web/.gitignore create mode 100644 mapbox_maps_flutter_web/.metadata create mode 100644 mapbox_maps_flutter_web/CHANGELOG.md create mode 100644 mapbox_maps_flutter_web/LICENSE create mode 100644 mapbox_maps_flutter_web/README.md create mode 100644 mapbox_maps_flutter_web/analysis_options.yaml create mode 100644 mapbox_maps_flutter_web/example/.gitignore create mode 100644 mapbox_maps_flutter_web/example/README.md create mode 100644 mapbox_maps_flutter_web/example/analysis_options.yaml create mode 100644 mapbox_maps_flutter_web/example/lib/main.dart create mode 100644 mapbox_maps_flutter_web/example/pubspec.lock create mode 100644 mapbox_maps_flutter_web/example/pubspec.yaml create mode 100644 mapbox_maps_flutter_web/example/test/widget_test.dart create mode 100644 mapbox_maps_flutter_web/example/web/favicon.png create mode 100644 mapbox_maps_flutter_web/example/web/icons/Icon-192.png create mode 100644 mapbox_maps_flutter_web/example/web/icons/Icon-512.png create mode 100644 mapbox_maps_flutter_web/example/web/icons/Icon-maskable-192.png create mode 100644 mapbox_maps_flutter_web/example/web/icons/Icon-maskable-512.png create mode 100644 mapbox_maps_flutter_web/example/web/index.html create mode 100644 mapbox_maps_flutter_web/example/web/manifest.json create mode 100644 mapbox_maps_flutter_web/lib/mapbox_maps_flutter_web.dart create mode 100644 mapbox_maps_flutter_web/lib/src/bindings.dart create mode 100644 mapbox_maps_flutter_web/lib/src/mapbox_maps_flutter_web.dart create mode 100644 mapbox_maps_flutter_web/pubspec.yaml rename {mapbox_maps_flutter_mobile/example => mapbox_maps_flutter_web}/pubspec_overrides.yaml (55%) diff --git a/mapbox_maps_flutter_mobile/example/pubspec.yaml b/mapbox_maps_flutter_mobile/example/pubspec.yaml index dc009f745..af60343e1 100644 --- a/mapbox_maps_flutter_mobile/example/pubspec.yaml +++ b/mapbox_maps_flutter_mobile/example/pubspec.yaml @@ -27,6 +27,10 @@ dependencies: http: ^1.3.0 path_provider: ^2.1.3 +dependency_overrides: + mapbox_maps_flutter_interface: + path: ../../mapbox_maps_flutter_interface + dev_dependencies: flutter_test: sdk: flutter diff --git a/mapbox_maps_flutter_v3/.metadata b/mapbox_maps_flutter_v3/.metadata index cff4c42e1..72a27dc70 100644 --- a/mapbox_maps_flutter_v3/.metadata +++ b/mapbox_maps_flutter_v3/.metadata @@ -21,6 +21,9 @@ migration: - platform: ios create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + - platform: web + create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf # User provided section diff --git a/mapbox_maps_flutter_v3/example/lib/main.dart b/mapbox_maps_flutter_v3/example/lib/main.dart index 4734c2d67..ae7879e15 100644 --- a/mapbox_maps_flutter_v3/example/lib/main.dart +++ b/mapbox_maps_flutter_v3/example/lib/main.dart @@ -14,9 +14,14 @@ class MyApp extends StatefulWidget { } class _MyAppState extends State { + static const String ACCESS_TOKEN = String.fromEnvironment( + "MAPBOX_ACCESS_TOKEN", + ); + @override void initState() { super.initState(); + MapboxOptions.setAccessToken(ACCESS_TOKEN); } @override diff --git a/mapbox_maps_flutter_v3/example/pubspec.lock b/mapbox_maps_flutter_v3/example/pubspec.lock index 41b6f105c..e0fe7c3d4 100644 --- a/mapbox_maps_flutter_v3/example/pubspec.lock +++ b/mapbox_maps_flutter_v3/example/pubspec.lock @@ -120,6 +120,11 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" fuchsia_remote_debug_protocol: dependency: transitive description: flutter @@ -199,6 +204,13 @@ packages: relative: true source: path version: "0.0.1" + mapbox_maps_flutter_web: + dependency: "direct overridden" + description: + path: "../../mapbox_maps_flutter_web" + relative: true + source: path + version: "0.0.1" matcher: dependency: transitive description: @@ -239,6 +251,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.6" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" + source: hosted + version: "2.1.8" process: dependency: transitive description: @@ -372,6 +392,14 @@ packages: url: "https://pub.dev" source: hosted version: "14.3.1" + web: + dependency: transitive + description: + name: web + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" + url: "https://pub.dev" + source: hosted + version: "1.1.1" webdriver: dependency: transitive description: diff --git a/mapbox_maps_flutter_v3/example/pubspec.yaml b/mapbox_maps_flutter_v3/example/pubspec.yaml index d213d8eee..5acc3c21d 100644 --- a/mapbox_maps_flutter_v3/example/pubspec.yaml +++ b/mapbox_maps_flutter_v3/example/pubspec.yaml @@ -29,6 +29,14 @@ dependencies: # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.8 +dependency_overrides: + mapbox_maps_flutter_interface: + path: ../../mapbox_maps_flutter_interface + mapbox_maps_flutter: + path: ../../mapbox_maps_flutter_mobile + mapbox_maps_flutter_web: + path: ../../mapbox_maps_flutter_web + dev_dependencies: integration_test: sdk: flutter diff --git a/mapbox_maps_flutter_v3/example/pubspec_overrides.yaml b/mapbox_maps_flutter_v3/example/pubspec_overrides.yaml deleted file mode 100644 index 83092298e..000000000 --- a/mapbox_maps_flutter_v3/example/pubspec_overrides.yaml +++ /dev/null @@ -1,5 +0,0 @@ -dependency_overrides: - mapbox_maps_flutter_interface: - path: ../../mapbox_maps_flutter_interface - mapbox_maps_flutter: - path: ../../mapbox_maps_flutter_mobile \ No newline at end of file diff --git a/mapbox_maps_flutter_v3/example/web/favicon.png b/mapbox_maps_flutter_v3/example/web/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..8aaa46ac1ae21512746f852a42ba87e4165dfdd1 GIT binary patch literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/web/icons/Icon-192.png b/mapbox_maps_flutter_v3/example/web/icons/Icon-192.png new file mode 100644 index 0000000000000000000000000000000000000000..b749bfef07473333cf1dd31e9eed89862a5d52aa GIT binary patch literal 5292 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 literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/web/icons/Icon-512.png b/mapbox_maps_flutter_v3/example/web/icons/Icon-512.png new file mode 100644 index 0000000000000000000000000000000000000000..88cfd48dff1169879ba46840804b412fe02fefd6 GIT binary patch literal 8252 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 literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/web/icons/Icon-maskable-192.png b/mapbox_maps_flutter_v3/example/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000000000000000000000000000000000000..eb9b4d76e525556d5d89141648c724331630325d GIT binary patch literal 5594 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 X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/web/icons/Icon-maskable-512.png b/mapbox_maps_flutter_v3/example/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000000000000000000000000000000000000..d69c56691fbdb0b7efa65097c7cc1edac12a6d3e GIT binary patch literal 20998 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 MPgg&ebxsLQ025IeI{*Lx literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_v3/example/web/index.html b/mapbox_maps_flutter_v3/example/web/index.html new file mode 100644 index 000000000..7e6a28bb8 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/web/index.html @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + mapbox_maps_flutter_v3_example + + + + + + + + diff --git a/mapbox_maps_flutter_v3/example/web/manifest.json b/mapbox_maps_flutter_v3/example/web/manifest.json new file mode 100644 index 000000000..bfbc8e97c --- /dev/null +++ b/mapbox_maps_flutter_v3/example/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "mapbox_maps_flutter_v3_example", + "short_name": "mapbox_maps_flutter_v3_example", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "Demonstrates how to use the mapbox_maps_flutter_v3 plugin.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_method_channel.dart b/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_method_channel.dart new file mode 100644 index 000000000..d249e363e --- /dev/null +++ b/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_method_channel.dart @@ -0,0 +1,17 @@ +import 'package:flutter/foundation.dart'; +import 'package:flutter/services.dart'; + +import 'mapbox_maps_flutter_v3_platform_interface.dart'; + +/// An implementation of [MapboxMapsFlutterV3Platform] that uses method channels. +class MethodChannelMapboxMapsFlutterV3 extends MapboxMapsFlutterV3Platform { + /// The method channel used to interact with the native platform. + @visibleForTesting + final methodChannel = const MethodChannel('mapbox_maps_flutter_v3'); + + @override + Future getPlatformVersion() async { + final version = await methodChannel.invokeMethod('getPlatformVersion'); + return version; + } +} diff --git a/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_platform_interface.dart b/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_platform_interface.dart new file mode 100644 index 000000000..9dbf7c222 --- /dev/null +++ b/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_platform_interface.dart @@ -0,0 +1,29 @@ +import 'package:plugin_platform_interface/plugin_platform_interface.dart'; + +import 'mapbox_maps_flutter_v3_method_channel.dart'; + +abstract class MapboxMapsFlutterV3Platform extends PlatformInterface { + /// Constructs a MapboxMapsFlutterV3Platform. + MapboxMapsFlutterV3Platform() : super(token: _token); + + static final Object _token = Object(); + + static MapboxMapsFlutterV3Platform _instance = MethodChannelMapboxMapsFlutterV3(); + + /// The default instance of [MapboxMapsFlutterV3Platform] to use. + /// + /// Defaults to [MethodChannelMapboxMapsFlutterV3]. + static MapboxMapsFlutterV3Platform get instance => _instance; + + /// Platform-specific implementations should set this with their own + /// platform-specific class that extends [MapboxMapsFlutterV3Platform] when + /// they register themselves. + static set instance(MapboxMapsFlutterV3Platform instance) { + PlatformInterface.verifyToken(instance, _token); + _instance = instance; + } + + Future getPlatformVersion() { + throw UnimplementedError('platformVersion() has not been implemented.'); + } +} diff --git a/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_web.dart b/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_web.dart new file mode 100644 index 000000000..423a10a57 --- /dev/null +++ b/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_web.dart @@ -0,0 +1,26 @@ +// In order to *not* need this ignore, consider extracting the "web" version +// of your plugin as a separate package, instead of inlining it in the same +// package as the core of your plugin. +// ignore: avoid_web_libraries_in_flutter + +import 'package:flutter_web_plugins/flutter_web_plugins.dart'; +import 'package:web/web.dart' as web; + +import 'mapbox_maps_flutter_v3_platform_interface.dart'; + +/// A web implementation of the MapboxMapsFlutterV3Platform of the MapboxMapsFlutterV3 plugin. +class MapboxMapsFlutterV3Web extends MapboxMapsFlutterV3Platform { + /// Constructs a MapboxMapsFlutterV3Web + MapboxMapsFlutterV3Web(); + + static void registerWith(Registrar registrar) { + MapboxMapsFlutterV3Platform.instance = MapboxMapsFlutterV3Web(); + } + + /// Returns a [String] containing the version of the platform. + @override + Future getPlatformVersion() async { + final version = web.window.navigator.userAgent; + return version; + } +} diff --git a/mapbox_maps_flutter_v3/pubspec.yaml b/mapbox_maps_flutter_v3/pubspec.yaml index 21020d546..f0b5d4bb4 100644 --- a/mapbox_maps_flutter_v3/pubspec.yaml +++ b/mapbox_maps_flutter_v3/pubspec.yaml @@ -12,6 +12,7 @@ dependencies: sdk: flutter mapbox_maps_flutter: any # Update this mapbox_maps_flutter_interface: any + mapbox_maps_flutter_web: any dev_dependencies: flutter_test: @@ -29,6 +30,8 @@ flutter: default_package: mapbox_maps_flutter ios: default_package: mapbox_maps_flutter + web: + default_package: mapbox_maps_flutter_web # To add assets to your package, add an assets section, like this: # assets: diff --git a/mapbox_maps_flutter_v3/pubspec_overrides.yaml b/mapbox_maps_flutter_v3/pubspec_overrides.yaml index 982dd428a..8049a004c 100644 --- a/mapbox_maps_flutter_v3/pubspec_overrides.yaml +++ b/mapbox_maps_flutter_v3/pubspec_overrides.yaml @@ -2,4 +2,6 @@ dependency_overrides: mapbox_maps_flutter_interface: path: ../mapbox_maps_flutter_interface mapbox_maps_flutter: - path: ../mapbox_maps_flutter_mobile \ No newline at end of file + path: ../mapbox_maps_flutter_mobile + mapbox_maps_flutter_web: + path: ../mapbox_maps_flutter_web \ No newline at end of file diff --git a/mapbox_maps_flutter_web/.gitignore b/mapbox_maps_flutter_web/.gitignore new file mode 100644 index 000000000..e7d347d9d --- /dev/null +++ b/mapbox_maps_flutter_web/.gitignore @@ -0,0 +1,33 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.build/ +.buildlog/ +.history +.svn/ +.swiftpm/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. +/pubspec.lock +**/doc/api/ +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +build/ diff --git a/mapbox_maps_flutter_web/.metadata b/mapbox_maps_flutter_web/.metadata new file mode 100644 index 000000000..b0ba0f55c --- /dev/null +++ b/mapbox_maps_flutter_web/.metadata @@ -0,0 +1,30 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "c23637390482d4cf9598c3ce3f2be31aa7332daf" + channel: "stable" + +project_type: plugin + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + - platform: web + create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/mapbox_maps_flutter_web/CHANGELOG.md b/mapbox_maps_flutter_web/CHANGELOG.md new file mode 100644 index 000000000..41cc7d819 --- /dev/null +++ b/mapbox_maps_flutter_web/CHANGELOG.md @@ -0,0 +1,3 @@ +## 0.0.1 + +* TODO: Describe initial release. diff --git a/mapbox_maps_flutter_web/LICENSE b/mapbox_maps_flutter_web/LICENSE new file mode 100644 index 000000000..ba75c69f7 --- /dev/null +++ b/mapbox_maps_flutter_web/LICENSE @@ -0,0 +1 @@ +TODO: Add your license here. diff --git a/mapbox_maps_flutter_web/README.md b/mapbox_maps_flutter_web/README.md new file mode 100644 index 000000000..5ec24a4cf --- /dev/null +++ b/mapbox_maps_flutter_web/README.md @@ -0,0 +1,15 @@ +# mapbox_maps_flutter_web + +A new Flutter plugin project. + +## Getting Started + +This project is a starting point for a Flutter +[plug-in package](https://flutter.dev/to/develop-plugins), +a specialized package that includes platform-specific implementation code for +Android and/or iOS. + +For help getting started with Flutter development, view the +[online documentation](https://docs.flutter.dev), which offers tutorials, +samples, guidance on mobile development, and a full API reference. + diff --git a/mapbox_maps_flutter_web/analysis_options.yaml b/mapbox_maps_flutter_web/analysis_options.yaml new file mode 100644 index 000000000..a5744c1cf --- /dev/null +++ b/mapbox_maps_flutter_web/analysis_options.yaml @@ -0,0 +1,4 @@ +include: package:flutter_lints/flutter.yaml + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/mapbox_maps_flutter_web/example/.gitignore b/mapbox_maps_flutter_web/example/.gitignore new file mode 100644 index 000000000..79c113f9b --- /dev/null +++ b/mapbox_maps_flutter_web/example/.gitignore @@ -0,0 +1,45 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.build/ +.buildlog/ +.history +.svn/ +.swiftpm/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/mapbox_maps_flutter_web/example/README.md b/mapbox_maps_flutter_web/example/README.md new file mode 100644 index 000000000..7effe2a48 --- /dev/null +++ b/mapbox_maps_flutter_web/example/README.md @@ -0,0 +1,16 @@ +# mapbox_maps_flutter_web_example + +Demonstrates how to use the mapbox_maps_flutter_web plugin. + +## Getting Started + +This project is a starting point for a Flutter application. + +A few resources to get you started if this is your first Flutter project: + +- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) +- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) + +For help getting started with Flutter development, view the +[online documentation](https://docs.flutter.dev/), which offers tutorials, +samples, guidance on mobile development, and a full API reference. diff --git a/mapbox_maps_flutter_web/example/analysis_options.yaml b/mapbox_maps_flutter_web/example/analysis_options.yaml new file mode 100644 index 000000000..0d2902135 --- /dev/null +++ b/mapbox_maps_flutter_web/example/analysis_options.yaml @@ -0,0 +1,28 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at https://dart.dev/lints. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/mapbox_maps_flutter_web/example/lib/main.dart b/mapbox_maps_flutter_web/example/lib/main.dart new file mode 100644 index 000000000..787b48c0e --- /dev/null +++ b/mapbox_maps_flutter_web/example/lib/main.dart @@ -0,0 +1,58 @@ +import 'package:flutter/material.dart'; +import 'dart:async'; + +import 'package:flutter/services.dart'; +import 'package:mapbox_maps_flutter_web/mapbox_maps_flutter_web.dart'; + +void main() { + runApp(const MyApp()); +} + +class MyApp extends StatefulWidget { + const MyApp({super.key}); + + @override + State createState() => _MyAppState(); +} + +class _MyAppState extends State { + String _platformVersion = 'Unknown'; + final _mapboxMapsFlutterWebPlugin = MapboxMapsFlutterWeb(); + + @override + void initState() { + super.initState(); + initPlatformState(); + } + + // Platform messages are asynchronous, so we initialize in an async method. + Future initPlatformState() async { + String platformVersion; + // Platform messages may fail, so we use a try/catch PlatformException. + // We also handle the message potentially returning null. + try { + platformVersion = 'Unknown platform version'; + } on PlatformException { + platformVersion = 'Failed to get platform version.'; + } + + // If the widget was removed from the tree while the asynchronous platform + // message was in flight, we want to discard the reply rather than calling + // setState to update our non-existent appearance. + if (!mounted) return; + + setState(() { + _platformVersion = platformVersion; + }); + } + + @override + Widget build(BuildContext context) { + return MaterialApp( + home: Scaffold( + appBar: AppBar(title: const Text('Plugin example app')), + body: Center(child: Text('Running on: $_platformVersion\n')), + ), + ); + } +} diff --git a/mapbox_maps_flutter_web/example/pubspec.lock b/mapbox_maps_flutter_web/example/pubspec.lock new file mode 100644 index 000000000..eece9cc45 --- /dev/null +++ b/mapbox_maps_flutter_web/example/pubspec.lock @@ -0,0 +1,303 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + async: + dependency: transitive + description: + name: async + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" + url: "https://pub.dev" + source: hosted + version: "2.13.0" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + characters: + dependency: transitive + description: + name: characters + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + clock: + dependency: transitive + description: + name: clock + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b + url: "https://pub.dev" + source: hosted + version: "1.1.2" + collection: + dependency: transitive + description: + name: collection + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://pub.dev" + source: hosted + version: "1.19.1" + cupertino_icons: + dependency: "direct main" + description: + name: cupertino_icons + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 + url: "https://pub.dev" + source: hosted + version: "1.0.8" + fake_async: + dependency: transitive + description: + name: fake_async + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" + url: "https://pub.dev" + source: hosted + version: "1.3.3" + file: + dependency: transitive + description: + name: file + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 + url: "https://pub.dev" + source: hosted + version: "7.0.1" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_driver: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" + url: "https://pub.dev" + source: hosted + version: "5.0.0" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + fuchsia_remote_debug_protocol: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + integration_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec + url: "https://pub.dev" + source: hosted + version: "10.0.8" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 + url: "https://pub.dev" + source: hosted + version: "3.0.9" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" + lints: + dependency: transitive + description: + name: lints + sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 + url: "https://pub.dev" + source: hosted + version: "5.1.1" + mapbox_maps_flutter_interface: + dependency: "direct overridden" + description: + path: "../../mapbox_maps_flutter_interface" + relative: true + source: path + version: "0.0.1" + mapbox_maps_flutter_web: + dependency: "direct main" + description: + path: ".." + relative: true + source: path + version: "0.0.1" + matcher: + dependency: transitive + description: + name: matcher + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + url: "https://pub.dev" + source: hosted + version: "0.12.17" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + url: "https://pub.dev" + source: hosted + version: "0.11.1" + meta: + dependency: transitive + description: + name: meta + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + url: "https://pub.dev" + source: hosted + version: "1.16.0" + path: + dependency: transitive + description: + name: path + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + platform: + dependency: transitive + description: + name: platform + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" + url: "https://pub.dev" + source: hosted + version: "3.1.6" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" + source: hosted + version: "2.1.8" + process: + dependency: transitive + description: + name: process + sha256: "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d" + url: "https://pub.dev" + source: hosted + version: "5.0.3" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + source_span: + dependency: transitive + description: + name: source_span + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" + url: "https://pub.dev" + source: hosted + version: "1.10.1" + stack_trace: + dependency: transitive + description: + name: stack_trace + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + url: "https://pub.dev" + source: hosted + version: "1.12.1" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + url: "https://pub.dev" + source: hosted + version: "1.4.1" + sync_http: + dependency: transitive + description: + name: sync_http + sha256: "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961" + url: "https://pub.dev" + source: hosted + version: "0.3.1" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + url: "https://pub.dev" + source: hosted + version: "1.2.2" + test_api: + dependency: transitive + description: + name: test_api + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + url: "https://pub.dev" + source: hosted + version: "0.7.4" + vector_math: + dependency: transitive + description: + name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" + url: "https://pub.dev" + source: hosted + version: "14.3.1" + web: + dependency: transitive + description: + name: web + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" + url: "https://pub.dev" + source: hosted + version: "1.1.1" + webdriver: + dependency: transitive + description: + name: webdriver + sha256: "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade" + url: "https://pub.dev" + source: hosted + version: "3.1.0" +sdks: + dart: ">=3.7.2 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/mapbox_maps_flutter_web/example/pubspec.yaml b/mapbox_maps_flutter_web/example/pubspec.yaml new file mode 100644 index 000000000..b5becde39 --- /dev/null +++ b/mapbox_maps_flutter_web/example/pubspec.yaml @@ -0,0 +1,89 @@ +name: mapbox_maps_flutter_web_example +description: "Demonstrates how to use the mapbox_maps_flutter_web plugin." +# The following line prevents the package from being accidentally published to +# pub.dev using `flutter pub publish`. This is preferred for private packages. +publish_to: 'none' # Remove this line if you wish to publish to pub.dev + +environment: + sdk: ^3.7.2 + +# Dependencies specify other packages that your package needs in order to work. +# To automatically upgrade your package dependencies to the latest versions +# consider running `flutter pub upgrade --major-versions`. Alternatively, +# dependencies can be manually updated by changing the version numbers below to +# the latest version available on pub.dev. To see which dependencies have newer +# versions available, run `flutter pub outdated`. +dependencies: + flutter: + sdk: flutter + + mapbox_maps_flutter_web: + # When depending on this package from a real application you should use: + # mapbox_maps_flutter_web: ^x.y.z + # See https://dart.dev/tools/pub/dependencies#version-constraints + # The example app is bundled with the plugin so we use a path dependency on + # the parent directory to use the current plugin's version. + path: ../ + + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^1.0.8 + +dependency_overrides: + mapbox_maps_flutter_interface: + path: ../../mapbox_maps_flutter_interface + +dev_dependencies: + integration_test: + sdk: flutter + flutter_test: + sdk: flutter + + # The "flutter_lints" package below contains a set of recommended lints to + # encourage good coding practices. The lint set provided by the package is + # activated in the `analysis_options.yaml` file located at the root of your + # package. See that file for information about deactivating specific lint + # rules and activating additional ones. + flutter_lints: ^5.0.0 + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter packages. +flutter: + + # The following line ensures that the Material Icons font is + # included with your application, so that you can use the icons in + # the material Icons class. + uses-material-design: true + + # To add assets to your application, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/to/resolution-aware-images + + # For details regarding adding assets from package dependencies, see + # https://flutter.dev/to/asset-from-package + + # To add custom fonts to your application, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts from package dependencies, + # see https://flutter.dev/to/font-from-package diff --git a/mapbox_maps_flutter_web/example/test/widget_test.dart b/mapbox_maps_flutter_web/example/test/widget_test.dart new file mode 100644 index 000000000..bcec5bab4 --- /dev/null +++ b/mapbox_maps_flutter_web/example/test/widget_test.dart @@ -0,0 +1,27 @@ +// This is a basic Flutter widget test. +// +// To perform an interaction with a widget in your test, use the WidgetTester +// utility in the flutter_test package. For example, you can send tap and scroll +// gestures. You can also use WidgetTester to find child widgets in the widget +// tree, read text, and verify that the values of widget properties are correct. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +import 'package:mapbox_maps_flutter_web_example/main.dart'; + +void main() { + testWidgets('Verify Platform version', (WidgetTester tester) async { + // Build our app and trigger a frame. + await tester.pumpWidget(const MyApp()); + + // Verify that platform version is retrieved. + expect( + find.byWidgetPredicate( + (Widget widget) => widget is Text && + widget.data!.startsWith('Running on:'), + ), + findsOneWidget, + ); + }); +} diff --git a/mapbox_maps_flutter_web/example/web/favicon.png b/mapbox_maps_flutter_web/example/web/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..8aaa46ac1ae21512746f852a42ba87e4165dfdd1 GIT binary patch literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_web/example/web/icons/Icon-192.png b/mapbox_maps_flutter_web/example/web/icons/Icon-192.png new file mode 100644 index 0000000000000000000000000000000000000000..b749bfef07473333cf1dd31e9eed89862a5d52aa GIT binary patch literal 5292 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 literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_web/example/web/icons/Icon-512.png b/mapbox_maps_flutter_web/example/web/icons/Icon-512.png new file mode 100644 index 0000000000000000000000000000000000000000..88cfd48dff1169879ba46840804b412fe02fefd6 GIT binary patch literal 8252 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 literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_web/example/web/icons/Icon-maskable-192.png b/mapbox_maps_flutter_web/example/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000000000000000000000000000000000000..eb9b4d76e525556d5d89141648c724331630325d GIT binary patch literal 5594 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 X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_web/example/web/icons/Icon-maskable-512.png b/mapbox_maps_flutter_web/example/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000000000000000000000000000000000000..d69c56691fbdb0b7efa65097c7cc1edac12a6d3e GIT binary patch literal 20998 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 MPgg&ebxsLQ025IeI{*Lx literal 0 HcmV?d00001 diff --git a/mapbox_maps_flutter_web/example/web/index.html b/mapbox_maps_flutter_web/example/web/index.html new file mode 100644 index 000000000..f931ada07 --- /dev/null +++ b/mapbox_maps_flutter_web/example/web/index.html @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + mapbox_maps_flutter_web_example + + + + + + diff --git a/mapbox_maps_flutter_web/example/web/manifest.json b/mapbox_maps_flutter_web/example/web/manifest.json new file mode 100644 index 000000000..36814e864 --- /dev/null +++ b/mapbox_maps_flutter_web/example/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "mapbox_maps_flutter_web_example", + "short_name": "mapbox_maps_flutter_web_example", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "Demonstrates how to use the mapbox_maps_flutter_web plugin.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/mapbox_maps_flutter_web/lib/mapbox_maps_flutter_web.dart b/mapbox_maps_flutter_web/lib/mapbox_maps_flutter_web.dart new file mode 100644 index 000000000..92498fdfe --- /dev/null +++ b/mapbox_maps_flutter_web/lib/mapbox_maps_flutter_web.dart @@ -0,0 +1,3 @@ +library; + +export 'src/mapbox_maps_flutter_web.dart'; diff --git a/mapbox_maps_flutter_web/lib/src/bindings.dart b/mapbox_maps_flutter_web/lib/src/bindings.dart new file mode 100644 index 000000000..44394d9a0 --- /dev/null +++ b/mapbox_maps_flutter_web/lib/src/bindings.dart @@ -0,0 +1,20 @@ +@JS('mapboxgl') +library; + +import 'dart:js_interop'; + +import 'package:web/web.dart'; + +@JS() +external String accessToken; + +@JS() +@anonymous +extension type MapOptions._(JSObject _) implements JSObject { + external factory MapOptions({required HTMLDivElement container}); +} + +extension type Map._(JSObject _) implements JSObject { + external Map(MapOptions container); + external void on(String event, JSFunction callback); +} diff --git a/mapbox_maps_flutter_web/lib/src/mapbox_maps_flutter_web.dart b/mapbox_maps_flutter_web/lib/src/mapbox_maps_flutter_web.dart new file mode 100644 index 000000000..86cde07e9 --- /dev/null +++ b/mapbox_maps_flutter_web/lib/src/mapbox_maps_flutter_web.dart @@ -0,0 +1,72 @@ +import 'dart:js_interop'; +import 'dart:ui_web'; + +import 'package:flutter/widgets.dart'; +import 'package:flutter_web_plugins/flutter_web_plugins.dart'; +import 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; +import 'package:mapbox_maps_flutter_web/src/bindings.dart'; +import 'package:web/web.dart'; + +const mapboxGlCss = 'https://api.mapbox.com/mapbox-gl-js/v3.11.1/mapbox-gl.css'; + +base class MapboxMapsFlutterWeb extends MapboxMapsFlutterPlatform { + /// Registers the platform implementation. + static void registerWith(Registrar registrar) { + MapboxMapsFlutterPlatform.instance = MapboxMapsFlutterWeb(); + } + + late HTMLDivElement _mapElement; + + @override + Widget buildView({OnPlatformViewCreated? onPlatformViewCreated}) { + final viewType = 'mapbox-maps-flutter-web/$hashCode'; + + // Attach the mapDiv to the DOM + platformViewRegistry.registerViewFactory(viewType, (int id) { + _mapElement = + document.createElement("div") as HTMLDivElement + ..style.position = 'absolute' + ..style.top = '0' + ..style.bottom = '0' + ..style.height = '100%' + ..style.width = '100%'; + + _initMap(); + return _mapElement; + }); + return HtmlElementView( + viewType: viewType, + onPlatformViewCreated: (int viewId) { + if (onPlatformViewCreated != null) { + onPlatformViewCreated(viewId); + } + }, + ); + } + + _initMap() async { + final link = + document.createElement('link') as HTMLLinkElement + ..rel = 'stylesheet' + ..href = mapboxGlCss + ..type = 'text/css'; + _mapElement.append(link); + + await link.onLoad.first; + + final options = MapOptions(container: _mapElement); + final nativeMap = Map(options); + + nativeMap.on('load', (() {}).toJS); + } + + @override + Future getAccessToken() { + return Future.value(accessToken); + } + + @override + void setAccessToken(String token) { + accessToken = token; + } +} diff --git a/mapbox_maps_flutter_web/pubspec.yaml b/mapbox_maps_flutter_web/pubspec.yaml new file mode 100644 index 000000000..659670293 --- /dev/null +++ b/mapbox_maps_flutter_web/pubspec.yaml @@ -0,0 +1,75 @@ +name: mapbox_maps_flutter_web +description: "A new Flutter plugin project." +version: 0.0.1 +homepage: + +environment: + sdk: ^3.7.2 + flutter: '>=3.3.0' + +dependencies: + flutter: + sdk: flutter + flutter_web_plugins: + sdk: flutter + web: ^1.0.0 + plugin_platform_interface: ^2.0.2 + mapbox_maps_flutter_interface: any + +dev_dependencies: + flutter_test: + sdk: flutter + flutter_lints: ^5.0.0 + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter packages. +flutter: + # This section identifies this Flutter project as a plugin project. + # The 'pluginClass' specifies the class (in Java, Kotlin, Swift, Objective-C, etc.) + # which should be registered in the plugin registry. This is required for + # using method channels. + # The Android 'package' specifies package in which the registered class is. + # This is required for using method channels on Android. + # The 'ffiPlugin' specifies that native code should be built and bundled. + # This is required for using `dart:ffi`. + # All these are used by the tooling to maintain consistency when + # adding or updating assets for this project. + plugin: + platforms: + implements: mapbox_maps_flutter_interface + web: + pluginClass: MapboxMapsFlutterWeb + fileName: src/mapbox_maps_flutter_web.dart + + # To add assets to your plugin package, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + # + # For details regarding assets in packages, see + # https://flutter.dev/to/asset-from-package + # + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/to/resolution-aware-images + + # To add custom fonts to your plugin package, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts in packages, see + # https://flutter.dev/to/font-from-package diff --git a/mapbox_maps_flutter_mobile/example/pubspec_overrides.yaml b/mapbox_maps_flutter_web/pubspec_overrides.yaml similarity index 55% rename from mapbox_maps_flutter_mobile/example/pubspec_overrides.yaml rename to mapbox_maps_flutter_web/pubspec_overrides.yaml index dd2f69e3d..93a8127cf 100644 --- a/mapbox_maps_flutter_mobile/example/pubspec_overrides.yaml +++ b/mapbox_maps_flutter_web/pubspec_overrides.yaml @@ -1,3 +1,3 @@ dependency_overrides: mapbox_maps_flutter_interface: - path: ../../mapbox_maps_flutter_interface \ No newline at end of file + path: ../mapbox_maps_flutter_interface \ No newline at end of file From 3e4c25459ac1f51a13fefe96b2097a393c4bd6ac Mon Sep 17 00:00:00 2001 From: Mai Mai Date: Thu, 8 May 2025 13:41:00 +0300 Subject: [PATCH 06/16] mobile onPlatformViewCreated --- ...apbox_maps_flutter_platform_interface.dart | 10 +------ .../lib/src/callbacks.dart | 2 +- .../lib/src/mapbox_maps_flutter_mobile.dart | 2 +- ...mapbox_maps_flutter_v3_method_channel.dart | 17 ----------- ...ox_maps_flutter_v3_platform_interface.dart | 29 ------------------- .../lib/mapbox_maps_flutter_v3_web.dart | 26 ----------------- .../lib/src/mapbox_maps_flutter_web.dart | 11 ++----- 7 files changed, 5 insertions(+), 92 deletions(-) delete mode 100644 mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_method_channel.dart delete mode 100644 mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_platform_interface.dart delete mode 100644 mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_web.dart diff --git a/mapbox_maps_flutter_interface/lib/src/mapbox_maps_flutter_platform_interface.dart b/mapbox_maps_flutter_interface/lib/src/mapbox_maps_flutter_platform_interface.dart index aaf464e4d..d5f49955c 100644 --- a/mapbox_maps_flutter_interface/lib/src/mapbox_maps_flutter_platform_interface.dart +++ b/mapbox_maps_flutter_interface/lib/src/mapbox_maps_flutter_platform_interface.dart @@ -38,13 +38,5 @@ abstract base class MapboxMapsFlutterPlatform { /// /// This method is responsible for creating the widget that integrates /// with the underlying platform's view system to render the map. - /// - /// The [onPlatformViewCreated] callback is invoked when the platform-specific - /// view is created. It provides a way to interact with the platform view - /// after it has been initialized. - /// - /// - [onPlatformViewCreated]: A callback function that is triggered when the - /// platform view is created. It can be used to perform additional setup - /// or configuration. - Widget buildView({OnPlatformViewCreated? onPlatformViewCreated}); + Widget buildView(); } diff --git a/mapbox_maps_flutter_mobile/lib/src/callbacks.dart b/mapbox_maps_flutter_mobile/lib/src/callbacks.dart index 980f8e9d1..7337dbcc8 100644 --- a/mapbox_maps_flutter_mobile/lib/src/callbacks.dart +++ b/mapbox_maps_flutter_mobile/lib/src/callbacks.dart @@ -1,7 +1,7 @@ part of mapbox_maps_flutter; /// Definition for listener invoked when the map is created. -typedef void MapCreatedCallback(MapboxMap controller); +typedef MapCreatedCallback = void Function(MapboxMap controller); /// Definition for listener invoked when the style is fully loaded. typedef void OnStyleLoadedListener(StyleLoadedEventData styleLoadedEventData); diff --git a/mapbox_maps_flutter_mobile/lib/src/mapbox_maps_flutter_mobile.dart b/mapbox_maps_flutter_mobile/lib/src/mapbox_maps_flutter_mobile.dart index dc081e2da..d25115ea3 100644 --- a/mapbox_maps_flutter_mobile/lib/src/mapbox_maps_flutter_mobile.dart +++ b/mapbox_maps_flutter_mobile/lib/src/mapbox_maps_flutter_mobile.dart @@ -4,7 +4,7 @@ base class MapboxMapsFlutterMobile extends MapboxMapsFlutterPlatform { late final MapboxMap _mapboxMap; @override - Widget buildView({OnPlatformViewCreated? onPlatformViewCreated}) { + Widget buildView() { return MapWidget( onMapCreated: (MapboxMap mapboxMap) { _mapboxMap = mapboxMap; diff --git a/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_method_channel.dart b/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_method_channel.dart deleted file mode 100644 index d249e363e..000000000 --- a/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_method_channel.dart +++ /dev/null @@ -1,17 +0,0 @@ -import 'package:flutter/foundation.dart'; -import 'package:flutter/services.dart'; - -import 'mapbox_maps_flutter_v3_platform_interface.dart'; - -/// An implementation of [MapboxMapsFlutterV3Platform] that uses method channels. -class MethodChannelMapboxMapsFlutterV3 extends MapboxMapsFlutterV3Platform { - /// The method channel used to interact with the native platform. - @visibleForTesting - final methodChannel = const MethodChannel('mapbox_maps_flutter_v3'); - - @override - Future getPlatformVersion() async { - final version = await methodChannel.invokeMethod('getPlatformVersion'); - return version; - } -} diff --git a/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_platform_interface.dart b/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_platform_interface.dart deleted file mode 100644 index 9dbf7c222..000000000 --- a/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_platform_interface.dart +++ /dev/null @@ -1,29 +0,0 @@ -import 'package:plugin_platform_interface/plugin_platform_interface.dart'; - -import 'mapbox_maps_flutter_v3_method_channel.dart'; - -abstract class MapboxMapsFlutterV3Platform extends PlatformInterface { - /// Constructs a MapboxMapsFlutterV3Platform. - MapboxMapsFlutterV3Platform() : super(token: _token); - - static final Object _token = Object(); - - static MapboxMapsFlutterV3Platform _instance = MethodChannelMapboxMapsFlutterV3(); - - /// The default instance of [MapboxMapsFlutterV3Platform] to use. - /// - /// Defaults to [MethodChannelMapboxMapsFlutterV3]. - static MapboxMapsFlutterV3Platform get instance => _instance; - - /// Platform-specific implementations should set this with their own - /// platform-specific class that extends [MapboxMapsFlutterV3Platform] when - /// they register themselves. - static set instance(MapboxMapsFlutterV3Platform instance) { - PlatformInterface.verifyToken(instance, _token); - _instance = instance; - } - - Future getPlatformVersion() { - throw UnimplementedError('platformVersion() has not been implemented.'); - } -} diff --git a/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_web.dart b/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_web.dart deleted file mode 100644 index 423a10a57..000000000 --- a/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3_web.dart +++ /dev/null @@ -1,26 +0,0 @@ -// In order to *not* need this ignore, consider extracting the "web" version -// of your plugin as a separate package, instead of inlining it in the same -// package as the core of your plugin. -// ignore: avoid_web_libraries_in_flutter - -import 'package:flutter_web_plugins/flutter_web_plugins.dart'; -import 'package:web/web.dart' as web; - -import 'mapbox_maps_flutter_v3_platform_interface.dart'; - -/// A web implementation of the MapboxMapsFlutterV3Platform of the MapboxMapsFlutterV3 plugin. -class MapboxMapsFlutterV3Web extends MapboxMapsFlutterV3Platform { - /// Constructs a MapboxMapsFlutterV3Web - MapboxMapsFlutterV3Web(); - - static void registerWith(Registrar registrar) { - MapboxMapsFlutterV3Platform.instance = MapboxMapsFlutterV3Web(); - } - - /// Returns a [String] containing the version of the platform. - @override - Future getPlatformVersion() async { - final version = web.window.navigator.userAgent; - return version; - } -} diff --git a/mapbox_maps_flutter_web/lib/src/mapbox_maps_flutter_web.dart b/mapbox_maps_flutter_web/lib/src/mapbox_maps_flutter_web.dart index 86cde07e9..22deedc59 100644 --- a/mapbox_maps_flutter_web/lib/src/mapbox_maps_flutter_web.dart +++ b/mapbox_maps_flutter_web/lib/src/mapbox_maps_flutter_web.dart @@ -18,7 +18,7 @@ base class MapboxMapsFlutterWeb extends MapboxMapsFlutterPlatform { late HTMLDivElement _mapElement; @override - Widget buildView({OnPlatformViewCreated? onPlatformViewCreated}) { + Widget buildView() { final viewType = 'mapbox-maps-flutter-web/$hashCode'; // Attach the mapDiv to the DOM @@ -34,14 +34,7 @@ base class MapboxMapsFlutterWeb extends MapboxMapsFlutterPlatform { _initMap(); return _mapElement; }); - return HtmlElementView( - viewType: viewType, - onPlatformViewCreated: (int viewId) { - if (onPlatformViewCreated != null) { - onPlatformViewCreated(viewId); - } - }, - ); + return HtmlElementView(viewType: viewType); } _initMap() async { From 7fae2ebafcb1038fd026dc6b330db5fe7f541aab Mon Sep 17 00:00:00 2001 From: Mai Mai Date: Thu, 8 May 2025 13:59:34 +0300 Subject: [PATCH 07/16] update .circleci/config.yml --- .circleci/config.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fe59deb70..84bf5ef32 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -83,7 +83,7 @@ jobs: parameters: workspace-path: type: string - default: example/build/app/outputs/apk + default: mapbox_maps_flutter_mobile/example/build/app/outputs/apk docker: - image: cimg/android:2024.01.1 resource_class: 2xlarge @@ -94,14 +94,14 @@ jobs: app-dir: example - run: name: ktlint - working_directory: example/android + working_directory: mapbox_maps_flutter_mobile/example/android command: ./gradlew ktlint - run: name: unit test - command: flutter test test + command: flutter test mapbox_maps_flutter_mobile/test - run: name: "Build Android integration tests" - working_directory: example/android + working_directory: mapbox_maps_flutter_mobile/example/android command: | ./gradlew app:assembleAndroidTest --stacktrace ./gradlew app:assembleDebug -Ptarget=integration_test/all_test.dart -Pdart-defines="$(echo -n "ACCESS_TOKEN=$MAPBOX_ACCESS_TOKEN" | base64 -w 0)" --stacktrace @@ -117,7 +117,7 @@ jobs: parameters: workspace-path: type: string - default: example/build/app/outputs/apk + default: mapbox_maps_flutter_mobile/example/build/app/outputs/apk executor: firebase-test-runner steps: - attach_workspace: @@ -144,7 +144,7 @@ jobs: parameters: workspace-path: type: string - default: example/build/output + default: mapbox_maps_flutter_mobile/example/build/output executor: macos-xcode-latest steps: - checkout @@ -156,18 +156,18 @@ jobs: app-dir: example - run: name: swiftlint - working_directory: ios/mapbox_maps_flutter + working_directory: mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter command: HOMEBREW_NO_AUTO_UPDATE=1 brew install swiftlint; swiftlint lint --strict - run: name: unit test - command: flutter test test + command: flutter test mapbox_maps_flutter_mobile/test - run: name: "Build iOS integration tests" command: | pushd example # required to init configs that pass environment variables to fastlane later - flutter build ios --config-only integration_test/all_test.dart \ + flutter build ios --config-only mapbox_maps_flutter_mobile/integration_test/all_test.dart \ --release --dart-define=ACCESS_TOKEN=${MAPBOX_ACCESS_TOKEN} popd # to repo root @@ -184,7 +184,7 @@ jobs: parameters: workspace-path: type: string - default: example/build/output + default: mapbox_maps_flutter_mobile/example/build/output executor: firebase-test-runner steps: - attach_workspace: From b8945e7b8aeab424a22c40f607499f6914347ea0 Mon Sep 17 00:00:00 2001 From: Mai Mai Date: Thu, 8 May 2025 14:19:24 +0300 Subject: [PATCH 08/16] pub workspaces --- mapbox_maps_flutter_interface/pubspec.yaml | 2 ++ mapbox_maps_flutter_mobile/pubspec.yaml | 4 +++- .../pubspec_overrides.yaml | 3 --- mapbox_maps_flutter_v3/pubspec.yaml | 2 ++ mapbox_maps_flutter_v3/pubspec_overrides.yaml | 7 ------- mapbox_maps_flutter_web/pubspec.yaml | 2 ++ .../pubspec_overrides.yaml | 3 --- pubspec.yaml | 19 +++++++++++++++++++ 8 files changed, 28 insertions(+), 14 deletions(-) delete mode 100644 mapbox_maps_flutter_mobile/pubspec_overrides.yaml delete mode 100644 mapbox_maps_flutter_v3/pubspec_overrides.yaml delete mode 100644 mapbox_maps_flutter_web/pubspec_overrides.yaml create mode 100644 pubspec.yaml diff --git a/mapbox_maps_flutter_interface/pubspec.yaml b/mapbox_maps_flutter_interface/pubspec.yaml index ec26e9c0f..670129657 100644 --- a/mapbox_maps_flutter_interface/pubspec.yaml +++ b/mapbox_maps_flutter_interface/pubspec.yaml @@ -6,6 +6,8 @@ homepage: environment: sdk: ^3.7.2 flutter: ">=1.17.0" + +resolution: workspace dependencies: flutter: diff --git a/mapbox_maps_flutter_mobile/pubspec.yaml b/mapbox_maps_flutter_mobile/pubspec.yaml index 43503208a..29f63e0c5 100644 --- a/mapbox_maps_flutter_mobile/pubspec.yaml +++ b/mapbox_maps_flutter_mobile/pubspec.yaml @@ -4,8 +4,10 @@ version: 2.8.0-rc.1 homepage: https://github.com/mapbox/mapbox-maps-flutter environment: - sdk: ">=3.4.4 <4.0.0" + sdk: ^3.7.2 flutter: ">=3.22.3" + +resolution: workspace dependencies: flutter: diff --git a/mapbox_maps_flutter_mobile/pubspec_overrides.yaml b/mapbox_maps_flutter_mobile/pubspec_overrides.yaml deleted file mode 100644 index 93a8127cf..000000000 --- a/mapbox_maps_flutter_mobile/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - mapbox_maps_flutter_interface: - path: ../mapbox_maps_flutter_interface \ No newline at end of file diff --git a/mapbox_maps_flutter_v3/pubspec.yaml b/mapbox_maps_flutter_v3/pubspec.yaml index f0b5d4bb4..42e752350 100644 --- a/mapbox_maps_flutter_v3/pubspec.yaml +++ b/mapbox_maps_flutter_v3/pubspec.yaml @@ -6,6 +6,8 @@ homepage: environment: sdk: ^3.7.2 flutter: ">=1.17.0" + +resolution: workspace dependencies: flutter: diff --git a/mapbox_maps_flutter_v3/pubspec_overrides.yaml b/mapbox_maps_flutter_v3/pubspec_overrides.yaml deleted file mode 100644 index 8049a004c..000000000 --- a/mapbox_maps_flutter_v3/pubspec_overrides.yaml +++ /dev/null @@ -1,7 +0,0 @@ -dependency_overrides: - mapbox_maps_flutter_interface: - path: ../mapbox_maps_flutter_interface - mapbox_maps_flutter: - path: ../mapbox_maps_flutter_mobile - mapbox_maps_flutter_web: - path: ../mapbox_maps_flutter_web \ No newline at end of file diff --git a/mapbox_maps_flutter_web/pubspec.yaml b/mapbox_maps_flutter_web/pubspec.yaml index 659670293..aa962b859 100644 --- a/mapbox_maps_flutter_web/pubspec.yaml +++ b/mapbox_maps_flutter_web/pubspec.yaml @@ -6,6 +6,8 @@ homepage: environment: sdk: ^3.7.2 flutter: '>=3.3.0' + +resolution: workspace dependencies: flutter: diff --git a/mapbox_maps_flutter_web/pubspec_overrides.yaml b/mapbox_maps_flutter_web/pubspec_overrides.yaml deleted file mode 100644 index 93a8127cf..000000000 --- a/mapbox_maps_flutter_web/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - mapbox_maps_flutter_interface: - path: ../mapbox_maps_flutter_interface \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml new file mode 100644 index 000000000..db0307c2f --- /dev/null +++ b/pubspec.yaml @@ -0,0 +1,19 @@ +name: _ +publish_to: none +environment: + sdk: ^3.6.0 +workspace: + - mapbox_maps_flutter_mobile + - mapbox_maps_flutter_interface + - mapbox_maps_flutter_web + - mapbox_maps_flutter_v3 + +dependencies: + mapbox_maps_flutter: + path: mapbox_maps_flutter_mobile + mapbox_maps_flutter_interface: + path: mapbox_maps_flutter_interface + mapbox_maps_flutter_web: + path: mapbox_maps_flutter_web + mapbox_maps_flutter_v3: + path: mapbox_maps_flutter_v3 \ No newline at end of file From cafb159d670e899601e1e112fa2167cb5c330fee Mon Sep 17 00:00:00 2001 From: Mai Mai Date: Thu, 8 May 2025 14:30:11 +0300 Subject: [PATCH 09/16] update to use Flutter 3.27.0 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 84bf5ef32..ed9a7de0f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -224,7 +224,7 @@ jobs: steps: - checkout - flutter/install_sdk_and_pub: - version: 3.24.3 + version: 3.27.0 - run: name: Check license command: bash scripts/license.sh --mode validate From 7ca865991aeafb6a5d6c8ee3eba055c3b8bcd4a1 Mon Sep 17 00:00:00 2001 From: Mai Mai Date: Thu, 8 May 2025 14:38:44 +0300 Subject: [PATCH 10/16] update to use Flutter 3.27.0 --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ed9a7de0f..c54f2c10f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -90,8 +90,8 @@ jobs: steps: - checkout - flutter/install_sdk_and_pub: - version: 3.24.3 - app-dir: example + version: 3.27.0 + app-dir: mapbox_maps_flutter_mobile/example - run: name: ktlint working_directory: mapbox_maps_flutter_mobile/example/android @@ -152,8 +152,8 @@ jobs: - add-mapbox-submodules-key - macos/install-rosetta - flutter/install_sdk_and_pub: - version: 3.24.3 - app-dir: example + version: 3.27.0 + app-dir: mapbox_maps_flutter_mobile/example - run: name: swiftlint working_directory: mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter From cc1fb357b28cb045f0ac23032033d3b13069288d Mon Sep 17 00:00:00 2001 From: Mai Mai Date: Thu, 8 May 2025 14:46:12 +0300 Subject: [PATCH 11/16] constraint flutter sdk to min 3.6.0 --- mapbox_maps_flutter_interface/pubspec.yaml | 4 ++-- mapbox_maps_flutter_mobile/example/pubspec.lock | 2 +- mapbox_maps_flutter_mobile/example/pubspec.yaml | 2 +- mapbox_maps_flutter_v3/example/pubspec.lock | 2 +- mapbox_maps_flutter_v3/example/pubspec.yaml | 2 +- mapbox_maps_flutter_v3/pubspec.yaml | 2 +- mapbox_maps_flutter_web/example/pubspec.lock | 2 +- mapbox_maps_flutter_web/example/pubspec.yaml | 2 +- mapbox_maps_flutter_web/pubspec.yaml | 4 ++-- pubspec.yaml | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mapbox_maps_flutter_interface/pubspec.yaml b/mapbox_maps_flutter_interface/pubspec.yaml index 670129657..ffbf8b029 100644 --- a/mapbox_maps_flutter_interface/pubspec.yaml +++ b/mapbox_maps_flutter_interface/pubspec.yaml @@ -4,9 +4,9 @@ version: 0.0.1 homepage: environment: - sdk: ^3.7.2 + sdk: ">=3.6.0 <4.0.0" flutter: ">=1.17.0" - + resolution: workspace dependencies: diff --git a/mapbox_maps_flutter_mobile/example/pubspec.lock b/mapbox_maps_flutter_mobile/example/pubspec.lock index 19d810e5d..6b739d9da 100644 --- a/mapbox_maps_flutter_mobile/example/pubspec.lock +++ b/mapbox_maps_flutter_mobile/example/pubspec.lock @@ -547,5 +547,5 @@ packages: source: hosted version: "1.1.0" sdks: - dart: ">=3.7.0 <4.0.0" + dart: ">=3.7.2 <4.0.0" flutter: ">=3.27.0" diff --git a/mapbox_maps_flutter_mobile/example/pubspec.yaml b/mapbox_maps_flutter_mobile/example/pubspec.yaml index af60343e1..dbb98cfad 100644 --- a/mapbox_maps_flutter_mobile/example/pubspec.yaml +++ b/mapbox_maps_flutter_mobile/example/pubspec.yaml @@ -8,7 +8,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev environment: - sdk: ">=3.0.0 <4.0.0" + sdk: ">=3.6.0 <4.0.0" flutter: ">=3.10.0" dependencies: diff --git a/mapbox_maps_flutter_v3/example/pubspec.lock b/mapbox_maps_flutter_v3/example/pubspec.lock index e0fe7c3d4..7855744a1 100644 --- a/mapbox_maps_flutter_v3/example/pubspec.lock +++ b/mapbox_maps_flutter_v3/example/pubspec.lock @@ -409,5 +409,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=3.7.2 <4.0.0" + dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.27.0" diff --git a/mapbox_maps_flutter_v3/example/pubspec.yaml b/mapbox_maps_flutter_v3/example/pubspec.yaml index 5acc3c21d..a5a7b421a 100644 --- a/mapbox_maps_flutter_v3/example/pubspec.yaml +++ b/mapbox_maps_flutter_v3/example/pubspec.yaml @@ -5,7 +5,7 @@ description: "Demonstrates how to use the mapbox_maps_flutter_v3 plugin." publish_to: 'none' # Remove this line if you wish to publish to pub.dev environment: - sdk: ^3.7.2 + sdk: ">=3.6.0 <4.0.0" # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions diff --git a/mapbox_maps_flutter_v3/pubspec.yaml b/mapbox_maps_flutter_v3/pubspec.yaml index 42e752350..b814f5c1b 100644 --- a/mapbox_maps_flutter_v3/pubspec.yaml +++ b/mapbox_maps_flutter_v3/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.0.1 homepage: environment: - sdk: ^3.7.2 + sdk: ">=3.6.0 <4.0.0" flutter: ">=1.17.0" resolution: workspace diff --git a/mapbox_maps_flutter_web/example/pubspec.lock b/mapbox_maps_flutter_web/example/pubspec.lock index eece9cc45..c62789efa 100644 --- a/mapbox_maps_flutter_web/example/pubspec.lock +++ b/mapbox_maps_flutter_web/example/pubspec.lock @@ -299,5 +299,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=3.7.2 <4.0.0" + dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.18.0-18.0.pre.54" diff --git a/mapbox_maps_flutter_web/example/pubspec.yaml b/mapbox_maps_flutter_web/example/pubspec.yaml index b5becde39..c11ef9d20 100644 --- a/mapbox_maps_flutter_web/example/pubspec.yaml +++ b/mapbox_maps_flutter_web/example/pubspec.yaml @@ -5,7 +5,7 @@ description: "Demonstrates how to use the mapbox_maps_flutter_web plugin." publish_to: 'none' # Remove this line if you wish to publish to pub.dev environment: - sdk: ^3.7.2 + sdk: ">=3.6.0 <4.0.0" # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions diff --git a/mapbox_maps_flutter_web/pubspec.yaml b/mapbox_maps_flutter_web/pubspec.yaml index aa962b859..b65089668 100644 --- a/mapbox_maps_flutter_web/pubspec.yaml +++ b/mapbox_maps_flutter_web/pubspec.yaml @@ -4,9 +4,9 @@ version: 0.0.1 homepage: environment: - sdk: ^3.7.2 + sdk: ">=3.6.0 <4.0.0" flutter: '>=3.3.0' - + resolution: workspace dependencies: diff --git a/pubspec.yaml b/pubspec.yaml index db0307c2f..b1497aef4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: _ publish_to: none environment: - sdk: ^3.6.0 + sdk: ">=3.6.0 <4.0.0" workspace: - mapbox_maps_flutter_mobile - mapbox_maps_flutter_interface From 6d6b481427e32a0508936e34771af5cb25a068a4 Mon Sep 17 00:00:00 2001 From: Mai Mai Date: Thu, 8 May 2025 14:49:19 +0300 Subject: [PATCH 12/16] fix up --- mapbox_maps_flutter_mobile/example/pubspec.lock | 2 +- mapbox_maps_flutter_mobile/pubspec.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mapbox_maps_flutter_mobile/example/pubspec.lock b/mapbox_maps_flutter_mobile/example/pubspec.lock index 6b739d9da..19d810e5d 100644 --- a/mapbox_maps_flutter_mobile/example/pubspec.lock +++ b/mapbox_maps_flutter_mobile/example/pubspec.lock @@ -547,5 +547,5 @@ packages: source: hosted version: "1.1.0" sdks: - dart: ">=3.7.2 <4.0.0" + dart: ">=3.7.0 <4.0.0" flutter: ">=3.27.0" diff --git a/mapbox_maps_flutter_mobile/pubspec.yaml b/mapbox_maps_flutter_mobile/pubspec.yaml index 29f63e0c5..fb45eebd6 100644 --- a/mapbox_maps_flutter_mobile/pubspec.yaml +++ b/mapbox_maps_flutter_mobile/pubspec.yaml @@ -4,9 +4,9 @@ version: 2.8.0-rc.1 homepage: https://github.com/mapbox/mapbox-maps-flutter environment: - sdk: ^3.7.2 + sdk: ">=3.6.0 <4.0.0" flutter: ">=3.22.3" - + resolution: workspace dependencies: From 18fde6ae40bcfe991ec5595e013b4e1a677c1e22 Mon Sep 17 00:00:00 2001 From: Mai Mai Date: Thu, 8 May 2025 15:07:45 +0300 Subject: [PATCH 13/16] fix license validate/generate --- scripts/license.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/license.sh b/scripts/license.sh index fc8b3e236..794c43cd9 100755 --- a/scripts/license.sh +++ b/scripts/license.sh @@ -35,7 +35,7 @@ while [[ $# -gt 0 ]]; do done # Extract the archive URLs for direct dependencies, excluding the package named 'flutter' -package_info=$(echo "$deps" | jq -r '.packages[] | select(.kind == "direct" and .name != "flutter") | "\(.name) \(.version)"') +package_info=$(echo "$deps" | jq -r '.packages[] | select(.kind != "root" and .name != "flutter") | "\(.name) \(.version)"') sdk_version=$(echo "$deps" | jq -r '.packages[] | select(.kind == "root") | .version') deps_licenses="" @@ -63,8 +63,14 @@ while read -r name version; do # Add your logic here to handle each package done <<< "$package_info" -ios_sdk_version=$(grep -A 1 'mapbox-maps-ios' ios/mapbox_maps_flutter/Package.swift | grep 'exact' | sed -E 's/.*"([0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?)".*/\1/') -android_sdk_version=$(grep 'com.mapbox.maps:android' android/build.gradle | sed -E 's/.*"com\.mapbox\.maps:android:([0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?)".*/\1/') +mobile_dir='mapbox_maps_flutter_mobile' + +ios_sdk_version=$(grep -A 1 'mapbox-maps-ios' $mobile_dir/ios/mapbox_maps_flutter/Package.swift | grep 'exact' | sed -E 's/.*"([0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?)".*/\1/') +android_sdk_version=$(grep 'com.mapbox.maps:android' $mobile_dir/android/build.gradle | sed -E 's/.*"com\.mapbox\.maps:android:([0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?)".*/\1/') + +echo "iOS SDK version: $ios_sdk_version" +echo "Android SDK version: $android_sdk_version" +# Fetch the license files for iOS and Android SDKs ios_license_content=$(curl -s "https://raw.githubusercontent.com/mapbox/mapbox-maps-ios/v$ios_sdk_version/LICENSE.md") android_license_content=$(curl -s "https://raw.githubusercontent.com/mapbox/mapbox-maps-android/v$android_sdk_version/LICENSE.md") From 3ffed10e2ed9a872d730f8e8b65413a8513b9b9e Mon Sep 17 00:00:00 2001 From: Mai Mai Date: Thu, 8 May 2025 15:11:01 +0300 Subject: [PATCH 14/16] fix ios builds --- .circleci/config.yml | 2 +- .fastlane/Fastfile | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c54f2c10f..7546b73df 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -167,7 +167,7 @@ jobs: pushd example # required to init configs that pass environment variables to fastlane later - flutter build ios --config-only mapbox_maps_flutter_mobile/integration_test/all_test.dart \ + flutter build ios --config-only mapbox_maps_flutter_mobile/example/integration_test/all_test.dart \ --release --dart-define=ACCESS_TOKEN=${MAPBOX_ACCESS_TOKEN} popd # to repo root diff --git a/.fastlane/Fastfile b/.fastlane/Fastfile index e7dcee283..b7d303d14 100644 --- a/.fastlane/Fastfile +++ b/.fastlane/Fastfile @@ -10,7 +10,7 @@ platform :ios do sync_code_signing(type: "development") update_code_signing_settings( use_automatic_signing: false, - path: "example/ios/Runner.xcodeproj", + path: "mapbox_maps_flutter_mobile/example/ios/Runner.xcodeproj", team_id: "GJZR2MEM28", # Developer Portal Team ID, profile_name: lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING]["com.mapbox.maps.FlutterMapsExample"], targets: ["Runner"], @@ -18,7 +18,7 @@ platform :ios do ) update_code_signing_settings( use_automatic_signing: false, - path: "example/ios/Runner.xcodeproj", + path: "mapbox_maps_flutter_mobile/example/ios/Runner.xcodeproj", team_id: "GJZR2MEM28", # Developer Portal Team ID, profile_name: lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING]["com.mapbox.maps.FlutterRunnerTests"], targets: ["RunnerTests"], @@ -26,10 +26,10 @@ platform :ios do ) # build tests archive in the `output_directory` to launch on firebase run_tests( - workspace: 'example/ios/Runner.xcworkspace', + workspace: 'mapbox_maps_flutter_mobile/example/ios/Runner.xcworkspace', scheme: 'Runner', # XCTest scheme - xcconfig: "example/ios/Flutter/Release.xcconfig", - derived_data_path: "example/build/output", + xcconfig: "mapbox_maps_flutter_mobile/example/ios/Flutter/Release.xcconfig", + derived_data_path: "mapbox_maps_flutter_mobile/example/build/output", configuration: "Release", xcargs: "SWIFT_TREAT_WARNINGS_AS_ERRORS=NO COMPILER_INDEX_STORE_ENABLE=NO", skip_detect_devices: true, # Required @@ -37,7 +37,7 @@ platform :ios do sdk: 'iphoneos', # Required should_zip_build_products: true, # Must be true to set the correct format for Firebase Test Lab, result_bundle: true, - output_directory: "example/build/output/", + output_directory: "mapbox_maps_flutter_mobile/example/build/output/", code_coverage: true ) end From 71117fc8b502a0fb04aeedfc68161ccd71344f1d Mon Sep 17 00:00:00 2001 From: Mai Mai Date: Fri, 16 May 2025 16:38:43 +0300 Subject: [PATCH 15/16] Expose camera get/set (#944) * support setting camera in Map init * add tests for camera get/set * [web] implement camera get/set --- .../lib/mapbox_maps_flutter_interface.dart | 15 +- .../lib/src/callbacks.dart | 4 +- .../lib/src/map_interface.dart | 18 ++ ...apbox_maps_flutter_platform_interface.dart | 9 +- .../platform_interface_data_types.dart | 279 ++++++++++++++++++ .../lib/src/turf_adapter.dart | 2 +- mapbox_maps_flutter_interface/pubspec.yaml | 1 + .../gradle/wrapper/gradle-wrapper.properties | 4 +- .../maps/mapbox_maps/pigeons/MapInterfaces.kt | 219 -------------- .../pigeons/PlatformInterfaceDataTypes.kt | 227 ++++++++++++++ .../app/src/profile/AndroidManifest.xml | 3 +- .../example/android/gradle.properties | 3 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 2 +- .../integration_test/animation_test.dart | 1 + .../example/integration_test/camera_test.dart | 1 + .../integration_test/gestures_test.dart | 1 + .../interactive_features_test.dart | 1 + .../integration_test/map_interface_test.dart | 1 + .../snapshotter/snapshotter_test.dart | 4 +- .../integration_test/viewport_test.dart | 1 + .../example/lib/animation_example.dart | 1 + .../example/lib/camera_example.dart | 1 + .../lib/circle_annotations_example.dart | 1 + .../example/lib/cluster_example.dart | 1 + .../example/lib/full_map_example.dart | 1 + .../example/lib/model_layer_example.dart | 1 + .../lib/model_layer_interactions_example.dart | 1 + .../lib/polyline_annotations_example.dart | 2 +- .../example/lib/spinning_globe_example.dart | 4 +- .../standard_style_interactions_example.dart | 1 + .../lib/traffic_route_line_example.dart | 2 +- .../example/pubspec.lock | 12 +- .../Classes/Generated/MapInterfaces.swift | 189 +----------- .../PlatformInterfaceDataTypes.swift | 209 +++++++++++++ .../lib/mapbox_maps_flutter.dart | 4 +- .../lib/src/mapbox_map.dart | 8 +- .../lib/src/mapbox_maps_flutter_mobile.dart | 12 +- .../lib/src/pigeons/map_interfaces.dart | 274 ----------------- .../states/overview_viewport_state.dart | 2 +- mapbox_maps_flutter_mobile/pubspec.yaml | 1 - .../test/events_test.dart | 7 +- mapbox_maps_flutter_v3/.pubignore | 4 + .../example/integration_test/app.dart | 40 +++ .../example/integration_test/camera_test.dart | 74 +++++ .../xcshareddata/swiftpm/Package.resolved | 12 +- .../xcshareddata/swiftpm/Package.resolved | 12 +- mapbox_maps_flutter_v3/example/lib/main.dart | 22 +- mapbox_maps_flutter_v3/example/lib/utils.dart | 7 + mapbox_maps_flutter_v3/example/pubspec.lock | 12 +- .../example/test/widget_test.dart | 4 +- .../lib/mapbox_maps_flutter_v3.dart | 9 +- .../lib/src/map_widget.dart | 50 +++- .../lib/src/mapbox_options.dart | 2 +- mapbox_maps_flutter_web/example/pubspec.lock | 92 +++++- .../example/test/widget_test.dart | 4 +- mapbox_maps_flutter_web/lib/src/bindings.dart | 55 +++- .../lib/src/conversion.dart | 36 +++ .../lib/src/mapbox_map.dart | 45 +++ .../lib/src/mapbox_maps_flutter_web.dart | 58 ++-- scripts/check_test_suite.dart | 9 +- 61 files changed, 1307 insertions(+), 772 deletions(-) create mode 100644 mapbox_maps_flutter_interface/lib/src/map_interface.dart create mode 100644 mapbox_maps_flutter_interface/lib/src/pigeons/platform_interface_data_types.dart rename mapbox_maps_flutter_mobile/lib/src/turf_adapters.dart => mapbox_maps_flutter_interface/lib/src/turf_adapter.dart (97%) create mode 100644 mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PlatformInterfaceDataTypes.kt create mode 100644 mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PlatformInterfaceDataTypes.swift create mode 100644 mapbox_maps_flutter_v3/.pubignore create mode 100644 mapbox_maps_flutter_v3/example/integration_test/app.dart create mode 100644 mapbox_maps_flutter_v3/example/integration_test/camera_test.dart create mode 100644 mapbox_maps_flutter_v3/example/lib/utils.dart create mode 100644 mapbox_maps_flutter_web/lib/src/conversion.dart create mode 100644 mapbox_maps_flutter_web/lib/src/mapbox_map.dart diff --git a/mapbox_maps_flutter_interface/lib/mapbox_maps_flutter_interface.dart b/mapbox_maps_flutter_interface/lib/mapbox_maps_flutter_interface.dart index cfcbba884..00dda3617 100644 --- a/mapbox_maps_flutter_interface/lib/mapbox_maps_flutter_interface.dart +++ b/mapbox_maps_flutter_interface/lib/mapbox_maps_flutter_interface.dart @@ -1,6 +1,13 @@ -library; +library mapbox_maps_flutter_interface; -import 'package:flutter/cupertino.dart'; +export 'src/mapbox_maps_flutter_platform_interface.dart'; +export 'src/map_interface.dart'; +export 'src/callbacks.dart'; +export 'package:turf/helpers.dart'; -part 'src/mapbox_maps_flutter_platform_interface.dart'; -part 'src/callbacks.dart'; +import 'dart:convert'; + +import 'package:turf/turf.dart' as turf; + +part 'src/pigeons/platform_interface_data_types.dart'; +part 'src/turf_adapter.dart'; diff --git a/mapbox_maps_flutter_interface/lib/src/callbacks.dart b/mapbox_maps_flutter_interface/lib/src/callbacks.dart index 815e6a300..988d70abc 100644 --- a/mapbox_maps_flutter_interface/lib/src/callbacks.dart +++ b/mapbox_maps_flutter_interface/lib/src/callbacks.dart @@ -1,3 +1,3 @@ -part of 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; +import 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; -typedef OnPlatformViewCreated = void Function(int id); +typedef OnMapCreated = void Function(MapboxMapInterface mapboxMap); diff --git a/mapbox_maps_flutter_interface/lib/src/map_interface.dart b/mapbox_maps_flutter_interface/lib/src/map_interface.dart new file mode 100644 index 000000000..92c5a6fd8 --- /dev/null +++ b/mapbox_maps_flutter_interface/lib/src/map_interface.dart @@ -0,0 +1,18 @@ +import 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; + +/// An abstract base class that defines the interface for interacting with a Mapbox map. +/// +/// This interface provides methods for setting the camera options and retrieving the current camera state. +abstract base class MapboxMapInterface { + /// Sets the camera options for the map. + /// + /// [cameraOptions] - The desired camera options to apply to the map. + /// + /// Returns a [Future] that completes when the camera options have been applied. + Future setCamera(CameraOptions cameraOptions); + + /// Retrieves the current state of the camera. + /// + /// Returns a [Future] that completes with the current [CameraState] of the map. + Future getCameraState(); +} diff --git a/mapbox_maps_flutter_interface/lib/src/mapbox_maps_flutter_platform_interface.dart b/mapbox_maps_flutter_interface/lib/src/mapbox_maps_flutter_platform_interface.dart index d5f49955c..e51703531 100644 --- a/mapbox_maps_flutter_interface/lib/src/mapbox_maps_flutter_platform_interface.dart +++ b/mapbox_maps_flutter_interface/lib/src/mapbox_maps_flutter_platform_interface.dart @@ -1,4 +1,6 @@ -part of 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; +import 'package:flutter/widgets.dart'; + +import '../mapbox_maps_flutter_interface.dart'; abstract base class MapboxMapsFlutterPlatform { static MapboxMapsFlutterPlatform? _instance; @@ -38,5 +40,8 @@ abstract base class MapboxMapsFlutterPlatform { /// /// This method is responsible for creating the widget that integrates /// with the underlying platform's view system to render the map. - Widget buildView(); + Widget buildView({ + CameraOptions? cameraOptions, + OnMapCreated? onMapCreated, + }); } diff --git a/mapbox_maps_flutter_interface/lib/src/pigeons/platform_interface_data_types.dart b/mapbox_maps_flutter_interface/lib/src/pigeons/platform_interface_data_types.dart new file mode 100644 index 000000000..4a5c8fa08 --- /dev/null +++ b/mapbox_maps_flutter_interface/lib/src/pigeons/platform_interface_data_types.dart @@ -0,0 +1,279 @@ +// Autogenerated from Pigeon (v25.2.0), do not edit directly. +// See also: https://pub.dev/packages/pigeon +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers + +part of mapbox_maps_flutter_interface; + +/// Describes the coordinate on the screen, measured from top to bottom and from left to right. +/// Note: the `map` uses screen coordinate units measured in `logical pixels`. +class ScreenCoordinate { + ScreenCoordinate({ + required this.x, + required this.y, + }); + + /// A value representing the x position of this coordinate. + double x; + + /// A value representing the y position of this coordinate. + double y; + + List _toList() { + return [ + x, + y, + ]; + } + + Object encode() { + return _toList(); + } + + static ScreenCoordinate decode(Object result) { + result as List; + return ScreenCoordinate( + x: result[0]! as double, + y: result[1]! as double, + ); + } + + @override + // ignore: avoid_equals_and_hash_code_on_mutable_classes + bool operator ==(Object other) { + if (other is! ScreenCoordinate || other.runtimeType != runtimeType) { + return false; + } + if (identical(this, other)) { + return true; + } + return x == other.x && y == other.y; + } + + @override + // ignore: avoid_equals_and_hash_code_on_mutable_classes + int get hashCode => Object.hashAll(_toList()); +} + +/// The distance on each side between rectangles, when one is contained into other. +/// +/// All fields' values are in `logical pixel` units. +class MbxEdgeInsets { + MbxEdgeInsets({ + required this.top, + required this.left, + required this.bottom, + required this.right, + }); + + /// Padding from the top. + double top; + + /// Padding from the left. + double left; + + /// Padding from the bottom. + double bottom; + + /// Padding from the right. + double right; + + List _toList() { + return [ + top, + left, + bottom, + right, + ]; + } + + Object encode() { + return _toList(); + } + + static MbxEdgeInsets decode(Object result) { + result as List; + return MbxEdgeInsets( + top: result[0]! as double, + left: result[1]! as double, + bottom: result[2]! as double, + right: result[3]! as double, + ); + } + + @override + // ignore: avoid_equals_and_hash_code_on_mutable_classes + bool operator ==(Object other) { + if (other is! MbxEdgeInsets || other.runtimeType != runtimeType) { + return false; + } + if (identical(this, other)) { + return true; + } + return top == other.top && + left == other.left && + bottom == other.bottom && + right == other.right; + } + + @override + // ignore: avoid_equals_and_hash_code_on_mutable_classes + int get hashCode => Object.hashAll(_toList()); +} + +/// Various options for describing the viewpoint of a camera. All fields are +/// optional. +/// +/// Anchor and center points are mutually exclusive, with preference for the +/// center point when both are set. +class CameraOptions { + CameraOptions({ + this.center, + this.padding, + this.anchor, + this.zoom, + this.bearing, + this.pitch, + }); + + /// Coordinate at the center of the camera. + Point? center; + + /// Padding around the interior of the view that affects the frame of + /// reference for `center`. + MbxEdgeInsets? padding; + + /// Point of reference for `zoom` and `angle`, assuming an origin at the + /// top-left corner of the view. + ScreenCoordinate? anchor; + + /// Zero-based zoom level. Constrained to the minimum and maximum zoom + /// levels. + double? zoom; + + /// Bearing, measured in degrees from true north. Wrapped to [0, 360). + double? bearing; + + /// Pitch toward the horizon measured in degrees. + double? pitch; + + List _toList() { + return [ + center, + padding, + anchor, + zoom, + bearing, + pitch, + ]; + } + + Object encode() { + return _toList(); + } + + static CameraOptions decode(Object result) { + result as List; + return CameraOptions( + center: result[0] as Point?, + padding: result[1] as MbxEdgeInsets?, + anchor: result[2] as ScreenCoordinate?, + zoom: result[3] as double?, + bearing: result[4] as double?, + pitch: result[5] as double?, + ); + } + + @override + // ignore: avoid_equals_and_hash_code_on_mutable_classes + bool operator ==(Object other) { + if (other is! CameraOptions || other.runtimeType != runtimeType) { + return false; + } + if (identical(this, other)) { + return true; + } + return center == other.center && + padding == other.padding && + anchor == other.anchor && + zoom == other.zoom && + bearing == other.bearing && + pitch == other.pitch; + } + + @override + // ignore: avoid_equals_and_hash_code_on_mutable_classes + int get hashCode => Object.hashAll(_toList()); +} + +/// Describes the viewpoint of a camera. +class CameraState { + CameraState({ + required this.center, + required this.padding, + required this.zoom, + required this.bearing, + required this.pitch, + }); + + /// Coordinate at the center of the camera. + Point center; + + /// Padding around the interior of the view that affects the frame of + /// reference for `center`. + MbxEdgeInsets padding; + + /// Zero-based zoom level. Constrained to the minimum and maximum zoom + /// levels. + double zoom; + + /// Bearing, measured in degrees from true north. Wrapped to [0, 360). + double bearing; + + /// Pitch toward the horizon measured in degrees. + double pitch; + + List _toList() { + return [ + center, + padding, + zoom, + bearing, + pitch, + ]; + } + + Object encode() { + return _toList(); + } + + static CameraState decode(Object result) { + result as List; + return CameraState( + center: result[0]! as Point, + padding: result[1]! as MbxEdgeInsets, + zoom: result[2]! as double, + bearing: result[3]! as double, + pitch: result[4]! as double, + ); + } + + @override + // ignore: avoid_equals_and_hash_code_on_mutable_classes + bool operator ==(Object other) { + if (other is! CameraState || other.runtimeType != runtimeType) { + return false; + } + if (identical(this, other)) { + return true; + } + return center == other.center && + padding == other.padding && + zoom == other.zoom && + bearing == other.bearing && + pitch == other.pitch; + } + + @override + // ignore: avoid_equals_and_hash_code_on_mutable_classes + int get hashCode => Object.hashAll(_toList()); +} diff --git a/mapbox_maps_flutter_mobile/lib/src/turf_adapters.dart b/mapbox_maps_flutter_interface/lib/src/turf_adapter.dart similarity index 97% rename from mapbox_maps_flutter_mobile/lib/src/turf_adapters.dart rename to mapbox_maps_flutter_interface/lib/src/turf_adapter.dart index be76d48ba..24e56f491 100644 --- a/mapbox_maps_flutter_mobile/lib/src/turf_adapters.dart +++ b/mapbox_maps_flutter_interface/lib/src/turf_adapter.dart @@ -1,4 +1,4 @@ -part of mapbox_maps_flutter; +part of 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; final class Point extends turf.Point { Point({super.bbox, required super.coordinates}); diff --git a/mapbox_maps_flutter_interface/pubspec.yaml b/mapbox_maps_flutter_interface/pubspec.yaml index ffbf8b029..74180c21e 100644 --- a/mapbox_maps_flutter_interface/pubspec.yaml +++ b/mapbox_maps_flutter_interface/pubspec.yaml @@ -12,6 +12,7 @@ resolution: workspace dependencies: flutter: sdk: flutter + turf: ^0.0.10 dev_dependencies: flutter_test: diff --git a/mapbox_maps_flutter_mobile/android/gradle/wrapper/gradle-wrapper.properties b/mapbox_maps_flutter_mobile/android/gradle/wrapper/gradle-wrapper.properties index 111c25e79..09523c0e5 100644 --- a/mapbox_maps_flutter_mobile/android/gradle/wrapper/gradle-wrapper.properties +++ b/mapbox_maps_flutter_mobile/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip diff --git a/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/MapInterfaces.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/MapInterfaces.kt index 1f762995b..8b1d1730e 100644 --- a/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/MapInterfaces.kt +++ b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/MapInterfaces.kt @@ -692,186 +692,6 @@ data class TileCoverOptions( override fun hashCode(): Int = toList().hashCode() } -/** - * The distance on each side between rectangles, when one is contained into other. - * - * All fields' values are in `logical pixel` units. - * - * Generated class from Pigeon that represents data sent in messages. - */ -data class MbxEdgeInsets( - /** Padding from the top. */ - val top: Double, - /** Padding from the left. */ - val left: Double, - /** Padding from the bottom. */ - val bottom: Double, - /** Padding from the right. */ - val right: Double -) { - companion object { - fun fromList(pigeonVar_list: List): MbxEdgeInsets { - val top = pigeonVar_list[0] as Double - val left = pigeonVar_list[1] as Double - val bottom = pigeonVar_list[2] as Double - val right = pigeonVar_list[3] as Double - return MbxEdgeInsets(top, left, bottom, right) - } - } - fun toList(): List { - return listOf( - top, - left, - bottom, - right, - ) - } - override fun equals(other: Any?): Boolean { - if (other !is MbxEdgeInsets) { - return false - } - if (this === other) { - return true - } - return top == other.top && - left == other.left && - bottom == other.bottom && - right == other.right - } - - override fun hashCode(): Int = toList().hashCode() -} - -/** - * Various options for describing the viewpoint of a camera. All fields are - * optional. - * - * Anchor and center points are mutually exclusive, with preference for the - * center point when both are set. - * - * Generated class from Pigeon that represents data sent in messages. - */ -data class CameraOptions( - /** Coordinate at the center of the camera. */ - val center: Point? = null, - /** - * Padding around the interior of the view that affects the frame of - * reference for `center`. - */ - val padding: MbxEdgeInsets? = null, - /** - * Point of reference for `zoom` and `angle`, assuming an origin at the - * top-left corner of the view. - */ - val anchor: ScreenCoordinate? = null, - /** - * Zero-based zoom level. Constrained to the minimum and maximum zoom - * levels. - */ - val zoom: Double? = null, - /** Bearing, measured in degrees from true north. Wrapped to [0, 360). */ - val bearing: Double? = null, - /** Pitch toward the horizon measured in degrees. */ - val pitch: Double? = null -) { - companion object { - fun fromList(pigeonVar_list: List): CameraOptions { - val center = pigeonVar_list[0] as Point? - val padding = pigeonVar_list[1] as MbxEdgeInsets? - val anchor = pigeonVar_list[2] as ScreenCoordinate? - val zoom = pigeonVar_list[3] as Double? - val bearing = pigeonVar_list[4] as Double? - val pitch = pigeonVar_list[5] as Double? - return CameraOptions(center, padding, anchor, zoom, bearing, pitch) - } - } - fun toList(): List { - return listOf( - center, - padding, - anchor, - zoom, - bearing, - pitch, - ) - } - override fun equals(other: Any?): Boolean { - if (other !is CameraOptions) { - return false - } - if (this === other) { - return true - } - return center == other.center && - padding == other.padding && - anchor == other.anchor && - zoom == other.zoom && - bearing == other.bearing && - pitch == other.pitch - } - - override fun hashCode(): Int = toList().hashCode() -} - -/** - * Describes the viewpoint of a camera. - * - * Generated class from Pigeon that represents data sent in messages. - */ -data class CameraState( - /** Coordinate at the center of the camera. */ - val center: Point, - /** - * Padding around the interior of the view that affects the frame of - * reference for `center`. - */ - val padding: MbxEdgeInsets, - /** - * Zero-based zoom level. Constrained to the minimum and maximum zoom - * levels. - */ - val zoom: Double, - /** Bearing, measured in degrees from true north. Wrapped to [0, 360). */ - val bearing: Double, - /** Pitch toward the horizon measured in degrees. */ - val pitch: Double -) { - companion object { - fun fromList(pigeonVar_list: List): CameraState { - val center = pigeonVar_list[0] as Point - val padding = pigeonVar_list[1] as MbxEdgeInsets - val zoom = pigeonVar_list[2] as Double - val bearing = pigeonVar_list[3] as Double - val pitch = pigeonVar_list[4] as Double - return CameraState(center, padding, zoom, bearing, pitch) - } - } - fun toList(): List { - return listOf( - center, - padding, - zoom, - bearing, - pitch, - ) - } - override fun equals(other: Any?): Boolean { - if (other !is CameraState) { - return false - } - if (this === other) { - return true - } - return center == other.center && - padding == other.padding && - zoom == other.zoom && - bearing == other.bearing && - pitch == other.pitch - } - - override fun hashCode(): Int = toList().hashCode() -} - /** * Holds options to be used for setting `camera bounds`. * @@ -1255,45 +1075,6 @@ data class MapOptions( override fun hashCode(): Int = toList().hashCode() } -/** - * Describes the coordinate on the screen, measured from top to bottom and from left to right. - * Note: the `map` uses screen coordinate units measured in `logical pixels`. - * - * Generated class from Pigeon that represents data sent in messages. - */ -data class ScreenCoordinate( - /** A value representing the x position of this coordinate. */ - val x: Double, - /** A value representing the y position of this coordinate. */ - val y: Double -) { - companion object { - fun fromList(pigeonVar_list: List): ScreenCoordinate { - val x = pigeonVar_list[0] as Double - val y = pigeonVar_list[1] as Double - return ScreenCoordinate(x, y) - } - } - fun toList(): List { - return listOf( - x, - y, - ) - } - override fun equals(other: Any?): Boolean { - if (other !is ScreenCoordinate) { - return false - } - if (this === other) { - return true - } - return x == other.x && - y == other.y - } - - override fun hashCode(): Int = toList().hashCode() -} - /** * Describes the coordinate box on the screen, measured in `logical pixels` * from top to bottom and from left to right. diff --git a/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PlatformInterfaceDataTypes.kt b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PlatformInterfaceDataTypes.kt new file mode 100644 index 000000000..0560ffa4d --- /dev/null +++ b/mapbox_maps_flutter_mobile/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PlatformInterfaceDataTypes.kt @@ -0,0 +1,227 @@ +// Autogenerated from Pigeon (v25.2.0), do not edit directly. +// See also: https://pub.dev/packages/pigeon +@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass") + +package com.mapbox.maps.mapbox_maps.pigeons + +import com.mapbox.geojson.Point +import com.mapbox.maps.mapbox_maps.mapping.turf.* + +/** + * Describes the coordinate on the screen, measured from top to bottom and from left to right. + * Note: the `map` uses screen coordinate units measured in `logical pixels`. + * + * Generated class from Pigeon that represents data sent in messages. + */ +data class ScreenCoordinate( + /** A value representing the x position of this coordinate. */ + val x: Double, + /** A value representing the y position of this coordinate. */ + val y: Double +) { + companion object { + fun fromList(pigeonVar_list: List): ScreenCoordinate { + val x = pigeonVar_list[0] as Double + val y = pigeonVar_list[1] as Double + return ScreenCoordinate(x, y) + } + } + fun toList(): List { + return listOf( + x, + y, + ) + } + override fun equals(other: Any?): Boolean { + if (other !is ScreenCoordinate) { + return false + } + if (this === other) { + return true + } + return x == other.x && + y == other.y + } + + override fun hashCode(): Int = toList().hashCode() +} + +/** + * The distance on each side between rectangles, when one is contained into other. + * + * All fields' values are in `logical pixel` units. + * + * Generated class from Pigeon that represents data sent in messages. + */ +data class MbxEdgeInsets( + /** Padding from the top. */ + val top: Double, + /** Padding from the left. */ + val left: Double, + /** Padding from the bottom. */ + val bottom: Double, + /** Padding from the right. */ + val right: Double +) { + companion object { + fun fromList(pigeonVar_list: List): MbxEdgeInsets { + val top = pigeonVar_list[0] as Double + val left = pigeonVar_list[1] as Double + val bottom = pigeonVar_list[2] as Double + val right = pigeonVar_list[3] as Double + return MbxEdgeInsets(top, left, bottom, right) + } + } + fun toList(): List { + return listOf( + top, + left, + bottom, + right, + ) + } + override fun equals(other: Any?): Boolean { + if (other !is MbxEdgeInsets) { + return false + } + if (this === other) { + return true + } + return top == other.top && + left == other.left && + bottom == other.bottom && + right == other.right + } + + override fun hashCode(): Int = toList().hashCode() +} + +/** + * Various options for describing the viewpoint of a camera. All fields are + * optional. + * + * Anchor and center points are mutually exclusive, with preference for the + * center point when both are set. + * + * Generated class from Pigeon that represents data sent in messages. + */ +data class CameraOptions( + /** Coordinate at the center of the camera. */ + val center: Point? = null, + /** + * Padding around the interior of the view that affects the frame of + * reference for `center`. + */ + val padding: MbxEdgeInsets? = null, + /** + * Point of reference for `zoom` and `angle`, assuming an origin at the + * top-left corner of the view. + */ + val anchor: ScreenCoordinate? = null, + /** + * Zero-based zoom level. Constrained to the minimum and maximum zoom + * levels. + */ + val zoom: Double? = null, + /** Bearing, measured in degrees from true north. Wrapped to [0, 360). */ + val bearing: Double? = null, + /** Pitch toward the horizon measured in degrees. */ + val pitch: Double? = null +) { + companion object { + fun fromList(pigeonVar_list: List): CameraOptions { + val center = pigeonVar_list[0] as Point? + val padding = pigeonVar_list[1] as MbxEdgeInsets? + val anchor = pigeonVar_list[2] as ScreenCoordinate? + val zoom = pigeonVar_list[3] as Double? + val bearing = pigeonVar_list[4] as Double? + val pitch = pigeonVar_list[5] as Double? + return CameraOptions(center, padding, anchor, zoom, bearing, pitch) + } + } + fun toList(): List { + return listOf( + center, + padding, + anchor, + zoom, + bearing, + pitch, + ) + } + override fun equals(other: Any?): Boolean { + if (other !is CameraOptions) { + return false + } + if (this === other) { + return true + } + return center == other.center && + padding == other.padding && + anchor == other.anchor && + zoom == other.zoom && + bearing == other.bearing && + pitch == other.pitch + } + + override fun hashCode(): Int = toList().hashCode() +} + +/** + * Describes the viewpoint of a camera. + * + * Generated class from Pigeon that represents data sent in messages. + */ +data class CameraState( + /** Coordinate at the center of the camera. */ + val center: Point, + /** + * Padding around the interior of the view that affects the frame of + * reference for `center`. + */ + val padding: MbxEdgeInsets, + /** + * Zero-based zoom level. Constrained to the minimum and maximum zoom + * levels. + */ + val zoom: Double, + /** Bearing, measured in degrees from true north. Wrapped to [0, 360). */ + val bearing: Double, + /** Pitch toward the horizon measured in degrees. */ + val pitch: Double +) { + companion object { + fun fromList(pigeonVar_list: List): CameraState { + val center = pigeonVar_list[0] as Point + val padding = pigeonVar_list[1] as MbxEdgeInsets + val zoom = pigeonVar_list[2] as Double + val bearing = pigeonVar_list[3] as Double + val pitch = pigeonVar_list[4] as Double + return CameraState(center, padding, zoom, bearing, pitch) + } + } + fun toList(): List { + return listOf( + center, + padding, + zoom, + bearing, + pitch, + ) + } + override fun equals(other: Any?): Boolean { + if (other !is CameraState) { + return false + } + if (this === other) { + return true + } + return center == other.center && + padding == other.padding && + zoom == other.zoom && + bearing == other.bearing && + pitch == other.pitch + } + + override fun hashCode(): Int = toList().hashCode() +} \ No newline at end of file diff --git a/mapbox_maps_flutter_mobile/example/android/app/src/profile/AndroidManifest.xml b/mapbox_maps_flutter_mobile/example/android/app/src/profile/AndroidManifest.xml index dfa0ba8d3..f880684a6 100644 --- a/mapbox_maps_flutter_mobile/example/android/app/src/profile/AndroidManifest.xml +++ b/mapbox_maps_flutter_mobile/example/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/mapbox_maps_flutter_mobile/example/android/gradle.properties b/mapbox_maps_flutter_mobile/example/android/gradle.properties index 3852c19ca..9b7e91c07 100644 --- a/mapbox_maps_flutter_mobile/example/android/gradle.properties +++ b/mapbox_maps_flutter_mobile/example/android/gradle.properties @@ -2,3 +2,6 @@ org.gradle.jvmargs=-Xmx4096M android.useAndroidX=true android.enableJetifier=false useLocalDependencies=false +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/mapbox_maps_flutter_mobile/example/android/gradle/wrapper/gradle-wrapper.properties b/mapbox_maps_flutter_mobile/example/android/gradle/wrapper/gradle-wrapper.properties index f58dbd5d8..c38a728c4 100644 --- a/mapbox_maps_flutter_mobile/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/mapbox_maps_flutter_mobile/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Apr 30 20:27:36 EEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/mapbox_maps_flutter_mobile/example/android/settings.gradle b/mapbox_maps_flutter_mobile/example/android/settings.gradle index dcd3b479a..34d8421bb 100644 --- a/mapbox_maps_flutter_mobile/example/android/settings.gradle +++ b/mapbox_maps_flutter_mobile/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.1" apply false + id "com.android.application" version '8.7.0' apply false id "org.jetbrains.kotlin.android" version "1.8.22" apply false } diff --git a/mapbox_maps_flutter_mobile/example/integration_test/animation_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/animation_test.dart index f05f01fa2..260c54096 100644 --- a/mapbox_maps_flutter_mobile/example/integration_test/animation_test.dart +++ b/mapbox_maps_flutter_mobile/example/integration_test/animation_test.dart @@ -3,6 +3,7 @@ import 'dart:io'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; import 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; + import 'empty_map_widget.dart' as app; void main() { diff --git a/mapbox_maps_flutter_mobile/example/integration_test/camera_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/camera_test.dart index 355c08f34..43611f2e2 100644 --- a/mapbox_maps_flutter_mobile/example/integration_test/camera_test.dart +++ b/mapbox_maps_flutter_mobile/example/integration_test/camera_test.dart @@ -1,6 +1,7 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; import 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; + import 'empty_map_widget.dart' as app; void main() { diff --git a/mapbox_maps_flutter_mobile/example/integration_test/gestures_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/gestures_test.dart index 8b9561862..9ff632048 100644 --- a/mapbox_maps_flutter_mobile/example/integration_test/gestures_test.dart +++ b/mapbox_maps_flutter_mobile/example/integration_test/gestures_test.dart @@ -3,6 +3,7 @@ import 'dart:io'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; import 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; + import 'empty_map_widget.dart' as app; void main() { diff --git a/mapbox_maps_flutter_mobile/example/integration_test/interactive_features_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/interactive_features_test.dart index 1b3c2da36..54bc0f5e3 100644 --- a/mapbox_maps_flutter_mobile/example/integration_test/interactive_features_test.dart +++ b/mapbox_maps_flutter_mobile/example/integration_test/interactive_features_test.dart @@ -3,6 +3,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; import 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; + import 'empty_map_widget.dart' as app; void main() { diff --git a/mapbox_maps_flutter_mobile/example/integration_test/map_interface_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/map_interface_test.dart index ec0c9c0ee..e9ef8d7c0 100644 --- a/mapbox_maps_flutter_mobile/example/integration_test/map_interface_test.dart +++ b/mapbox_maps_flutter_mobile/example/integration_test/map_interface_test.dart @@ -5,6 +5,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; import 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; + import 'empty_map_widget.dart' as app; void main() { diff --git a/mapbox_maps_flutter_mobile/example/integration_test/snapshotter/snapshotter_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/snapshotter/snapshotter_test.dart index 3e2fc33f4..8cfde171e 100644 --- a/mapbox_maps_flutter_mobile/example/integration_test/snapshotter/snapshotter_test.dart +++ b/mapbox_maps_flutter_mobile/example/integration_test/snapshotter/snapshotter_test.dart @@ -5,6 +5,8 @@ import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; import 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; +import 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart' + show CameraOptions; import '../empty_map_widget.dart' as app; void main() { @@ -96,7 +98,7 @@ void main() { expect(bounds, isNotNull); final camera = await snapshotter.camera( - coordinates: [cameraOptions.center!], + coordinates: [Point(coordinates: cameraState.center.coordinates)], bearing: cameraOptions.bearing, pitch: cameraOptions.pitch, ); diff --git a/mapbox_maps_flutter_mobile/example/integration_test/viewport_test.dart b/mapbox_maps_flutter_mobile/example/integration_test/viewport_test.dart index 14ffc80a5..0153f1818 100644 --- a/mapbox_maps_flutter_mobile/example/integration_test/viewport_test.dart +++ b/mapbox_maps_flutter_mobile/example/integration_test/viewport_test.dart @@ -3,6 +3,7 @@ import 'dart:io'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; import 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; + import 'empty_map_widget.dart' as app; void main() { diff --git a/mapbox_maps_flutter_mobile/example/lib/animation_example.dart b/mapbox_maps_flutter_mobile/example/lib/animation_example.dart index a04e6ac0b..c8199bfba 100644 --- a/mapbox_maps_flutter_mobile/example/lib/animation_example.dart +++ b/mapbox_maps_flutter_mobile/example/lib/animation_example.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; + import 'example.dart'; class AnimationExample extends StatefulWidget implements Example { diff --git a/mapbox_maps_flutter_mobile/example/lib/camera_example.dart b/mapbox_maps_flutter_mobile/example/lib/camera_example.dart index d978e0a25..1a47c3b86 100644 --- a/mapbox_maps_flutter_mobile/example/lib/camera_example.dart +++ b/mapbox_maps_flutter_mobile/example/lib/camera_example.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; + import 'example.dart'; class CameraExample extends StatefulWidget implements Example { diff --git a/mapbox_maps_flutter_mobile/example/lib/circle_annotations_example.dart b/mapbox_maps_flutter_mobile/example/lib/circle_annotations_example.dart index 9a8b6eb2e..901ee3898 100644 --- a/mapbox_maps_flutter_mobile/example/lib/circle_annotations_example.dart +++ b/mapbox_maps_flutter_mobile/example/lib/circle_annotations_example.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart' hide Visibility; import 'package:mapbox_maps_example/utils.dart'; import 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; + import 'example.dart'; class CircleAnnotationExample extends StatefulWidget implements Example { diff --git a/mapbox_maps_flutter_mobile/example/lib/cluster_example.dart b/mapbox_maps_flutter_mobile/example/lib/cluster_example.dart index 2335f39c8..e5118e947 100644 --- a/mapbox_maps_flutter_mobile/example/lib/cluster_example.dart +++ b/mapbox_maps_flutter_mobile/example/lib/cluster_example.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart' show rootBundle; import 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; + import 'example.dart'; class StyleClustersExample extends StatefulWidget implements Example { diff --git a/mapbox_maps_flutter_mobile/example/lib/full_map_example.dart b/mapbox_maps_flutter_mobile/example/lib/full_map_example.dart index a09176fa6..e4c0d4e26 100644 --- a/mapbox_maps_flutter_mobile/example/lib/full_map_example.dart +++ b/mapbox_maps_flutter_mobile/example/lib/full_map_example.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; + import 'example.dart'; class FullMapExample extends StatefulWidget implements Example { diff --git a/mapbox_maps_flutter_mobile/example/lib/model_layer_example.dart b/mapbox_maps_flutter_mobile/example/lib/model_layer_example.dart index 05b9162f1..bd9781b4c 100644 --- a/mapbox_maps_flutter_mobile/example/lib/model_layer_example.dart +++ b/mapbox_maps_flutter_mobile/example/lib/model_layer_example.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; + import 'example.dart'; class ModelLayerExample extends StatefulWidget implements Example { diff --git a/mapbox_maps_flutter_mobile/example/lib/model_layer_interactions_example.dart b/mapbox_maps_flutter_mobile/example/lib/model_layer_interactions_example.dart index 6f9ad1443..31f6eedbb 100644 --- a/mapbox_maps_flutter_mobile/example/lib/model_layer_interactions_example.dart +++ b/mapbox_maps_flutter_mobile/example/lib/model_layer_interactions_example.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; + import 'example.dart'; class ModelLayerInteractionsExample extends StatefulWidget implements Example { diff --git a/mapbox_maps_flutter_mobile/example/lib/polyline_annotations_example.dart b/mapbox_maps_flutter_mobile/example/lib/polyline_annotations_example.dart index 3c7682fe7..96d053c74 100644 --- a/mapbox_maps_flutter_mobile/example/lib/polyline_annotations_example.dart +++ b/mapbox_maps_flutter_mobile/example/lib/polyline_annotations_example.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; -import 'package:mapbox_maps_example/utils.dart'; +import 'utils.dart'; import 'example.dart'; diff --git a/mapbox_maps_flutter_mobile/example/lib/spinning_globe_example.dart b/mapbox_maps_flutter_mobile/example/lib/spinning_globe_example.dart index 9f187c4eb..2f472be3c 100644 --- a/mapbox_maps_flutter_mobile/example/lib/spinning_globe_example.dart +++ b/mapbox_maps_flutter_mobile/example/lib/spinning_globe_example.dart @@ -2,8 +2,10 @@ import 'dart:async'; import 'dart:math'; import 'package:flutter/material.dart'; -import 'package:mapbox_maps_example/example.dart'; +import 'example.dart'; import 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; +import 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart' + show CameraOptions, CameraState; class SpinningGlobeExample extends StatefulWidget implements Example { @override diff --git a/mapbox_maps_flutter_mobile/example/lib/standard_style_interactions_example.dart b/mapbox_maps_flutter_mobile/example/lib/standard_style_interactions_example.dart index b9aa7d884..28a1d9589 100644 --- a/mapbox_maps_flutter_mobile/example/lib/standard_style_interactions_example.dart +++ b/mapbox_maps_flutter_mobile/example/lib/standard_style_interactions_example.dart @@ -1,6 +1,7 @@ import 'dart:developer'; import 'package:flutter/material.dart'; import 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; + import 'example.dart'; class StandardStyleInteractionsExample extends StatefulWidget diff --git a/mapbox_maps_flutter_mobile/example/lib/traffic_route_line_example.dart b/mapbox_maps_flutter_mobile/example/lib/traffic_route_line_example.dart index 0e784f9b9..276e18816 100644 --- a/mapbox_maps_flutter_mobile/example/lib/traffic_route_line_example.dart +++ b/mapbox_maps_flutter_mobile/example/lib/traffic_route_line_example.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:mapbox_maps_example/example.dart'; +import 'example.dart'; import 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; class TrafficRouteLineExample extends StatefulWidget implements Example { diff --git a/mapbox_maps_flutter_mobile/example/pubspec.lock b/mapbox_maps_flutter_mobile/example/pubspec.lock index 19d810e5d..03e2d7470 100644 --- a/mapbox_maps_flutter_mobile/example/pubspec.lock +++ b/mapbox_maps_flutter_mobile/example/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: async - sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.13.0" + version: "2.12.0" benchmark: dependency: transitive description: @@ -85,10 +85,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.3" + version: "1.3.2" ffi: dependency: transitive description: @@ -534,10 +534,10 @@ packages: dependency: transitive description: name: webdriver - sha256: "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade" + sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.0.4" xdg_directories: dependency: transitive description: diff --git a/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/MapInterfaces.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/MapInterfaces.swift index 1ffc51221..d192ba28b 100644 --- a/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/MapInterfaces.swift +++ b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/MapInterfaces.swift @@ -482,146 +482,6 @@ struct TileCoverOptions { } } -/// The distance on each side between rectangles, when one is contained into other. -/// -/// All fields' values are in `logical pixel` units. -/// -/// Generated class from Pigeon that represents data sent in messages. -struct MbxEdgeInsets { - /// Padding from the top. - var top: Double - /// Padding from the left. - var left: Double - /// Padding from the bottom. - var bottom: Double - /// Padding from the right. - var right: Double - - - // swift-format-ignore: AlwaysUseLowerCamelCase - static func fromList(_ pigeonVar_list: [Any?]) -> MbxEdgeInsets? { - let top = pigeonVar_list[0] as! Double - let left = pigeonVar_list[1] as! Double - let bottom = pigeonVar_list[2] as! Double - let right = pigeonVar_list[3] as! Double - - return MbxEdgeInsets( - top: top, - left: left, - bottom: bottom, - right: right - ) - } - func toList() -> [Any?] { - return [ - top, - left, - bottom, - right, - ] - } -} - -/// Various options for describing the viewpoint of a camera. All fields are -/// optional. -/// -/// Anchor and center points are mutually exclusive, with preference for the -/// center point when both are set. -/// -/// Generated class from Pigeon that represents data sent in messages. -struct CameraOptions { - /// Coordinate at the center of the camera. - var center: Point? = nil - /// Padding around the interior of the view that affects the frame of - /// reference for `center`. - var padding: MbxEdgeInsets? = nil - /// Point of reference for `zoom` and `angle`, assuming an origin at the - /// top-left corner of the view. - var anchor: ScreenCoordinate? = nil - /// Zero-based zoom level. Constrained to the minimum and maximum zoom - /// levels. - var zoom: Double? = nil - /// Bearing, measured in degrees from true north. Wrapped to [0, 360). - var bearing: Double? = nil - /// Pitch toward the horizon measured in degrees. - var pitch: Double? = nil - - - // swift-format-ignore: AlwaysUseLowerCamelCase - static func fromList(_ pigeonVar_list: [Any?]) -> CameraOptions? { - let center: Point? = nilOrValue(pigeonVar_list[0]) - let padding: MbxEdgeInsets? = nilOrValue(pigeonVar_list[1]) - let anchor: ScreenCoordinate? = nilOrValue(pigeonVar_list[2]) - let zoom: Double? = nilOrValue(pigeonVar_list[3]) - let bearing: Double? = nilOrValue(pigeonVar_list[4]) - let pitch: Double? = nilOrValue(pigeonVar_list[5]) - - return CameraOptions( - center: center, - padding: padding, - anchor: anchor, - zoom: zoom, - bearing: bearing, - pitch: pitch - ) - } - func toList() -> [Any?] { - return [ - center, - padding, - anchor, - zoom, - bearing, - pitch, - ] - } -} - -/// Describes the viewpoint of a camera. -/// -/// Generated class from Pigeon that represents data sent in messages. -struct CameraState { - /// Coordinate at the center of the camera. - var center: Point - /// Padding around the interior of the view that affects the frame of - /// reference for `center`. - var padding: MbxEdgeInsets - /// Zero-based zoom level. Constrained to the minimum and maximum zoom - /// levels. - var zoom: Double - /// Bearing, measured in degrees from true north. Wrapped to [0, 360). - var bearing: Double - /// Pitch toward the horizon measured in degrees. - var pitch: Double - - - // swift-format-ignore: AlwaysUseLowerCamelCase - static func fromList(_ pigeonVar_list: [Any?]) -> CameraState? { - let center = pigeonVar_list[0] as! Point - let padding = pigeonVar_list[1] as! MbxEdgeInsets - let zoom = pigeonVar_list[2] as! Double - let bearing = pigeonVar_list[3] as! Double - let pitch = pigeonVar_list[4] as! Double - - return CameraState( - center: center, - padding: padding, - zoom: zoom, - bearing: bearing, - pitch: pitch - ) - } - func toList() -> [Any?] { - return [ - center, - padding, - zoom, - bearing, - pitch, - ] - } -} - /// Holds options to be used for setting `camera bounds`. /// /// Generated class from Pigeon that represents data sent in messages. @@ -905,35 +765,6 @@ struct MapOptions { } } -/// Describes the coordinate on the screen, measured from top to bottom and from left to right. -/// Note: the `map` uses screen coordinate units measured in `logical pixels`. -/// -/// Generated class from Pigeon that represents data sent in messages. -struct ScreenCoordinate { - /// A value representing the x position of this coordinate. - var x: Double - /// A value representing the y position of this coordinate. - var y: Double - - - // swift-format-ignore: AlwaysUseLowerCamelCase - static func fromList(_ pigeonVar_list: [Any?]) -> ScreenCoordinate? { - let x = pigeonVar_list[0] as! Double - let y = pigeonVar_list[1] as! Double - - return ScreenCoordinate( - x: x, - y: y - ) - } - func toList() -> [Any?] { - return [ - x, - y, - ] - } -} - /// Describes the coordinate box on the screen, measured in `logical pixels` /// from top to bottom and from left to right. /// @@ -4965,14 +4796,14 @@ protocol StyleManager { /// @return The `transition options` of the current style in use. func getStyleTransition(completion: @escaping (Result) -> Void) /// Adds new import to current style, loaded from a JSON string. - /// + /// /// @param importId Identifier of import to update. /// @param json The JSON string to be loaded directly as the import. /// @param config A map containing the configuration options of the import. /// @param importPosition The import will be positioned according to the ImportPosition parameters. If not specified, then the import is moved to the top of the import stack. func addStyleImportFromJSON(importId: String, json: String, config: [String: Any]?, importPosition: ImportPosition?) throws /// Adds new import to current style, loaded from an URI. - /// + /// /// @param importId Identifier of import to update. /// @param uri URI of the import. /// @param config A map containing the configuration options of the import. @@ -4981,7 +4812,7 @@ protocol StyleManager { /// Updates an existing import in the style. /// The function replaces the content of the import, with the content loaded from the provided data value. /// The configuration values of the import are merged with the configuration provided in the update. - /// + /// /// @param importId Identifier of import to update. /// @param json The JSON string to be loaded directly as the import. /// @param config A map containing the configuration options of the import. @@ -4989,13 +4820,13 @@ protocol StyleManager { /// Updates an existing import in the style. /// The function replaces the content of the import, with the content loaded from the provided URI. /// The configuration values of the import are merged with the configuration provided in the update. - /// + /// /// @param importId Identifier of import to update. /// @param uri URI of the import. /// @param config A map containing the configuration options of the import. func updateStyleImportWithURI(importId: String, uri: String, config: [String: Any]?) throws /// Moves import to position before another import, specified with `beforeId`. Order of imported styles corresponds to order of their layers. - /// + /// /// @param importId Identifier of import to move. /// @param importPosition The import will be positioned according to the ImportPosition parameters. If not specified, then the import is moved to the top of the import stack. func moveStyleImport(importId: String, importPosition: ImportPosition?) throws @@ -5543,7 +5374,7 @@ class StyleManagerSetup { getStyleTransitionChannel.setMessageHandler(nil) } /// Adds new import to current style, loaded from a JSON string. - /// + /// /// @param importId Identifier of import to update. /// @param json The JSON string to be loaded directly as the import. /// @param config A map containing the configuration options of the import. @@ -5567,7 +5398,7 @@ class StyleManagerSetup { addStyleImportFromJSONChannel.setMessageHandler(nil) } /// Adds new import to current style, loaded from an URI. - /// + /// /// @param importId Identifier of import to update. /// @param uri URI of the import. /// @param config A map containing the configuration options of the import. @@ -5593,7 +5424,7 @@ class StyleManagerSetup { /// Updates an existing import in the style. /// The function replaces the content of the import, with the content loaded from the provided data value. /// The configuration values of the import are merged with the configuration provided in the update. - /// + /// /// @param importId Identifier of import to update. /// @param json The JSON string to be loaded directly as the import. /// @param config A map containing the configuration options of the import. @@ -5617,7 +5448,7 @@ class StyleManagerSetup { /// Updates an existing import in the style. /// The function replaces the content of the import, with the content loaded from the provided URI. /// The configuration values of the import are merged with the configuration provided in the update. - /// + /// /// @param importId Identifier of import to update. /// @param uri URI of the import. /// @param config A map containing the configuration options of the import. @@ -5639,7 +5470,7 @@ class StyleManagerSetup { updateStyleImportWithURIChannel.setMessageHandler(nil) } /// Moves import to position before another import, specified with `beforeId`. Order of imported styles corresponds to order of their layers. - /// + /// /// @param importId Identifier of import to move. /// @param importPosition The import will be positioned according to the ImportPosition parameters. If not specified, then the import is moved to the top of the import stack. let moveStyleImportChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.mapbox_maps_flutter.StyleManager.moveStyleImport\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) diff --git a/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PlatformInterfaceDataTypes.swift b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PlatformInterfaceDataTypes.swift new file mode 100644 index 000000000..8524c6b93 --- /dev/null +++ b/mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Generated/PlatformInterfaceDataTypes.swift @@ -0,0 +1,209 @@ +// Autogenerated from Pigeon (v25.2.0), do not edit directly. +// See also: https://pub.dev/packages/pigeon + +import Foundation + +#if os(iOS) + import Flutter +#elseif os(macOS) + import FlutterMacOS +#else + #error("Unsupported platform.") +#endif +import struct Turf.Point + +/// Error class for passing custom error details to Dart side. +final class PlatformInterfaceDataTypesError: Error { + let code: String + let message: String? + let details: Sendable? + + init(code: String, message: String?, details: Sendable?) { + self.code = code + self.message = message + self.details = details + } + + var localizedDescription: String { + return + "PlatformInterfaceDataTypesError(code: \(code), message: \(message ?? ""), details: \(details ?? "")" + } +} + +private func isNullish(_ value: Any?) -> Bool { + return value is NSNull || value == nil +} + +private func nilOrValue(_ value: Any?) -> T? { + if value is NSNull { return nil } + return value as! T? +} + +/// Describes the coordinate on the screen, measured from top to bottom and from left to right. +/// Note: the `map` uses screen coordinate units measured in `logical pixels`. +/// +/// Generated class from Pigeon that represents data sent in messages. +struct ScreenCoordinate { + /// A value representing the x position of this coordinate. + var x: Double + /// A value representing the y position of this coordinate. + var y: Double + + + // swift-format-ignore: AlwaysUseLowerCamelCase + static func fromList(_ pigeonVar_list: [Any?]) -> ScreenCoordinate? { + let x = pigeonVar_list[0] as! Double + let y = pigeonVar_list[1] as! Double + + return ScreenCoordinate( + x: x, + y: y + ) + } + func toList() -> [Any?] { + return [ + x, + y, + ] + } +} + +/// The distance on each side between rectangles, when one is contained into other. +/// +/// All fields' values are in `logical pixel` units. +/// +/// Generated class from Pigeon that represents data sent in messages. +struct MbxEdgeInsets { + /// Padding from the top. + var top: Double + /// Padding from the left. + var left: Double + /// Padding from the bottom. + var bottom: Double + /// Padding from the right. + var right: Double + + + // swift-format-ignore: AlwaysUseLowerCamelCase + static func fromList(_ pigeonVar_list: [Any?]) -> MbxEdgeInsets? { + let top = pigeonVar_list[0] as! Double + let left = pigeonVar_list[1] as! Double + let bottom = pigeonVar_list[2] as! Double + let right = pigeonVar_list[3] as! Double + + return MbxEdgeInsets( + top: top, + left: left, + bottom: bottom, + right: right + ) + } + func toList() -> [Any?] { + return [ + top, + left, + bottom, + right, + ] + } +} + +/// Various options for describing the viewpoint of a camera. All fields are +/// optional. +/// +/// Anchor and center points are mutually exclusive, with preference for the +/// center point when both are set. +/// +/// Generated class from Pigeon that represents data sent in messages. +struct CameraOptions { + /// Coordinate at the center of the camera. + var center: Point? = nil + /// Padding around the interior of the view that affects the frame of + /// reference for `center`. + var padding: MbxEdgeInsets? = nil + /// Point of reference for `zoom` and `angle`, assuming an origin at the + /// top-left corner of the view. + var anchor: ScreenCoordinate? = nil + /// Zero-based zoom level. Constrained to the minimum and maximum zoom + /// levels. + var zoom: Double? = nil + /// Bearing, measured in degrees from true north. Wrapped to [0, 360). + var bearing: Double? = nil + /// Pitch toward the horizon measured in degrees. + var pitch: Double? = nil + + + // swift-format-ignore: AlwaysUseLowerCamelCase + static func fromList(_ pigeonVar_list: [Any?]) -> CameraOptions? { + let center: Point? = nilOrValue(pigeonVar_list[0]) + let padding: MbxEdgeInsets? = nilOrValue(pigeonVar_list[1]) + let anchor: ScreenCoordinate? = nilOrValue(pigeonVar_list[2]) + let zoom: Double? = nilOrValue(pigeonVar_list[3]) + let bearing: Double? = nilOrValue(pigeonVar_list[4]) + let pitch: Double? = nilOrValue(pigeonVar_list[5]) + + return CameraOptions( + center: center, + padding: padding, + anchor: anchor, + zoom: zoom, + bearing: bearing, + pitch: pitch + ) + } + func toList() -> [Any?] { + return [ + center, + padding, + anchor, + zoom, + bearing, + pitch, + ] + } +} + +/// Describes the viewpoint of a camera. +/// +/// Generated class from Pigeon that represents data sent in messages. +struct CameraState { + /// Coordinate at the center of the camera. + var center: Point + /// Padding around the interior of the view that affects the frame of + /// reference for `center`. + var padding: MbxEdgeInsets + /// Zero-based zoom level. Constrained to the minimum and maximum zoom + /// levels. + var zoom: Double + /// Bearing, measured in degrees from true north. Wrapped to [0, 360). + var bearing: Double + /// Pitch toward the horizon measured in degrees. + var pitch: Double + + + // swift-format-ignore: AlwaysUseLowerCamelCase + static func fromList(_ pigeonVar_list: [Any?]) -> CameraState? { + let center = pigeonVar_list[0] as! Point + let padding = pigeonVar_list[1] as! MbxEdgeInsets + let zoom = pigeonVar_list[2] as! Double + let bearing = pigeonVar_list[3] as! Double + let pitch = pigeonVar_list[4] as! Double + + return CameraState( + center: center, + padding: padding, + zoom: zoom, + bearing: bearing, + pitch: pitch + ) + } + func toList() -> [Any?] { + return [ + center, + padding, + zoom, + bearing, + pitch, + ] + } +} diff --git a/mapbox_maps_flutter_mobile/lib/mapbox_maps_flutter.dart b/mapbox_maps_flutter_mobile/lib/mapbox_maps_flutter.dart index a60585993..3aa21a463 100644 --- a/mapbox_maps_flutter_mobile/lib/mapbox_maps_flutter.dart +++ b/mapbox_maps_flutter_mobile/lib/mapbox_maps_flutter.dart @@ -11,9 +11,8 @@ import 'package:flutter/rendering.dart'; import 'package:flutter/services.dart'; import 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; import 'package:meta/meta.dart'; -import 'package:turf/turf.dart' as turf; -export 'package:turf/helpers.dart'; +export 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; part 'src/annotation/circle_annotation_manager.dart'; part 'src/annotation/point_annotation_manager.dart'; @@ -66,7 +65,6 @@ part 'src/style/interactive_features/standard_poi.dart'; part 'src/location_settings.dart'; part 'src/snapshotter/snapshotter.dart'; part 'src/log_configuration.dart'; -part 'src/turf_adapters.dart'; part 'src/extensions.dart'; part 'src/map_events.dart'; part 'src/offline/offline_messenger.dart'; diff --git a/mapbox_maps_flutter_mobile/lib/src/mapbox_map.dart b/mapbox_maps_flutter_mobile/lib/src/mapbox_map.dart index 1ca57a7dd..cb6f2993d 100644 --- a/mapbox_maps_flutter_mobile/lib/src/mapbox_map.dart +++ b/mapbox_maps_flutter_mobile/lib/src/mapbox_map.dart @@ -136,7 +136,7 @@ extension on _MapWidgetDebugOptions { } /// Controller for a single MapboxMap instance running on the host platform. -class MapboxMap extends ChangeNotifier { +final class MapboxMap extends MapboxMapInterface with ChangeNotifier { MapboxMap._({ required _MapboxMapsPlatform mapboxMapsPlatform, this.onMapTapListener, @@ -344,10 +344,14 @@ class MapboxMap extends ChangeNotifier { /// The map will retain its current values for any details not passed via the camera options argument. /// It is not guaranteed that the provided `camera options` will be set, the map may apply constraints resulting in a /// different `camera state`. + @override Future setCamera(CameraOptions cameraOptions) => - _cameraManager.setCamera(cameraOptions); + _cameraManager.setCamera( + cameraOptions, + ); /// Returns the current `camera state`. + @override Future getCameraState() => _cameraManager.getCameraState(); /// Sets the `camera bounds options` of the map. The map will retain its current values for any diff --git a/mapbox_maps_flutter_mobile/lib/src/mapbox_maps_flutter_mobile.dart b/mapbox_maps_flutter_mobile/lib/src/mapbox_maps_flutter_mobile.dart index d25115ea3..59ef402a7 100644 --- a/mapbox_maps_flutter_mobile/lib/src/mapbox_maps_flutter_mobile.dart +++ b/mapbox_maps_flutter_mobile/lib/src/mapbox_maps_flutter_mobile.dart @@ -1,13 +1,17 @@ part of 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; base class MapboxMapsFlutterMobile extends MapboxMapsFlutterPlatform { - late final MapboxMap _mapboxMap; - @override - Widget buildView() { + Widget buildView({ + CameraOptions? cameraOptions, + OnMapCreated? onMapCreated, + }) { return MapWidget( + cameraOptions: cameraOptions, onMapCreated: (MapboxMap mapboxMap) { - _mapboxMap = mapboxMap; + if (onMapCreated != null) { + onMapCreated(mapboxMap); + } }, ); } diff --git a/mapbox_maps_flutter_mobile/lib/src/pigeons/map_interfaces.dart b/mapbox_maps_flutter_mobile/lib/src/pigeons/map_interfaces.dart index 8ae8b74c2..08c0919ce 100644 --- a/mapbox_maps_flutter_mobile/lib/src/pigeons/map_interfaces.dart +++ b/mapbox_maps_flutter_mobile/lib/src/pigeons/map_interfaces.dart @@ -561,230 +561,6 @@ class TileCoverOptions { int get hashCode => Object.hashAll(_toList()); } -/// The distance on each side between rectangles, when one is contained into other. -/// -/// All fields' values are in `logical pixel` units. -class MbxEdgeInsets { - MbxEdgeInsets({ - required this.top, - required this.left, - required this.bottom, - required this.right, - }); - - /// Padding from the top. - double top; - - /// Padding from the left. - double left; - - /// Padding from the bottom. - double bottom; - - /// Padding from the right. - double right; - - List _toList() { - return [ - top, - left, - bottom, - right, - ]; - } - - Object encode() { - return _toList(); - } - - static MbxEdgeInsets decode(Object result) { - result as List; - return MbxEdgeInsets( - top: result[0]! as double, - left: result[1]! as double, - bottom: result[2]! as double, - right: result[3]! as double, - ); - } - - @override - // ignore: avoid_equals_and_hash_code_on_mutable_classes - bool operator ==(Object other) { - if (other is! MbxEdgeInsets || other.runtimeType != runtimeType) { - return false; - } - if (identical(this, other)) { - return true; - } - return top == other.top && - left == other.left && - bottom == other.bottom && - right == other.right; - } - - @override - // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()); -} - -/// Various options for describing the viewpoint of a camera. All fields are -/// optional. -/// -/// Anchor and center points are mutually exclusive, with preference for the -/// center point when both are set. -class CameraOptions { - CameraOptions({ - this.center, - this.padding, - this.anchor, - this.zoom, - this.bearing, - this.pitch, - }); - - /// Coordinate at the center of the camera. - Point? center; - - /// Padding around the interior of the view that affects the frame of - /// reference for `center`. - MbxEdgeInsets? padding; - - /// Point of reference for `zoom` and `angle`, assuming an origin at the - /// top-left corner of the view. - ScreenCoordinate? anchor; - - /// Zero-based zoom level. Constrained to the minimum and maximum zoom - /// levels. - double? zoom; - - /// Bearing, measured in degrees from true north. Wrapped to [0, 360). - double? bearing; - - /// Pitch toward the horizon measured in degrees. - double? pitch; - - List _toList() { - return [ - center, - padding, - anchor, - zoom, - bearing, - pitch, - ]; - } - - Object encode() { - return _toList(); - } - - static CameraOptions decode(Object result) { - result as List; - return CameraOptions( - center: result[0] as Point?, - padding: result[1] as MbxEdgeInsets?, - anchor: result[2] as ScreenCoordinate?, - zoom: result[3] as double?, - bearing: result[4] as double?, - pitch: result[5] as double?, - ); - } - - @override - // ignore: avoid_equals_and_hash_code_on_mutable_classes - bool operator ==(Object other) { - if (other is! CameraOptions || other.runtimeType != runtimeType) { - return false; - } - if (identical(this, other)) { - return true; - } - return center == other.center && - padding == other.padding && - anchor == other.anchor && - zoom == other.zoom && - bearing == other.bearing && - pitch == other.pitch; - } - - @override - // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()); -} - -/// Describes the viewpoint of a camera. -class CameraState { - CameraState({ - required this.center, - required this.padding, - required this.zoom, - required this.bearing, - required this.pitch, - }); - - /// Coordinate at the center of the camera. - Point center; - - /// Padding around the interior of the view that affects the frame of - /// reference for `center`. - MbxEdgeInsets padding; - - /// Zero-based zoom level. Constrained to the minimum and maximum zoom - /// levels. - double zoom; - - /// Bearing, measured in degrees from true north. Wrapped to [0, 360). - double bearing; - - /// Pitch toward the horizon measured in degrees. - double pitch; - - List _toList() { - return [ - center, - padding, - zoom, - bearing, - pitch, - ]; - } - - Object encode() { - return _toList(); - } - - static CameraState decode(Object result) { - result as List; - return CameraState( - center: result[0]! as Point, - padding: result[1]! as MbxEdgeInsets, - zoom: result[2]! as double, - bearing: result[3]! as double, - pitch: result[4]! as double, - ); - } - - @override - // ignore: avoid_equals_and_hash_code_on_mutable_classes - bool operator ==(Object other) { - if (other is! CameraState || other.runtimeType != runtimeType) { - return false; - } - if (identical(this, other)) { - return true; - } - return center == other.center && - padding == other.padding && - zoom == other.zoom && - bearing == other.bearing && - pitch == other.pitch; - } - - @override - // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()); -} - /// Holds options to be used for setting `camera bounds`. class CameraBoundsOptions { CameraBoundsOptions({ @@ -1266,56 +1042,6 @@ class MapOptions { int get hashCode => Object.hashAll(_toList()); } -/// Describes the coordinate on the screen, measured from top to bottom and from left to right. -/// Note: the `map` uses screen coordinate units measured in `logical pixels`. -class ScreenCoordinate { - ScreenCoordinate({ - required this.x, - required this.y, - }); - - /// A value representing the x position of this coordinate. - double x; - - /// A value representing the y position of this coordinate. - double y; - - List _toList() { - return [ - x, - y, - ]; - } - - Object encode() { - return _toList(); - } - - static ScreenCoordinate decode(Object result) { - result as List; - return ScreenCoordinate( - x: result[0]! as double, - y: result[1]! as double, - ); - } - - @override - // ignore: avoid_equals_and_hash_code_on_mutable_classes - bool operator ==(Object other) { - if (other is! ScreenCoordinate || other.runtimeType != runtimeType) { - return false; - } - if (identical(this, other)) { - return true; - } - return x == other.x && y == other.y; - } - - @override - // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()); -} - /// Describes the coordinate box on the screen, measured in `logical pixels` /// from top to bottom and from left to right. class ScreenBox { diff --git a/mapbox_maps_flutter_mobile/lib/src/viewport/states/overview_viewport_state.dart b/mapbox_maps_flutter_mobile/lib/src/viewport/states/overview_viewport_state.dart index a1cdc37ca..0c7789583 100644 --- a/mapbox_maps_flutter_mobile/lib/src/viewport/states/overview_viewport_state.dart +++ b/mapbox_maps_flutter_mobile/lib/src/viewport/states/overview_viewport_state.dart @@ -21,7 +21,7 @@ part of mapbox_maps_flutter; /// ``` final class OverviewViewportState extends ViewportState { /// The geometry to display in the overview. - final turf.GeometryObject geometry; + final GeometryObject geometry; /// Extra padding to add around the [geometry]. /// diff --git a/mapbox_maps_flutter_mobile/pubspec.yaml b/mapbox_maps_flutter_mobile/pubspec.yaml index fb45eebd6..2c04af077 100644 --- a/mapbox_maps_flutter_mobile/pubspec.yaml +++ b/mapbox_maps_flutter_mobile/pubspec.yaml @@ -13,7 +13,6 @@ dependencies: flutter: sdk: flutter flutter_plugin_android_lifecycle: ^2.0.5 - turf: ^0.0.8 typed_data: ^1.3.0 meta: ^1.9.1 mapbox_maps_flutter_interface: any diff --git a/mapbox_maps_flutter_mobile/test/events_test.dart b/mapbox_maps_flutter_mobile/test/events_test.dart index d6a3877e4..ee5a3c375 100644 --- a/mapbox_maps_flutter_mobile/test/events_test.dart +++ b/mapbox_maps_flutter_mobile/test/events_test.dart @@ -6,7 +6,9 @@ void main() { final json = { 'timestamp': 1, 'cameraState': { - 'center': {'coordinates': [0, 0]}, + 'center': { + 'coordinates': [0, 0] + }, 'padding': {'top': 0, 'left': 1, 'bottom': 2, 'right': 3}, 'zoom': 11, 'bearing': 0, @@ -15,7 +17,8 @@ void main() { }; var cameraChangedEventData = CameraChangedEventData.fromJson(json); expect(cameraChangedEventData.timestamp, 1); - expect(cameraChangedEventData.cameraState.center.coordinates, Position.of([0, 0])); + expect(cameraChangedEventData.cameraState.center.coordinates, + Position.of([0, 0])); expect(cameraChangedEventData.cameraState.padding.top, 0); expect(cameraChangedEventData.cameraState.padding.left, 1); expect(cameraChangedEventData.cameraState.padding.bottom, 2); diff --git a/mapbox_maps_flutter_v3/.pubignore b/mapbox_maps_flutter_v3/.pubignore new file mode 100644 index 000000000..34924180a --- /dev/null +++ b/mapbox_maps_flutter_v3/.pubignore @@ -0,0 +1,4 @@ +*.lock +**/android/gradlew +**/android/gradlew.bat +**/android/gradle/wrapper/gradle-wrapper.jar \ No newline at end of file diff --git a/mapbox_maps_flutter_v3/example/integration_test/app.dart b/mapbox_maps_flutter_v3/example/integration_test/app.dart new file mode 100644 index 000000000..3a8af8367 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/integration_test/app.dart @@ -0,0 +1,40 @@ +import 'dart:async'; + +import 'package:flutter/material.dart'; +import 'package:mapbox_maps_flutter_v3/mapbox_maps_flutter_v3.dart'; + +const ACCESS_TOKEN = String.fromEnvironment('ACCESS_TOKEN'); + +Future main( + {double? width, + double? height, + CameraOptions? camera, + Alignment alignment = Alignment.topLeft}) { + final completer = Completer(); + + MapboxOptions.setAccessToken(ACCESS_TOKEN); + + runApp(MaterialApp( + home: Align( + alignment: alignment, + child: SizedBox( + width: width, + height: height, + child: MapWidget( + key: ValueKey("mapWidget"), + cameraOptions: camera, + onMapCreated: (MapboxMap mapboxMap) { + completer.complete(mapboxMap); + }, + ), + ), + ))); + + return completer.future; +} + +void runEmpty() { + MapboxOptions.setAccessToken(ACCESS_TOKEN); + + runApp(MaterialApp()); +} diff --git a/mapbox_maps_flutter_v3/example/integration_test/camera_test.dart b/mapbox_maps_flutter_v3/example/integration_test/camera_test.dart new file mode 100644 index 000000000..b271f25cc --- /dev/null +++ b/mapbox_maps_flutter_v3/example/integration_test/camera_test.dart @@ -0,0 +1,74 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:integration_test/integration_test.dart'; +import 'package:mapbox_maps_flutter_v3/mapbox_maps_flutter_v3.dart'; + +import 'app.dart' as app; + +void main() { + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); + final initialCamera = CameraOptions( + center: Point(coordinates: Position(0, 0)), + padding: MbxEdgeInsets(top: 10, left: 20, bottom: 30, right: 40), + zoom: 15, + pitch: 60, + bearing: 12, + ); + + group('camera get and set', () { + testWidgets('set camera when creating a map', (WidgetTester tester) async { + final mapFuture = app.main(camera: initialCamera); + await tester.pumpAndSettle(); + final mapboxMap = await mapFuture; + + // Verify that the camera options are set correctly + final camera = await mapboxMap.getCameraState(); + expect(camera.center.coordinates.lng, + closeTo(initialCamera.center!.coordinates.lng, 0.0001)); + expect(camera.center.coordinates.lat, + closeTo(initialCamera.center!.coordinates.lat, 0.0001)); + expect(camera.padding.top, closeTo(initialCamera.padding!.top, 0.0001)); + expect(camera.padding.left, closeTo(initialCamera.padding!.left, 0.0001)); + expect(camera.padding.bottom, + closeTo(initialCamera.padding!.bottom, 0.0001)); + expect( + camera.padding.right, closeTo(initialCamera.padding!.right, 0.0001)); + expect(camera.zoom, closeTo(initialCamera.zoom!, 0.0001)); + expect(camera.pitch, closeTo(initialCamera.pitch!, 0.0001)); + expect(camera.bearing, closeTo(initialCamera.bearing!, 0.0001)); + }); + + testWidgets('set camera after map created', (tester) async { + final mapFuture = app.main(); + await tester.pumpAndSettle(); + final mapboxMap = await mapFuture; + + // Set the camera options + final cameraOptions = CameraOptions( + center: Point(coordinates: Position(1, 1)), + padding: MbxEdgeInsets(top: 10, left: 20, bottom: 30, right: 40), + zoom: 15, + pitch: 60, + bearing: 12, + ); + + await mapboxMap.setCamera(cameraOptions); + await tester.pumpAndSettle(); + + final camera = await mapboxMap.getCameraState(); + expect(camera.center.coordinates.lng, + closeTo(cameraOptions.center!.coordinates.lng, 0.0001)); + expect(camera.center.coordinates.lat, + closeTo(cameraOptions.center!.coordinates.lat, 0.0001)); + expect( + camera.padding.top, closeTo(cameraOptions.padding?.top ?? 0, 0.0001)); + expect(camera.padding.left, closeTo(cameraOptions.padding!.left, 0.0001)); + expect(camera.padding.bottom, + closeTo(cameraOptions.padding!.bottom, 0.0001)); + expect( + camera.padding.right, closeTo(cameraOptions.padding!.right, 0.0001)); + expect(camera.zoom, closeTo(cameraOptions.zoom!, 0.0001)); + expect(camera.pitch, closeTo(cameraOptions.pitch!, 0.0001)); + expect(camera.bearing, closeTo(cameraOptions.bearing!, 0.0001)); + }); + }); +} diff --git a/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index f0bf926d2..a37adb51b 100644 --- a/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/mapbox_maps_flutter_v3/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-common-ios.git", "state" : { - "revision" : "6efcdd6ca3ded3647f3ff897845c679d52dd625a", - "version" : "24.12.0-rc.1" + "revision" : "316a4f97bcf45aaae632327b69fac545cc38e42f", + "version" : "24.12.0" } }, { @@ -15,8 +15,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git", "state" : { - "revision" : "bfb41b136ecd52b45e35fe25b1b4840309a3994d", - "version" : "11.12.0-rc.1" + "revision" : "853cfc3c431d42291e1c4a0d550fc8cf6ea90015", + "version" : "11.12.0" } }, { @@ -24,8 +24,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-maps-ios.git", "state" : { - "revision" : "5f46396a6816c6d89a4ca8df39c22db2f9f9e3d2", - "version" : "11.12.0-rc.1" + "revision" : "c141954157c3aaf09bc1bc3d233239666421b96e", + "version" : "11.12.0" } }, { diff --git a/mapbox_maps_flutter_v3/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/mapbox_maps_flutter_v3/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved index f0bf926d2..a37adb51b 100644 --- a/mapbox_maps_flutter_v3/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/mapbox_maps_flutter_v3/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-common-ios.git", "state" : { - "revision" : "6efcdd6ca3ded3647f3ff897845c679d52dd625a", - "version" : "24.12.0-rc.1" + "revision" : "316a4f97bcf45aaae632327b69fac545cc38e42f", + "version" : "24.12.0" } }, { @@ -15,8 +15,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git", "state" : { - "revision" : "bfb41b136ecd52b45e35fe25b1b4840309a3994d", - "version" : "11.12.0-rc.1" + "revision" : "853cfc3c431d42291e1c4a0d550fc8cf6ea90015", + "version" : "11.12.0" } }, { @@ -24,8 +24,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-maps-ios.git", "state" : { - "revision" : "5f46396a6816c6d89a4ca8df39c22db2f9f9e3d2", - "version" : "11.12.0-rc.1" + "revision" : "c141954157c3aaf09bc1bc3d233239666421b96e", + "version" : "11.12.0" } }, { diff --git a/mapbox_maps_flutter_v3/example/lib/main.dart b/mapbox_maps_flutter_v3/example/lib/main.dart index ae7879e15..ba69b26da 100644 --- a/mapbox_maps_flutter_v3/example/lib/main.dart +++ b/mapbox_maps_flutter_v3/example/lib/main.dart @@ -1,6 +1,8 @@ import 'package:flutter/material.dart'; import 'package:mapbox_maps_flutter_v3/mapbox_maps_flutter_v3.dart'; +import 'utils.dart'; + void main() { WidgetsFlutterBinding.ensureInitialized(); runApp(const MyApp()); @@ -18,18 +20,36 @@ class _MyAppState extends State { "MAPBOX_ACCESS_TOKEN", ); + late final MapboxMap _mapboxMap; + @override void initState() { super.initState(); MapboxOptions.setAccessToken(ACCESS_TOKEN); } + _onMapCreated(MapboxMap mapboxMap) { + _mapboxMap = mapboxMap; + + Future.delayed(const Duration(seconds: 2), () { + _mapboxMap.setCamera( + CameraOptions( + center: City.saigon, + ), + ); + }); + } + @override Widget build(BuildContext context) { return MaterialApp( home: Scaffold( appBar: AppBar(title: const Text('Example app')), - body: Center(child: MapWidget()), + body: Center( + child: MapWidget( + cameraOptions: CameraOptions(center: City.helsinki, zoom: 6), + onMapCreated: _onMapCreated, + )), ), ); } diff --git a/mapbox_maps_flutter_v3/example/lib/utils.dart b/mapbox_maps_flutter_v3/example/lib/utils.dart new file mode 100644 index 000000000..4aabe8e70 --- /dev/null +++ b/mapbox_maps_flutter_v3/example/lib/utils.dart @@ -0,0 +1,7 @@ +import 'package:mapbox_maps_flutter_v3/mapbox_maps_flutter_v3.dart'; + +extension City on Point { + static Point get helsinki => + Point(coordinates: Position.of([24.941, 60.173])); + static Point get saigon => Point(coordinates: Position.of([106.700, 10.776])); +} diff --git a/mapbox_maps_flutter_v3/example/pubspec.lock b/mapbox_maps_flutter_v3/example/pubspec.lock index 7855744a1..24048737d 100644 --- a/mapbox_maps_flutter_v3/example/pubspec.lock +++ b/mapbox_maps_flutter_v3/example/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: async - sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.13.0" + version: "2.12.0" benchmark: dependency: transitive description: @@ -77,10 +77,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.3" + version: "1.3.2" file: dependency: transitive description: @@ -404,10 +404,10 @@ packages: dependency: transitive description: name: webdriver - sha256: "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade" + sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.0.4" sdks: dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.27.0" diff --git a/mapbox_maps_flutter_v3/example/test/widget_test.dart b/mapbox_maps_flutter_v3/example/test/widget_test.dart index c4bfe976d..5f3efff37 100644 --- a/mapbox_maps_flutter_v3/example/test/widget_test.dart +++ b/mapbox_maps_flutter_v3/example/test/widget_test.dart @@ -18,8 +18,8 @@ void main() { // Verify that platform version is retrieved. expect( find.byWidgetPredicate( - (Widget widget) => widget is Text && - widget.data!.startsWith('Running on:'), + (Widget widget) => + widget is Text && widget.data!.startsWith('Running on:'), ), findsOneWidget, ); diff --git a/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3.dart b/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3.dart index f10cc7014..641ee72f2 100644 --- a/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3.dart +++ b/mapbox_maps_flutter_v3/lib/mapbox_maps_flutter_v3.dart @@ -1,9 +1,6 @@ library; -import 'dart:io'; +export 'src/map_widget.dart'; +export 'src/mapbox_options.dart'; -import 'package:flutter/material.dart'; -import 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; - -part 'src/map_widget.dart'; -part 'src/mapbox_options.dart'; +export 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; diff --git a/mapbox_maps_flutter_v3/lib/src/map_widget.dart b/mapbox_maps_flutter_v3/lib/src/map_widget.dart index ec6181ee7..5cc7f2e2a 100644 --- a/mapbox_maps_flutter_v3/lib/src/map_widget.dart +++ b/mapbox_maps_flutter_v3/lib/src/map_widget.dart @@ -1,12 +1,56 @@ -part of 'package:mapbox_maps_flutter_v3/mapbox_maps_flutter_v3.dart'; +import 'package:flutter/widgets.dart'; +import 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; +typedef MapboxMap = MapboxMapInterface; + +/// A widget that displays a Mapbox map using the Mapbox Maps Flutter SDK. +/// +/// You use this class to display map information and to manipulate the map contents from your application. +/// You can center the map on a given coordinate, specify the size of the area you want to display, +/// and style the features of the map to fit your application's use case. +/// +/// Use of MapWidget requires a Mapbox API access token. +/// Obtain an access token on the [Mapbox account page](https://www.mapbox.com/studio/account/tokens/). +/// +/// Warning: Please note that you are responsible for getting permission to use the map data, +/// and for ensuring your use adheres to the relevant terms of use. +/// +/// ### Example: +/// ```dart +/// MapWidget( +/// cameraOptions: CameraOptions( +/// center: Point(37.7749, -122.4194), +/// zoom: 12.0, +/// ), +/// onMapCreated: (mapboxMap) { +/// // Handle map creation logic here. +/// }, +/// ) +/// ``` class MapWidget extends StatelessWidget { final MapboxMapsFlutterPlatform _platform; - MapWidget({super.key}) : _platform = MapboxMapsFlutterPlatform.instance; + /// The initial Camera options when creating a MapWidget. + final CameraOptions? cameraOptions; + + /// Callback that is triggered when the map has been successfully created. + /// + /// This provides an opportunity to perform additional setup or configuration + /// once the map is ready. The [OnMapCreated] callback can be used to access + /// the [MapboxMap] instance and interact with it. + final OnMapCreated? onMapCreated; + + MapWidget({ + super.key, + this.cameraOptions, + this.onMapCreated, + }) : _platform = MapboxMapsFlutterPlatform.instance; @override Widget build(BuildContext context) { - return _platform.buildView(); + return _platform.buildView( + cameraOptions: cameraOptions, + onMapCreated: onMapCreated, + ); } } diff --git a/mapbox_maps_flutter_v3/lib/src/mapbox_options.dart b/mapbox_maps_flutter_v3/lib/src/mapbox_options.dart index bb65344bf..a179cfd34 100644 --- a/mapbox_maps_flutter_v3/lib/src/mapbox_options.dart +++ b/mapbox_maps_flutter_v3/lib/src/mapbox_options.dart @@ -1,4 +1,4 @@ -part of 'package:mapbox_maps_flutter_v3/mapbox_maps_flutter_v3.dart'; +import 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; /// A class that provides options and configurations for Mapbox services. /// diff --git a/mapbox_maps_flutter_web/example/pubspec.lock b/mapbox_maps_flutter_web/example/pubspec.lock index c62789efa..d7ec1b519 100644 --- a/mapbox_maps_flutter_web/example/pubspec.lock +++ b/mapbox_maps_flutter_web/example/pubspec.lock @@ -1,14 +1,30 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + args: + dependency: transitive + description: + name: args + sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 + url: "https://pub.dev" + source: hosted + version: "2.7.0" async: dependency: transitive description: name: async - sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.13.0" + version: "2.12.0" + benchmark: + dependency: transitive + description: + name: benchmark + sha256: cb3eeea01e3f054df76ee9775ca680f3afa5f19f39b2bb426ba78ba27654493b + url: "https://pub.dev" + source: hosted + version: "0.3.0" boolean_selector: dependency: transitive description: @@ -49,14 +65,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.8" + dart_sort_queue: + dependency: transitive + description: + name: dart_sort_queue + sha256: f3353ba8b4850e072d3368757f62edb79af34a9703c3e3df9c59342721f5f5b1 + url: "https://pub.dev" + source: hosted + version: "0.0.2+3" fake_async: dependency: transitive description: name: fake_async - sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.3" + version: "1.3.2" file: dependency: transitive description: @@ -98,11 +122,27 @@ packages: description: flutter source: sdk version: "0.0.0" + geotypes: + dependency: transitive + description: + name: geotypes + sha256: "5bedf57de92283133dd221e363812ef50eaaba414f0823b1974ef7d84b86991f" + url: "https://pub.dev" + source: hosted + version: "0.0.2" integration_test: dependency: "direct dev" description: flutter source: sdk version: "0.0.0" + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" + url: "https://pub.dev" + source: hosted + version: "4.9.0" leak_tracker: dependency: transitive description: @@ -205,6 +245,14 @@ packages: url: "https://pub.dev" source: hosted version: "5.0.3" + rbush: + dependency: transitive + description: + name: rbush + sha256: "48b683421b4afb43a642f82c6aa31911e54f3069143d31c7d33cbe329df13403" + url: "https://pub.dev" + source: hosted + version: "1.1.1" sky_engine: dependency: transitive description: flutter @@ -242,6 +290,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.4.1" + sweepline_intersections: + dependency: transitive + description: + name: sweepline_intersections + sha256: a665c707200a4f07140a4029b41a7c4883beb3f04322cd8e08ebf650f69e1176 + url: "https://pub.dev" + source: hosted + version: "0.0.4" sync_http: dependency: transitive description: @@ -266,6 +322,30 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.4" + turf: + dependency: transitive + description: + name: turf + sha256: "75347c45a5c1de805db7cb182286f05a3770e01546626c4dc292709d15cbe436" + url: "https://pub.dev" + source: hosted + version: "0.0.10" + turf_equality: + dependency: transitive + description: + name: turf_equality + sha256: f0f44ffe389547941358e0d3d4a747db2bd56115b32ff1cede5e5bdf3126a3e2 + url: "https://pub.dev" + source: hosted + version: "0.1.0" + turf_pip: + dependency: transitive + description: + name: turf_pip + sha256: ba4fd414baffd5d7b30880658ad6db82461c49ec023f8ffd0c23d398ad8b14be + url: "https://pub.dev" + source: hosted + version: "0.0.2" vector_math: dependency: transitive description: @@ -294,10 +374,10 @@ packages: dependency: transitive description: name: webdriver - sha256: "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade" + sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.0.4" sdks: dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.18.0-18.0.pre.54" diff --git a/mapbox_maps_flutter_web/example/test/widget_test.dart b/mapbox_maps_flutter_web/example/test/widget_test.dart index bcec5bab4..df76b5acc 100644 --- a/mapbox_maps_flutter_web/example/test/widget_test.dart +++ b/mapbox_maps_flutter_web/example/test/widget_test.dart @@ -18,8 +18,8 @@ void main() { // Verify that platform version is retrieved. expect( find.byWidgetPredicate( - (Widget widget) => widget is Text && - widget.data!.startsWith('Running on:'), + (Widget widget) => + widget is Text && widget.data!.startsWith('Running on:'), ), findsOneWidget, ); diff --git a/mapbox_maps_flutter_web/lib/src/bindings.dart b/mapbox_maps_flutter_web/lib/src/bindings.dart index 44394d9a0..2370856ea 100644 --- a/mapbox_maps_flutter_web/lib/src/bindings.dart +++ b/mapbox_maps_flutter_web/lib/src/bindings.dart @@ -8,13 +8,66 @@ import 'package:web/web.dart'; @JS() external String accessToken; +@JS() +@anonymous +extension type LngLat._(JSObject _) implements JSObject { + external LngLat(num lng, num lat); + external num lat; + external num lng; +} + +@JS() +@anonymous +extension type CameraOptions._(JSObject _) implements JSObject { + external factory CameraOptions({ + LngLat? center, + PaddingOptions? padding, + double? zoom, + double? bearing, + double? pitch, + }); + external LngLat? center; + external PaddingOptions? padding; + external double? zoom; + external double? bearing; + external double? pitch; +} + +@JS() +@anonymous +extension type PaddingOptions._(JSObject _) implements JSObject { + external factory PaddingOptions({ + num top, + num left, + num bottom, + num right, + }); + external num top; + external num left; + external num bottom; + external num right; +} + @JS() @anonymous extension type MapOptions._(JSObject _) implements JSObject { - external factory MapOptions({required HTMLDivElement container}); + external factory MapOptions({ + required HTMLDivElement container, + LngLat? center, + PaddingOptions? padding, + double? zoom, + double? bearing, + double? pitch, + }); } extension type Map._(JSObject _) implements JSObject { external Map(MapOptions container); external void on(String event, JSFunction callback); + external void jumpTo(CameraOptions camera); + external LngLat getCenter(); + external PaddingOptions getPadding(); + external double getZoom(); + external double getBearing(); + external double getPitch(); } diff --git a/mapbox_maps_flutter_web/lib/src/conversion.dart b/mapbox_maps_flutter_web/lib/src/conversion.dart new file mode 100644 index 000000000..1846add2e --- /dev/null +++ b/mapbox_maps_flutter_web/lib/src/conversion.dart @@ -0,0 +1,36 @@ +import 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; +import 'package:mapbox_maps_flutter_web/src/bindings.dart'; + +extension PointToLngLat on Point { + LngLat toLngLat() { + return LngLat(coordinates.lng, coordinates.lat); + } +} + +extension LngLatToPoint on LngLat { + Point toPoint() { + return Point(coordinates: Position(lng, lat)); + } +} + +extension PaddingOptionsToMbxEdgeInsets on PaddingOptions { + MbxEdgeInsets toMbxEdgeInsets() { + return MbxEdgeInsets( + top: top.toDouble(), + left: left.toDouble(), + bottom: bottom.toDouble(), + right: right.toDouble(), + ); + } +} + +extension MbxEdgeInsetsToPaddingOptions on MbxEdgeInsets { + PaddingOptions toPaddingOptions() { + return PaddingOptions( + top: top, + left: left, + bottom: bottom, + right: right, + ); + } +} diff --git a/mapbox_maps_flutter_web/lib/src/mapbox_map.dart b/mapbox_maps_flutter_web/lib/src/mapbox_map.dart new file mode 100644 index 000000000..45cf2657e --- /dev/null +++ b/mapbox_maps_flutter_web/lib/src/mapbox_map.dart @@ -0,0 +1,45 @@ +import 'dart:js_interop'; + +import 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; +import 'package:mapbox_maps_flutter_web/src/bindings.dart' as gl_js; +import 'package:mapbox_maps_flutter_web/src/conversion.dart'; + +final class MapboxMap extends MapboxMapInterface { + final gl_js.Map nativeMap; + + MapboxMap(this.nativeMap); + + @override + Future getCameraState() { + final camera = CameraState( + center: nativeMap.getCenter().toPoint(), + padding: nativeMap.getPadding().toMbxEdgeInsets(), + zoom: nativeMap.getZoom(), + bearing: nativeMap.getBearing(), + pitch: nativeMap.getPitch(), + ); + return Future.value(camera); + } + + @override + Future setCamera(CameraOptions cameraOptions) { + final options = gl_js.CameraOptions(); + if (cameraOptions.center != null) { + options.center = cameraOptions.center!.toLngLat(); + } + if (cameraOptions.padding != null) { + options.padding = cameraOptions.padding!.toPaddingOptions(); + } + if (cameraOptions.zoom != null) { + options.zoom = cameraOptions.zoom; + } + if (cameraOptions.bearing != null) { + options.bearing = cameraOptions.bearing; + } + if (cameraOptions.pitch != null) { + options.pitch = cameraOptions.pitch; + } + nativeMap.jumpTo(options); + return Future.value(); + } +} diff --git a/mapbox_maps_flutter_web/lib/src/mapbox_maps_flutter_web.dart b/mapbox_maps_flutter_web/lib/src/mapbox_maps_flutter_web.dart index 22deedc59..12b05b150 100644 --- a/mapbox_maps_flutter_web/lib/src/mapbox_maps_flutter_web.dart +++ b/mapbox_maps_flutter_web/lib/src/mapbox_maps_flutter_web.dart @@ -4,7 +4,9 @@ import 'dart:ui_web'; import 'package:flutter/widgets.dart'; import 'package:flutter_web_plugins/flutter_web_plugins.dart'; import 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; -import 'package:mapbox_maps_flutter_web/src/bindings.dart'; +import 'package:mapbox_maps_flutter_web/src/bindings.dart' as gl_js; +import 'package:mapbox_maps_flutter_web/src/conversion.dart'; +import 'package:mapbox_maps_flutter_web/src/mapbox_map.dart'; import 'package:web/web.dart'; const mapboxGlCss = 'https://api.mapbox.com/mapbox-gl-js/v3.11.1/mapbox-gl.css'; @@ -18,48 +20,64 @@ base class MapboxMapsFlutterWeb extends MapboxMapsFlutterPlatform { late HTMLDivElement _mapElement; @override - Widget buildView() { + Widget buildView({ + CameraOptions? cameraOptions, + OnMapCreated? onMapCreated, + }) { final viewType = 'mapbox-maps-flutter-web/$hashCode'; // Attach the mapDiv to the DOM platformViewRegistry.registerViewFactory(viewType, (int id) { - _mapElement = - document.createElement("div") as HTMLDivElement - ..style.position = 'absolute' - ..style.top = '0' - ..style.bottom = '0' - ..style.height = '100%' - ..style.width = '100%'; + _mapElement = document.createElement("div") as HTMLDivElement + ..style.position = 'absolute' + ..style.top = '0' + ..style.bottom = '0' + ..style.height = '100%' + ..style.width = '100%'; - _initMap(); + _initMap( + cameraOptions: cameraOptions, + onMapCreated: onMapCreated, + ); return _mapElement; }); return HtmlElementView(viewType: viewType); } - _initMap() async { - final link = - document.createElement('link') as HTMLLinkElement - ..rel = 'stylesheet' - ..href = mapboxGlCss - ..type = 'text/css'; + _initMap({ + CameraOptions? cameraOptions, + OnMapCreated? onMapCreated, + }) async { + final link = document.createElement('link') as HTMLLinkElement + ..rel = 'stylesheet' + ..href = mapboxGlCss + ..type = 'text/css'; _mapElement.append(link); await link.onLoad.first; - final options = MapOptions(container: _mapElement); - final nativeMap = Map(options); + final options = gl_js.MapOptions( + container: _mapElement, + center: cameraOptions?.center?.toLngLat(), + padding: cameraOptions?.padding?.toPaddingOptions(), + zoom: cameraOptions?.zoom, + bearing: cameraOptions?.bearing, + pitch: cameraOptions?.pitch, + ); + final nativeMap = gl_js.Map(options); + + onMapCreated?.call(MapboxMap(nativeMap)); nativeMap.on('load', (() {}).toJS); } @override Future getAccessToken() { - return Future.value(accessToken); + return Future.value(gl_js.accessToken); } @override void setAccessToken(String token) { - accessToken = token; + gl_js.accessToken = token; } } diff --git a/scripts/check_test_suite.dart b/scripts/check_test_suite.dart index 316a4d559..c4ad7b23f 100644 --- a/scripts/check_test_suite.dart +++ b/scripts/check_test_suite.dart @@ -32,15 +32,18 @@ void main() { .where((testFile) => !includedTestFiles.contains(testFile)) .toList(); - missingTests.remove('all_test.dart'); // Exclude the aggregated test suite file itself + missingTests + .remove('all_test.dart'); // Exclude the aggregated test suite file itself if (missingTests.isNotEmpty) { - print('The following test files are missing from the aggregated test suite:'); + print( + 'The following test files are missing from the aggregated test suite:'); for (var missingTest in missingTests) { print(missingTest); } print(''); - print('Import the missing test files in the integration_test/all_test.dart.'); + print( + 'Import the missing test files in the integration_test/all_test.dart.'); print("Don't forget to invoke the main function of the test file as well."); exit(1); // Exit with error code 1 if there are missing tests } else { From b997a435879df1aeb5a4b76b4a1734f90bb020cf Mon Sep 17 00:00:00 2001 From: Mai Mai Date: Tue, 20 May 2025 10:50:18 +0300 Subject: [PATCH 16/16] Fix ci v3 (#947) --- .circleci/config.yml | 80 ++++++++--------- .../mapbox_maps_flutter_interface_test.dart | 5 -- mapbox_maps_flutter_mobile/LICENSE | 25 ------ .../utils/list_close_to_matcher.dart | 6 +- .../example/pubspec.lock | 2 +- mapbox_maps_flutter_mobile/pubspec.yaml | 2 +- mapbox_maps_flutter_v3/example/pubspec.lock | 2 +- .../example/test/widget_test.dart | 27 ------ mapbox_maps_flutter_web/example/lib/main.dart | 2 - .../lib/src/mapbox_map.dart | 2 - scripts/license.sh | 86 +++++++++++-------- scripts/update-version.sh | 8 +- 12 files changed, 95 insertions(+), 152 deletions(-) delete mode 100644 mapbox_maps_flutter_interface/test/mapbox_maps_flutter_interface_test.dart delete mode 100644 mapbox_maps_flutter_v3/example/test/widget_test.dart diff --git a/.circleci/config.yml b/.circleci/config.yml index 7546b73df..85b12eb49 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,6 @@ orbs: slack: circleci/slack@5 commands: - inject-netrc-credentials: steps: - run: @@ -28,6 +27,15 @@ commands: fingerprints: - "9d:db:07:0b:62:81:11:c3:46:21:8e:fa:51:99:80:2d" + setup-flutter: + parameters: + app-dir: + type: string + steps: + - flutter/install_sdk_and_pub: + version: 3.27.0 + app-dir: << parameters.app-dir >> + slack-notify-failure-if-any: steps: - slack/notify: @@ -48,23 +56,9 @@ commands: "type": "section", "text": { "type": "mrkdwn", - "text": "`$CIRCLE_JOB` <$CIRCLE_BUILD_URL|failed> for by `$(git log --format='%an' -n 1 $CIRCLE_SHA1)` on $(if [ \"$CIRCLE_BRANCH\" == \"main\" ]; then echo 'the'; fi) `${CIRCLE_TAG:-$CIRCLE_BRANCH}` ${CIRCLE_TAG:+tag}${CIRCLE_BRANCH:+branch}." + "text": "`$CIRCLE_JOB` <$CIRCLE_BUILD_URL|failed> for commit ${CIRCLE_SHA1:0:6} on `${CIRCLE_TAG:-$CIRCLE_BRANCH}` ${CIRCLE_TAG:+tag}${CIRCLE_BRANCH:+branch}." } }, - { - "type": "rich_text", - "elements": [ - { - "type": "rich_text_quote", - "elements": [ - { - "type": "text", - "text": "$(git log --format=%s -n 1 $CIRCLE_SHA1)" - } - ] - } - ] - }, { "type": "section", "fields": [ @@ -78,7 +72,6 @@ commands: } jobs: - build-android: parameters: workspace-path: @@ -89,8 +82,7 @@ jobs: resource_class: 2xlarge steps: - checkout - - flutter/install_sdk_and_pub: - version: 3.27.0 + - setup-flutter: app-dir: mapbox_maps_flutter_mobile/example - run: name: ktlint @@ -100,11 +92,11 @@ jobs: name: unit test command: flutter test mapbox_maps_flutter_mobile/test - run: - name: "Build Android integration tests" + name: Build Android integration tests working_directory: mapbox_maps_flutter_mobile/example/android command: | ./gradlew app:assembleAndroidTest --stacktrace - ./gradlew app:assembleDebug -Ptarget=integration_test/all_test.dart -Pdart-defines="$(echo -n "ACCESS_TOKEN=$MAPBOX_ACCESS_TOKEN" | base64 -w 0)" --stacktrace + ./gradlew app:assembleDebug -Ptarget=integration_test/all_test.dart -Pdart-defines="$(echo -n \"ACCESS_TOKEN=$MAPBOX_ACCESS_TOKEN\" | base64 -w 0)" --stacktrace - persist_to_workspace: root: << parameters.workspace-path >> paths: @@ -112,7 +104,6 @@ jobs: - androidTest/debug/app-debug-androidTest.apk - slack-notify-failure-if-any - run-android-tests-firebase: parameters: workspace-path: @@ -124,7 +115,7 @@ jobs: at: << parameters.workspace-path >> - setup-gcloud - run: - name: "Run Android integration tests on Firebase" + name: Run Android integration tests on Firebase no_output_timeout: 20m command: | gcloud firebase test android run --type instrumentation \ @@ -151,8 +142,7 @@ jobs: - inject-netrc-credentials - add-mapbox-submodules-key - macos/install-rosetta - - flutter/install_sdk_and_pub: - version: 3.27.0 + - setup-flutter: app-dir: mapbox_maps_flutter_mobile/example - run: name: swiftlint @@ -162,16 +152,11 @@ jobs: name: unit test command: flutter test mapbox_maps_flutter_mobile/test - run: - name: "Build iOS integration tests" + name: Build iOS integration tests command: | - pushd example - - # required to init configs that pass environment variables to fastlane later - flutter build ios --config-only mapbox_maps_flutter_mobile/example/integration_test/all_test.dart \ - --release --dart-define=ACCESS_TOKEN=${MAPBOX_ACCESS_TOKEN} - - popd # to repo root - + pushd mapbox_maps_flutter_mobile/example + flutter build ios --config-only integration_test/all_test.dart --release --dart-define=ACCESS_TOKEN=${MAPBOX_ACCESS_TOKEN} + popd bundle install bundle exec fastlane build_examples_tests - persist_to_workspace: @@ -191,7 +176,7 @@ jobs: at: << parameters.workspace-path >> - setup-gcloud - run: - name: "Run iOS integration tests on Firebase" + name: Run iOS integration tests on Firebase no_output_timeout: 20m command: | gcloud firebase test ios run \ @@ -202,17 +187,17 @@ jobs: --client-details matrixLabel="${CIRCLE_JOB}-${CIRCLE_SHA1:0:6}" 2>&1 | tee firebase_test_lab_run.log - run: name: Download XCResults + when: always command: | - TEST_LAB_PATH=$(cat firebase_test_lab_run.log | grep -o "test-lab.*/") - + TEST_LAB_PATH=$(grep -o "test-lab.*/" firebase_test_lab_run.log) mkdir testlab_results gsutil -m cp -r "gs://${TEST_LAB_PATH}i*" testlab_results zip -r testlab_results.zip testlab_results - when: always - store_artifacts: path: firebase_test_lab_run.log - store_artifacts: path: testlab_results.zip + destination: ios/testlab_results.zip - store_test_results: path: testlab_results - slack-notify-failure-if-any @@ -223,18 +208,24 @@ jobs: resource_class: small steps: - checkout - - flutter/install_sdk_and_pub: - version: 3.27.0 + - setup-flutter: + app-dir: . - run: - name: Check license - command: bash scripts/license.sh --mode validate + name: Install dependencies for examples + command: | + dart pub get -C mapbox_maps_flutter_mobile/example + dart pub get -C mapbox_maps_flutter_web/example + dart pub get -C mapbox_maps_flutter_v3/example + - run: + name: Check license for mapbox_maps_flutter_mobile + command: bash scripts/license.sh mapbox_maps_flutter --mode=validate - run: name: Run dart analyze command: dart analyze - run: name: Check all tests are in the test suite - command: dart ../scripts/check_test_suite.dart - working_directory: example + working_directory: mapbox_maps_flutter_mobile/example + command: dart ../../scripts/check_test_suite.dart workflows: build: @@ -254,6 +245,7 @@ executors: resource_class: macos.m1.medium.gen1 macos: xcode: 16.0.0 + firebase-test-runner: resource_class: small docker: diff --git a/mapbox_maps_flutter_interface/test/mapbox_maps_flutter_interface_test.dart b/mapbox_maps_flutter_interface/test/mapbox_maps_flutter_interface_test.dart deleted file mode 100644 index 92778e501..000000000 --- a/mapbox_maps_flutter_interface/test/mapbox_maps_flutter_interface_test.dart +++ /dev/null @@ -1,5 +0,0 @@ -import 'package:flutter_test/flutter_test.dart'; - -import 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; - -void main() {} diff --git a/mapbox_maps_flutter_mobile/LICENSE b/mapbox_maps_flutter_mobile/LICENSE index 2b01675af..41cfc3b9e 100644 --- a/mapbox_maps_flutter_mobile/LICENSE +++ b/mapbox_maps_flutter_mobile/LICENSE @@ -75,31 +75,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ``` -### turf, https://github.com/dartclub/turf_dart - -``` -The MIT License (MIT) - -Copyright (c) 2020 Lukas Himsel - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -``` - ### flutter_plugin_android_lifecycle, https://github.com/flutter/packages/tree/main/packages/flutter_plugin_android_lifecycle ``` diff --git a/mapbox_maps_flutter_mobile/example/integration_test/utils/list_close_to_matcher.dart b/mapbox_maps_flutter_mobile/example/integration_test/utils/list_close_to_matcher.dart index 176a3c3c8..1f7ef777a 100644 --- a/mapbox_maps_flutter_mobile/example/integration_test/utils/list_close_to_matcher.dart +++ b/mapbox_maps_flutter_mobile/example/integration_test/utils/list_close_to_matcher.dart @@ -14,11 +14,11 @@ class _IsListCloseTo extends Matcher { if (_value == null || list == null) { return false; } - if (_value!.length != list.length) { + if (_value.length != list.length) { return false; } - for (var i = 0; i < _value!.length; i++) { - final expected = _value![i]; + for (var i = 0; i < _value.length; i++) { + final expected = _value[i]; final actual = list[i]; if (expected is num && actual is num) { final pairIsCloseTo = closeTo(expected, _delta).matches(actual, {}); diff --git a/mapbox_maps_flutter_mobile/example/pubspec.lock b/mapbox_maps_flutter_mobile/example/pubspec.lock index 03e2d7470..0c844f42d 100644 --- a/mapbox_maps_flutter_mobile/example/pubspec.lock +++ b/mapbox_maps_flutter_mobile/example/pubspec.lock @@ -269,7 +269,7 @@ packages: path: ".." relative: true source: path - version: "2.8.0-rc.1" + version: "2.8.0" mapbox_maps_flutter_interface: dependency: "direct overridden" description: diff --git a/mapbox_maps_flutter_mobile/pubspec.yaml b/mapbox_maps_flutter_mobile/pubspec.yaml index 2c04af077..fcd56292c 100644 --- a/mapbox_maps_flutter_mobile/pubspec.yaml +++ b/mapbox_maps_flutter_mobile/pubspec.yaml @@ -1,6 +1,6 @@ name: mapbox_maps_flutter description: Interactive, thoroughly customizable maps powered by Mapbox Maps mobile SDKs. -version: 2.8.0-rc.1 +version: 2.8.0 homepage: https://github.com/mapbox/mapbox-maps-flutter environment: diff --git a/mapbox_maps_flutter_v3/example/pubspec.lock b/mapbox_maps_flutter_v3/example/pubspec.lock index 24048737d..5777a47bd 100644 --- a/mapbox_maps_flutter_v3/example/pubspec.lock +++ b/mapbox_maps_flutter_v3/example/pubspec.lock @@ -189,7 +189,7 @@ packages: path: "../../mapbox_maps_flutter_mobile" relative: true source: path - version: "2.8.0-rc.1" + version: "2.8.0" mapbox_maps_flutter_interface: dependency: "direct overridden" description: diff --git a/mapbox_maps_flutter_v3/example/test/widget_test.dart b/mapbox_maps_flutter_v3/example/test/widget_test.dart deleted file mode 100644 index 5f3efff37..000000000 --- a/mapbox_maps_flutter_v3/example/test/widget_test.dart +++ /dev/null @@ -1,27 +0,0 @@ -// This is a basic Flutter widget test. -// -// To perform an interaction with a widget in your test, use the WidgetTester -// utility in the flutter_test package. For example, you can send tap and scroll -// gestures. You can also use WidgetTester to find child widgets in the widget -// tree, read text, and verify that the values of widget properties are correct. - -import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; - -import 'package:mapbox_maps_flutter_v3_example/main.dart'; - -void main() { - testWidgets('Verify Platform version', (WidgetTester tester) async { - // Build our app and trigger a frame. - await tester.pumpWidget(const MyApp()); - - // Verify that platform version is retrieved. - expect( - find.byWidgetPredicate( - (Widget widget) => - widget is Text && widget.data!.startsWith('Running on:'), - ), - findsOneWidget, - ); - }); -} diff --git a/mapbox_maps_flutter_web/example/lib/main.dart b/mapbox_maps_flutter_web/example/lib/main.dart index 787b48c0e..7446474ed 100644 --- a/mapbox_maps_flutter_web/example/lib/main.dart +++ b/mapbox_maps_flutter_web/example/lib/main.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'dart:async'; import 'package:flutter/services.dart'; -import 'package:mapbox_maps_flutter_web/mapbox_maps_flutter_web.dart'; void main() { runApp(const MyApp()); @@ -17,7 +16,6 @@ class MyApp extends StatefulWidget { class _MyAppState extends State { String _platformVersion = 'Unknown'; - final _mapboxMapsFlutterWebPlugin = MapboxMapsFlutterWeb(); @override void initState() { diff --git a/mapbox_maps_flutter_web/lib/src/mapbox_map.dart b/mapbox_maps_flutter_web/lib/src/mapbox_map.dart index 45cf2657e..d68855d71 100644 --- a/mapbox_maps_flutter_web/lib/src/mapbox_map.dart +++ b/mapbox_maps_flutter_web/lib/src/mapbox_map.dart @@ -1,5 +1,3 @@ -import 'dart:js_interop'; - import 'package:mapbox_maps_flutter_interface/mapbox_maps_flutter_interface.dart'; import 'package:mapbox_maps_flutter_web/src/bindings.dart' as gl_js; import 'package:mapbox_maps_flutter_web/src/conversion.dart'; diff --git a/scripts/license.sh b/scripts/license.sh index 794c43cd9..c7c2fe5b8 100755 --- a/scripts/license.sh +++ b/scripts/license.sh @@ -3,45 +3,55 @@ set -eou pipefail # Function to display usage information usage() { - echo "Usage: $0 --mode " + echo "Usage: $0 --mode " exit 1 } mode="generate" + +# Check if exactly two arguments are provided +if [ "$#" -ne 2 ]; then + echo "Usage: $0 --mode=[generate|validate]" + exit 1 +fi + +PACKAGE_NAME="$1" +MODE="$2" + +# Extract the mode value +if [[ "$MODE" =~ --mode[=\ ]?(generate|validate) ]]; then + MODE="${BASH_REMATCH[1]}" +else + echo "Invalid mode. Use --mode generate or --mode validate" + exit 1 +fi + # Fetch the dependencies in JSON format deps=$(flutter pub deps --json) -# Parse command-line arguments -if [[ $# -eq 0 ]]; then - echo "Error: No arguments provided." - usage -fi +PACKAGE_INFO=$(echo "$deps" | jq --arg PACKAGE_NAME "$PACKAGE_NAME" ' + .packages + | map(select(.name == $PACKAGE_NAME)) + | first + | {version: .version, directDependencies: .directDependencies} +') + +# Extract directDependencies array from PACKAGE_INFO +DIRECT_DEPS=$(echo "$PACKAGE_INFO" | jq '.directDependencies') + +# Find all packages whose names are in directDependencies +MATCHING_PACKAGES=$(echo "$deps" | jq -s --argjson deps "$DIRECT_DEPS" ' + .[0].packages + | map(select(.name as $n | $deps | index($n))) + | map(select(.name != "flutter" and (.name | startswith("mapbox_maps_flutter") | not))) + | map({name, version}) +') -while [[ $# -gt 0 ]]; do - case "$1" in - --mode) - if [[ -n "$2" ]]; then - mode="$2" - shift 2 - else - echo "Error: --mode requires a value." - usage - fi - ;; - *) - usage - ;; - esac -done - -# Extract the archive URLs for direct dependencies, excluding the package named 'flutter' -package_info=$(echo "$deps" | jq -r '.packages[] | select(.kind != "root" and .name != "flutter") | "\(.name) \(.version)"') -sdk_version=$(echo "$deps" | jq -r '.packages[] | select(.kind == "root") | .version') +PACKAGE_VERSION=$(echo "$PACKAGE_INFO" | jq -r '.version') deps_licenses="" # Loop through each name/version pair while read -r name version; do - package_metadata=$(curl -s "https://pub.dev/api/packages/$name/versions/$version") archive_url=$(echo "$package_metadata" | jq -r '.archive_url') repository_url=$(echo "$package_metadata" | jq -r '.pubspec.repository // "No repository URL found"') @@ -58,18 +68,20 @@ while read -r name version; do license_entry="### $name, $repository_url"$'\n\n'"\`\`\`"$'\n'"$(cat "$license_file")"$'\n'"\`\`\`"$'\n\n' deps_licenses+="$license_entry" else - dep_licenses+="No license file found for $name $version" + deps_licenses+="No license file found for $name $version" fi # Add your logic here to handle each package -done <<< "$package_info" +done < <(echo "$MATCHING_PACKAGES" | jq -r '.[] | "\(.name) \(.version)"') -mobile_dir='mapbox_maps_flutter_mobile' +if [[ "$PACKAGE_NAME" == "mapbox_maps_flutter" ]]; then + mobile_dir="mapbox_maps_flutter_mobile" +else + mobile_dir="$PACKAGE_NAME" +fi ios_sdk_version=$(grep -A 1 'mapbox-maps-ios' $mobile_dir/ios/mapbox_maps_flutter/Package.swift | grep 'exact' | sed -E 's/.*"([0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?)".*/\1/') android_sdk_version=$(grep 'com.mapbox.maps:android' $mobile_dir/android/build.gradle | sed -E 's/.*"com\.mapbox\.maps:android:([0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?)".*/\1/') -echo "iOS SDK version: $ios_sdk_version" -echo "Android SDK version: $android_sdk_version" # Fetch the license files for iOS and Android SDKs ios_license_content=$(curl -s "https://raw.githubusercontent.com/mapbox/mapbox-maps-ios/v$ios_sdk_version/LICENSE.md") android_license_content=$(curl -s "https://raw.githubusercontent.com/mapbox/mapbox-maps-android/v$android_sdk_version/LICENSE.md") @@ -94,22 +106,22 @@ __IOS_LICENSES__ __ANDROID_LICENSES__ " -license=$(echo "$license_template" | m4 -D __SDK_VERSION__="$sdk_version" \ +license=$(echo "$license_template" | m4 -D __SDK_VERSION__="$PACKAGE_VERSION" \ -D __DEPS_LICENSES__="$deps_licenses" \ -D __IOS_LICENSES__="$ios_license_content" \ -D __ANDROID_LICENSES__="$android_license_content" \ -D __YEAR__="$(date +%Y)") -if [ "$mode" == "validate" ]; then - if [[ "$(cat LICENSE)" == "$license" ]]; then +if [ "$MODE" == "validate" ]; then + if [[ "$(cat $mobile_dir/LICENSE)" == "$license" ]]; then echo "License file is up-to-date." exit 0 else echo "⚠️ License is not up-to-date. ⚠️" exit 1 fi -elif [ "$mode" == "generate" ]; then - echo "$license" > LICENSE +elif [ "$MODE" == "generate" ]; then + echo "$license" > $mobile_dir/LICENSE echo "License file has been updated." >&2 else usage diff --git a/scripts/update-version.sh b/scripts/update-version.sh index 7ec5f7df3..8fb5aec57 100755 --- a/scripts/update-version.sh +++ b/scripts/update-version.sh @@ -15,13 +15,13 @@ if ! [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9]+(\.[0-9]+)*)?$ ]]; th exit 1 fi -echo "Updating MapboxMaps Flutter SDK version: $VERSION" +echo "Updating MapboxMaps Flutter Mobile SDK version: $VERSION" -PUBSPEC_FILE="$SCRIPT_DIR/../pubspec.yaml" +PUBSPEC_FILE="$SCRIPT_DIR/../mapbox_maps_flutter_mobile/pubspec.yaml" sed -i '' "s/^version: .*/version: $VERSION/" "$PUBSPEC_FILE" -PODSPEC_FILE="$SCRIPT_DIR/../ios/mapbox_maps_flutter.podspec" +PODSPEC_FILE="$SCRIPT_DIR/../mapbox_maps_flutter_mobile/ios/mapbox_maps_flutter.podspec" sed -i '' "s/\(s\.version *= *\)\'[^\']*\'/\1\'$VERSION\'/" "$PODSPEC_FILE" -PACKAGE_INFO_FILE="$SCRIPT_DIR/../lib/src/package_info.dart" +PACKAGE_INFO_FILE="$SCRIPT_DIR/../mapbox_maps_flutter_mobile/lib/src/package_info.dart" sed -i '' "s/^const String mapboxPluginVersion = .*/const String mapboxPluginVersion = '$VERSION';/" "$PACKAGE_INFO_FILE"