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

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
change text direction to layout direction
  • Loading branch information
@bparrishMines
bparrishMines committed Aug 17, 2021
commit be87b94172a1ad4f434f748b71c6eba75f67b747
8 changes: 4 additions & 4 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 @@ -61,7 +61,7 @@ class GoogleMap extends StatefulWidget {
this.tiltGesturesEnabled = true,
this.myLocationEnabled = false,
this.myLocationButtonEnabled = true,
this.textDirection,
this.layoutDirection,

/// If no padding is specified default padding will be 0.
this.padding = const EdgeInsets.all(0),
Expand Down Expand Up @@ -101,11 +101,11 @@ class GoogleMap extends StatefulWidget {
/// Type of map tiles to be rendered.
final MapType mapType;

/// The text direction to use for the embedded view.
/// The layout direction to use for the embedded view.
///
/// If this is null, the ambient [Directionality] is used instead. If there is
/// no ambient [Directionality], [TextDirection.ltr] is used.
final TextDirection? textDirection;
final TextDirection? layoutDirection;

/// Preferred bounds for the camera zoom level.
///
Expand Down Expand Up @@ -260,7 +260,7 @@ class _GoogleMapState extends State<GoogleMap> {
return GoogleMapsFlutterPlatform.instance.buildViewWithTextDirection(
_mapId,
onPlatformViewCreated,
textDirection: widget.textDirection ??
textDirection: widget.layoutDirection ??
Directionality.maybeOf(context) ??
Copy link
Contributor Author

@bparrishMines bparrishMines Aug 15, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

This may return null if there is no Directionality ancestor. This was the case with one of the tests, so I also added a default TextDirection.ltr.

TextDirection.ltr,
initialCameraPosition: widget.initialCameraPosition,
Expand Down