Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Support Hybrid Composition through the GoogleMaps Widget #4082

Merged
merged 17 commits into from
Oct 28, 2021
Merged

Support Hybrid Composition through the GoogleMaps Widget #4082

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b17d1dc
start
bparrishMines Jun 17, 2021
82c4614
change to hybrid composition in example
bparrishMines Jun 17, 2021
7b6f801
UPdate readme
bparrishMines Jun 17, 2021
736c073
Merge branch 'master' of github.com:flutter/plugins into android_maps
bparrishMines Jun 23, 2021
f6631b4
update README and remove unnecessary line
bparrishMines Jun 29, 2021
50b548e
Merge branch 'master' of github.com:flutter/plugins into android_maps
bparrishMines Aug 12, 2021
944d965
use buildViewWithTextDirection by default
bparrishMines Aug 12, 2021
e345f3a
remove hash
bparrishMines Aug 12, 2021
1809e66
add default value if no directionality ancestor
bparrishMines Aug 12, 2021
f504ffc
remove mactro
bparrishMines Aug 15, 2021
be87b94
change text direction to layout direction
bparrishMines Aug 17, 2021
cf87583
Merge branch 'master' of github.com:flutter/plugins into android_maps
bparrishMines Aug 20, 2021
d907845
create android settings class
bparrishMines Aug 23, 2021
58c3028
update readme
bparrishMines Aug 23, 2021
0c26d6c
Update google_map.dart
bparrishMines Sep 14, 2021
86f965c
Merge branch 'master' of github.com:flutter/plugins into android_maps
bparrishMines Oct 5, 2021
35a8186
Merge branch 'master' of github.com:flutter/plugins into android_maps
bparrishMines Oct 27, 2021
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
create android settings class
  • Loading branch information
@bparrishMines
bparrishMines committed Aug 23, 2021
commit d90784525475b0f4fbcdb0bfbc4615ddc4b7eb3f
4 changes: 1 addition & 3 deletions packages/google_maps_flutter/google_maps_flutter/example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,7 @@ class MapsDemo extends StatelessWidget {

void main() {
if (defaultTargetPlatform == TargetPlatform.android) {
final MethodChannelGoogleMapsFlutter platform =
GoogleMapsFlutterPlatform.instance as MethodChannelGoogleMapsFlutter;
platform.useAndroidViewSurface = true;
AndroidGoogleMapsFlutter.useAndroidViewSurface = true;
}
runApp(MaterialApp(home: MapsDemo()));
}
2 changes: 0 additions & 2 deletions packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf
Cap,
Circle,
CircleId,
GoogleMapsFlutterPlatform,
InfoWindow,
JointType,
LatLng,
Expand All @@ -37,7 +36,6 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf
MapType,
Marker,
MarkerId,
MethodChannelGoogleMapsFlutter,
MinMaxZoomPreference,
PatternItem,
Polygon,
Expand Down
42 changes: 42 additions & 0 deletions packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,48 @@ class UnknownMapObjectIdError extends Error {
}
}

/// Android specific settings for [GoogleMap].
class AndroidGoogleMapsFlutter {
Copy link
Contributor

@stuartmorgan-g stuartmorgan-g Oct 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would expect this to be a MethodChannelGoogleMapsFlutter subclass. I guess we can add that later without it being a breaking change though, and doing it now would have registration complexities since we don't have dartPluginClass support for mobile on stable yet.

/// Whether to render [GoogleMap] with a [AndroidViewSurface] to build the Google Maps widget.
///
/// This implementation uses hybrid composition to render the Google Maps
/// Widget on Android. This comes at the cost of some performance on Android
/// versions below 10. See
/// https://flutter.dev/docs/development/platform-integration/platform-views#performance for more
/// information.
///
/// Defaults to false.
static bool get useAndroidViewSurface {
assert(
GoogleMapsFlutterPlatform.instance is MethodChannelGoogleMapsFlutter,
'This feature is only supported when `GoogleMapsFlutterPlatform.instance` '
'is a `MethodChannelGoogleMapsFlutter`. The default implementation for Android.',
);
Copy link
Contributor

@stuartmorgan-g stuartmorgan-g Oct 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will interfere with people setting mock platform implementations for tests, which is the recommended way of mocking federated plugins. We should no-op it (returning false) rather than asserting.

return (GoogleMapsFlutterPlatform.instance
as MethodChannelGoogleMapsFlutter)
.useAndroidViewSurface;
}

/// Set whether to render [GoogleMap] with a [AndroidViewSurface] to build the Google Maps widget.
///
/// This implementation uses hybrid composition to render the Google Maps
/// Widget on Android. This comes at the cost of some performance on Android
/// versions below 10. See
/// https://flutter.dev/docs/development/platform-integration/platform-views#performance for more
/// information.
///
/// Defaults to false.
static set useAndroidViewSurface(bool useAndroidViewSurface) {
assert(
GoogleMapsFlutterPlatform.instance is MethodChannelGoogleMapsFlutter,
'This feature is only supported when `GoogleMapsFlutterPlatform.instance` '
'is a `MethodChannelGoogleMapsFlutter`. The default implementation for Android.',
);
Copy link
Contributor

@stuartmorgan-g stuartmorgan-g Oct 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same.

(GoogleMapsFlutterPlatform.instance as MethodChannelGoogleMapsFlutter)
.useAndroidViewSurface = useAndroidViewSurface;
}
}

/// A widget which displays a map with data obtained from the Google Maps service.
class GoogleMap extends StatefulWidget {
/// Creates a widget displaying data from Google Maps services.
Expand Down