fix: merge and commit issues

flutter · Nov 25, 2024 · 6bc7717 · 6bc7717
1 parent d40c5e4
commit 6bc7717
Show file tree

Hide file tree

Showing 8 changed files with 1,822 additions and 1,286 deletions.
diff --git a/.../google_maps_flutter/google_maps_flutter/example/integration_test/src/maps_inspector.dart b/.../google_maps_flutter/google_maps_flutter/example/integration_test/src/maps_inspector.dart
@@ -714,7 +714,7 @@ void runTests() {
       final StreamQueue<void> cameraFiredQueue =
           StreamQueue<void>(cameraFiredStream.stream);
 
-      const int shortCameraAnimationDurationMS = 10;
+      const int shortCameraAnimationDurationMS = 200;
       const int longCameraAnimationDurationMS = 1000;
 
       /// Calculate the midpoint duration of the animation test, which will

diff --git a/..._maps_flutter/google_maps_flutter_android/example/integration_test/google_maps_tests.dart b/..._maps_flutter/google_maps_flutter_android/example/integration_test/google_maps_tests.dart
@@ -1547,7 +1547,7 @@ void googleMapsTests() {
       final StreamQueue<void> cameraFiredQueue =
           StreamQueue<void>(cameraFiredStream.stream);
 
-      const int shortCameraAnimationDurationMS = 10;
+      const int shortCameraAnimationDurationMS = 200;
       const int longCameraAnimationDurationMS = 1000;
 
       /// Calculate the midpoint duration of the animation test, which will

diff --git a/...maps_flutter/google_maps_flutter_ios/example/ios14/integration_test/google_maps_test.dart b/...maps_flutter/google_maps_flutter_ios/example/ios14/integration_test/google_maps_test.dart
@@ -1393,7 +1393,7 @@ void main() {
       final StreamQueue<void> cameraFiredQueue =
           StreamQueue<void>(cameraFiredStream.stream);
 
-      const int shortCameraAnimationDurationMS = 10;
+      const int shortCameraAnimationDurationMS = 200;
       const int longCameraAnimationDurationMS = 1000;
 
       /// Calculate the midpoint duration of the animation test, which will

diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/messages.g.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/messages.g.h
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/messages.g.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/messages.g.m
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/lib/src/google_maps_flutter_ios.dart b/packages/google_maps_flutter/google_maps_flutter_ios/lib/src/google_maps_flutter_ios.dart
@@ -347,8 +347,8 @@ class GoogleMapsFlutterIOS extends GoogleMapsFlutterPlatform {
     CameraUpdate cameraUpdate, {
     required int mapId,
   }) {
-    return _hostApi(mapId)
-        .animateCamera(_platformCameraUpdateFromCameraUpdate(cameraUpdate), null);
+    return _hostApi(mapId).animateCamera(
+        _platformCameraUpdateFromCameraUpdate(cameraUpdate), null);
   }
 
   @override
@@ -358,7 +358,7 @@ class GoogleMapsFlutterIOS extends GoogleMapsFlutterPlatform {
     required int mapId,
   }) {
     return _hostApi(mapId).animateCamera(
-        PlatformCameraUpdate(json: cameraUpdate.toJson()),
+        _platformCameraUpdateFromCameraUpdate(cameraUpdate),
         configuration.duration?.inMilliseconds);
   }