This repository was archived by the owner on Feb 22, 2023. It is now read-only.
[google_maps_flutter] Fix the visual jarring during the first gesture on the map #2629
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -50,10 +50,6 @@ @implementation FLTGoogleMapController { | |
| FlutterMethodChannel* _channel; | ||
| BOOL _trackCameraPosition; | ||
| NSObject<FlutterPluginRegistrar>* _registrar; | ||
| BOOL _cameraDidInitialSetup; | ||
| FLTMarkersController* _markersController; | ||
| FLTPolygonsController* _polygonsController; | ||
|
|
@@ -119,9 +115,36 @@ - (instancetype)initWithFrame:(CGRect)frame | |
| } | ||
|
|
||
| - (UIView*)view { | ||
| [_mapView addObserver:self forKeyPath:@"frame" options:0 context:nil]; | ||
| return _mapView; | ||
| } | ||
|
|
||
| - (void)observeValueForKeyPath:(NSString*)keyPath | ||
| ofObject:(id)object | ||
| change:(NSDictionary*)change | ||
| context:(void*)context { | ||
| if (_cameraDidInitialSetup) { | ||
| // We only observe the frame for initial setup. | ||
| [_mapView removeObserver:self forKeyPath:@"frame"]; | ||
| return; | ||
| } | ||
| if (object == _mapView && [keyPath isEqualToString:@"frame"]) { | ||
| CGRect bounds = _mapView.bounds; | ||
| if (CGRectEqualToRect(bounds, CGRectZero)) { | ||
| // The workaround is to fix an issue that the camera location is not current when | ||
| // the size of the map is zero at initialization. | ||
| // So We only care about the size of the `_mapView`, ignore the frame changes when the size is | ||
| // zero. | ||
| return; | ||
| } | ||
| _cameraDidInitialSetup = YES; | ||
|
Contributor
There was a problem hiding this comment. Why not remove the observer here instead of on the next frame change?
Contributor
Author
There was a problem hiding this comment. good point! Thanks. will change. |
||
| [_mapView removeObserver:self forKeyPath:@"frame"]; | ||
| [_mapView moveCamera:[GMSCameraUpdate setCamera:_mapView.camera]]; | ||
|
Contributor
There was a problem hiding this comment. What's the intended behavior if a the map frame is resized while it's being animated?
Contributor
Author
There was a problem hiding this comment. In that case, this method will get called multiple times. However, since we are always setting the camera to the same location, it shouldn't have any behavior effects.
Contributor
There was a problem hiding this comment. animateWithCameraUpdate is implemented by multiple calls to
Contributor
Author
There was a problem hiding this comment. I made this only happens once during initialization, so it shouldn't have any side effects that you worried about. |
||
| } else { | ||
| [super observeValueForKeyPath:keyPath ofObject:object change:change context:context]; | ||
| } | ||
| } | ||
|
|
||
| - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result { | ||
| if ([call.method isEqualToString:@"map#show"]) { | ||
| [self showAtX:ToDouble(call.arguments[@"x"]) Y:ToDouble(call.arguments[@"y"])]; | ||
|
|
@@ -437,16 +460,6 @@ - (void)mapView:(GMSMapView*)mapView willMove:(BOOL)gesture { | |
| } | ||
|
|
||
| - (void)mapView:(GMSMapView*)mapView didChangeCameraPosition:(GMSCameraPosition*)position { | ||
| if (_trackCameraPosition) { | ||
| [_channel invokeMethod:@"camera#onMove" arguments:@{@"position" : PositionToJson(position)}]; | ||
| } | ||
|
|
@@ -511,8 +524,8 @@ - (void)mapView:(GMSMapView*)mapView didLongPressAtCoordinate:(CLLocationCoordin | |
|
|
||
| static NSDictionary* PointToJson(CGPoint point) { | ||
| return @{ | ||
| @"x" : @(lroundf(point.x)), | ||
| @"y" : @(lroundf(point.y)), | ||
| }; | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we have a reliable way to detect when it's ready?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unless we add a new callback API in the google map, something like "onMapRendered". This can be in a separate PR tho.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should do that, I'm not blocking this PR since we're trading a 3 seconds timer with a 1 second one , but we should at least add a TODO.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will do!