From 1df0ccc49f14ec672bdfd2784b7bad1c6dbb60dc Mon Sep 17 00:00:00 2001 From: Rexios Date: Wed, 22 Feb 2023 10:56:29 -0500 Subject: [PATCH 01/21] Transfer changes from flutter/plugins --- .../google_maps_flutter/CHANGELOG.md | 3 +- .../example/android/app/build.gradle | 6 +- .../example/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 3 +- .../ios/Flutter/AppFrameworkInfo.plist | 2 +- .../google_maps_flutter/example/ios/Podfile | 2 +- .../ios/Runner.xcodeproj/project.pbxproj | 108 ++++++------------ .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../example/ios/Runner/Info.plist | 2 + .../google_maps_flutter/example/pubspec.yaml | 4 + .../lib/google_maps_flutter.dart | 1 + .../lib/src/google_map.dart | 12 ++ .../google_maps_flutter/pubspec.yaml | 6 +- .../CHANGELOG.md | 5 +- .../lib/src/types/map_configuration.dart | 35 +++++- .../lib/src/types/types.dart | 1 + .../lib/src/types/web_gesture_handling.dart | 22 ++++ .../pubspec.yaml | 2 +- .../google_maps_flutter_web/CHANGELOG.md | 3 +- .../google_maps_controller_test.dart | 18 +-- .../example/pubspec.yaml | 4 + .../lib/src/convert.dart | 13 ++- .../lib/src/google_maps_controller.dart | 5 + .../google_maps_flutter_web/pubspec.yaml | 6 +- 24 files changed, 159 insertions(+), 108 deletions(-) create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/web_gesture_handling.dart diff --git a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md index bab8412142d..835ead8e081 100644 --- a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md @@ -1,5 +1,6 @@ -## NEXT +## 2.3.0 +* Adds options for gesture handling and tilt controls on web. * Updates minimum Flutter version to 3.0. ## 2.2.3 diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/app/build.gradle b/packages/google_maps_flutter/google_maps_flutter/example/android/app/build.gradle index f6d29f63fad..d608fe0d16c 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/app/build.gradle +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/app/build.gradle @@ -27,9 +27,6 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { compileSdkVersion 31 - lintOptions { - disable 'InvalidPackage' - } defaultConfig { applicationId "io.flutter.plugins.googlemapsexample" @@ -66,6 +63,9 @@ android { api 'androidx.test:core:1.2.0' testImplementation 'com.google.android.gms:play-services-maps:17.0.0' } + lint { + disable 'InvalidPackage' + } } flutter { diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/build.gradle b/packages/google_maps_flutter/google_maps_flutter/example/android/build.gradle index c21bff8e0a2..3ecc2576de2 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/build.gradle +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.1' + classpath 'com.android.tools.build:gradle:7.3.0' } } diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/google_maps_flutter/google_maps_flutter/example/android/gradle/wrapper/gradle-wrapper.properties index b8793d3c0d6..7645e290ee9 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Jun 23 08:50:38 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip diff --git a/packages/google_maps_flutter/google_maps_flutter/example/ios/Flutter/AppFrameworkInfo.plist b/packages/google_maps_flutter/google_maps_flutter/example/ios/Flutter/AppFrameworkInfo.plist index 3a9c234f96d..9b41e7d8798 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/ios/Flutter/AppFrameworkInfo.plist +++ b/packages/google_maps_flutter/google_maps_flutter/example/ios/Flutter/AppFrameworkInfo.plist @@ -25,6 +25,6 @@ arm64 MinimumOSVersion - 9.0 + 11.0 diff --git a/packages/google_maps_flutter/google_maps_flutter/example/ios/Podfile b/packages/google_maps_flutter/google_maps_flutter/example/ios/Podfile index 8df8fef0a78..b690cc71379 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/ios/Podfile +++ b/packages/google_maps_flutter/google_maps_flutter/example/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '9.0' +# platform :ios, '11.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.pbxproj b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.pbxproj index 343e0504134..80586c34c9d 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,14 +3,13 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 50; objects = { /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 4510D964F3B1259FEDD3ABA6 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7755F8F4BABC3D6A0BD4048B /* libPods-Runner.a */; }; - 4A097997B7B27CE82FFC3AB8 /* libPods-RunnerUITests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8ED0578E8D540BBDA17645 /* libPods-RunnerUITests.a */; }; 6851F3562835BC180032B7C8 /* FLTGoogleMapJSONConversionsConversionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6851F3552835BC180032B7C8 /* FLTGoogleMapJSONConversionsConversionTests.m */; }; 68E4726A2836FF0C00BDDDAC /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 68E472692836FF0C00BDDDAC /* MapKit.framework */; }; 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; @@ -21,7 +20,6 @@ 982F2A6C27BADE17003C81F4 /* PartiallyMockedMapView.m in Sources */ = {isa = PBXBuildFile; fileRef = 982F2A6B27BADE17003C81F4 /* PartiallyMockedMapView.m */; }; F7151F13265D7ED70028CB91 /* GoogleMapsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F7151F12265D7ED70028CB91 /* GoogleMapsTests.m */; }; F7151F21265D7EE50028CB91 /* GoogleMapsUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = F7151F20265D7EE50028CB91 /* GoogleMapsUITests.m */; }; - FC8F35FC8CD533B128950487 /* libPods-RunnerTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F267F68029D1A4E2E4C572A7 /* libPods-RunnerTests.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -60,8 +58,6 @@ 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; 6851F3552835BC180032B7C8 /* FLTGoogleMapJSONConversionsConversionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLTGoogleMapJSONConversionsConversionTests.m; sourceTree = ""; }; 68E472692836FF0C00BDDDAC /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.0.sdk/System/iOSSupport/System/Library/Frameworks/MapKit.framework; sourceTree = DEVELOPER_DIR; }; - 6AC1E6095B09DE4B02ECF64E /* Pods-RunnerUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerUITests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RunnerUITests/Pods-RunnerUITests.release.xcconfig"; sourceTree = ""; }; - 733AFAB37683A9DA7512F09C /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 7755F8F4BABC3D6A0BD4048B /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -77,11 +73,7 @@ 982F2A6A27BADE17003C81F4 /* PartiallyMockedMapView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PartiallyMockedMapView.h; sourceTree = ""; }; 982F2A6B27BADE17003C81F4 /* PartiallyMockedMapView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PartiallyMockedMapView.m; sourceTree = ""; }; B7AFC65E3DD5AC60D834D83D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - DC8ED0578E8D540BBDA17645 /* libPods-RunnerUITests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RunnerUITests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - DDDAC1342ABDF2F125577581 /* Pods-RunnerUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerUITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RunnerUITests/Pods-RunnerUITests.debug.xcconfig"; sourceTree = ""; }; - E52C6A6210A56F027C582EF9 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; EA0E91726245EDC22B97E8B9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - F267F68029D1A4E2E4C572A7 /* libPods-RunnerTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RunnerTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; F7151F10265D7ED70028CB91 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; F7151F12265D7ED70028CB91 /* GoogleMapsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoogleMapsTests.m; sourceTree = ""; }; F7151F14265D7ED70028CB91 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -104,7 +96,6 @@ buildActionMask = 2147483647; files = ( 68E4726A2836FF0C00BDDDAC /* MapKit.framework in Frameworks */, - FC8F35FC8CD533B128950487 /* libPods-RunnerTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -112,7 +103,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4A097997B7B27CE82FFC3AB8 /* libPods-RunnerUITests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -124,8 +114,6 @@ children = ( 68E472692836FF0C00BDDDAC /* MapKit.framework */, 7755F8F4BABC3D6A0BD4048B /* libPods-Runner.a */, - F267F68029D1A4E2E4C572A7 /* libPods-RunnerTests.a */, - DC8ED0578E8D540BBDA17645 /* libPods-RunnerUITests.a */, ); name = Frameworks; sourceTree = ""; @@ -193,10 +181,6 @@ children = ( B7AFC65E3DD5AC60D834D83D /* Pods-Runner.debug.xcconfig */, EA0E91726245EDC22B97E8B9 /* Pods-Runner.release.xcconfig */, - E52C6A6210A56F027C582EF9 /* Pods-RunnerTests.debug.xcconfig */, - 733AFAB37683A9DA7512F09C /* Pods-RunnerTests.release.xcconfig */, - DDDAC1342ABDF2F125577581 /* Pods-RunnerUITests.debug.xcconfig */, - 6AC1E6095B09DE4B02ECF64E /* Pods-RunnerUITests.release.xcconfig */, ); name = Pods; sourceTree = ""; @@ -251,7 +235,6 @@ isa = PBXNativeTarget; buildConfigurationList = F7151F19265D7ED70028CB91 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - D067548A17DC238B80D2BD12 /* [CP] Check Pods Manifest.lock */, F7151F0C265D7ED70028CB91 /* Sources */, F7151F0D265D7ED70028CB91 /* Frameworks */, F7151F0E265D7ED70028CB91 /* Resources */, @@ -270,7 +253,6 @@ isa = PBXNativeTarget; buildConfigurationList = F7151F25265D7EE50028CB91 /* Build configuration list for PBXNativeTarget "RunnerUITests" */; buildPhases = ( - BD39F60794E9A0264D5D3752 /* [CP] Check Pods Manifest.lock */, F7151F1A265D7EE50028CB91 /* Sources */, F7151F1B265D7EE50028CB91 /* Frameworks */, F7151F1C265D7EE50028CB91 /* Resources */, @@ -291,7 +273,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1320; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = "The Flutter Authors"; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -422,50 +404,6 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; showEnvVarsInLog = 0; }; - BD39F60794E9A0264D5D3752 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerUITests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - D067548A17DC238B80D2BD12 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -581,7 +519,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -632,7 +570,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -652,7 +590,10 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", @@ -674,7 +615,10 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", @@ -686,13 +630,16 @@ }; F7151F17265D7ED70028CB91 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E52C6A6210A56F027C582EF9 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64"; INFOPLIST_FILE = RunnerTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -702,13 +649,16 @@ }; F7151F18265D7ED70028CB91 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 733AFAB37683A9DA7512F09C /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64"; INFOPLIST_FILE = RunnerTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -718,11 +668,14 @@ }; F7151F26265D7EE50028CB91 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = DDDAC1342ABDF2F125577581 /* Pods-RunnerUITests.debug.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = RunnerUITests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.RunnerUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -732,11 +685,14 @@ }; F7151F27265D7EE50028CB91 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 6AC1E6095B09DE4B02ECF64E /* Pods-RunnerUITests.release.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = RunnerUITests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.RunnerUITests; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c983bfc640f..a60a46be23c 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ UIViewControllerBasedStatusBarAppearance + CADisableMinimumFrameDurationOnPhone + diff --git a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml index 5813d42e617..f9c81f8672a 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml @@ -35,3 +35,7 @@ flutter: uses-material-design: true assets: - assets/ + +dependency_overrides: + google_maps_flutter_platform_interface: + path: ../../google_maps_flutter_platform_interface diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart index a4be120b211..49d05c1289a 100644 --- a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart +++ b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart @@ -28,6 +28,7 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf Cap, Circle, CircleId, + WebGestureHandling, InfoWindow, JointType, LatLng, diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart index 1f7871068ca..dc269a716aa 100644 --- a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart +++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart @@ -93,6 +93,7 @@ class GoogleMap extends StatefulWidget { required this.initialCameraPosition, this.onMapCreated, this.gestureRecognizers = const >{}, + this.webGestureHandling, this.compassEnabled = true, this.mapToolbarEnabled = true, this.cameraTargetBounds = CameraTargetBounds.unbounded, @@ -104,6 +105,7 @@ class GoogleMap extends StatefulWidget { this.zoomGesturesEnabled = true, this.liteModeEnabled = false, this.tiltGesturesEnabled = true, + this.fortyFiveDegreeImageryEnabled = false, this.myLocationEnabled = false, this.myLocationButtonEnabled = true, this.layoutDirection, @@ -180,6 +182,9 @@ class GoogleMap extends StatefulWidget { /// True if the map view should respond to tilt gestures. final bool tiltGesturesEnabled; + /// True if 45 degree imagery should be enabled. Web only. + final bool fortyFiveDegreeImageryEnabled; + /// Padding to be set on map. See https://developers.google.com/maps/documentation/android-sdk/map#map_padding for more details. final EdgeInsets padding; @@ -283,6 +288,11 @@ class GoogleMap extends StatefulWidget { /// were not claimed by any other gesture recognizer. final Set> gestureRecognizers; + /// This setting controls how the API handles gestures on the map. Web only. + /// + /// See [WebGestureHandling] for more details. + final WebGestureHandling? webGestureHandling; + /// Creates a [State] for this [GoogleMap]. @override State createState() => _GoogleMapState(); @@ -535,6 +545,7 @@ class _GoogleMapState extends State { MapConfiguration _configurationFromMapWidget(GoogleMap map) { assert(!map.liteModeEnabled || Platform.isAndroid); return MapConfiguration( + webGestureHandling: map.webGestureHandling, compassEnabled: map.compassEnabled, mapToolbarEnabled: map.mapToolbarEnabled, cameraTargetBounds: map.cameraTargetBounds, @@ -543,6 +554,7 @@ MapConfiguration _configurationFromMapWidget(GoogleMap map) { rotateGesturesEnabled: map.rotateGesturesEnabled, scrollGesturesEnabled: map.scrollGesturesEnabled, tiltGesturesEnabled: map.tiltGesturesEnabled, + fortyFiveDegreeImageryEnabled: map.fortyFiveDegreeImageryEnabled, trackCameraPosition: map.onCameraMove != null, zoomControlsEnabled: map.zoomControlsEnabled, zoomGesturesEnabled: map.zoomGesturesEnabled, diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index 0771314b9e4..dcd22a6a80f 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter description: A Flutter plugin for integrating Google Maps in iOS and Android applications. repository: https://github.com/flutter/plugins/tree/main/packages/google_maps_flutter/google_maps_flutter issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.2.3 +version: 2.3.0 environment: sdk: ">=2.14.0 <3.0.0" @@ -28,3 +28,7 @@ dev_dependencies: sdk: flutter plugin_platform_interface: ^2.0.0 stream_transform: ^2.0.0 + +dependency_overrides: + google_maps_flutter_platform_interface: + path: ../google_maps_flutter_platform_interface diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md index b3d6c5540e7..94b5730ca55 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md @@ -1,5 +1,6 @@ -## NEXT +## 2.3.0 +* Adds options for gesture handling and tilt controls on web. * Updates minimum Flutter version to 3.0. ## 2.2.5 @@ -47,7 +48,7 @@ ## 2.1.5 -Removes dependency on `meta`. +* Removes dependency on `meta`. ## 2.1.4 diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart index 4b43caffe5b..1c58386fb12 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart @@ -3,8 +3,7 @@ // found in the LICENSE file. import 'package:flutter/widgets.dart'; - -import 'ui.dart'; +import '../../google_maps_flutter_platform_interface.dart'; /// Configuration options for the GoogleMaps user interface. @immutable @@ -15,6 +14,7 @@ class MapConfiguration { /// as either a full configuration selection, or an update to an existing /// configuration where only non-null values are updated. const MapConfiguration({ + this.webGestureHandling, this.compassEnabled, this.mapToolbarEnabled, this.cameraTargetBounds, @@ -23,6 +23,7 @@ class MapConfiguration { this.rotateGesturesEnabled, this.scrollGesturesEnabled, this.tiltGesturesEnabled, + this.fortyFiveDegreeImageryEnabled, this.trackCameraPosition, this.zoomControlsEnabled, this.zoomGesturesEnabled, @@ -35,6 +36,11 @@ class MapConfiguration { this.buildingsEnabled, }); + /// This setting controls how the API handles gestures on the map. Web only. + /// + /// See [WebGestureHandling] for more details. + final WebGestureHandling? webGestureHandling; + /// True if the compass UI should be shown. final bool? compassEnabled; @@ -47,18 +53,23 @@ class MapConfiguration { /// The type of the map. final MapType? mapType; - /// The prefered zoom range. + /// The preferred zoom range. final MinMaxZoomPreference? minMaxZoomPreference; /// True if rotate gestures should be enabled. final bool? rotateGesturesEnabled; /// True if scroll gestures should be enabled. + /// + /// Android/iOS only. For web, see [webGestureHandling]. final bool? scrollGesturesEnabled; /// True if tilt gestures should be enabled. final bool? tiltGesturesEnabled; + /// True if 45 degree imagery should be enabled. Web only. + final bool? fortyFiveDegreeImageryEnabled; + /// True if camera position changes should trigger notifications. final bool? trackCameraPosition; @@ -66,6 +77,8 @@ class MapConfiguration { final bool? zoomControlsEnabled; /// True if zoom gestures should be enabled. + /// + /// Android/iOS only. For web, see [webGestureHandling]. final bool? zoomGesturesEnabled; /// True if the map should use Lite Mode, showing a limited-interactivity @@ -94,6 +107,9 @@ class MapConfiguration { /// that are different from [other]. MapConfiguration diffFrom(MapConfiguration other) { return MapConfiguration( + webGestureHandling: webGestureHandling != other.webGestureHandling + ? webGestureHandling + : null, compassEnabled: compassEnabled != other.compassEnabled ? compassEnabled : null, mapToolbarEnabled: mapToolbarEnabled != other.mapToolbarEnabled @@ -117,6 +133,10 @@ class MapConfiguration { tiltGesturesEnabled: tiltGesturesEnabled != other.tiltGesturesEnabled ? tiltGesturesEnabled : null, + fortyFiveDegreeImageryEnabled: + fortyFiveDegreeImageryEnabled != other.fortyFiveDegreeImageryEnabled + ? fortyFiveDegreeImageryEnabled + : null, trackCameraPosition: trackCameraPosition != other.trackCameraPosition ? trackCameraPosition : null, @@ -150,6 +170,7 @@ class MapConfiguration { /// replacing the previous values. MapConfiguration applyDiff(MapConfiguration diff) { return MapConfiguration( + webGestureHandling: diff.webGestureHandling ?? webGestureHandling, compassEnabled: diff.compassEnabled ?? compassEnabled, mapToolbarEnabled: diff.mapToolbarEnabled ?? mapToolbarEnabled, cameraTargetBounds: diff.cameraTargetBounds ?? cameraTargetBounds, @@ -160,6 +181,8 @@ class MapConfiguration { scrollGesturesEnabled: diff.scrollGesturesEnabled ?? scrollGesturesEnabled, tiltGesturesEnabled: diff.tiltGesturesEnabled ?? tiltGesturesEnabled, + fortyFiveDegreeImageryEnabled: + diff.fortyFiveDegreeImageryEnabled ?? fortyFiveDegreeImageryEnabled, trackCameraPosition: diff.trackCameraPosition ?? trackCameraPosition, zoomControlsEnabled: diff.zoomControlsEnabled ?? zoomControlsEnabled, zoomGesturesEnabled: diff.zoomGesturesEnabled ?? zoomGesturesEnabled, @@ -176,6 +199,7 @@ class MapConfiguration { /// True if no options are set. bool get isEmpty => + webGestureHandling == null && compassEnabled == null && mapToolbarEnabled == null && cameraTargetBounds == null && @@ -184,6 +208,7 @@ class MapConfiguration { rotateGesturesEnabled == null && scrollGesturesEnabled == null && tiltGesturesEnabled == null && + fortyFiveDegreeImageryEnabled == null && trackCameraPosition == null && zoomControlsEnabled == null && zoomGesturesEnabled == null && @@ -204,6 +229,7 @@ class MapConfiguration { return false; } return other is MapConfiguration && + webGestureHandling == other.webGestureHandling && compassEnabled == other.compassEnabled && mapToolbarEnabled == other.mapToolbarEnabled && cameraTargetBounds == other.cameraTargetBounds && @@ -212,6 +238,7 @@ class MapConfiguration { rotateGesturesEnabled == other.rotateGesturesEnabled && scrollGesturesEnabled == other.scrollGesturesEnabled && tiltGesturesEnabled == other.tiltGesturesEnabled && + fortyFiveDegreeImageryEnabled == other.fortyFiveDegreeImageryEnabled && trackCameraPosition == other.trackCameraPosition && zoomControlsEnabled == other.zoomControlsEnabled && zoomGesturesEnabled == other.zoomGesturesEnabled && @@ -226,6 +253,7 @@ class MapConfiguration { @override int get hashCode => Object.hash( + webGestureHandling, compassEnabled, mapToolbarEnabled, cameraTargetBounds, @@ -234,6 +262,7 @@ class MapConfiguration { rotateGesturesEnabled, scrollGesturesEnabled, tiltGesturesEnabled, + fortyFiveDegreeImageryEnabled, trackCameraPosition, zoomControlsEnabled, zoomGesturesEnabled, diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart index 0beb7d747ec..1f1916b1c55 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart @@ -34,3 +34,4 @@ export 'utils/marker.dart'; export 'utils/polygon.dart'; export 'utils/polyline.dart'; export 'utils/tile_overlay.dart'; +export 'web_gesture_handling.dart'; diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/web_gesture_handling.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/web_gesture_handling.dart new file mode 100644 index 00000000000..c978f915309 --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/web_gesture_handling.dart @@ -0,0 +1,22 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +/// This setting controls how the API handles gestures on the map +enum WebGestureHandling { + /// Scroll events and one-finger touch gestures scroll the page, and do not + /// zoom or pan the map. Two-finger touch gestures pan and zoom the map. + /// Scroll events with a ctrl key or ⌘ key pressed zoom the map. In this mode + /// the map cooperates with the page. + cooperative, + + /// All touch gestures and scroll events pan or zoom the map. + greedy, + + /// The map cannot be panned or zoomed by user gestures. + none, + + /// (default) Gesture handling is either cooperative or greedy, depending on + /// whether the page is scrollable or in an iframe. + auto, +} diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml index 6dfff89f8c4..da7168533d4 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml @@ -4,7 +4,7 @@ repository: https://github.com/flutter/plugins/tree/main/packages/google_maps_fl issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 # NOTE: We strongly prefer non-breaking changes, even at the expense of a # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes -version: 2.2.5 +version: 2.3.0 environment: sdk: '>=2.12.0 <3.0.0' diff --git a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md index 42930348965..78819dba0c1 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md @@ -1,5 +1,6 @@ -## NEXT +## 0.4.1 +* Adds options for gesture handling and tilt controls. * Updates minimum Flutter version to 3.0. ## 0.4.0+5 diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart index 0226234ea97..84db2dd05e9 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart @@ -387,6 +387,7 @@ void main() { mapConfiguration: const MapConfiguration( mapType: MapType.satellite, zoomControlsEnabled: true, + fortyFiveDegreeImageryEnabled: false, )); controller.debugSetOverrides( createMap: (_, gmaps.MapOptions options) { @@ -402,13 +403,16 @@ void main() { expect(capturedOptions!.gestureHandling, 'auto', reason: 'by default the map handles zoom/pan gestures internally'); + expect(capturedOptions!.rotateControl, false); + expect(capturedOptions!.tilt, 0); }); - testWidgets('disables gestureHandling with scrollGesturesEnabled false', + testWidgets('translates fortyFiveDegreeImageryEnabled option', (WidgetTester tester) async { controller = createController( mapConfiguration: const MapConfiguration( scrollGesturesEnabled: false, + fortyFiveDegreeImageryEnabled: true, )); controller.debugSetOverrides( createMap: (_, gmaps.MapOptions options) { @@ -419,16 +423,16 @@ void main() { controller.init(); expect(capturedOptions, isNotNull); - expect(capturedOptions!.gestureHandling, 'none', - reason: - 'disabling scroll gestures disables all gesture handling'); + expect(capturedOptions!.rotateControl, true); + expect(capturedOptions!.tilt, isNull); }); - testWidgets('disables gestureHandling with zoomGesturesEnabled false', + testWidgets('translates webGestureHandling option', (WidgetTester tester) async { controller = createController( mapConfiguration: const MapConfiguration( zoomGesturesEnabled: false, + webGestureHandling: WebGestureHandling.greedy, )); controller.debugSetOverrides( createMap: (_, gmaps.MapOptions options) { @@ -439,9 +443,7 @@ void main() { controller.init(); expect(capturedOptions, isNotNull); - expect(capturedOptions!.gestureHandling, 'none', - reason: - 'disabling scroll gestures disables all gesture handling'); + expect(capturedOptions!.gestureHandling, 'greedy'); }); testWidgets('sets initial position when passed', diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml index 43f67946464..4efa1786a22 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml @@ -26,3 +26,7 @@ dev_dependencies: integration_test: sdk: flutter mockito: ^5.3.2 + +dependency_overrides: + google_maps_flutter_platform_interface: + path: ../../google_maps_flutter_platform_interface diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart index 25cba849475..342d41c7e54 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart @@ -41,7 +41,7 @@ double _getCssOpacity(Color color) { // myLocationEnabled needs to be built through dart:html navigator.geolocation // See: https://api.dart.dev/stable/2.8.4/dart-html/Geolocation-class.html // trafficEnabled is handled when creating the GMap object, since it needs to be added as a layer. -// trackCameraPosition is just a boolan value that indicates if the map has an onCameraMove handler. +// trackCameraPosition is just a boolean value that indicates if the map has an onCameraMove handler. // indoorViewEnabled seems to not have an equivalent in web // buildingsEnabled seems to not have an equivalent in web // padding seems to behave differently in web than mobile. You can't move UI elements in web. @@ -70,11 +70,14 @@ gmaps.MapOptions _configurationAndStyleToGmapsOptions( options.zoomControl = configuration.zoomControlsEnabled; } - if (configuration.scrollGesturesEnabled == false || - configuration.zoomGesturesEnabled == false) { - options.gestureHandling = 'none'; + if (configuration.webGestureHandling != null) { + options.gestureHandling = configuration.webGestureHandling!.name; } else { - options.gestureHandling = 'auto'; + options.gestureHandling = WebGestureHandling.auto.name; + } + + if (configuration.fortyFiveDegreeImageryEnabled != null) { + options.rotateControl = configuration.fortyFiveDegreeImageryEnabled; } // These don't have any configuration entries, but they seem to be off in the diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart index a659fb21880..0e29018b7cb 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart @@ -161,6 +161,11 @@ class GoogleMapController { // Initial position can only to be set here! options = _applyInitialPosition(_initialCameraPosition, options); + // Fully disable 45 degree imagery if desired + if (options.rotateControl == false) { + options.tilt = 0; + } + // Create the map... final gmaps.GMap map = _createMap(_div, options); _googleMap = map; diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml index 072d584b133..109790efe4b 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_web description: Web platform implementation of google_maps_flutter repository: https://github.com/flutter/plugins/tree/main/packages/google_maps_flutter/google_maps_flutter_web issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 0.4.0+5 +version: 0.4.1 environment: sdk: ">=2.12.0 <3.0.0" @@ -33,3 +33,7 @@ dev_dependencies: # The example deliberately includes limited-use secrets. false_secrets: - /example/web/index.html + +dependency_overrides: + google_maps_flutter_platform_interface: + path: ../google_maps_flutter_platform_interface From aeeb30c9494f4991642ec319f88f66520af69653 Mon Sep 17 00:00:00 2001 From: Rexios Date: Tue, 7 Mar 2023 17:02:38 -0500 Subject: [PATCH 02/21] Regenerated overrides with tooling --- .../google_maps_flutter/example/pubspec.yaml | 3 ++- .../google_maps_flutter/google_maps_flutter/pubspec.yaml | 3 ++- .../google_maps_flutter_android/example/pubspec.yaml | 5 +++++ .../google_maps_flutter_android/pubspec.yaml | 5 +++++ .../google_maps_flutter_ios/example/pubspec.yaml | 5 +++++ .../google_maps_flutter/google_maps_flutter_ios/pubspec.yaml | 5 +++++ .../google_maps_flutter_web/example/pubspec.yaml | 5 ++++- .../google_maps_flutter/google_maps_flutter_web/pubspec.yaml | 3 ++- 8 files changed, 30 insertions(+), 4 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml index 2d4c960b5fe..310b528d9fe 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml @@ -36,6 +36,7 @@ flutter: assets: - assets/ +# FOR TESTING ONLY. DO NOT MERGE. dependency_overrides: google_maps_flutter_platform_interface: - path: ../../google_maps_flutter_platform_interface + path: ../../../google_maps_flutter/google_maps_flutter_platform_interface diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index 6ce34beb112..f08decc1567 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -29,6 +29,7 @@ dev_dependencies: plugin_platform_interface: ^2.0.0 stream_transform: ^2.0.0 +# FOR TESTING ONLY. DO NOT MERGE. dependency_overrides: google_maps_flutter_platform_interface: - path: ../google_maps_flutter_platform_interface + path: ../../google_maps_flutter/google_maps_flutter_platform_interface diff --git a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml index 74eef48836b..9f0f22cbe74 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml @@ -34,3 +34,8 @@ flutter: uses-material-design: true assets: - assets/ + +# FOR TESTING ONLY. DO NOT MERGE. +dependency_overrides: + google_maps_flutter_platform_interface: + path: ../../../google_maps_flutter/google_maps_flutter_platform_interface diff --git a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml index 92efcb9b92c..735350e772d 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml @@ -29,3 +29,8 @@ dev_dependencies: flutter_test: sdk: flutter plugin_platform_interface: ^2.0.0 + +# FOR TESTING ONLY. DO NOT MERGE. +dependency_overrides: + google_maps_flutter_platform_interface: + path: ../../google_maps_flutter/google_maps_flutter_platform_interface diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/pubspec.yaml index cc5c9ed7b16..027275e7af5 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/pubspec.yaml @@ -32,3 +32,8 @@ flutter: uses-material-design: true assets: - assets/ + +# FOR TESTING ONLY. DO NOT MERGE. +dependency_overrides: + google_maps_flutter_platform_interface: + path: ../../../google_maps_flutter/google_maps_flutter_platform_interface diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml index a7f524d79be..46ee0a6be67 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml @@ -27,3 +27,8 @@ dev_dependencies: flutter_test: sdk: flutter plugin_platform_interface: ^2.0.0 + +# FOR TESTING ONLY. DO NOT MERGE. +dependency_overrides: + google_maps_flutter_platform_interface: + path: ../../google_maps_flutter/google_maps_flutter_platform_interface diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml index 80d7127e9e4..42cfc4b0af4 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml @@ -27,6 +27,9 @@ dev_dependencies: sdk: flutter mockito: ^5.3.2 +# FOR TESTING ONLY. DO NOT MERGE. dependency_overrides: google_maps_flutter_platform_interface: - path: ../../google_maps_flutter_platform_interface + path: ../../../google_maps_flutter/google_maps_flutter_platform_interface + google_maps_flutter_web: + path: ../../../google_maps_flutter/google_maps_flutter_web diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml index 72c173f8204..cc8e040c8c2 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml @@ -34,6 +34,7 @@ dev_dependencies: false_secrets: - /example/web/index.html +# FOR TESTING ONLY. DO NOT MERGE. dependency_overrides: google_maps_flutter_platform_interface: - path: ../google_maps_flutter_platform_interface + path: ../../google_maps_flutter/google_maps_flutter_platform_interface From 5a02d1690e6481f7f2268663d9d25c7753d88baf Mon Sep 17 00:00:00 2001 From: Rexios Date: Tue, 7 Mar 2023 17:08:33 -0500 Subject: [PATCH 03/21] Revert android example config changes --- .../google_maps_flutter/example/android/app/build.gradle | 6 +++--- .../google_maps_flutter/example/android/build.gradle | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/app/build.gradle b/packages/google_maps_flutter/google_maps_flutter/example/android/app/build.gradle index 6bf0de9a2a4..b6e7a5189b1 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/app/build.gradle +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/app/build.gradle @@ -27,6 +27,9 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { compileSdkVersion flutter.compileSdkVersion + lintOptions { + disable 'InvalidPackage' + } defaultConfig { applicationId "io.flutter.plugins.googlemapsexample" @@ -63,9 +66,6 @@ android { api 'androidx.test:core:1.2.0' testImplementation 'com.google.android.gms:play-services-maps:17.0.0' } - lint { - disable 'InvalidPackage' - } } flutter { diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/build.gradle b/packages/google_maps_flutter/google_maps_flutter/example/android/build.gradle index 3ecc2576de2..c21bff8e0a2 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/build.gradle +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.0' + classpath 'com.android.tools.build:gradle:7.0.1' } } diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/google_maps_flutter/google_maps_flutter/example/android/gradle/wrapper/gradle-wrapper.properties index 7645e290ee9..b8793d3c0d6 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Fri Jun 23 08:50:38 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip From 38a2060215f20abba095184f165a879aac721589 Mon Sep 17 00:00:00 2001 From: Rexios Date: Tue, 7 Mar 2023 17:40:45 -0500 Subject: [PATCH 04/21] Alphabetical ordering --- .../google_maps_flutter/lib/google_maps_flutter.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart index 49d05c1289a..954a195c3e5 100644 --- a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart +++ b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart @@ -28,7 +28,6 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf Cap, Circle, CircleId, - WebGestureHandling, InfoWindow, JointType, LatLng, @@ -47,7 +46,8 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf Tile, TileOverlayId, TileOverlay, - TileProvider; + TileProvider, + WebGestureHandling; part 'src/controller.dart'; part 'src/google_map.dart'; From 6e04109c3fbdd1bb445a4cc96245974093e05d20 Mon Sep 17 00:00:00 2001 From: Rexios Date: Tue, 7 Mar 2023 17:47:03 -0500 Subject: [PATCH 05/21] Revert changes in unrelated platforms --- .../google_maps_flutter_android/example/pubspec.yaml | 5 ----- .../google_maps_flutter_android/pubspec.yaml | 5 ----- .../google_maps_flutter_ios/example/pubspec.yaml | 5 ----- .../google_maps_flutter/google_maps_flutter_ios/pubspec.yaml | 5 ----- 4 files changed, 20 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml index 9f0f22cbe74..74eef48836b 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml @@ -34,8 +34,3 @@ flutter: uses-material-design: true assets: - assets/ - -# FOR TESTING ONLY. DO NOT MERGE. -dependency_overrides: - google_maps_flutter_platform_interface: - path: ../../../google_maps_flutter/google_maps_flutter_platform_interface diff --git a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml index 735350e772d..92efcb9b92c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml @@ -29,8 +29,3 @@ dev_dependencies: flutter_test: sdk: flutter plugin_platform_interface: ^2.0.0 - -# FOR TESTING ONLY. DO NOT MERGE. -dependency_overrides: - google_maps_flutter_platform_interface: - path: ../../google_maps_flutter/google_maps_flutter_platform_interface diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/pubspec.yaml index 027275e7af5..cc5c9ed7b16 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/pubspec.yaml @@ -32,8 +32,3 @@ flutter: uses-material-design: true assets: - assets/ - -# FOR TESTING ONLY. DO NOT MERGE. -dependency_overrides: - google_maps_flutter_platform_interface: - path: ../../../google_maps_flutter/google_maps_flutter_platform_interface diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml index 46ee0a6be67..a7f524d79be 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml @@ -27,8 +27,3 @@ dev_dependencies: flutter_test: sdk: flutter plugin_platform_interface: ^2.0.0 - -# FOR TESTING ONLY. DO NOT MERGE. -dependency_overrides: - google_maps_flutter_platform_interface: - path: ../../google_maps_flutter/google_maps_flutter_platform_interface From 275ec3f9d75ec4b0f76b4b36f7cb3a7ddda46c5e Mon Sep 17 00:00:00 2001 From: Rexios Date: Wed, 28 Jun 2023 10:04:32 -0400 Subject: [PATCH 06/21] Fix analysis issue --- .../google_maps_flutter_web/example/pubspec.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml index 8bbbf993881..04ccd7108ab 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml @@ -27,11 +27,11 @@ dev_dependencies: mockito: 5.4.1 dependency_overrides: + # FOR TESTING ONLY. DO NOT MERGE. + google_maps_flutter_platform_interface: + path: ../../../google_maps_flutter/google_maps_flutter_platform_interface # Override the google_maps_flutter dependency on google_maps_flutter_web. # TODO(ditman): Unwind the circular dependency. This will create problems # if we need to make a breaking change to google_maps_flutter_web. google_maps_flutter_web: path: ../ - # FOR TESTING ONLY. DO NOT MERGE. - google_maps_flutter_platform_interface: - path: ../../../google_maps_flutter/google_maps_flutter_platform_interface From e09c6181550b3f71cb712903525131ec0e10ff04 Mon Sep 17 00:00:00 2001 From: Rexios Date: Fri, 14 Jul 2023 09:19:02 -0400 Subject: [PATCH 07/21] Update packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart Co-authored-by: David Iglesias --- .../google_maps_flutter_web/lib/src/convert.dart | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart index 734faa81370..721c170232c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart @@ -60,6 +60,11 @@ gmaps.MapOptions _configurationAndStyleToGmapsOptions( options.zoomControl = configuration.zoomControlsEnabled; } + if (configuration.scrollGesturesEnabled == false || + configuration.zoomGesturesEnabled == false) { + html.window.console.warn('`scrollGesturesEnabled` and `zoomGesturesEnabled` are now ignored on the web. Use `webGestureHandling: WebGestureHandling.none` instead.'); + } + if (configuration.webGestureHandling != null) { options.gestureHandling = configuration.webGestureHandling!.name; } else { From 03903effbe62eada4a8e9b11519e49aacbc7fa5e Mon Sep 17 00:00:00 2001 From: Rexios Date: Fri, 14 Jul 2023 09:23:05 -0400 Subject: [PATCH 08/21] Remove duplicated changelog line --- packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md index e78e8c0531e..86c6f2a39b1 100644 --- a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md @@ -25,7 +25,6 @@ ## 2.2.6 -* Adds options for gesture handling and tilt controls on web. * Aligns Dart and Flutter SDK constraints. * Updates README.md to specify not to use GoogleMaps widget within an unbounded widget. From cc8090325eea8aa2745e6687a7b62d407891f53b Mon Sep 17 00:00:00 2001 From: Rexios Date: Sat, 15 Jul 2023 08:04:35 -0400 Subject: [PATCH 09/21] Platform interface changes for #3258 --- .../CHANGELOG.md | 3 +- .../lib/src/types/map_configuration.dart | 35 +++++++++++++++++-- .../lib/src/types/types.dart | 1 + .../lib/src/types/web_gesture_handling.dart | 22 ++++++++++++ 4 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/web_gesture_handling.dart diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md index c47578b208a..6094502fbb9 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md @@ -1,5 +1,6 @@ ## 2.3.0 +* Adds options for gesture handling and tilt controls on web. * Adds a `cloudMapId` parameter to support cloud-based map styling. ## 2.2.7 @@ -58,7 +59,7 @@ ## 2.1.5 -Removes dependency on `meta`. +* Removes dependency on `meta`. ## 2.1.4 diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart index 5580e9eea98..c87055d83bf 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart @@ -3,8 +3,7 @@ // found in the LICENSE file. import 'package:flutter/widgets.dart'; - -import 'ui.dart'; +import '../../google_maps_flutter_platform_interface.dart'; /// Configuration options for the GoogleMaps user interface. @immutable @@ -15,6 +14,7 @@ class MapConfiguration { /// as either a full configuration selection, or an update to an existing /// configuration where only non-null values are updated. const MapConfiguration({ + this.webGestureHandling, this.compassEnabled, this.mapToolbarEnabled, this.cameraTargetBounds, @@ -23,6 +23,7 @@ class MapConfiguration { this.rotateGesturesEnabled, this.scrollGesturesEnabled, this.tiltGesturesEnabled, + this.fortyFiveDegreeImageryEnabled, this.trackCameraPosition, this.zoomControlsEnabled, this.zoomGesturesEnabled, @@ -36,6 +37,11 @@ class MapConfiguration { this.cloudMapId, }); + /// This setting controls how the API handles gestures on the map. Web only. + /// + /// See [WebGestureHandling] for more details. + final WebGestureHandling? webGestureHandling; + /// True if the compass UI should be shown. final bool? compassEnabled; @@ -48,18 +54,23 @@ class MapConfiguration { /// The type of the map. final MapType? mapType; - /// The prefered zoom range. + /// The preferred zoom range. final MinMaxZoomPreference? minMaxZoomPreference; /// True if rotate gestures should be enabled. final bool? rotateGesturesEnabled; /// True if scroll gestures should be enabled. + /// + /// Android/iOS only. For web, see [webGestureHandling]. final bool? scrollGesturesEnabled; /// True if tilt gestures should be enabled. final bool? tiltGesturesEnabled; + /// True if 45 degree imagery should be enabled. Web only. + final bool? fortyFiveDegreeImageryEnabled; + /// True if camera position changes should trigger notifications. final bool? trackCameraPosition; @@ -67,6 +78,8 @@ class MapConfiguration { final bool? zoomControlsEnabled; /// True if zoom gestures should be enabled. + /// + /// Android/iOS only. For web, see [webGestureHandling]. final bool? zoomGesturesEnabled; /// True if the map should use Lite Mode, showing a limited-interactivity @@ -101,6 +114,9 @@ class MapConfiguration { /// that are different from [other]. MapConfiguration diffFrom(MapConfiguration other) { return MapConfiguration( + webGestureHandling: webGestureHandling != other.webGestureHandling + ? webGestureHandling + : null, compassEnabled: compassEnabled != other.compassEnabled ? compassEnabled : null, mapToolbarEnabled: mapToolbarEnabled != other.mapToolbarEnabled @@ -124,6 +140,10 @@ class MapConfiguration { tiltGesturesEnabled: tiltGesturesEnabled != other.tiltGesturesEnabled ? tiltGesturesEnabled : null, + fortyFiveDegreeImageryEnabled: + fortyFiveDegreeImageryEnabled != other.fortyFiveDegreeImageryEnabled + ? fortyFiveDegreeImageryEnabled + : null, trackCameraPosition: trackCameraPosition != other.trackCameraPosition ? trackCameraPosition : null, @@ -158,6 +178,7 @@ class MapConfiguration { /// replacing the previous values. MapConfiguration applyDiff(MapConfiguration diff) { return MapConfiguration( + webGestureHandling: diff.webGestureHandling ?? webGestureHandling, compassEnabled: diff.compassEnabled ?? compassEnabled, mapToolbarEnabled: diff.mapToolbarEnabled ?? mapToolbarEnabled, cameraTargetBounds: diff.cameraTargetBounds ?? cameraTargetBounds, @@ -168,6 +189,8 @@ class MapConfiguration { scrollGesturesEnabled: diff.scrollGesturesEnabled ?? scrollGesturesEnabled, tiltGesturesEnabled: diff.tiltGesturesEnabled ?? tiltGesturesEnabled, + fortyFiveDegreeImageryEnabled: + diff.fortyFiveDegreeImageryEnabled ?? fortyFiveDegreeImageryEnabled, trackCameraPosition: diff.trackCameraPosition ?? trackCameraPosition, zoomControlsEnabled: diff.zoomControlsEnabled ?? zoomControlsEnabled, zoomGesturesEnabled: diff.zoomGesturesEnabled ?? zoomGesturesEnabled, @@ -185,6 +208,7 @@ class MapConfiguration { /// True if no options are set. bool get isEmpty => + webGestureHandling == null && compassEnabled == null && mapToolbarEnabled == null && cameraTargetBounds == null && @@ -193,6 +217,7 @@ class MapConfiguration { rotateGesturesEnabled == null && scrollGesturesEnabled == null && tiltGesturesEnabled == null && + fortyFiveDegreeImageryEnabled == null && trackCameraPosition == null && zoomControlsEnabled == null && zoomGesturesEnabled == null && @@ -214,6 +239,7 @@ class MapConfiguration { return false; } return other is MapConfiguration && + webGestureHandling == other.webGestureHandling && compassEnabled == other.compassEnabled && mapToolbarEnabled == other.mapToolbarEnabled && cameraTargetBounds == other.cameraTargetBounds && @@ -222,6 +248,7 @@ class MapConfiguration { rotateGesturesEnabled == other.rotateGesturesEnabled && scrollGesturesEnabled == other.scrollGesturesEnabled && tiltGesturesEnabled == other.tiltGesturesEnabled && + fortyFiveDegreeImageryEnabled == other.fortyFiveDegreeImageryEnabled && trackCameraPosition == other.trackCameraPosition && zoomControlsEnabled == other.zoomControlsEnabled && zoomGesturesEnabled == other.zoomGesturesEnabled && @@ -237,6 +264,7 @@ class MapConfiguration { @override int get hashCode => Object.hash( + webGestureHandling, compassEnabled, mapToolbarEnabled, cameraTargetBounds, @@ -245,6 +273,7 @@ class MapConfiguration { rotateGesturesEnabled, scrollGesturesEnabled, tiltGesturesEnabled, + fortyFiveDegreeImageryEnabled, trackCameraPosition, zoomControlsEnabled, zoomGesturesEnabled, diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart index 0beb7d747ec..1f1916b1c55 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart @@ -34,3 +34,4 @@ export 'utils/marker.dart'; export 'utils/polygon.dart'; export 'utils/polyline.dart'; export 'utils/tile_overlay.dart'; +export 'web_gesture_handling.dart'; diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/web_gesture_handling.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/web_gesture_handling.dart new file mode 100644 index 00000000000..c978f915309 --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/web_gesture_handling.dart @@ -0,0 +1,22 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +/// This setting controls how the API handles gestures on the map +enum WebGestureHandling { + /// Scroll events and one-finger touch gestures scroll the page, and do not + /// zoom or pan the map. Two-finger touch gestures pan and zoom the map. + /// Scroll events with a ctrl key or ⌘ key pressed zoom the map. In this mode + /// the map cooperates with the page. + cooperative, + + /// All touch gestures and scroll events pan or zoom the map. + greedy, + + /// The map cannot be panned or zoomed by user gestures. + none, + + /// (default) Gesture handling is either cooperative or greedy, depending on + /// whether the page is scrollable or in an iframe. + auto, +} From 44640ae14a14b43f32df04efdde71d7a433f6733 Mon Sep 17 00:00:00 2001 From: Rexios Date: Sat, 15 Jul 2023 08:25:12 -0400 Subject: [PATCH 10/21] Adds tests --- .../lib/src/types/map_configuration.dart | 4 +-- .../test/types/map_configuration_test.dart | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart index c87055d83bf..5cc4fe1a075 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart @@ -263,7 +263,7 @@ class MapConfiguration { } @override - int get hashCode => Object.hash( + int get hashCode => Object.hashAll([ webGestureHandling, compassEnabled, mapToolbarEnabled, @@ -285,5 +285,5 @@ class MapConfiguration { trafficEnabled, buildingsEnabled, cloudMapId, - ); + ]); } diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart index e57d2c73eef..f0922083a86 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart @@ -12,6 +12,7 @@ void main() { group('diffs', () { // A options instance with every field set, to test diffs against. final MapConfiguration diffBase = MapConfiguration( + webGestureHandling: WebGestureHandling.auto, compassEnabled: false, mapToolbarEnabled: false, cameraTargetBounds: CameraTargetBounds(LatLngBounds( @@ -21,6 +22,7 @@ void main() { rotateGesturesEnabled: false, scrollGesturesEnabled: false, tiltGesturesEnabled: false, + fortyFiveDegreeImageryEnabled: false, trackCameraPosition: false, zoomControlsEnabled: false, zoomGesturesEnabled: false, @@ -58,6 +60,19 @@ void main() { expect(updated.cloudMapId, null); }); + test('handle webGestureHandling', () async { + const MapConfiguration diff = + MapConfiguration(webGestureHandling: WebGestureHandling.none); + + const MapConfiguration empty = MapConfiguration(); + final MapConfiguration updated = diffBase.applyDiff(diff); + + // A diff applied to empty options should be the diff itself. + expect(empty.applyDiff(diff), diff); + // A diff applied to non-empty options should update that field. + expect(updated.webGestureHandling, WebGestureHandling.none); + }); + test('handle compassEnabled', () async { const MapConfiguration diff = MapConfiguration(compassEnabled: true); @@ -162,6 +177,19 @@ void main() { expect(updated.tiltGesturesEnabled, true); }); + test('handle fortyFiveDegreeImageryEnabled', () async { + const MapConfiguration diff = + MapConfiguration(fortyFiveDegreeImageryEnabled: true); + + const MapConfiguration empty = MapConfiguration(); + final MapConfiguration updated = diffBase.applyDiff(diff); + + // A diff applied to empty options should be the diff itself. + expect(empty.applyDiff(diff), diff); + // A diff applied to non-empty options should update that field. + expect(updated.fortyFiveDegreeImageryEnabled, true); + }); + test('handle trackCameraPosition', () async { const MapConfiguration diff = MapConfiguration(trackCameraPosition: true); From 2ccf1faa75d4817fa976661838330a714eaa3f52 Mon Sep 17 00:00:00 2001 From: Rexios Date: Sat, 15 Jul 2023 09:30:21 -0400 Subject: [PATCH 11/21] Fixes --- .../lib/src/types/map_configuration.dart | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart index 5cc4fe1a075..3ec973fd7d0 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'package:flutter/widgets.dart'; + import '../../google_maps_flutter_platform_interface.dart'; /// Configuration options for the GoogleMaps user interface. @@ -68,7 +69,9 @@ class MapConfiguration { /// True if tilt gestures should be enabled. final bool? tiltGesturesEnabled; - /// True if 45 degree imagery should be enabled. Web only. + /// True if 45 degree imagery should be enabled. + /// + /// Web only. final bool? fortyFiveDegreeImageryEnabled; /// True if camera position changes should trigger notifications. From c144efe0d6877451f04e0438d015f629fc6be54b Mon Sep 17 00:00:00 2001 From: Rexios Date: Sat, 15 Jul 2023 09:39:14 -0400 Subject: [PATCH 12/21] Adding more tests --- .../test/types/map_configuration_test.dart | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart index f0922083a86..2a53b8c0bbc 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart @@ -69,8 +69,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.webGestureHandling, WebGestureHandling.none); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); test('handle compassEnabled', () async { @@ -81,8 +85,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.compassEnabled, true); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); test('handle mapToolbarEnabled', () async { @@ -93,8 +101,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.mapToolbarEnabled, true); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); test('handle cameraTargetBounds', () async { @@ -108,8 +120,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.cameraTargetBounds, newBounds); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); test('handle mapType', () async { @@ -121,8 +137,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.mapType, MapType.satellite); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); test('handle minMaxZoomPreference', () async { @@ -135,8 +155,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.minMaxZoomPreference, newZoomPref); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); test('handle rotateGesturesEnabled', () async { @@ -148,8 +172,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.rotateGesturesEnabled, true); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); test('handle scrollGesturesEnabled', () async { @@ -161,8 +189,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.scrollGesturesEnabled, true); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); test('handle tiltGesturesEnabled', () async { @@ -173,8 +205,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.tiltGesturesEnabled, true); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); test('handle fortyFiveDegreeImageryEnabled', () async { @@ -186,8 +222,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.fortyFiveDegreeImageryEnabled, true); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); test('handle trackCameraPosition', () async { @@ -198,8 +238,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.trackCameraPosition, true); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); test('handle zoomControlsEnabled', () async { @@ -210,8 +254,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.zoomControlsEnabled, true); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); test('handle zoomGesturesEnabled', () async { @@ -222,8 +270,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.zoomGesturesEnabled, true); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); test('handle liteModeEnabled', () async { @@ -234,8 +286,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.liteModeEnabled, true); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); test('handle myLocationEnabled', () async { @@ -246,8 +302,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.myLocationEnabled, true); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); test('handle myLocationButtonEnabled', () async { @@ -259,8 +319,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.myLocationButtonEnabled, true); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); test('handle padding', () async { @@ -273,8 +337,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.padding, newPadding); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); test('handle indoorViewEnabled', () async { @@ -285,8 +353,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.indoorViewEnabled, true); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); test('handle trafficEnabled', () async { @@ -297,8 +369,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.trafficEnabled, true); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); test('handle buildingsEnabled', () async { @@ -309,8 +385,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.buildingsEnabled, true); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); test('handle cloudMapId', () async { @@ -321,8 +401,12 @@ void main() { // A diff applied to empty options should be the diff itself. expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); // A diff applied to non-empty options should update that field. expect(updated.cloudMapId, _kCloudMapId); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); }); }); From 9c9cc1672b5127c8d91d8a77eacc7ff51f578ba5 Mon Sep 17 00:00:00 2001 From: Rexios Date: Mon, 17 Jul 2023 10:24:47 -0400 Subject: [PATCH 13/21] Update versions --- .../google_maps_flutter_platform_interface/CHANGELOG.md | 5 ++++- .../google_maps_flutter_platform_interface/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md index 6094502fbb9..c7856259978 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md @@ -1,6 +1,9 @@ -## 2.3.0 +## 2.4.0 * Adds options for gesture handling and tilt controls on web. + +## 2.3.0 + * Adds a `cloudMapId` parameter to support cloud-based map styling. ## 2.2.7 diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml index a8d7b126ca3..9b79a532ebb 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml @@ -4,7 +4,7 @@ repository: https://github.com/flutter/packages/tree/main/packages/google_maps_f issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 # NOTE: We strongly prefer non-breaking changes, even at the expense of a # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes -version: 2.3.0 +version: 2.4.0 environment: sdk: ">=2.18.0 <4.0.0" From ff28a1872bb8f46b7538a74ad9d1e345927a76c7 Mon Sep 17 00:00:00 2001 From: Rexios Date: Mon, 17 Jul 2023 22:08:54 -0400 Subject: [PATCH 14/21] Remove dependency overrides for platform interface --- .../google_maps_flutter/example/pubspec.yaml | 5 ----- .../google_maps_flutter/google_maps_flutter/pubspec.yaml | 5 ----- .../google_maps_flutter_web/example/pubspec.yaml | 3 --- .../google_maps_flutter/google_maps_flutter_web/pubspec.yaml | 4 ---- 4 files changed, 17 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml index 0013c975c1f..364d9b62d3c 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml @@ -33,8 +33,3 @@ flutter: uses-material-design: true assets: - assets/ - -# FOR TESTING ONLY. DO NOT MERGE. -dependency_overrides: - google_maps_flutter_platform_interface: - path: ../../../google_maps_flutter/google_maps_flutter_platform_interface diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index e6e56eb823c..c7c8eb7f39c 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -35,8 +35,3 @@ dev_dependencies: # The example deliberately includes limited-use secrets. false_secrets: - /example/web/index.html - -# FOR TESTING ONLY. DO NOT MERGE. -dependency_overrides: - google_maps_flutter_platform_interface: - path: ../../google_maps_flutter/google_maps_flutter_platform_interface diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml index 0692d4e5beb..4944d77651a 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml @@ -25,9 +25,6 @@ dev_dependencies: mockito: 5.4.1 dependency_overrides: - # FOR TESTING ONLY. DO NOT MERGE. - google_maps_flutter_platform_interface: - path: ../../../google_maps_flutter/google_maps_flutter_platform_interface # Override the google_maps_flutter dependency on google_maps_flutter_web. # TODO(ditman): Unwind the circular dependency. This will create problems # if we need to make a breaking change to google_maps_flutter_web. diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml index b45059cbddf..6b760304178 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml @@ -34,7 +34,3 @@ dev_dependencies: false_secrets: - /example/web/index.html -# FOR TESTING ONLY. DO NOT MERGE. -dependency_overrides: - google_maps_flutter_platform_interface: - path: ../../google_maps_flutter/google_maps_flutter_platform_interface From ced5c25a0edb61baf9a70365c793e9c63c76f127 Mon Sep 17 00:00:00 2001 From: Rexios Date: Mon, 17 Jul 2023 22:13:38 -0400 Subject: [PATCH 15/21] Fixing changelogs --- .../google_maps_flutter_platform_interface/CHANGELOG.md | 1 - .../google_maps_flutter/google_maps_flutter_web/CHANGELOG.md | 5 ++++- .../google_maps_flutter/google_maps_flutter_web/pubspec.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md index 59f97c3afae..c7856259978 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md @@ -4,7 +4,6 @@ ## 2.3.0 -* Adds options for gesture handling and tilt controls on web. * Adds a `cloudMapId` parameter to support cloud-based map styling. ## 2.2.7 diff --git a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md index 652f360ba27..0427818ca50 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md @@ -1,6 +1,9 @@ -## 0.5.1 +## 0.5.2 * Adds options for gesture handling and tilt controls. + +## 0.5.1 + * Adds padding support to `CameraUpdate.newLatLngBounds`. Issue [#122192](https://github.com/flutter/flutter/issues/122192). ## 0.5.0+1 diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml index 6b760304178..fb9b7e42ce2 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_web description: Web platform implementation of google_maps_flutter repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_web issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 0.5.1 +version: 0.5.2 environment: sdk: ">=2.18.0 <4.0.0" From 5ec7bd26cb4f140bed059809d918c9a64c36db2e Mon Sep 17 00:00:00 2001 From: Rexios Date: Mon, 17 Jul 2023 22:23:13 -0400 Subject: [PATCH 16/21] Fixing issues --- .../google_maps_flutter_web/lib/src/convert.dart | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart index 1931e7ba14f..a88d85cab5f 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart @@ -62,7 +62,10 @@ gmaps.MapOptions _configurationAndStyleToGmapsOptions( if (configuration.scrollGesturesEnabled == false || configuration.zoomGesturesEnabled == false) { - html.window.console.warn('`scrollGesturesEnabled` and `zoomGesturesEnabled` are now ignored on the web. Use `webGestureHandling: WebGestureHandling.none` instead.'); + window.console.warn( + '`scrollGesturesEnabled` and `zoomGesturesEnabled` are now ignored on the web.' + ' Use `webGestureHandling: WebGestureHandling.none` instead.', + ); } if (configuration.webGestureHandling != null) { From 222b80d32ffcc16fb23bea50e583c01e0ff2d9b4 Mon Sep 17 00:00:00 2001 From: Rexios Date: Tue, 18 Jul 2023 15:48:44 -0400 Subject: [PATCH 17/21] Update google_maps_platform_interface constraint --- .../google_maps_flutter/example/pubspec.yaml | 2 +- packages/google_maps_flutter/google_maps_flutter/pubspec.yaml | 2 +- .../google_maps_flutter_android/example/pubspec.yaml | 2 +- .../google_maps_flutter_android/pubspec.yaml | 2 +- .../google_maps_flutter_ios/example/ios11/pubspec.yaml | 2 +- .../google_maps_flutter_ios/example/ios12/pubspec.yaml | 2 +- .../google_maps_flutter_ios/example/ios13/pubspec.yaml | 2 +- .../example/shared/maps_example_dart/pubspec.yaml | 2 +- .../google_maps_flutter/google_maps_flutter_ios/pubspec.yaml | 2 +- .../google_maps_flutter_web/example/pubspec.yaml | 2 +- .../google_maps_flutter/google_maps_flutter_web/pubspec.yaml | 3 +-- 11 files changed, 11 insertions(+), 12 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml index 364d9b62d3c..3c90433879d 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml @@ -19,7 +19,7 @@ dependencies: # the parent directory to use the current plugin's version. path: ../ google_maps_flutter_android: ^2.1.10 - google_maps_flutter_platform_interface: ^2.2.1 + google_maps_flutter_platform_interface: ^2.4.0 dev_dependencies: build_runner: ^2.1.10 diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index c7c8eb7f39c..3156bac4116 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -23,7 +23,7 @@ dependencies: sdk: flutter google_maps_flutter_android: ^2.1.10 google_maps_flutter_ios: ^2.1.10 - google_maps_flutter_platform_interface: ^2.2.1 + google_maps_flutter_platform_interface: ^2.4.0 google_maps_flutter_web: ^0.5.0 dev_dependencies: diff --git a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml index d21ff07a34a..48a622c3646 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: # 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: ../ - google_maps_flutter_platform_interface: ^2.2.1 + google_maps_flutter_platform_interface: ^2.4.0 dev_dependencies: build_runner: ^2.1.10 diff --git a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml index 04c9f12bbba..3bfcc2d07b5 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml @@ -21,7 +21,7 @@ dependencies: flutter: sdk: flutter flutter_plugin_android_lifecycle: ^2.0.1 - google_maps_flutter_platform_interface: ^2.2.1 + google_maps_flutter_platform_interface: ^2.4.0 stream_transform: ^2.0.0 dev_dependencies: diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml index 050519e8acb..7fd8dd58478 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: # 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: ../../ - google_maps_flutter_platform_interface: ^2.2.1 + google_maps_flutter_platform_interface: ^2.4.0 maps_example_dart: path: ../shared/maps_example_dart/ diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml index 050519e8acb..7fd8dd58478 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: # 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: ../../ - google_maps_flutter_platform_interface: ^2.2.1 + google_maps_flutter_platform_interface: ^2.4.0 maps_example_dart: path: ../shared/maps_example_dart/ diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml index 050519e8acb..7fd8dd58478 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: # 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: ../../ - google_maps_flutter_platform_interface: ^2.2.1 + google_maps_flutter_platform_interface: ^2.4.0 maps_example_dart: path: ../shared/maps_example_dart/ diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml index e20bdb9a5af..deeeac15956 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: # 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: ../../../ - google_maps_flutter_platform_interface: ^2.2.1 + google_maps_flutter_platform_interface: ^2.4.0 flutter: uses-material-design: true diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml index 499387f6433..7d7d87a7d08 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml @@ -19,7 +19,7 @@ flutter: dependencies: flutter: sdk: flutter - google_maps_flutter_platform_interface: ^2.2.1 + google_maps_flutter_platform_interface: ^2.4.0 stream_transform: ^2.0.0 dev_dependencies: diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml index 4944d77651a..5721b08b1ab 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml @@ -9,7 +9,7 @@ environment: dependencies: flutter: sdk: flutter - google_maps_flutter_platform_interface: ^2.2.1 + google_maps_flutter_platform_interface: ^2.4.0 google_maps_flutter_web: path: ../ diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml index fb9b7e42ce2..f1eb09c6c57 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml @@ -22,7 +22,7 @@ dependencies: flutter_web_plugins: sdk: flutter google_maps: ^6.1.0 - google_maps_flutter_platform_interface: ^2.2.2 + google_maps_flutter_platform_interface: ^2.4.0 sanitize_html: ^2.0.0 stream_transform: ^2.0.0 @@ -33,4 +33,3 @@ dev_dependencies: # The example deliberately includes limited-use secrets. false_secrets: - /example/web/index.html - From bed7229e5311aa43870f5cb6abbdc06ab9c7cd4d Mon Sep 17 00:00:00 2001 From: Rexios Date: Tue, 18 Jul 2023 16:53:20 -0400 Subject: [PATCH 18/21] Revert "Update google_maps_platform_interface constraint" This reverts commit 222b80d32ffcc16fb23bea50e583c01e0ff2d9b4. --- .../google_maps_flutter/example/pubspec.yaml | 2 +- packages/google_maps_flutter/google_maps_flutter/pubspec.yaml | 2 +- .../google_maps_flutter_android/example/pubspec.yaml | 2 +- .../google_maps_flutter_android/pubspec.yaml | 2 +- .../google_maps_flutter_ios/example/ios11/pubspec.yaml | 2 +- .../google_maps_flutter_ios/example/ios12/pubspec.yaml | 2 +- .../google_maps_flutter_ios/example/ios13/pubspec.yaml | 2 +- .../example/shared/maps_example_dart/pubspec.yaml | 2 +- .../google_maps_flutter/google_maps_flutter_ios/pubspec.yaml | 2 +- .../google_maps_flutter_web/example/pubspec.yaml | 2 +- .../google_maps_flutter/google_maps_flutter_web/pubspec.yaml | 3 ++- 11 files changed, 12 insertions(+), 11 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml index 3c90433879d..364d9b62d3c 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml @@ -19,7 +19,7 @@ dependencies: # the parent directory to use the current plugin's version. path: ../ google_maps_flutter_android: ^2.1.10 - google_maps_flutter_platform_interface: ^2.4.0 + google_maps_flutter_platform_interface: ^2.2.1 dev_dependencies: build_runner: ^2.1.10 diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index 3156bac4116..c7c8eb7f39c 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -23,7 +23,7 @@ dependencies: sdk: flutter google_maps_flutter_android: ^2.1.10 google_maps_flutter_ios: ^2.1.10 - google_maps_flutter_platform_interface: ^2.4.0 + google_maps_flutter_platform_interface: ^2.2.1 google_maps_flutter_web: ^0.5.0 dev_dependencies: diff --git a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml index 48a622c3646..d21ff07a34a 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: # 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: ../ - google_maps_flutter_platform_interface: ^2.4.0 + google_maps_flutter_platform_interface: ^2.2.1 dev_dependencies: build_runner: ^2.1.10 diff --git a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml index 3bfcc2d07b5..04c9f12bbba 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml @@ -21,7 +21,7 @@ dependencies: flutter: sdk: flutter flutter_plugin_android_lifecycle: ^2.0.1 - google_maps_flutter_platform_interface: ^2.4.0 + google_maps_flutter_platform_interface: ^2.2.1 stream_transform: ^2.0.0 dev_dependencies: diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml index 7fd8dd58478..050519e8acb 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: # 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: ../../ - google_maps_flutter_platform_interface: ^2.4.0 + google_maps_flutter_platform_interface: ^2.2.1 maps_example_dart: path: ../shared/maps_example_dart/ diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml index 7fd8dd58478..050519e8acb 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: # 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: ../../ - google_maps_flutter_platform_interface: ^2.4.0 + google_maps_flutter_platform_interface: ^2.2.1 maps_example_dart: path: ../shared/maps_example_dart/ diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml index 7fd8dd58478..050519e8acb 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: # 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: ../../ - google_maps_flutter_platform_interface: ^2.4.0 + google_maps_flutter_platform_interface: ^2.2.1 maps_example_dart: path: ../shared/maps_example_dart/ diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml index deeeac15956..e20bdb9a5af 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: # 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: ../../../ - google_maps_flutter_platform_interface: ^2.4.0 + google_maps_flutter_platform_interface: ^2.2.1 flutter: uses-material-design: true diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml index 7d7d87a7d08..499387f6433 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml @@ -19,7 +19,7 @@ flutter: dependencies: flutter: sdk: flutter - google_maps_flutter_platform_interface: ^2.4.0 + google_maps_flutter_platform_interface: ^2.2.1 stream_transform: ^2.0.0 dev_dependencies: diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml index 5721b08b1ab..4944d77651a 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml @@ -9,7 +9,7 @@ environment: dependencies: flutter: sdk: flutter - google_maps_flutter_platform_interface: ^2.4.0 + google_maps_flutter_platform_interface: ^2.2.1 google_maps_flutter_web: path: ../ diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml index f1eb09c6c57..fb9b7e42ce2 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml @@ -22,7 +22,7 @@ dependencies: flutter_web_plugins: sdk: flutter google_maps: ^6.1.0 - google_maps_flutter_platform_interface: ^2.4.0 + google_maps_flutter_platform_interface: ^2.2.2 sanitize_html: ^2.0.0 stream_transform: ^2.0.0 @@ -33,3 +33,4 @@ dev_dependencies: # The example deliberately includes limited-use secrets. false_secrets: - /example/web/index.html + From 133810f627ea6c5b19908a8f58ba59400ee3f8a2 Mon Sep 17 00:00:00 2001 From: Rexios Date: Tue, 18 Jul 2023 16:54:35 -0400 Subject: [PATCH 19/21] Let's try this again --- packages/google_maps_flutter/google_maps_flutter/pubspec.yaml | 2 +- .../google_maps_flutter/google_maps_flutter_web/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index c7c8eb7f39c..3156bac4116 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -23,7 +23,7 @@ dependencies: sdk: flutter google_maps_flutter_android: ^2.1.10 google_maps_flutter_ios: ^2.1.10 - google_maps_flutter_platform_interface: ^2.2.1 + google_maps_flutter_platform_interface: ^2.4.0 google_maps_flutter_web: ^0.5.0 dev_dependencies: diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml index fb9b7e42ce2..87d99382f12 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml @@ -22,7 +22,7 @@ dependencies: flutter_web_plugins: sdk: flutter google_maps: ^6.1.0 - google_maps_flutter_platform_interface: ^2.2.2 + google_maps_flutter_platform_interface: ^2.4.0 sanitize_html: ^2.0.0 stream_transform: ^2.0.0 From e64a2394fcf972f99c5193e43f0e22e34fee65ab Mon Sep 17 00:00:00 2001 From: Rexios Date: Fri, 21 Jul 2023 11:53:46 -0400 Subject: [PATCH 20/21] Update google_maps_flutter_web --- packages/google_maps_flutter/google_maps_flutter/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index 3156bac4116..28928f8ed24 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -24,7 +24,7 @@ dependencies: google_maps_flutter_android: ^2.1.10 google_maps_flutter_ios: ^2.1.10 google_maps_flutter_platform_interface: ^2.4.0 - google_maps_flutter_web: ^0.5.0 + google_maps_flutter_web: ^0.5.2 dev_dependencies: flutter_test: From a7aeb65fa7d5570e3a9b2656639f7e815dc1ce21 Mon Sep 17 00:00:00 2001 From: Rexios Date: Fri, 21 Jul 2023 11:56:39 -0400 Subject: [PATCH 21/21] Fixes --- .../google_maps_flutter/google_maps_flutter_web/pubspec.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml index 87d99382f12..f1eb09c6c57 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml @@ -33,4 +33,3 @@ dev_dependencies: # The example deliberately includes limited-use secrets. false_secrets: - /example/web/index.html -