v1.0.0 - Migrate to null safety

Author: bpillon

.DS_Store

@@ -1,19 +1,77 @@
-# Files and directories created by pub
-.dart_tool/
-.packages
-# Remove the following pattern if you wish to check in your lock file
-pubspec.lock
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
 
-# Conventional directory for build outputs
-build/
-coverage/
-
-# Directory created by dartdoc
-doc/api/
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
 
 # Api key files
 **/example/android/app/src/main/res/values/strings.xml
 **/example/ios/Runner/Secrets.swift
 
 # Visual Studio Code related
-.vscode/
+.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+pubspec.lock
+.pub-cache/
+.pub/
+build/
+
+# Android related
+**/android/**/gradle-wrapper.jar
+**/android/.gradle
+**/android/captures/
+**/android/gradlew
+**/android/gradlew.bat
+**/android/local.properties
+**/android/**/GeneratedPluginRegistrant.java
+
+# iOS/XCode related
+**/ios/**/*.mode1v3
+**/ios/**/*.mode2v3
+**/ios/**/*.moved-aside
+**/ios/**/*.pbxuser
+**/ios/**/*.perspectivev3
+**/ios/**/*sync/
+**/ios/**/.sconsign.dblite
+**/ios/**/.tags*
+**/ios/**/.vagrant/
+**/ios/**/DerivedData/
+**/ios/**/Icon?
+**/ios/**/Pods/
+**/ios/**/.symlinks/
+**/ios/**/profile
+**/ios/**/xcuserdata
+**/ios/.generated/
+**/ios/Flutter/App.framework
+**/ios/Flutter/Flutter.framework
+**/ios/Flutter/Flutter.podspec
+**/ios/Flutter/Generated.xcconfig
+**/ios/Flutter/app.flx
+**/ios/Flutter/app.zip
+**/ios/Flutter/flutter_assets/
+**/ios/Flutter/flutter_export_environment.sh
+**/ios/ServiceDefinitions.json
+**/ios/Runner/GeneratedPluginRegistrant.*
+
+# Exceptions to above rules.
+!**/ios/**/default.mode1v3
+!**/ios/**/default.mode2v3
+!**/ios/**/default.pbxuser
+!**/ios/**/default.perspectivev3

.flutter-plugins

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: 9f5ff2306bb3e30b2b98eee79cd231b1336f41f4
+  revision: 60bd88df915880d23877bfc1602e8ddcf4c4dd2a
   channel: stable
 
 project_type: package

.flutter-plugins-dependencies

@@ -1,3 +1,9 @@
+## 1.0.0
+
+- Migrate to null safety
+- Internalising geohash to make it null safety compatible
+- Temporary : remove `google_maps_flutter_web` because it needs a reorganization of the project to work correctly (& it's not null safety compatible for the moment)
+
 ## 0.3.0
 
 - Add `google_maps_flutter_web` dependency to be compatible with Flutter web

.gitignore

@@ -24,7 +24,7 @@ To start with Cluster Manager, you have to initialize a `ClusterManager` instanc
 ClusterManager<Place>(
     _items, // Your items to be clustered on the map (of Place type for this example)
     _updateMarkers, // Method to be called when markers are updated
-    markerBuilder: _markerBuilder, // Optional : Method to implement if you want to customise markers
+    markerBuilder: _markerBuilder, // Optional : Method to implement if you want to customize markers
     levels: [1, 4.25, 6.75, 8.25, 11.5, 14.5, 16.0, 16.5, 20.0], // Optional : Configure this if you want to change zoom levels at which the clustering precision change
     extraPercent: 0.2, // Optional : This number represents the percentage (0.2 for 20%) of latitude and longitude (in each direction) to be considered on top of the visible map bounds to render clusters. This way, clusters don't "pop out" when you cross the map.
     initialZoom: 5.0, // Optional : The initial zoom of your map to be able to render good clusters on map creation
@@ -34,7 +34,7 @@ ClusterManager<Place>(
 
 You are able to add an new item to the map by calling `addItem` method on your `ClusterManager` instance. You can also completely change the items on your maps by calling `setItems` method.
 
-You can customise the icon of a cluster by using `Future<Marker> Function(Cluster<T>) markerBuilder` parameter.
+You can customize the icon of a cluster by using `Future<Marker> Function(Cluster<T>) markerBuilder` parameter.
 
 ```dart
 static Future<Marker> Function(Cluster) get markerBuilder => (cluster) async {
@@ -49,7 +49,7 @@ static Future<Marker> Function(Cluster) get markerBuilder => (cluster) async {
   );
 };
 
-static Future<BitmapDescriptor> getClusterBitmap(int size, {String text}) async {
+static Future<BitmapDescriptor> getClusterBitmap(int size, {String text?}) async {
   final PictureRecorder pictureRecorder = PictureRecorder();
   final Canvas canvas = Canvas(pictureRecorder);
   final Paint paint1 = Paint()..color = Colors.red;
@@ -83,133 +83,4 @@ Every cluster (even one item clusters) is rendered by the library as a `Cluster<
 
 ## Complete Basic Example
 
-```dart
-class MapSample extends StatefulWidget {
-  @override
-  State<MapSample> createState() => MapSampleState();
-}
-
-class MapSampleState extends State<MapSample> {
-  ClusterManager _manager;
-
-  Completer<GoogleMapController> _controller = Completer();
-
-  Set<Marker> markers = Set();
-
-  final CameraPosition _parisCameraPosition =
-      CameraPosition(target: LatLng(48.856613, 2.352222), zoom: 12.0);
-
-  List<ClusterItem<Place>> items = [
-    for (int i = 0; i < 10; i++)
-      ClusterItem(LatLng(48.848200 + i * 0.001, 2.319124 + i * 0.001),
-          item: Place(name: 'Place $i')),
-    for (int i = 0; i < 10; i++)
-      ClusterItem(LatLng(48.858265 - i * 0.001, 2.350107 + i * 0.001),
-          item: Place(name: 'Restaurant $i', isClosed: i % 2 == 0)),
-    for (int i = 0; i < 10; i++)
-      ClusterItem(LatLng(48.858265 + i * 0.01, 2.350107 - i * 0.01),
-          item: Place(name: 'Bar $i')),
-    for (int i = 0; i < 10; i++)
-      ClusterItem(LatLng(48.858265 - i * 0.1, 2.350107 - i * 0.01),
-          item: Place(name: 'Hotel $i')),
-    for (int i = 0; i < 10; i++)
-      ClusterItem(LatLng(48.858265 + i * 0.1, 2.350107 + i * 0.1)),
-    for (int i = 0; i < 10; i++)
-      ClusterItem(LatLng(48.858265 + i * 1, 2.350107 + i * 1)),
-  ];
-
-  @override
-  void initState() {
-    _manager = _initClusterManager();
-    super.initState();
-  }
-
-  ClusterManager _initClusterManager() {
-    return ClusterManager<Place>(items, _updateMarkers,
-        markerBuilder: _markerBuilder, initialZoom: _parisCameraPosition.zoom);
-  }
-
-  void _updateMarkers(Set<Marker> markers) {
-    print('Updated ${markers.length} markers');
-    setState(() {
-      this.markers = markers;
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return new Scaffold(
-      body: GoogleMap(
-          mapType: MapType.normal,
-          initialCameraPosition: _parisCameraPosition,
-          markers: markers,
-          onMapCreated: (GoogleMapController controller) {
-            _controller.complete(controller);
-            _manager.setMapController(controller);
-          },
-          onCameraMove: _manager.onCameraMove,
-          onCameraIdle: _manager.updateMap),
-      floatingActionButton: FloatingActionButton(
-        onPressed: () {
-          _manager.setItems(<ClusterItem<Place>>[
-            for (int i = 0; i < 30; i++)
-              ClusterItem<Place>(LatLng(48.858265 + i * 0.01, 2.350107),
-                  item: Place(name: 'New Place ${DateTime.now()}'))
-          ]);
-        },
-        child: Icon(Icons.update),
-      ),
-    );
-  }
-
-  Future<Marker> Function(Cluster<Place>) get _markerBuilder =>
-      (cluster) async {
-        return Marker(
-          markerId: MarkerId(cluster.getId()),
-          position: cluster.location,
-          onTap: () {
-            print('---- $cluster');
-            cluster.items.forEach((p) => print(p));
-          },
-          icon: await _getMarkerBitmap(cluster.isMultiple ? 125 : 75,
-              text: cluster.isMultiple ? cluster.count.toString() : null),
-        );
-      };
-
-  Future<BitmapDescriptor> _getMarkerBitmap(int size, {String text}) async {
-    assert(size != null);
-
-    final PictureRecorder pictureRecorder = PictureRecorder();
-    final Canvas canvas = Canvas(pictureRecorder);
-    final Paint paint1 = Paint()..color = Colors.red;
-    final Paint paint2 = Paint()..color = Colors.white;
-
-    canvas.drawCircle(Offset(size / 2, size / 2), size / 2.0, paint1);
-    canvas.drawCircle(Offset(size / 2, size / 2), size / 2.2, paint2);
-    canvas.drawCircle(Offset(size / 2, size / 2), size / 2.8, paint1);
-
-    if (text != null) {
-      TextPainter painter = TextPainter(textDirection: TextDirection.ltr);
-      painter.text = TextSpan(
-        text: text,
-        style: TextStyle(
-            fontSize: size / 3,
-            color: Colors.white,
-            fontWeight: FontWeight.normal),
-      );
-      painter.layout();
-      painter.paint(
-        canvas,
-        Offset(size / 2 - painter.width / 2, size / 2 - painter.height / 2),
-      );
-    }
-
-    final img = await pictureRecorder.endRecording().toImage(size, size);
-    final data = await img.toByteData(format: ImageByteFormat.png);
-
-    return BitmapDescriptor.fromBytes(data.buffer.asUint8List());
-  }
-}
-```
-
 See the `example` directory for a complete sample app.

.idea/libraries/Dart_SDK.xml

@@ -171,6 +171,7 @@
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
 						CreatedOnToolsVersion = 7.3.1;
+						DevelopmentTeam = Q46ADN6S6V;
 						LastSwiftMigration = 1100;
 					};
 				};
@@ -368,6 +369,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = Q46ADN6S6V;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -500,6 +502,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = Q46ADN6S6V;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -527,6 +530,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = Q46ADN6S6V;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",