diff --git a/android/src/main/java/org/maplibre/maplibregl/MapLibreMapsPlugin.java b/android/src/main/java/org/maplibre/maplibregl/MapLibreMapsPlugin.java index 4213ca38e..d73b1dfec 100644 --- a/android/src/main/java/org/maplibre/maplibregl/MapLibreMapsPlugin.java +++ b/android/src/main/java/org/maplibre/maplibregl/MapLibreMapsPlugin.java @@ -27,7 +27,7 @@ */ public class MapLibreMapsPlugin implements FlutterPlugin, ActivityAware { - private static final String VIEW_TYPE = "plugins.flutter.io/mapbox_gl"; + private static final String VIEW_TYPE = "plugins.flutter.io/maplibre_gl"; static FlutterAssets flutterAssets; private Lifecycle lifecycle; @@ -43,13 +43,13 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) { flutterAssets = binding.getFlutterAssets(); MethodChannel methodChannel = - new MethodChannel(binding.getBinaryMessenger(), "plugins.flutter.io/mapbox_gl"); + new MethodChannel(binding.getBinaryMessenger(), "plugins.flutter.io/maplibre_gl"); methodChannel.setMethodCallHandler(new GlobalMethodHandler(binding)); binding .getPlatformViewRegistry() .registerViewFactory( - "plugins.flutter.io/mapbox_gl", + "plugins.flutter.io/maplibre_gl", new MapLibreMapFactory( binding.getBinaryMessenger(), new LifecycleProvider() { diff --git a/ios/Classes/SwiftMapboxGlFlutterPlugin.swift b/ios/Classes/SwiftMapboxGlFlutterPlugin.swift index 70ffe349b..d66313fc2 100644 --- a/ios/Classes/SwiftMapboxGlFlutterPlugin.swift +++ b/ios/Classes/SwiftMapboxGlFlutterPlugin.swift @@ -8,10 +8,10 @@ public class SwiftMapboxGlFlutterPlugin: NSObject, FlutterPlugin { public static func register(with registrar: FlutterPluginRegistrar) { let instance = MapboxMapFactory(withRegistrar: registrar) - registrar.register(instance, withId: "plugins.flutter.io/mapbox_gl") + registrar.register(instance, withId: "plugins.flutter.io/maplibre_gl") let channel = FlutterMethodChannel( - name: "plugins.flutter.io/mapbox_gl", + name: "plugins.flutter.io/maplibre_gl", binaryMessenger: registrar.messenger() ) diff --git a/lib/src/global.dart b/lib/src/global.dart index 1dac46ecc..a892ae892 100644 --- a/lib/src/global.dart +++ b/lib/src/global.dart @@ -4,7 +4,7 @@ part of '../maplibre_gl.dart'; -const _globalChannel = MethodChannel('plugins.flutter.io/mapbox_gl'); +const _globalChannel = MethodChannel('plugins.flutter.io/maplibre_gl'); /// Copy tiles db file passed in to the tiles cache directory (sideloaded) to /// make tiles available offline. diff --git a/maplibre_gl_platform_interface/lib/src/method_channel_maplibre_gl.dart b/maplibre_gl_platform_interface/lib/src/method_channel_maplibre_gl.dart index 458c9561c..db317365b 100644 --- a/maplibre_gl_platform_interface/lib/src/method_channel_maplibre_gl.dart +++ b/maplibre_gl_platform_interface/lib/src/method_channel_maplibre_gl.dart @@ -140,7 +140,7 @@ class MapLibreMethodChannel extends MapLibrePlatform { if (defaultTargetPlatform == TargetPlatform.android) { if (useHybridComposition) { return PlatformViewLink( - viewType: 'plugins.flutter.io/mapbox_gl', + viewType: 'plugins.flutter.io/maplibre_gl', surfaceFactory: ( BuildContext context, PlatformViewController controller, @@ -155,7 +155,7 @@ class MapLibreMethodChannel extends MapLibrePlatform { onCreatePlatformView: (PlatformViewCreationParams params) { final controller = PlatformViewsService.initAndroidView( id: params.id, - viewType: 'plugins.flutter.io/mapbox_gl', + viewType: 'plugins.flutter.io/maplibre_gl', layoutDirection: TextDirection.ltr, creationParams: creationParams, creationParamsCodec: const StandardMessageCodec(), @@ -175,7 +175,7 @@ class MapLibreMethodChannel extends MapLibrePlatform { ); } else { return AndroidView( - viewType: 'plugins.flutter.io/mapbox_gl', + viewType: 'plugins.flutter.io/maplibre_gl', onPlatformViewCreated: onPlatformViewCreated, gestureRecognizers: gestureRecognizers, creationParams: creationParams, @@ -184,7 +184,7 @@ class MapLibreMethodChannel extends MapLibrePlatform { } } else if (defaultTargetPlatform == TargetPlatform.iOS) { return UiKitView( - viewType: 'plugins.flutter.io/mapbox_gl', + viewType: 'plugins.flutter.io/maplibre_gl', onPlatformViewCreated: onPlatformViewCreated, gestureRecognizers: gestureRecognizers, creationParams: creationParams, diff --git a/maplibre_gl_web/ios/maplibre_gl_web.podspec b/maplibre_gl_web/ios/maplibre_gl_web.podspec deleted file mode 100644 index 4f9de180b..000000000 --- a/maplibre_gl_web/ios/maplibre_gl_web.podspec +++ /dev/null @@ -1,18 +0,0 @@ - -Pod::Spec.new do |s| - s.name = 'maplibre_gl_web' - s.version = '0.1.0' - s.summary = 'No-op implementation of maplibre_gl_web web plugin to avoid build issues on iOS' - s.description = <<-DESC - temp fake maplibre_gl_web plugin - DESC - s.homepage = 'http://example.com' - s.license = { :file => '../LICENSE' } - s.author = { 'Your Company' => 'email@example.com' } - s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' - s.dependency 'Flutter' - - s.ios.deployment_target = '8.0' -end \ No newline at end of file diff --git a/maplibre_gl_web/lib/src/maplibre_web_gl_platform.dart b/maplibre_gl_web/lib/src/maplibre_web_gl_platform.dart index 321dcd94a..f9e601c4b 100644 --- a/maplibre_gl_web/lib/src/maplibre_web_gl_platform.dart +++ b/maplibre_gl_web/lib/src/maplibre_web_gl_platform.dart @@ -31,7 +31,8 @@ class MapLibreMapController extends MapLibrePlatform Set>? gestureRecognizers) { _creationParams = creationParams; _registerViewFactory(onPlatformViewCreated, hashCode); - return HtmlElementView(viewType: 'plugins.flutter.io/mapbox_gl_$hashCode'); + return HtmlElementView( + viewType: 'plugins.flutter.io/maplibre_gl_$hashCode'); } @override @@ -43,7 +44,7 @@ class MapLibreMapController extends MapLibrePlatform void _registerViewFactory(Function(int) callback, int identifier) { // ignore: undefined_prefixed_name ui.platformViewRegistry.registerViewFactory( - 'plugins.flutter.io/mapbox_gl_$identifier', (int viewId) { + 'plugins.flutter.io/maplibre_gl_$identifier', (int viewId) { _mapElement = html.DivElement() ..style.position = 'absolute' ..style.top = '0'