Various bug fixes

Author: LuisThein

CHANGELOG.md

@@ -1,3 +1,3 @@
-## [0.0.1] - TODO: Add release date.
+# 0.1.0
 
-* TODO: Describe initial release.
+* Initial release.

README.md

@@ -8,9 +8,18 @@ This package combines the [google_maps_flutter]("https://pub.dev/packages/google
 
 # Screenshots
 
-|                                               Example 1                                               |                                               Example 2                                               |
-| :---------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------: |
-| ![Example 1](https://github.com/LuisThein/apple_maps_flutter/blob/master/resources/example_img01.png) | ![Example 2](https://github.com/LuisThein/apple_maps_flutter/blob/master/resources/example_img02.png) |
+|                                                   Android                                                   |                                                   iOS                                                   |
+| :---------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------: |
+| ![Example 1](https://github.com/LuisThein/apple_maps_flutter/blob/master/resources/android_screenshot1.png) | ![Example 2](https://github.com/LuisThein/apple_maps_flutter/blob/master/resources/ios_screenshot1.png) |
+| ![Example 1](https://github.com/LuisThein/apple_maps_flutter/blob/master/resources/android_screenshot2.png) | ![Example 2](https://github.com/LuisThein/apple_maps_flutter/blob/master/resources/ios_screenshot2.png) |
+
+# Current functionality
+
+- Camera movement including bearing, heading, tilt (also animated)
+- Markers, including custom marker images and Info windows
+- Different map types
+- Map manipulation, enable/disable gestures, show current location, show compass ...
+
 
 # iOS
 

lib/src/platform_maps.dart

@@ -12,7 +12,6 @@ class PlatformMap extends StatefulWidget {
     this.compassEnabled = true,
     this.trafficEnabled = false,
     this.mapType,
-    // this.trackingMode = TrackingMode.none,
     this.rotateGesturesEnabled = true,
     this.scrollGesturesEnabled = true,
     this.zoomGesturesEnabled = true,
@@ -43,9 +42,6 @@ class PlatformMap extends StatefulWidget {
   /// True if the map should display the current traffic.
   final bool trafficEnabled;
 
-  /// The mode used to track the user location.
-  // final TrackingMode trackingMode;
-
   /// Preferred bounds for the camera zoom level.
   ///
   /// Actual bounds depend on map data and device.
@@ -127,8 +123,6 @@ class PlatformMap extends StatefulWidget {
   /// By default, the my-location button is enabled (and hence shown when the
   /// my-location layer is enabled).
   ///
-  /// See also:
-  ///   * [myLocationEnabled] parameter.
   final bool myLocationButtonEnabled;
 
   /// Which gestures should be consumed by the map.
@@ -171,9 +165,9 @@ class _PlatformMapState extends State<PlatformMap> {
         onTap: widget.onTap,
         onLongPress: widget.onLongPress,
         trafficEnabled: widget.trafficEnabled,
-        minMaxZoomPreference:
-            widget.minMaxZoomPreference.googleMapsZoomPreference ??
-                MinMaxZoomPreference.unbounded,
+        minMaxZoomPreference: widget.minMaxZoomPreference != null
+            ? widget.minMaxZoomPreference.googleMapsZoomPreference
+            : MinMaxZoomPreference.googleMapsUnboundedZoomPreference,
       );
     } else if (Platform.isIOS) {
       return appleMaps.AppleMap(
@@ -196,21 +190,25 @@ class _PlatformMapState extends State<PlatformMap> {
         onTap: widget.onTap,
         onLongPress: widget.onLongPress,
         trafficEnabled: widget.trafficEnabled,
-        minMaxZoomPreference:
-            widget.minMaxZoomPreference.appleMapsZoomPreference ??
-                MinMaxZoomPreference.unbounded,
+        minMaxZoomPreference: widget.minMaxZoomPreference != null
+            ? widget.minMaxZoomPreference.appleMapsZoomPreference
+            : MinMaxZoomPreference.appleMapsUnboundedZoomPreference,
       );
     } else {
       return Text("Platform not yet implemented");
     }
   }
 
   _onGoogleMapCreated(googleMaps.GoogleMapController controller) {
-    widget.onMapCreated(PlatformMapController(controller));
+    if (widget.onMapCreated != null) {
+      widget.onMapCreated(PlatformMapController(controller));
+    }
   }
 
   _onAppleMapCreated(appleMaps.AppleMapController controller) {
-    widget.onMapCreated(PlatformMapController(controller));
+    if (widget.onMapCreated != null) {
+      widget.onMapCreated(PlatformMapController(controller));
+    }
   }
 
   appleMaps.MapType _getAppleMapType() {

lib/src/ui.dart

@@ -30,19 +30,16 @@ class MinMaxZoomPreference
   /// The preferred maximum zoom level or null, if unbounded from above.
   final double maxZoom;
 
-  /// Unbounded zooming.
-  static MinMaxZoomPreference get unbounded {
-    if (Platform.isIOS) {
-      return appleMaps.MinMaxZoomPreference.unbounded;
-    } else if (Platform.isAndroid) {
-      return googleMaps.MinMaxZoomPreference.unbounded;
-    }
-    return null;
-  }
-
   appleMaps.MinMaxZoomPreference get appleMapsZoomPreference =>
       appleMaps.MinMaxZoomPreference(this.maxZoom, this.maxZoom);
 
   googleMaps.MinMaxZoomPreference get googleMapsZoomPreference =>
       googleMaps.MinMaxZoomPreference(this.maxZoom, this.maxZoom);
+
+  static appleMaps.MinMaxZoomPreference get appleMapsUnboundedZoomPreference =>
+      appleMaps.MinMaxZoomPreference.unbounded;
+
+  static googleMaps.MinMaxZoomPreference
+      get googleMapsUnboundedZoomPreference =>
+          googleMaps.MinMaxZoomPreference.unbounded;
 }