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

Commit 4556c01

Browse files
author
Chris Yang
committed
remove all static methods
1 parent a69e9f4 commit 4556c01

File tree

8 files changed

+462
-425
lines changed

8 files changed

+462
-425
lines changed

packages/google_maps_flutter/google_maps_flutter/ios/Classes/FLTGoogleMapTileOverlayController.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ @interface FLTTileProviderController ()
7575
@implementation FLTTileProviderController
7676

7777
- (instancetype)init:(FlutterMethodChannel *)methodChannel
78-
tileOverlayIdentifier:(NSString *)tileOverlayId {
78+
tileOverlayIdentifier:(NSString *)identifier {
7979
self = [super init];
8080
if (self) {
8181
_methodChannel = methodChannel;
82-
_tileOverlayIdentifier = tileOverlayId;
82+
_tileOverlayIdentifier = identifier;
8383
}
8484
return self;
8585
}
@@ -156,7 +156,7 @@ - (void)addTileOverlays:(NSArray *)tileOverlaysToAdd {
156156
FLTGoogleMapTileOverlayController *controller =
157157
[[FLTGoogleMapTileOverlayController alloc] initWithTileLayer:tileProvider
158158
mapView:self.mapView];
159-
[FLTTileOverlaysController InterpretTileOverlayOptions:tileOverlay sink:controller];
159+
[FLTTileOverlaysController interpretTileOverlayOptions:tileOverlay sink:controller];
160160
self.tileOverlayIdentifierToController[identifier] = controller;
161161
}
162162
}
@@ -169,7 +169,7 @@ - (void)changeTileOverlays:(NSArray *)tileOverlaysToChange {
169169
if (!controller) {
170170
continue;
171171
}
172-
[FLTTileOverlaysController InterpretTileOverlayOptions:tileOverlay sink:controller];
172+
[FLTTileOverlaysController interpretTileOverlayOptions:tileOverlay sink:controller];
173173
}
174174
}
175175
- (void)removeTileOverlayWithIdentifiers:(NSArray *)identifiers {
@@ -204,7 +204,7 @@ + (NSString *)getTileOverlayIdentifier:(NSDictionary *)tileOverlay {
204204
return tileOverlay[@"tileOverlayId"];
205205
}
206206

207-
+ (void)InterpretTileOverlayOptions:(NSDictionary *)data
207+
+ (void)interpretTileOverlayOptions:(NSDictionary *)data
208208
sink:(id<FLTGoogleMapTileOverlayOptionsSink>)sink {
209209
NSNumber *visible = data[@"visible"];
210210
if (visible != nil) {

packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapCircleController.m

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,11 @@ - (void)didTapCircleWithIdentifier:(NSString *)identifier {
133133
}
134134
+ (CLLocationCoordinate2D)getPosition:(NSDictionary *)circle {
135135
NSArray *center = circle[@"center"];
136-
return [FLTGoogleMapJsonConversions toLocation:center];
136+
return [FLTGoogleMapJsonConversions getLocationFromData:center];
137137
}
138138
+ (CLLocationDistance)getRadius:(NSDictionary *)circle {
139139
NSNumber *radius = circle[@"radius"];
140-
return [FLTGoogleMapJsonConversions toFloat:radius];
140+
return [FLTGoogleMapJsonConversions getFloatFromData:radius];
141141
}
142142
+ (NSString *)getCircleId:(NSDictionary *)circle {
143143
return circle[@"circleId"];
@@ -146,42 +146,42 @@ + (NSString *)getCircleId:(NSDictionary *)circle {
146146
+ (void)interpretCircleOptions:(NSDictionary *)data sink:(id<FLTGoogleMapCircleOptionsSink>)sink {
147147
NSNumber *consumeTapEvents = data[@"consumeTapEvents"];
148148
if (consumeTapEvents != nil) {
149-
[sink setConsumeTapEvents:[FLTGoogleMapJsonConversions toBool:consumeTapEvents]];
149+
[sink setConsumeTapEvents:[FLTGoogleMapJsonConversions getBoolFromData:consumeTapEvents]];
150150
}
151151

152152
NSNumber *visible = data[@"visible"];
153153
if (visible != nil) {
154-
[sink setVisible:[FLTGoogleMapJsonConversions toBool:visible]];
154+
[sink setVisible:[FLTGoogleMapJsonConversions getBoolFromData:visible]];
155155
}
156156

157157
NSNumber *zIndex = data[@"zIndex"];
158158
if (zIndex != nil) {
159-
[sink setZIndex:[FLTGoogleMapJsonConversions toInt:zIndex]];
159+
[sink setZIndex:[FLTGoogleMapJsonConversions getIntFromData:zIndex]];
160160
}
161161

162162
NSArray *center = data[@"center"];
163163
if (center) {
164-
[sink setCenter:[FLTGoogleMapJsonConversions toLocation:center]];
164+
[sink setCenter:[FLTGoogleMapJsonConversions getLocationFromData:center]];
165165
}
166166

167167
NSNumber *radius = data[@"radius"];
168168
if (radius != nil) {
169-
[sink setRadius:[FLTGoogleMapJsonConversions toFloat:radius]];
169+
[sink setRadius:[FLTGoogleMapJsonConversions getFloatFromData:radius]];
170170
}
171171

172172
NSNumber *strokeColor = data[@"strokeColor"];
173173
if (strokeColor != nil) {
174-
[sink setStrokeColor:[FLTGoogleMapJsonConversions toColor:strokeColor]];
174+
[sink setStrokeColor:[FLTGoogleMapJsonConversions getColorFromData:strokeColor]];
175175
}
176176

177177
NSNumber *strokeWidth = data[@"strokeWidth"];
178178
if (strokeWidth != nil) {
179-
[sink setStrokeWidth:[FLTGoogleMapJsonConversions toInt:strokeWidth]];
179+
[sink setStrokeWidth:[FLTGoogleMapJsonConversions getIntFromData:strokeWidth]];
180180
}
181181

182182
NSNumber *fillColor = data[@"fillColor"];
183183
if (fillColor != nil) {
184-
[sink setFillColor:[FLTGoogleMapJsonConversions toColor:fillColor]];
184+
[sink setFillColor:[FLTGoogleMapJsonConversions getColorFromData:fillColor]];
185185
}
186186
}
187187

0 commit comments

Comments
 (0)