Skip to content

Commit 5653b5a

Browse files
[google_maps_flutter] Replace use of zIndex in examples and tests (#11572)
Replaces uses of the deprecated `zIndex` in examples and tests with the preferred `zIndexInt`. This doesn't change the production use of `zIndex` in google_maps_flutter_web, as that could change behavior, so should stay for now.
1 parent e122039 commit 5653b5a

16 files changed

Lines changed: 27 additions & 27 deletions

File tree

packages/google_maps_flutter/google_maps_flutter/example/lib/place_advanced_marker.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,10 @@ class _PlaceAdvancedMarkerBodyState extends State<_PlaceAdvancedMarkerBody> {
247247

248248
Future<void> _changeZIndex(MarkerId markerId) async {
249249
final AdvancedMarker marker = markers[markerId]!;
250-
final double current = marker.zIndex;
250+
final int current = marker.zIndexInt;
251251
setState(() {
252252
markers[markerId] = marker.copyWith(
253-
zIndexParam: current == 12.0 ? 0.0 : current + 1.0,
253+
zIndexIntParam: current == 12 ? 0 : current + 1,
254254
);
255255
});
256256
}

packages/google_maps_flutter/google_maps_flutter_android/example/integration_test/google_maps_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2488,7 +2488,7 @@ AdvancedMarker _copyAdvancedMarkerWithClusterManagerId(
24882488
position: marker.position,
24892489
rotation: marker.rotation,
24902490
visible: marker.visible,
2491-
zIndex: marker.zIndex.toInt(),
2491+
zIndex: marker.zIndexInt,
24922492
onTap: marker.onTap,
24932493
onDragStart: marker.onDragStart,
24942494
onDrag: marker.onDrag,

packages/google_maps_flutter/google_maps_flutter_android/example/lib/place_advanced_marker.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,10 @@ class _PlaceAdvancedMarkerBodyState extends State<_PlaceAdvancedMarkerBody> {
247247

248248
Future<void> _changeZIndex(MarkerId markerId) async {
249249
final AdvancedMarker marker = markers[markerId]!;
250-
final double current = marker.zIndex;
250+
final int current = marker.zIndexInt;
251251
setState(() {
252252
markers[markerId] = marker.copyWith(
253-
zIndexParam: current == 12.0 ? 0.0 : current + 1.0,
253+
zIndexIntParam: current == 12 ? 0 : current + 1,
254254
);
255255
});
256256
}

packages/google_maps_flutter/google_maps_flutter_android/test/google_maps_flutter_android_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ void main() {
662662
expect(firstChanged.position.longitude, object2new.position.longitude);
663663
expect(firstChanged.rotation, object2new.rotation);
664664
expect(firstChanged.visible, object2new.visible);
665-
expect(firstChanged.zIndex, object2new.zIndex);
665+
expect(firstChanged.zIndex, object2new.zIndexInt);
666666
expect(firstChanged.markerId, object2new.markerId.value);
667667
expect(firstChanged.clusterManagerId, object2new.clusterManagerId?.value);
668668
expect(
@@ -694,7 +694,7 @@ void main() {
694694
expect(firstAdded.position.longitude, object3.position.longitude);
695695
expect(firstAdded.rotation, object3.rotation);
696696
expect(firstAdded.visible, object3.visible);
697-
expect(firstAdded.zIndex, object3.zIndex);
697+
expect(firstAdded.zIndex, object3.zIndexInt);
698698
expect(firstAdded.markerId, object3.markerId.value);
699699
expect(firstAdded.clusterManagerId, object3.clusterManagerId?.value);
700700
expect(

packages/google_maps_flutter/google_maps_flutter_ios/example/integration_test/google_maps_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2274,7 +2274,7 @@ AdvancedMarker _copyAdvancedMarkerWithClusterManagerId(
22742274
position: marker.position,
22752275
rotation: marker.rotation,
22762276
visible: marker.visible,
2277-
zIndex: marker.zIndex.toInt(),
2277+
zIndex: marker.zIndexInt,
22782278
onTap: marker.onTap,
22792279
onDragStart: marker.onDragStart,
22802280
onDrag: marker.onDrag,

packages/google_maps_flutter/google_maps_flutter_ios/example/lib/place_advanced_marker.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,10 @@ class _PlaceAdvancedMarkerBodyState extends State<_PlaceAdvancedMarkerBody> {
264264

265265
Future<void> _changeZIndex(MarkerId markerId) async {
266266
final AdvancedMarker marker = markers[markerId]!;
267-
final double current = marker.zIndex;
267+
final int current = marker.zIndexInt;
268268
setState(() {
269269
markers[markerId] = marker.copyWith(
270-
zIndexParam: current == 12.0 ? 0.0 : current + 1.0,
270+
zIndexIntParam: current == 12 ? 0 : current + 1,
271271
);
272272
});
273273
}

packages/google_maps_flutter/google_maps_flutter_ios/test/google_maps_flutter_ios_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ void main() {
600600
expect(firstChanged.position.longitude, object2new.position.longitude);
601601
expect(firstChanged.rotation, object2new.rotation);
602602
expect(firstChanged.visible, object2new.visible);
603-
expect(firstChanged.zIndex, object2new.zIndex);
603+
expect(firstChanged.zIndex, object2new.zIndexInt);
604604
expect(firstChanged.markerId, object2new.markerId.value);
605605
expect(firstChanged.clusterManagerId, object2new.clusterManagerId?.value);
606606
expect(
@@ -634,7 +634,7 @@ void main() {
634634
expect(firstAdded.position.longitude, object3.position.longitude);
635635
expect(firstAdded.rotation, object3.rotation);
636636
expect(firstAdded.visible, object3.visible);
637-
expect(firstAdded.zIndex, object3.zIndex);
637+
expect(firstAdded.zIndex, object3.zIndexInt);
638638
expect(firstAdded.markerId, object3.markerId.value);
639639
expect(firstAdded.clusterManagerId, object3.clusterManagerId?.value);
640640
expect(

packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/integration_test/google_maps_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2274,7 +2274,7 @@ AdvancedMarker _copyAdvancedMarkerWithClusterManagerId(
22742274
position: marker.position,
22752275
rotation: marker.rotation,
22762276
visible: marker.visible,
2277-
zIndex: marker.zIndex.toInt(),
2277+
zIndex: marker.zIndexInt,
22782278
onTap: marker.onTap,
22792279
onDragStart: marker.onDragStart,
22802280
onDrag: marker.onDrag,

packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/lib/place_advanced_marker.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,10 @@ class _PlaceAdvancedMarkerBodyState extends State<_PlaceAdvancedMarkerBody> {
264264

265265
Future<void> _changeZIndex(MarkerId markerId) async {
266266
final AdvancedMarker marker = markers[markerId]!;
267-
final double current = marker.zIndex;
267+
final int current = marker.zIndexInt;
268268
setState(() {
269269
markers[markerId] = marker.copyWith(
270-
zIndexParam: current == 12.0 ? 0.0 : current + 1.0,
270+
zIndexIntParam: current == 12 ? 0 : current + 1,
271271
);
272272
});
273273
}

packages/google_maps_flutter/google_maps_flutter_ios_sdk10/test/google_maps_flutter_ios_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ void main() {
600600
expect(firstChanged.position.longitude, object2new.position.longitude);
601601
expect(firstChanged.rotation, object2new.rotation);
602602
expect(firstChanged.visible, object2new.visible);
603-
expect(firstChanged.zIndex, object2new.zIndex);
603+
expect(firstChanged.zIndex, object2new.zIndexInt);
604604
expect(firstChanged.markerId, object2new.markerId.value);
605605
expect(firstChanged.clusterManagerId, object2new.clusterManagerId?.value);
606606
expect(
@@ -634,7 +634,7 @@ void main() {
634634
expect(firstAdded.position.longitude, object3.position.longitude);
635635
expect(firstAdded.rotation, object3.rotation);
636636
expect(firstAdded.visible, object3.visible);
637-
expect(firstAdded.zIndex, object3.zIndex);
637+
expect(firstAdded.zIndex, object3.zIndexInt);
638638
expect(firstAdded.markerId, object3.markerId.value);
639639
expect(firstAdded.clusterManagerId, object3.clusterManagerId?.value);
640640
expect(

0 commit comments

Comments
 (0)