Fixed BitmapDescriptor typing.

Author: LuisThein

.gitignore

@@ -71,3 +71,5 @@ build/
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+example/.flutter-plugins-dependencies
+example/ios/Flutter/Flutter.podspec

example/pubspec.lock

@@ -8,13 +8,27 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.0.6"
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.11"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.2"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -36,6 +50,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.14.11"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -60,20 +88,27 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.5.21+7"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.4"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.5"
+    version: "0.12.6"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
   path:
     dependency: transitive
     description:
@@ -88,6 +123,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0+1"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
   platform_maps_flutter:
     dependency: "direct main"
     description:
@@ -148,7 +190,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.5"
+    version: "0.2.11"
   typed_data:
     dependency: transitive
     description:
@@ -163,6 +205,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.8"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.5.0"
 sdks:
-  dart: ">=2.2.2 <3.0.0"
+  dart: ">=2.4.0 <3.0.0"
   flutter: ">=1.5.0 <2.0.0"

lib/src/bitmap.dart

@@ -5,36 +5,42 @@ part of flutter_platform_maps;
 /// image to place on the surface of the earth.
 
 class BitmapDescriptor {
+  final dynamic bitmapDescriptor;
+
+  BitmapDescriptor._(this.bitmapDescriptor);
+
   /// Creates a BitmapDescriptor that refers to the default marker image.
-  static dynamic get defaultMarker {
+  static BitmapDescriptor get defaultMarker {
     if (Platform.isIOS) {
-      return appleMaps.BitmapDescriptor.defaultAnnotation;
+      return BitmapDescriptor._(appleMaps.BitmapDescriptor.defaultAnnotation);
     } else if (Platform.isAndroid) {
-      return googleMaps.BitmapDescriptor.defaultMarker;
+      return BitmapDescriptor._(googleMaps.BitmapDescriptor.defaultMarker);
     }
     return null;
   }
 
-  static dynamic fromAssetImage(
+  static Future<BitmapDescriptor> fromAssetImage(
     ImageConfiguration configuration,
     String assetName, {
     AssetBundle bundle,
     String package,
-  }) {
+  }) async {
+    dynamic bitmap;
     if (Platform.isIOS) {
-      return appleMaps.BitmapDescriptor.fromAssetImage(
+      bitmap = await appleMaps.BitmapDescriptor.fromAssetImage(
         configuration,
         assetName,
         bundle: bundle,
         package: package,
       );
     } else if (Platform.isAndroid) {
-      return googleMaps.BitmapDescriptor.fromAssetImage(
+      bitmap = googleMaps.BitmapDescriptor.fromAssetImage(
         configuration,
         assetName,
         bundle: bundle,
         package: package,
       );
     }
+    return BitmapDescriptor._(bitmap);
   }
 }

lib/src/marker.dart

@@ -122,7 +122,7 @@ class Marker {
   final bool draggable;
 
   /// A description of the bitmap used to draw the marker icon.
-  final dynamic icon;
+  final BitmapDescriptor icon;
 
   /// A Google Maps InfoWindow.
   ///
@@ -146,7 +146,8 @@ class Marker {
         draggable: this.draggable,
         infoWindow: this.infoWindow.appleMapsInfoWindow,
         onTap: this.onTap,
-        icon: this.icon ?? BitmapDescriptor.defaultMarker,
+        icon: this.icon.bitmapDescriptor ??
+            BitmapDescriptor.defaultMarker.bitmapDescriptor,
         visible: this.visible,
         onDragEnd: this.onDragEnd != null
             ? (appleMaps.LatLng latLng) =>
@@ -161,7 +162,8 @@ class Marker {
         draggable: this.draggable,
         infoWindow: this.infoWindow.googleMapsInfoWindow,
         onTap: this.onTap,
-        icon: this.icon ?? BitmapDescriptor.defaultMarker,
+        icon: this.icon.bitmapDescriptor ??
+            BitmapDescriptor.defaultMarker.bitmapDescriptor,
         visible: this.visible,
         onDragEnd: this.onDragEnd != null
             ? (googleMaps.LatLng latLng) =>
@@ -177,7 +179,8 @@ class Marker {
         draggable: marker.draggable,
         infoWindow: marker.infoWindow.appleMapsInfoWindow,
         onTap: marker.onTap,
-        icon: marker.icon ?? BitmapDescriptor.defaultMarker,
+        icon: marker.icon?.bitmapDescriptor ??
+            BitmapDescriptor.defaultMarker.bitmapDescriptor,
         visible: marker.visible,
         onDragEnd: marker.onDragEnd != null
             ? (appleMaps.LatLng latLng) =>
@@ -193,7 +196,8 @@ class Marker {
         draggable: marker.draggable,
         infoWindow: marker.infoWindow.googleMapsInfoWindow,
         onTap: marker.onTap,
-        icon: marker.icon ?? BitmapDescriptor.defaultMarker,
+        icon: marker.icon?.bitmapDescriptor ??
+            BitmapDescriptor.defaultMarker.bitmapDescriptor,
         visible: marker.visible,
         onDragEnd: marker.onDragEnd != null
             ? (googleMaps.LatLng latLng) =>
@@ -223,7 +227,7 @@ class Marker {
     double alphaParam,
     bool consumeTapEventsParam,
     bool draggableParam,
-    dynamic iconParam,
+    BitmapDescriptor iconParam,
     InfoWindow infoWindowParam,
     LatLng positionParam,
     bool visibleParam,