diff --git a/plugins/aves_services_google/lib/aves_services_platform.dart b/plugins/aves_services_google/lib/aves_services_platform.dart index 8e11799c6..4c8f2ef0d 100644 --- a/plugins/aves_services_google/lib/aves_services_platform.dart +++ b/plugins/aves_services_google/lib/aves_services_platform.dart @@ -6,7 +6,8 @@ import 'package:aves_services_platform/src/map.dart'; import 'package:device_info_plus/device_info_plus.dart'; import 'package:flutter/widgets.dart'; import 'package:google_api_availability/google_api_availability.dart'; -import 'package:google_maps_flutter/google_maps_flutter.dart'; +import 'package:google_maps_flutter_android/google_maps_flutter_android.dart'; +import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart'; import 'package:latlong2/latlong.dart' as ll; class PlatformMobileServices extends MobileServices { @@ -26,15 +27,18 @@ class PlatformMobileServices extends MobileServices { final androidInfo = await DeviceInfoPlugin().androidInfo; _canRenderMaps = (androidInfo.version.sdkInt ?? 0) >= 21; if (_canRenderMaps) { - // as of google_maps_flutter_android v2.2.0, - // setting `useAndroidViewSurface` to true: - // + issue #241 exists but workaround is efficient - // + pan perf is OK when overlay is disabled - // - pan perf is bad when overlay is enabled - // setting `useAndroidViewSurface` to false: - // - issue #241 exists and workaround is inefficient - // + pan perf is OK when overlay is disabled or enabled - AndroidGoogleMapsFlutter.useAndroidViewSurface = false; + final mapsImplementation = GoogleMapsFlutterPlatform.instance; + if (mapsImplementation is GoogleMapsFlutterAndroid) { + // as of google_maps_flutter_android v2.2.0, + // setting `useAndroidViewSurface` to true: + // + issue #241 exists but workaround is efficient + // + pan perf is OK when overlay is disabled + // - pan perf is bad when overlay is enabled + // setting `useAndroidViewSurface` to false: + // - issue #241 exists and workaround is inefficient + // + pan perf is OK when overlay is disabled or enabled + mapsImplementation.useAndroidViewSurface = false; + } } } diff --git a/plugins/aves_services_google/pubspec.yaml b/plugins/aves_services_google/pubspec.yaml index 7e8e0a489..aaa5aa74b 100644 --- a/plugins/aves_services_google/pubspec.yaml +++ b/plugins/aves_services_google/pubspec.yaml @@ -15,6 +15,8 @@ dependencies: device_info_plus: google_api_availability: google_maps_flutter: + google_maps_flutter_android: + google_maps_flutter_platform_interface: latlong2: provider: diff --git a/pubspec.lock b/pubspec.lock index 0c1609d1a..0faeeba54 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,14 +7,14 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "46.0.0" + version: "47.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "4.6.0" + version: "4.7.0" archive: dependency: transitive description: @@ -266,7 +266,7 @@ packages: name: dynamic_color url: "https://pub.dartlang.org" source: hosted - version: "1.5.3" + version: "1.5.4" equatable: dependency: "direct main" description: @@ -361,7 +361,14 @@ packages: name: flex_color_picker url: "https://pub.dartlang.org" source: hosted - version: "2.5.0" + version: "2.6.0" + flex_seed_scheme: + dependency: transitive + description: + name: flex_seed_scheme + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" fluster: dependency: "direct main" description: @@ -489,14 +496,14 @@ packages: name: google_maps_flutter url: "https://pub.dartlang.org" source: hosted - version: "2.1.12" + version: "2.2.0" google_maps_flutter_android: dependency: transitive description: name: google_maps_flutter_android url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.3.0" google_maps_flutter_ios: dependency: transitive description: @@ -1284,7 +1291,7 @@ packages: name: webkit_inspection_protocol url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" win32: dependency: transitive description: @@ -1322,4 +1329,4 @@ packages: version: "3.1.1" sdks: dart: ">=2.18.0 <3.0.0" - flutter: ">=3.1.0-0.0.pre.1036" + flutter: ">=3.3.0"