From f9597ecb671ecd39d56bbca74c2fb43294bbf4c8 Mon Sep 17 00:00:00 2001 From: Anton Duzenko Date: Wed, 12 Jun 2019 07:52:38 -0700 Subject: [PATCH 01/15] Allow BitmapDescriptor scaling override --- packages/google_maps_flutter/lib/src/bitmap.dart | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/google_maps_flutter/lib/src/bitmap.dart b/packages/google_maps_flutter/lib/src/bitmap.dart index 2027eee3394e..e239956730c9 100644 --- a/packages/google_maps_flutter/lib/src/bitmap.dart +++ b/packages/google_maps_flutter/lib/src/bitmap.dart @@ -59,6 +59,13 @@ class BitmapDescriptor { AssetBundle bundle, String package, }) async { + if (configuration.devicePixelRatio != null) { + return BitmapDescriptor._([ + 'fromAssetImage', + assetName, + configuration.devicePixelRatio, + ]); + } final AssetImage assetImage = AssetImage(assetName, package: package, bundle: bundle); final AssetBundleImageKey assetBundleImageKey = From 9cf14ffeb5e371b6f1c0f96ac3b9d2997d3ad728 Mon Sep 17 00:00:00 2001 From: duzenko Date: Thu, 20 Jun 2019 10:40:56 +0300 Subject: [PATCH 02/15] Updated the pubspec.yml and changelog files --- packages/google_maps_flutter/CHANGELOG.md | 4 ++++ packages/google_maps_flutter/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md index ccd7c2d53549..b607c49f6b17 100644 --- a/packages/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.5.17+1 + +* Allow BitmapDescriptor scaling override + ## 0.5.17 * Add support for Padding. diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml index aa97ad91cc87..aab23c4c7fb3 100644 --- a/packages/google_maps_flutter/pubspec.yaml +++ b/packages/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. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter -version: 0.5.17 +version: 0.5.17+1 dependencies: flutter: From 4c12b6a4dd2ad973c97679fa8d1821a901ef2d6f Mon Sep 17 00:00:00 2001 From: duzenko Date: Tue, 9 Jul 2019 12:18:44 +0300 Subject: [PATCH 03/15] Breaking change fix --- packages/google_maps_flutter/lib/src/bitmap.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/lib/src/bitmap.dart b/packages/google_maps_flutter/lib/src/bitmap.dart index e239956730c9..47f46c273e41 100644 --- a/packages/google_maps_flutter/lib/src/bitmap.dart +++ b/packages/google_maps_flutter/lib/src/bitmap.dart @@ -58,8 +58,9 @@ class BitmapDescriptor { String assetName, { AssetBundle bundle, String package, + bool mipmaps = true, }) async { - if (configuration.devicePixelRatio != null) { + if (!mipmaps && configuration.devicePixelRatio != null) { return BitmapDescriptor._([ 'fromAssetImage', assetName, From 78edc7342281af918be40f22c92cb29676348f86 Mon Sep 17 00:00:00 2001 From: duzenko Date: Tue, 16 Jul 2019 12:31:15 +0300 Subject: [PATCH 04/15] Failing test for BitmapDescriptor.fromAssetImage --- .../example/test_driver/google_maps.dart | 16 ++++++++++++++++ packages/google_maps_flutter/lib/src/bitmap.dart | 3 +++ 2 files changed, 19 insertions(+) diff --git a/packages/google_maps_flutter/example/test_driver/google_maps.dart b/packages/google_maps_flutter/example/test_driver/google_maps.dart index 2e037603d7ca..bcf155f61771 100644 --- a/packages/google_maps_flutter/example/test_driver/google_maps.dart +++ b/packages/google_maps_flutter/example/test_driver/google_maps.dart @@ -539,4 +539,20 @@ void main() { final GoogleMapController controller = await controllerCompleter.future; await controller.setMapStyle(null); }); + + test("fromAssetImage", () async { + final Iterable> futures = [1, 2, 3].map((double pixelRatio) async { + final ImageConfiguration imageConfiguration = + ImageConfiguration(devicePixelRatio: pixelRatio); + final BitmapDescriptor mip = await BitmapDescriptor.fromAssetImage( + imageConfiguration, 'red_square.png'); + final BitmapDescriptor scaled = await BitmapDescriptor.fromAssetImage( + imageConfiguration, 'red_square.png', mipmaps: false); + mip.toJson().forEach((dynamic x)=>print(x)); + scaled.toJson().forEach((dynamic x)=>print(x)); + return Future.value(true); + }); + + Future.wait(futures); + }); } diff --git a/packages/google_maps_flutter/lib/src/bitmap.dart b/packages/google_maps_flutter/lib/src/bitmap.dart index 47f46c273e41..c86a7ad7cdad 100644 --- a/packages/google_maps_flutter/lib/src/bitmap.dart +++ b/packages/google_maps_flutter/lib/src/bitmap.dart @@ -86,5 +86,8 @@ class BitmapDescriptor { final dynamic _json; + @visibleForTesting + dynamic toJson() => _json; + dynamic _toJson() => _json; } From 2fa20d61fc16eb4cf16754d789da6b5941856109 Mon Sep 17 00:00:00 2001 From: duzenko Date: Mon, 24 Feb 2020 17:34:40 +0200 Subject: [PATCH 05/15] Version bump in change log --- packages/google_maps_flutter/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md index 96373213e1e2..8bb3452729ff 100644 --- a/packages/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.5.20+1 +## 0.5.21 * Breaking change fix for BitmapDescriptor scaling override From 5cb40bd0361685c04c88cac7ceb0c97283ea1026 Mon Sep 17 00:00:00 2001 From: duzenko Date: Tue, 10 Mar 2020 17:32:08 +0200 Subject: [PATCH 06/15] Update packages/google_maps_flutter/pubspec.yaml Co-Authored-By: Chris Yang --- packages/google_maps_flutter/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml index 7b595046e1a3..f8a852998d42 100644 --- a/packages/google_maps_flutter/pubspec.yaml +++ b/packages/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. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter -version: 0.5.20+1 +version: 0.5.21 dependencies: flutter: From a000e0bf2c959399eec28f61c65fed09da19cfb1 Mon Sep 17 00:00:00 2001 From: duzenko Date: Tue, 10 Mar 2020 17:37:58 +0200 Subject: [PATCH 07/15] cyanglaz's suggstions --- packages/google_maps_flutter/CHANGELOG.md | 2 +- packages/google_maps_flutter/lib/src/bitmap.dart | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md index 8bb3452729ff..433e140457ff 100644 --- a/packages/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.5.21 -* Breaking change fix for BitmapDescriptor scaling override +* Breaking change fix for BitmapDescriptor scaling override. Add an optional param mipmaps for BitmapDescriptor.fromAssetImage. ## 0.5.20 diff --git a/packages/google_maps_flutter/lib/src/bitmap.dart b/packages/google_maps_flutter/lib/src/bitmap.dart index c86a7ad7cdad..125b1d1dcd11 100644 --- a/packages/google_maps_flutter/lib/src/bitmap.dart +++ b/packages/google_maps_flutter/lib/src/bitmap.dart @@ -53,6 +53,7 @@ class BitmapDescriptor { /// https://flutter.dev/docs/development/ui/assets-and-images#declaring-resolution-aware-image-assets /// This method takes into consideration various asset resolutions /// and scales the images to the right resolution depending on the dpi. + /// Set mipmaps to false to load the exact dpi version of the image, mipmaps is true by default. static Future fromAssetImage( ImageConfiguration configuration, String assetName, { From 5b453bbb4ef4bdd3335110e8bf748002d3cf5c2d Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Tue, 10 Mar 2020 09:52:54 -0700 Subject: [PATCH 08/15] Update bitmap.dart --- packages/google_maps_flutter/lib/src/bitmap.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/lib/src/bitmap.dart b/packages/google_maps_flutter/lib/src/bitmap.dart index 125b1d1dcd11..51f0f4a67edf 100644 --- a/packages/google_maps_flutter/lib/src/bitmap.dart +++ b/packages/google_maps_flutter/lib/src/bitmap.dart @@ -53,7 +53,7 @@ class BitmapDescriptor { /// https://flutter.dev/docs/development/ui/assets-and-images#declaring-resolution-aware-image-assets /// This method takes into consideration various asset resolutions /// and scales the images to the right resolution depending on the dpi. - /// Set mipmaps to false to load the exact dpi version of the image, mipmaps is true by default. + /// Set `mipmaps` to false to load the exact dpi version of the image, `mipmap` is true by default. static Future fromAssetImage( ImageConfiguration configuration, String assetName, { From 7142174843771482c0fc559eaab201729c48f233 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Tue, 10 Mar 2020 11:03:04 -0700 Subject: [PATCH 09/15] remove extra line --- .../google_maps_flutter/example/test_driver/google_maps_e2e.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart b/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart index 0dbe1320db80..2f82c091b03d 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart +++ b/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart @@ -838,7 +838,6 @@ void main() { scaled.toJson().forEach((dynamic x) => print(x)); return Future.value(true); }); - Future.wait(futures); }); } From 7fe0edaa55b1b908d05043d30e89402b1f093d99 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Tue, 10 Mar 2020 11:04:14 -0700 Subject: [PATCH 10/15] Update FLTConnectivityPlugin.m --- .../connectivity/ios/Classes/FLTConnectivityPlugin.m | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m b/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m index 0a65409b3828..526bee25d561 100644 --- a/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m +++ b/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m @@ -156,9 +156,7 @@ - (NSString*)convertCLAuthorizationStatusToString:(CLAuthorizationStatus)status case kCLAuthorizationStatusAuthorizedWhenInUse: { return @"authorizedWhenInUse"; } - default: { - return @"unknown"; - } + default: { return @"unknown"; } } } From f0c75897d44f216ce491af0db12abd5a729949ca Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Tue, 10 Mar 2020 11:06:28 -0700 Subject: [PATCH 11/15] revert accidental format change --- packages/in_app_purchase/ios/Tests/Stubs.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/in_app_purchase/ios/Tests/Stubs.m b/packages/in_app_purchase/ios/Tests/Stubs.m index 01a2a754ed80..a2c65b88adbe 100644 --- a/packages/in_app_purchase/ios/Tests/Stubs.m +++ b/packages/in_app_purchase/ios/Tests/Stubs.m @@ -180,8 +180,8 @@ - (instancetype)initWithMap:(NSDictionary *)map { if (self) { [self setValue:map[@"transactionIdentifier"] forKey:@"transactionIdentifier"]; [self setValue:map[@"transactionState"] forKey:@"transactionState"]; - if (map[@"originalTransaction"] && - ![map[@"originalTransaction"] isKindOfClass:[NSNull class]]) { + if (map[@"originalTransaction"] && ! + [map[@"originalTransaction"] isKindOfClass:[NSNull class]]) { [self setValue:[[SKPaymentTransactionStub alloc] initWithMap:map[@"originalTransaction"]] forKey:@"originalTransaction"]; } From e15039c5436bbee95f83a11789aec773ed4de88c Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Tue, 10 Mar 2020 11:22:15 -0700 Subject: [PATCH 12/15] fix analyze error --- .../example/test_driver/google_maps_e2e.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart b/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart index 2f82c091b03d..364eee0de20a 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart +++ b/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart @@ -838,6 +838,6 @@ void main() { scaled.toJson().forEach((dynamic x) => print(x)); return Future.value(true); }); - Future.wait(futures); + await Future.wait(futures); }); } From 85d1979b28502469cea0eb275d001c1794bc4ba7 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Tue, 10 Mar 2020 11:46:18 -0700 Subject: [PATCH 13/15] fix analyze error --- .../example/test_driver/google_maps_e2e.dart | 2 ++ .../google_maps_flutter/google_maps_flutter/lib/src/bitmap.dart | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart b/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart index 364eee0de20a..86a0e2bb8997 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart +++ b/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart @@ -834,7 +834,9 @@ void main() { final BitmapDescriptor scaled = await BitmapDescriptor.fromAssetImage( imageConfiguration, 'red_square.png', mipmaps: false); + // ignore: invalid_use_of_visible_for_testing_member mip.toJson().forEach((dynamic x) => print(x)); + // ignore: invalid_use_of_visible_for_testing_member scaled.toJson().forEach((dynamic x) => print(x)); return Future.value(true); }); diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/bitmap.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/bitmap.dart index 50118b4e54d3..7cf5b2e25b7e 100644 --- a/packages/google_maps_flutter/google_maps_flutter/lib/src/bitmap.dart +++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/bitmap.dart @@ -106,6 +106,8 @@ class BitmapDescriptor { final dynamic _json; + /// Convert the object to a Json format. + /// Used for testing only. @visibleForTesting dynamic toJson() => _json; From 6cf6c2933930acaf13390bff007232da2bef5cc6 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Wed, 18 Mar 2020 10:17:39 -0700 Subject: [PATCH 14/15] fix tests --- .../example/test_driver/google_maps_e2e.dart | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart b/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart index 86a0e2bb8997..77621693bca6 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart +++ b/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart @@ -825,21 +825,17 @@ void main() { }); testWidgets("fromAssetImage", (WidgetTester tester) async { - final Iterable> futures = - [1, 2, 3].map((double pixelRatio) async { - final ImageConfiguration imageConfiguration = - ImageConfiguration(devicePixelRatio: pixelRatio); - final BitmapDescriptor mip = await BitmapDescriptor.fromAssetImage( - imageConfiguration, 'red_square.png'); - final BitmapDescriptor scaled = await BitmapDescriptor.fromAssetImage( - imageConfiguration, 'red_square.png', - mipmaps: false); - // ignore: invalid_use_of_visible_for_testing_member - mip.toJson().forEach((dynamic x) => print(x)); - // ignore: invalid_use_of_visible_for_testing_member - scaled.toJson().forEach((dynamic x) => print(x)); - return Future.value(true); - }); - await Future.wait(futures); + double pixelRatio = 2; + final ImageConfiguration imageConfiguration = + ImageConfiguration(devicePixelRatio: pixelRatio); + final BitmapDescriptor mip = await BitmapDescriptor.fromAssetImage( + imageConfiguration, 'red_square.png'); + final BitmapDescriptor scaled = await BitmapDescriptor.fromAssetImage( + imageConfiguration, 'red_square.png', + mipmaps: false); + // ignore: invalid_use_of_visible_for_testing_member + expect(mip.toJson()[2], 1); + // ignore: invalid_use_of_visible_for_testing_member + expect(scaled.toJson()[2], 2); }); } From d5c211fad0733db9ef5986f836c91e011ebe50e7 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Fri, 20 Mar 2020 10:37:53 -0700 Subject: [PATCH 15/15] Update CHANGELOG.md --- packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 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 7c027e197724..fbbc3cc885a9 100644 --- a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.5.25 -* Add an optional param `mipmaps` for BitmapDescriptor.fromAssetImage. +* Add an optional param `mipmaps` for `BitmapDescriptor.fromAssetImage`. ## 0.5.24+1