Skip to content

[google_maps_flutter_android] Android changes to support heatmaps #7313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 8 commits into from
Aug 6, 2024
Merged

[google_maps_flutter_android] Android changes to support heatmaps #7313

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6875cee
Platform interface changes to support heatmaps
Rexios80 Aug 5, 2024
57a8062
Android changes to support heatmaps
Rexios80 Aug 5, 2024
bb5be3a
Merge branch 'main' into feature/heatmaps-android
Rexios80 Aug 5, 2024
c57e4eb
Merge with google_maps_flutter PR
Rexios80 Aug 5, 2024
44f572f
Merge remote-tracking branch 'upstream/main' into feature/heatmaps-an…
Rexios80 Aug 5, 2024
4a99369
Revert platform interface changes
Rexios80 Aug 5, 2024
0264ef0
Remove dependency_overrides
Rexios80 Aug 5, 2024
08231a1
Fix tests
Rexios80 Aug 5, 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
Prev Previous commit
Next Next commit
Merge with google_maps_flutter PR
  • Loading branch information
@Rexios80
Rexios80 committed Aug 5, 2024
commit c57e4ebf2f17357547163eb3e276e5042d9e73be
4 changes: 1 addition & 3 deletions packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.0
google_maps_flutter_platform_interface: ^2.9.0

dev_dependencies:
build_runner: ^2.1.10
Expand All @@ -39,5 +39,3 @@ flutter:
dependency_overrides:
google_maps_flutter_android:
path: ../../../google_maps_flutter/google_maps_flutter_android
google_maps_flutter_platform_interface:
path: ../../../google_maps_flutter/google_maps_flutter_platform_interface
4 changes: 0 additions & 4 deletions .../google_maps_flutter/google_maps_flutter_android/lib/src/google_maps_flutter_android.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,6 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
Set<Polygon> polygons = const <Polygon>{},
Set<Polyline> polylines = const <Polyline>{},
Set<Circle> circles = const <Circle>{},
Set<Heatmap> heatmaps = const <Heatmap>{},
Set<TileOverlay> tileOverlays = const <TileOverlay>{},
Set<ClusterManager> clusterManagers = const <ClusterManager>{},
Set<Factory<OneSequenceGestureRecognizer>>? gestureRecognizers,
Expand All @@ -615,7 +614,6 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
polylines: polylines,
circles: circles,
clusterManagers: clusterManagers,
heatmaps: heatmaps,
tileOverlays: tileOverlays),
mapOptions: mapOptions,
);
Expand All @@ -630,7 +628,6 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
Set<Polygon> polygons = const <Polygon>{},
Set<Polyline> polylines = const <Polyline>{},
Set<Circle> circles = const <Circle>{},
Set<Heatmap> heatmaps = const <Heatmap>{},
Set<TileOverlay> tileOverlays = const <TileOverlay>{},
Set<ClusterManager> clusterManagers = const <ClusterManager>{},
Set<Factory<OneSequenceGestureRecognizer>>? gestureRecognizers,
Expand All @@ -645,7 +642,6 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
polygons: polygons,
polylines: polylines,
circles: circles,
heatmaps: heatmaps,
tileOverlays: tileOverlays,
clusterManagers: clusterManagers,
gestureRecognizers: gestureRecognizers,
Expand Down
8 changes: 1 addition & 7 deletions packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies:
flutter:
sdk: flutter
flutter_plugin_android_lifecycle: ^2.0.1
google_maps_flutter_platform_interface: ^2.7.0
google_maps_flutter_platform_interface: ^2.9.0
stream_transform: ^2.0.0

dev_dependencies:
Expand All @@ -33,12 +33,6 @@ dev_dependencies:
pigeon: ^20.0.2
plugin_platform_interface: ^2.1.7


# FOR TESTING ONLY. DO NOT MERGE.
dependency_overrides:
google_maps_flutter_platform_interface:
path: ../../google_maps_flutter/google_maps_flutter_platform_interface

topics:
- google-maps
- google-maps-flutter
Expand Down