Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## NEXT
## 2.14.1

* Replaces internal use of deprecated methods.
* Updates minimum supported SDK version to Flutter 3.32/Dart 3.8.

## 2.14.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,9 @@ Object serializeHeatmapGradient(HeatmapGradient gradient) {
_addIfNonNull(
json,
_heatmapGradientColorsKey,
gradient.colors.map((HeatmapGradientColor e) => e.color.value).toList(),
gradient.colors
.map((HeatmapGradientColor e) => e.color.toARGB32())
.toList(),
);
_addIfNonNull(
json,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1107,8 +1107,9 @@ class PinConfig extends BitmapDescriptor {
Object toJson() => <Object>[
type,
<String, Object?>{
if (backgroundColor != null) 'backgroundColor': backgroundColor?.value,
if (borderColor != null) 'borderColor': borderColor?.value,
if (backgroundColor != null)
'backgroundColor': backgroundColor?.toARGB32(),
if (borderColor != null) 'borderColor': borderColor?.toARGB32(),
if (glyph != null) 'glyph': glyph?.toJson(),
},
];
Expand All @@ -1131,7 +1132,7 @@ class CircleGlyph extends AdvancedMarkerGlyph {
@override
Object toJson() => <Object>[
'circleGlyph',
<String, Object>{'color': color.value},
<String, Object>{'color': color.toARGB32()},
];
}

Expand Down Expand Up @@ -1175,7 +1176,7 @@ class TextGlyph extends AdvancedMarkerGlyph {
'textGlyph',
<String, Object>{
'text': text,
if (textColor != null) 'textColor': textColor!.value,
if (textColor != null) 'textColor': textColor!.toARGB32(),
},
];
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ class Circle implements MapsObject<Circle> {

addIfPresent('circleId', circleId.value);
addIfPresent('consumeTapEvents', consumeTapEvents);
addIfPresent('fillColor', fillColor.value);
addIfPresent('fillColor', fillColor.toARGB32());
addIfPresent('center', center.toJson());
addIfPresent('radius', radius);
addIfPresent('strokeColor', strokeColor.value);
addIfPresent('strokeColor', strokeColor.toARGB32());
addIfPresent('strokeWidth', strokeWidth);
addIfPresent('visible', visible);
addIfPresent('zIndex', zIndex);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ class HeatmapGradient {

addIfPresent(
'colors',
colors.map((HeatmapGradientColor e) => e.color.value).toList(),
colors.map((HeatmapGradientColor e) => e.color.toARGB32()).toList(),
);
addIfPresent(
'startPoints',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ class Polygon implements MapsObject<Polygon> {

addIfPresent('polygonId', polygonId.value);
addIfPresent('consumeTapEvents', consumeTapEvents);
addIfPresent('fillColor', fillColor.value);
addIfPresent('fillColor', fillColor.toARGB32());
addIfPresent('geodesic', geodesic);
addIfPresent('strokeColor', strokeColor.value);
addIfPresent('strokeColor', strokeColor.toARGB32());
addIfPresent('strokeWidth', strokeWidth);
addIfPresent('visible', visible);
addIfPresent('zIndex', zIndex);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ class Polyline implements MapsObject<Polyline> {

addIfPresent('polylineId', polylineId.value);
addIfPresent('consumeTapEvents', consumeTapEvents);
addIfPresent('color', color.value);
addIfPresent('color', color.toARGB32());
addIfPresent('endCap', endCap.toJson());
addIfPresent('geodesic', geodesic);
addIfPresent('jointType', jointType.value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ repository: https://github.com/flutter/packages/tree/main/packages/google_maps_f
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
# NOTE: We strongly prefer non-breaking changes, even at the expense of a
# less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
version: 2.14.0
version: 2.14.1

environment:
sdk: ^3.8.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -784,8 +784,8 @@ void main() {
expect(pinConfig.toJson(), <Object>[
PinConfig.type,
<String, Object>{
'backgroundColor': Colors.green.value,
'borderColor': Colors.blue.value,
'backgroundColor': Colors.green.toARGB32(),
'borderColor': Colors.blue.toARGB32(),
},
]);
});
Expand All @@ -802,11 +802,14 @@ void main() {
expect(pinConfig.toJson(), <Object>[
PinConfig.type,
<String, Object>{
'backgroundColor': Colors.green.value,
'borderColor': Colors.blue.value,
'backgroundColor': Colors.green.toARGB32(),
'borderColor': Colors.blue.toARGB32(),
'glyph': <Object>[
'textGlyph',
<Object, Object>{'text': 'Hello', 'textColor': Colors.red.value},
<Object, Object>{
'text': 'Hello',
'textColor': Colors.red.toARGB32(),
},
],
},
]);
Expand All @@ -831,8 +834,8 @@ void main() {
'bitmap': <Object>['fromAsset', 'red_square.png'],
},
],
'backgroundColor': Colors.black.value,
'borderColor': Colors.red.value,
'backgroundColor': Colors.black.toARGB32(),
'borderColor': Colors.red.toARGB32(),
},
]);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ void main() {

expect(gradient.toJson(), <String, Object?>{
'colors': colors
.map((HeatmapGradientColor e) => e.color.value)
.map((HeatmapGradientColor e) => e.color.toARGB32())
.toList(),
'startPoints': colors
.map((HeatmapGradientColor e) => e.startPoint)
Expand Down