Fix icon issue on ios and manifest on android (#1294)
diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index e328c09..c2516da 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.3.0+2
+
+* Address an issue on iOS where icons were not loading.
+* Add apache http library required false for Android.
+
## 0.3.0+1
* Add NSNull Checks for markers controller in iOS.
diff --git a/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml b/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml
index 01a15d7..2a56a5f 100644
--- a/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml
@@ -8,7 +8,8 @@
android:name="io.flutter.app.FlutterApplication"
android:label="google_maps_flutter_example"
android:icon="@mipmap/ic_launcher">
- <meta-data
+ <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+ <meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
<meta-data
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index f42e598..1783bde 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -78,7 +78,9 @@
_mapView.delegate = weakSelf;
_registrar = registrar;
_cameraDidInitialSetup = NO;
- _markersController = [[FLTMarkersController alloc] init:_channel mapView:_mapView];
+ _markersController = [[FLTMarkersController alloc] init:_channel
+ mapView:_mapView
+ registrar:registrar];
id markersToAdd = args[@"markersToAdd"];
if ([markersToAdd isKindOfClass:[NSArray class]]) {
[_markersController addMarkers:markersToAdd];
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.h b/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.h
index ddc194f..898edde 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.h
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.h
@@ -33,7 +33,9 @@
@end
@interface FLTMarkersController : NSObject
-- (instancetype)init:(FlutterMethodChannel*)methodChannel mapView:(GMSMapView*)mapView;
+- (instancetype)init:(FlutterMethodChannel*)methodChannel
+ mapView:(GMSMapView*)mapView
+ registrar:(NSObject<FlutterPluginRegistrar>*)registrar;
- (void)addMarkers:(NSArray*)markersToAdd;
- (void)changeMarkers:(NSArray*)markersToChange;
- (void)removeMarkerIds:(NSArray*)markerIdsToRemove;
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
index 404352f..42c23b3 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
@@ -174,12 +174,15 @@
NSObject<FlutterPluginRegistrar>* _registrar;
GMSMapView* _mapView;
}
-- (instancetype)init:(FlutterMethodChannel*)methodChannel mapView:(GMSMapView*)mapView {
+- (instancetype)init:(FlutterMethodChannel*)methodChannel
+ mapView:(GMSMapView*)mapView
+ registrar:(NSObject<FlutterPluginRegistrar>*)registrar {
self = [super init];
if (self) {
_methodChannel = methodChannel;
_mapView = mapView;
_markerIdToController = [NSMutableDictionary dictionaryWithCapacity:1];
+ _registrar = registrar;
}
return self;
}
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index d34e161..4a9ae46 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@
description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
author: Flutter Team <flutter-dev@googlegroups.com>
homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.3.0+1
+version: 0.3.0+2
dependencies:
flutter:
