Skip to content

Commit 005785f

Browse files
aednlaxeraednlaxer
committed
Rename MarkerType enum values
1 parent c6115e2 commit 005785f

File tree

38 files changed

+110
-94
lines changed

38 files changed

+110
-94
lines changed

‎packages/google_maps_flutter/google_maps_flutter/example/lib/clustering.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,9 @@ class ClusteringBodyState extends State<ClusteringBody> {
234234
SizedBox(
235235
height: 300.0,
236236
child: GoogleMap(
237-
markerType:
238-
widget.mapId == null ? MarkerType.legacy : MarkerType.advanced,
237+
markerType: widget.mapId != null
238+
? MarkerType.advancedMarker
239+
: MarkerType.marker,
239240
mapId: widget.mapId,
240241
onMapCreated: _onMapCreated,
241242
initialCameraPosition: const CameraPosition(

‎packages/google_maps_flutter/google_maps_flutter/example/lib/marker_icons.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ class MarkerIconsBodyState extends State<MarkerIconsBody> {
8585
width: 350.0,
8686
height: 300.0,
8787
child: GoogleMap(
88-
markerType: widget.mapId == null
89-
? MarkerType.legacy
90-
: MarkerType.advanced,
88+
markerType: widget.mapId != null
89+
? MarkerType.advancedMarker
90+
: MarkerType.marker,
9191
mapId: widget.mapId,
9292
initialCameraPosition: const CameraPosition(
9393
target: _kMapCenter,

‎packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ class PlaceMarkerBodyState extends State<PlaceMarkerBody> {
317317
child: GoogleMap(
318318
mapId: mapId,
319319
markerType:
320-
mapId != null ? MarkerType.advanced : MarkerType.legacy,
320+
mapId != null ? MarkerType.advancedMarker : MarkerType.marker,
321321
onMapCreated: _onMapCreated,
322322
initialCameraPosition: const CameraPosition(
323323
target: LatLng(-33.852, 151.211),

‎packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class GoogleMap extends StatefulWidget {
128128
this.onTap,
129129
this.onLongPress,
130130
this.mapId,
131-
this.markerType = MarkerType.legacy,
131+
this.markerType = MarkerType.marker,
132132
@Deprecated('cloudMapId is deprecated. Use mapId instead') this.cloudMapId,
133133
});
134134

‎packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/ClusterManagersController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ private void initializeRenderer(ClusterManager<MarkerBuilder> clusterManager) {
122122
}
123123

124124
final ClusterRenderer<MarkerBuilder> clusterRenderer =
125-
markerType == PlatformMarkerType.ADVANCED
125+
markerType == PlatformMarkerType.ADVANCED_MARKER
126126
? new AdvancedMarkerClusterRenderer<>(context, googleMap, clusterManager, this)
127127
: new MarkerClusterRenderer<>(context, googleMap, clusterManager, this);
128128
clusterManager.setRenderer(clusterRenderer);

‎packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/MarkerBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class MarkerBuilder implements MarkerOptionsSink, ClusterItem {
1818
private boolean consumeTapEvents;
1919

2020
MarkerBuilder(String markerId, String clusterManagerId, PlatformMarkerType markerType) {
21-
this.markerOptions = markerType == PlatformMarkerType.ADVANCED
21+
this.markerOptions = markerType == PlatformMarkerType.ADVANCED_MARKER
2222
? new AdvancedMarkerOptions()
2323
: new MarkerOptions();
2424
this.markerId = markerId;

‎packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ClusterManagersControllerTest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void setUp() {
7070
context = ApplicationProvider.getApplicationContext();
7171
assetManager = context.getAssets();
7272
flutterApi = spy(new MapsCallbackApi(mock(BinaryMessenger.class)));
73-
controller = spy(new ClusterManagersController(flutterApi, context, PlatformMarkerType.LEGACY));
73+
controller = spy(new ClusterManagersController(flutterApi, context, PlatformMarkerType.MARKER));
7474
googleMap = mock(GoogleMap.class);
7575
markerManager = new MarkerManager(googleMap);
7676
controller.init(googleMap, markerManager);
@@ -107,9 +107,9 @@ public void AddClusterManagersAndMarkers() {
107107
controller.addClusterManagers(clusterManagersToAdd);
108108

109109
MarkerBuilder markerBuilder1 = new MarkerBuilder(markerId1, clusterManagerId,
110-
PlatformMarkerType.LEGACY);
110+
PlatformMarkerType.MARKER);
111111
MarkerBuilder markerBuilder2 = new MarkerBuilder(markerId2, clusterManagerId,
112-
PlatformMarkerType.LEGACY);
112+
PlatformMarkerType.MARKER);
113113

114114
final Messages.PlatformMarker markerData1 =
115115
createPlatformMarker(markerId1, location1, clusterManagerId);
@@ -150,10 +150,10 @@ public void SelectClusterRenderer() {
150150
.thenReturn(CameraPosition.builder().target(new LatLng(0, 0)).build());
151151

152152
ClusterManagersController controller1 = spy(
153-
new ClusterManagersController(flutterApi, context, PlatformMarkerType.LEGACY));
153+
new ClusterManagersController(flutterApi, context, PlatformMarkerType.MARKER));
154154
controller1.init(googleMap, markerManager);
155155
ClusterManagersController controller2 = spy(
156-
new ClusterManagersController(flutterApi, context, PlatformMarkerType.ADVANCED));
156+
new ClusterManagersController(flutterApi, context, PlatformMarkerType.ADVANCED_MARKER));
157157
controller2.init(googleMap, markerManager);
158158

159159
Messages.PlatformClusterManager initialClusterManager1 =
@@ -169,12 +169,12 @@ public void SelectClusterRenderer() {
169169
controller2.addClusterManagers(clusterManagersToAdd2);
170170

171171
MarkerBuilder markerBuilder1 = new MarkerBuilder(markerId1, clusterManagerId1,
172-
PlatformMarkerType.LEGACY);
172+
PlatformMarkerType.MARKER);
173173
markerBuilder1.setPosition(new LatLng(10.0, 20.0));
174174
controller1.addItem(markerBuilder1);
175175

176176
MarkerBuilder markerBuilder2 = new MarkerBuilder(markerId2, clusterManagerId2,
177-
PlatformMarkerType.ADVANCED);
177+
PlatformMarkerType.ADVANCED_MARKER);
178178
markerBuilder2.setPosition(new LatLng(20.0, 10.0));
179179
controller2.addItem(markerBuilder2);
180180

@@ -198,11 +198,11 @@ public void OnClusterClickCallsMethodChannel() {
198198

199199
StaticCluster<MarkerBuilder> cluster = new StaticCluster<>(clusterPosition);
200200

201-
MarkerBuilder marker1 = new MarkerBuilder("m_1", clusterManagerId, PlatformMarkerType.LEGACY);
201+
MarkerBuilder marker1 = new MarkerBuilder("m_1", clusterManagerId, PlatformMarkerType.MARKER);
202202
marker1.setPosition(markerPosition1);
203203
cluster.add(marker1);
204204

205-
MarkerBuilder marker2 = new MarkerBuilder("m_2", clusterManagerId, PlatformMarkerType.LEGACY);
205+
MarkerBuilder marker2 = new MarkerBuilder("m_2", clusterManagerId, PlatformMarkerType.MARKER);
206206
marker2.setPosition(markerPosition2);
207207
cluster.add(marker2);
208208

‎packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@ public void ConvertClusterToPigeonReturnsCorrectData() {
104104

105105
StaticCluster<MarkerBuilder> cluster = new StaticCluster<>(clusterPosition);
106106

107-
MarkerBuilder marker1 = new MarkerBuilder("m_1", clusterManagerId, PlatformMarkerType.LEGACY);
107+
MarkerBuilder marker1 = new MarkerBuilder("m_1", clusterManagerId, PlatformMarkerType.MARKER);
108108
marker1.setPosition(markerPosition1);
109109
cluster.add(marker1);
110110

111-
MarkerBuilder marker2 = new MarkerBuilder("m_2", clusterManagerId, PlatformMarkerType.LEGACY);
111+
MarkerBuilder marker2 = new MarkerBuilder("m_2", clusterManagerId, PlatformMarkerType.MARKER);
112112
marker2.setPosition(markerPosition2);
113113
cluster.add(marker2);
114114

‎packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/GoogleMapControllerTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void before() {
7676
public GoogleMapController getGoogleMapController() {
7777
GoogleMapController googleMapController =
7878
new GoogleMapController(0, context, mockMessenger, activity::getLifecycle, null,
79-
PlatformMarkerType.LEGACY);
79+
PlatformMarkerType.MARKER);
8080
googleMapController.init();
8181
return googleMapController;
8282
}
@@ -221,7 +221,7 @@ public void SetInitialClusterManagers() {
221221
@Test
222222
public void OnClusterItemRenderedCallsMarkersController() {
223223
GoogleMapController googleMapController = getGoogleMapControllerWithMockedDependencies();
224-
MarkerBuilder markerBuilder = new MarkerBuilder("m_1", "cm_1", PlatformMarkerType.LEGACY);
224+
MarkerBuilder markerBuilder = new MarkerBuilder("m_1", "cm_1", PlatformMarkerType.MARKER);
225225
final Marker marker = mock(Marker.class);
226226
googleMapController.onClusterItemRendered(markerBuilder, marker);
227227
verify(mockMarkersController, times(1)).onClusterItemRendered(markerBuilder, marker);
@@ -230,7 +230,7 @@ public void OnClusterItemRenderedCallsMarkersController() {
230230
@Test
231231
public void OnClusterItemClickCallsMarkersController() {
232232
GoogleMapController googleMapController = getGoogleMapControllerWithMockedDependencies();
233-
MarkerBuilder markerBuilder = new MarkerBuilder("m_1", "cm_1", PlatformMarkerType.LEGACY);
233+
MarkerBuilder markerBuilder = new MarkerBuilder("m_1", "cm_1", PlatformMarkerType.MARKER);
234234

235235
googleMapController.onClusterItemClick(markerBuilder);
236236
verify(mockMarkersController, times(1)).onMarkerTap(markerBuilder.markerId());

‎packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/MarkersControllerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,15 @@ public void setUp() {
9797
context = ApplicationProvider.getApplicationContext();
9898
flutterApi = spy(new MapsCallbackApi(mock(BinaryMessenger.class)));
9999
clusterManagersController = spy(
100-
new ClusterManagersController(flutterApi, context, PlatformMarkerType.LEGACY));
100+
new ClusterManagersController(flutterApi, context, PlatformMarkerType.MARKER));
101101
controller =
102102
new MarkersController(
103103
flutterApi,
104104
clusterManagersController,
105105
assetManager,
106106
density,
107107
bitmapDescriptorFactoryWrapper,
108-
PlatformMarkerType.LEGACY);
108+
PlatformMarkerType.MARKER);
109109
googleMap = mock(GoogleMap.class);
110110
markerManager = new MarkerManager(googleMap);
111111
markerCollection = markerManager.newCollection();

0 commit comments

Comments
 (0)