Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
ba98185
fix issue 139733 - takeSnapShot for IOS17
GavrielRosendorn74 Jan 7, 2024
610f2ee
CHANGELOG + pubspec update
GavrielRosendorn74 Jan 7, 2024
463bb19
reformat-ios
GavrielRosendorn74 Jan 7, 2024
4bf0c1a
CHANGELOG - more descriptive.
GavrielRosendorn74 Jan 8, 2024
27ae1d5
Merge branch 'main' into google_maps_flutter_ios_17_snapshot_fix
GavrielRosendorn74 Jan 9, 2024
e794586
-> 2.3.6
GavrielRosendorn74 Jan 9, 2024
e2d9b97
Merge branch 'main' into google_maps_flutter_ios_17_snapshot_fix
GavrielRosendorn74 Jan 10, 2024
5a12dd9
changes
GavrielRosendorn74 Jan 16, 2024
098f9f4
Merge branch 'main' into google_maps_flutter_ios_17_snapshot_fix
GavrielRosendorn74 Feb 1, 2024
88cc8da
changes request done
GavrielRosendorn74 Feb 1, 2024
3d70b85
Merge branch 'main' into google_maps_flutter_ios_17_snapshot_fix
GavrielRosendorn74 Feb 1, 2024
d5b1b2d
detailed comment
GavrielRosendorn74 Feb 1, 2024
ba0117a
Merge branch 'main' into google_maps_flutter_ios_17_snapshot_fix
GavrielRosendorn74 Feb 1, 2024
fcaa83f
Merge branch 'main' into google_maps_flutter_ios_17_snapshot_fix
GavrielRosendorn74 Feb 1, 2024
ed79e47
better comment
GavrielRosendorn74 Feb 1, 2024
a65ce3e
Merge branch 'google_maps_flutter_ios_17_snapshot_fix' of https://git…
GavrielRosendorn74 Feb 1, 2024
3299460
Merge branch 'main' into google_maps_flutter_ios_17_snapshot_fix
GavrielRosendorn74 Feb 1, 2024
1a0d46f
Merge branch 'main' into google_maps_flutter_ios_17_snapshot_fix
GavrielRosendorn74 Feb 1, 2024
4a74b70
Merge branch 'main' into google_maps_flutter_ios_17_snapshot_fix
GavrielRosendorn74 Feb 2, 2024
63f69d2
Merge branch 'main' into google_maps_flutter_ios_17_snapshot_fix
GavrielRosendorn74 Feb 5, 2024
082f7d0
Merge branch 'main' into google_maps_flutter_ios_17_snapshot_fix
GavrielRosendorn74 Feb 6, 2024
2f11323
Merge branch 'main' into google_maps_flutter_ios_17_snapshot_fix
GavrielRosendorn74 Feb 7, 2024
40c13d4
Merge branch 'main' into google_maps_flutter_ios_17_snapshot_fix
GavrielRosendorn74 Feb 8, 2024
a45c389
Merge branch 'main' into google_maps_flutter_ios_17_snapshot_fix
GavrielRosendorn74 Feb 9, 2024
101403c
fixes asked done
GavrielRosendorn74 Feb 9, 2024
828b76b
Merge branch 'main' into google_maps_flutter_ios_17_snapshot_fix
GavrielRosendorn74 Feb 12, 2024
d1ebbee
Merge branch 'main' into google_maps_flutter_ios_17_snapshot_fix
GavrielRosendorn74 Feb 13, 2024
0fd595a
fix for CI
GavrielRosendorn74 Feb 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.4.2

* Fixes a bug in "takeSnapshot" function that incorrectly returns a blank image on iOS 17.

## 2.4.1

* Restores the workaround to exclude arm64 simulator builds, as it is still necessary for applications targeting iOS 12.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -849,9 +849,7 @@ void main() {
await controllerCompleter.future;
final Uint8List? bytes = await controller.takeSnapshot();
expect(bytes?.isNotEmpty, true);
},
// TODO(stuartmorgan): Re-enable; see https://github.com/flutter/flutter/issues/139825
skip: true);
});

testWidgets(
'set tileOverlay correctly',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,13 +250,12 @@ - (void)onMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
result(nil);
} else if ([call.method isEqualToString:@"map#takeSnapshot"]) {
if (self.mapView != nil) {
UIGraphicsImageRendererFormat *format = [UIGraphicsImageRendererFormat defaultFormat];
format.scale = [[UIScreen mainScreen] scale];
UIGraphicsImageRenderer *renderer =
[[UIGraphicsImageRenderer alloc] initWithSize:self.mapView.frame.size format:format];

[[UIGraphicsImageRenderer alloc] initWithSize:self.mapView.bounds.size];
// For some unknown reason mapView.layer::renderInContext API returns a blank image on iOS 17.
// So we have to use drawViewHierarchyInRect API.
UIImage *image = [renderer imageWithActions:^(UIGraphicsImageRendererContext *context) {
[self.mapView.layer renderInContext:context.CGContext];
[self.mapView drawViewHierarchyInRect:self.mapView.bounds afterScreenUpdates:YES];
}];
result([FlutterStandardTypedData typedDataWithBytes:UIImagePNGRepresentation(image)]);
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: google_maps_flutter_ios
description: iOS implementation of the google_maps_flutter plugin.
repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
version: 2.4.1
version: 2.4.2

environment:
sdk: ^3.2.3
Expand Down