From 61dda0947ada51856400cbf25c86e7490cf73ac9 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 8 Feb 2023 14:28:37 -0500 Subject: [PATCH 1/5] [ci] Update iOS simulator --- .ci/targets/ios_platform_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/targets/ios_platform_tests.yaml b/.ci/targets/ios_platform_tests.yaml index 5a00da7278a4..692b83dcb285 100644 --- a/.ci/targets/ios_platform_tests.yaml +++ b/.ci/targets/ios_platform_tests.yaml @@ -15,7 +15,7 @@ tasks: args: ["xcode-analyze", "--ios", "--ios-min-version=13.0"] - name: native test script: script/tool_runner.sh - args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=iPhone 11,OS=latest"] + args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=iPhone 13,OS=latest"] - name: drive examples # `drive-examples` contains integration tests, which changes the UI of the application. # This UI change sometimes affects `xctest`. From 830f3018e3adeb40483ae6573c4e78e1150eb65c Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 8 Feb 2023 14:40:47 -0500 Subject: [PATCH 2/5] Update creation as well --- .ci/scripts/create_simulator.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/scripts/create_simulator.sh b/.ci/scripts/create_simulator.sh index 3d86739051f1..98bfb6573593 100644 --- a/.ci/scripts/create_simulator.sh +++ b/.ci/scripts/create_simulator.sh @@ -3,7 +3,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -device=com.apple.CoreSimulator.SimDeviceType.iPhone-11 +device=com.apple.CoreSimulator.SimDeviceType.iPhone-13 os=com.apple.CoreSimulator.SimRuntime.iOS-16-0 xcrun simctl list From 08c38f166505da3a757dfa4268e54605e6037008 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 13 Feb 2023 14:23:20 -0500 Subject: [PATCH 3/5] Add gesture recognizer in example --- .../example/lib/map_coordinates.dart | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/lib/map_coordinates.dart b/packages/google_maps_flutter/google_maps_flutter_ios/example/lib/map_coordinates.dart index 22f383bd1254..329d5836be77 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/lib/map_coordinates.dart +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/lib/map_coordinates.dart @@ -4,6 +4,8 @@ // ignore_for_file: public_member_api_docs +import 'package:flutter/foundation.dart'; +import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart'; @@ -46,6 +48,12 @@ class _MapCoordinatesBodyState extends State<_MapCoordinatesBody> { initialCameraPosition: _kInitialPosition, onCameraIdle: _updateVisibleRegion, // https://github.com/flutter/flutter/issues/54758 + gestureRecognizers: // + >{ + Factory( + () => EagerGestureRecognizer(), + ), + }, ); return NotificationListener( From 258e5ba933435b54367fcde1838d06ac9c8dfffe Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 13 Feb 2023 15:45:27 -0500 Subject: [PATCH 4/5] Revert "Add gesture recognizer in example" This reverts commit 08c38f166505da3a757dfa4268e54605e6037008. --- .../example/lib/map_coordinates.dart | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/lib/map_coordinates.dart b/packages/google_maps_flutter/google_maps_flutter_ios/example/lib/map_coordinates.dart index 329d5836be77..22f383bd1254 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/lib/map_coordinates.dart +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/lib/map_coordinates.dart @@ -4,8 +4,6 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/foundation.dart'; -import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart'; @@ -48,12 +46,6 @@ class _MapCoordinatesBodyState extends State<_MapCoordinatesBody> { initialCameraPosition: _kInitialPosition, onCameraIdle: _updateVisibleRegion, // https://github.com/flutter/flutter/issues/54758 - gestureRecognizers: // - >{ - Factory( - () => EagerGestureRecognizer(), - ), - }, ); return NotificationListener( From 4886e6b855513c71c80c58fa224634ec790e5429 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 13 Feb 2023 15:46:39 -0500 Subject: [PATCH 5/5] Stationary text --- .../example/lib/map_coordinates.dart | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/lib/map_coordinates.dart b/packages/google_maps_flutter/google_maps_flutter_ios/example/lib/map_coordinates.dart index 22f383bd1254..25247bc7c7bd 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/lib/map_coordinates.dart +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/lib/map_coordinates.dart @@ -53,17 +53,28 @@ class _MapCoordinatesBodyState extends State<_MapCoordinatesBody> { _updateVisibleRegion(); return true; }, - child: ListView( + child: Stack( children: [ - Padding( - padding: const EdgeInsets.all(10.0), - child: Center( - child: SizedBox( - width: 300.0, - height: 200.0, - child: googleMap, + ListView( + children: [ + Padding( + padding: const EdgeInsets.all(10.0), + child: Center( + child: SizedBox( + width: 300.0, + height: 200.0, + child: googleMap, + ), + ), ), - ), + // Add a block at the bottom of this list to allow validation that the visible region of the map + // does not change when scrolled under the safe view on iOS. + // https://github.com/flutter/flutter/issues/107913 + const SizedBox( + width: 300, + height: 1000, + ), + ], ), if (mapController != null) Center( @@ -71,13 +82,6 @@ class _MapCoordinatesBodyState extends State<_MapCoordinatesBody> { '\nnortheast: ${_visibleRegion.northeast},' '\nsouthwest: ${_visibleRegion.southwest}'), ), - // Add a block at the bottom of this list to allow validation that the visible region of the map - // does not change when scrolled under the safe view on iOS. - // https://github.com/flutter/flutter/issues/107913 - const SizedBox( - width: 300, - height: 1000, - ), ], ), );