Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
7c4cd57
Added options to GoogleMap
Rexios80 Feb 24, 2022
d40968f
Use the options in google_maps_flutter_web
Rexios80 Feb 24, 2022
81bdeb2
Tests
Rexios80 Feb 24, 2022
92c8327
Cherry-picked google_maps_flutter_platform_interface changes from fea…
Rexios80 Feb 24, 2022
afbab1a
Merge branch 'feature/more-web-config-options-platform-interface' int…
Rexios80 Feb 24, 2022
2d99561
Updated changelogs
Rexios80 Mar 15, 2022
0c7dc71
Merge branch 'master' into feature/more-web-config-options
Rexios80 Mar 15, 2022
66130ca
More clear doc comment for tiltControlsEnabled
Rexios80 Mar 17, 2022
56de8e1
Merge branch 'main' into feature/more-web-config-options
Rexios80 Mar 22, 2022
b33411e
Merge branch 'main' into feature/more-web-config-options
Rexios80 Apr 5, 2022
4931805
Update CHANGELOG.md
Rexios80 Apr 5, 2022
d6c475c
Merge branch 'master' into feature/more-web-config-options
Rexios80 Apr 19, 2022
539dc12
Merge branch 'main' into feature/more-web-config-options
Rexios80 Apr 28, 2022
2f59c50
Merge branch 'main' into feature/more-web-config-options
Rexios80 May 8, 2022
2d78fa0
Merge branch 'master' into feature/more-web-config-options
Rexios80 May 23, 2022
f53fdca
Fixed analysis issues
Rexios80 May 23, 2022
3ed3277
Refactored GestureHandling to WebGestureHandling
Rexios80 May 23, 2022
7c6934d
Added license text to web_gesture_handling.dart and organized imports
Rexios80 May 23, 2022
48c85bf
Merge branch 'master' into feature/more-web-config-options
Rexios80 May 23, 2022
e47ba62
Refactored 45 degree imagery option
Rexios80 May 24, 2022
c19c7a8
Merge branch 'master' into feature/more-web-config-options
Rexios80 Jun 15, 2022
c16e89f
Merge branch 'main' into feature/more-web-config-options
Rexios80 Jul 11, 2022
70121cd
Removed extra if condition and updated documentation
Rexios80 Jul 11, 2022
c458b88
Merge branch 'main' into feature/more-web-config-options
Rexios80 Jul 14, 2022
8b9c69f
Formatting
Rexios80 Jul 14, 2022
3577e26
Removed now irrelevant tests
Rexios80 Jul 15, 2022
4936999
Merge remote-tracking branch 'origin/master' into feature/more-web-co…
Rexios80 Oct 17, 2022
a047e50
Fixes
Rexios80 Oct 17, 2022
46536fd
Cleaning some things up
Rexios80 Oct 17, 2022
c1b5467
Fixed android build issue
Rexios80 Oct 17, 2022
4c73eea
Fixed web test
Rexios80 Oct 17, 2022
63126cb
Merge remote-tracking branch 'origin/master' into feature/more-web-co…
Rexios80 Oct 24, 2022
17bb023
Merge branch 'master' into feature/more-web-config-options
Rexios80 Dec 20, 2022
2b93eaa
Merge remote-tracking branch 'origin/master' into feature/more-web-co…
Rexios80 Feb 22, 2023
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
Prev Previous commit
Next Next commit
Use the options in google_maps_flutter_web
  • Loading branch information
Rexios80 committed Feb 24, 2022
commit d40968fc9173d9ec28cd6ebc95f646e8bd767dd4
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

* Removes dependencies from `pubspec.yaml` that are only needed in `example/pubspec.yaml`
* Updates Android compileSdkVersion to 31.
* Added options for gesture handling and tilt controls
* Added options for gesture handling and tilt controls on web

## 2.1.1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf
Cap,
Circle,
CircleId,
GestureHandling,
InfoWindow,
JointType,
LatLng,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ class GoogleMap extends StatefulWidget {
final Set<Factory<OneSequenceGestureRecognizer>> gestureRecognizers;

/// This setting controls how the API handles gestures on the map. Web only.
///
///
/// See [GestureHandling] for more details.
final GestureHandling? gestureHandling;

Expand Down Expand Up @@ -532,14 +532,16 @@ class _GoogleMapState extends State<GoogleMap> {
/// Configuration options for the GoogleMaps user interface.
class _GoogleMapOptions {
_GoogleMapOptions.fromWidget(GoogleMap map)
: compassEnabled = map.compassEnabled,
: gestureHandling = map.gestureHandling,
compassEnabled = map.compassEnabled,
mapToolbarEnabled = map.mapToolbarEnabled,
cameraTargetBounds = map.cameraTargetBounds,
mapType = map.mapType,
minMaxZoomPreference = map.minMaxZoomPreference,
rotateGesturesEnabled = map.rotateGesturesEnabled,
scrollGesturesEnabled = map.scrollGesturesEnabled,
tiltGesturesEnabled = map.tiltGesturesEnabled,
tiltControlsEnabled = map.tiltControlsEnabled,
trackCameraPosition = map.onCameraMove != null,
zoomControlsEnabled = map.zoomControlsEnabled,
zoomGesturesEnabled = map.zoomGesturesEnabled,
Expand All @@ -552,6 +554,8 @@ class _GoogleMapOptions {
buildingsEnabled = map.buildingsEnabled,
assert(!map.liteModeEnabled || Platform.isAndroid);

final GestureHandling? gestureHandling;

final bool compassEnabled;

final bool mapToolbarEnabled;
Expand All @@ -568,6 +572,8 @@ class _GoogleMapOptions {

final bool tiltGesturesEnabled;

final bool tiltControlsEnabled;

final bool trackCameraPosition;

final bool zoomControlsEnabled;
Expand All @@ -590,6 +596,7 @@ class _GoogleMapOptions {

Map<String, dynamic> toMap() {
return <String, dynamic>{
'gestureHandling': gestureHandling?.name,
'compassEnabled': compassEnabled,
'mapToolbarEnabled': mapToolbarEnabled,
'cameraTargetBounds': cameraTargetBounds.toJson(),
Expand All @@ -598,6 +605,7 @@ class _GoogleMapOptions {
'rotateGesturesEnabled': rotateGesturesEnabled,
'scrollGesturesEnabled': scrollGesturesEnabled,
'tiltGesturesEnabled': tiltGesturesEnabled,
'tiltControlsEnabled': tiltControlsEnabled,
'zoomControlsEnabled': zoomControlsEnabled,
'zoomGesturesEnabled': zoomGesturesEnabled,
'liteModeEnabled': liteModeEnabled,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## 2.2.0

* Added options for gesture handling and tilt controls
* Added options for gesture handling and tilt controls on web

## 2.1.5

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,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.
Expand Down Expand Up @@ -81,11 +81,18 @@ gmaps.MapOptions _rawOptionsToGmapsOptions(Map<String, dynamic> rawOptions) {
options.styles = rawOptions['styles'];
}

if (rawOptions['scrollGesturesEnabled'] == false ||
if (rawOptions['gestureHandling'] != null) {
options.gestureHandling = rawOptions['gestureHandling'];
} else if (rawOptions['scrollGesturesEnabled'] == false ||
rawOptions['zoomGesturesEnabled'] == false) {
options.gestureHandling = 'none';
options.gestureHandling = GestureHandling.none.name;
} else {
options.gestureHandling = 'auto';
options.gestureHandling = GestureHandling.auto.name;
}

if (rawOptions['tiltControlsEnabled'] == false) {
options.rotateControl = false;
options.tilt = 0;
}

// These don't have any rawOptions entry, but they seem to be off in the native maps.
Expand Down