upgrade to null-safety

android/src/main/kotlin/app/loup/geolocation/GeolocationPlugin.kt

@@ -103,31 +103,31 @@ public class GeolocationPlugin : FlutterPlugin, ActivityAware, Application.Activ
 
   // Application.ActivityLifecycleCallbacks
 
-  override fun onActivityPaused(activity: Activity?) {
+  override fun onActivityPaused(activity: Activity) {
     locationClient.pause()
   }
 
-  override fun onActivityResumed(activity: Activity?) {
+  override fun onActivityResumed(activity: Activity) {
     locationClient.resume()
   }
 
-  override fun onActivityStarted(activity: Activity?) {
+  override fun onActivityStarted(activity: Activity) {
 
   }
 
-  override fun onActivityDestroyed(activity: Activity?) {
+  override fun onActivityDestroyed(activity: Activity) {
 
   }
 
-  override fun onActivitySaveInstanceState(activity: Activity?, outState: Bundle?) {
+  override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
 
   }
 
-  override fun onActivityStopped(activity: Activity?) {
+  override fun onActivityStopped(activity: Activity) {
 
   }
 
-  override fun onActivityCreated(activity: Activity?, savedInstanceState: Bundle?) {
+  override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
 
   }
 

example/.flutter-plugins-dependencies

@@ -1 +1 @@
-{"_info":"// This is a generated file; do not edit or check into version control.","dependencyGraph":[{"name":"geolocation","dependencies":["streams_channel"]},{"name":"streams_channel","dependencies":[]}]}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"geolocation","path":"/Users/taleb/FlutterProjects/geolocation/","dependencies":["streams_channel"]},{"name":"streams_channel","path":"/Users/taleb/.pub-cache/hosted/pub.dartlang.org/streams_channel-0.3.0/","dependencies":[]}],"android":[{"name":"geolocation","path":"/Users/taleb/FlutterProjects/geolocation/","dependencies":["streams_channel"]},{"name":"streams_channel","path":"/Users/taleb/.pub-cache/hosted/pub.dartlang.org/streams_channel-0.3.0/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"geolocation","dependencies":["streams_channel"]},{"name":"streams_channel","dependencies":[]}],"date_created":"2021-06-05 17:32:11.340882","version":"2.2.1"}

example/lib/tab_location.dart

@@ -128,9 +128,9 @@ class _TabLocationState extends State<TabLocation> {
 
 class _Header extends StatelessWidget {
   _Header(
-      {@required this.onLastKnownPressed,
-      @required this.onCurrentPressed,
-      @required this.onSingleUpdatePressed});
+      {required this.onLastKnownPressed,
+      required this.onCurrentPressed,
+      required this.onSingleUpdatePressed});
 
   final VoidCallback onLastKnownPressed;
   final VoidCallback onCurrentPressed;
@@ -173,7 +173,7 @@ class _Header extends StatelessWidget {
 
 class _HeaderButton extends StatelessWidget {
   _HeaderButton(
-      {@required this.title, @required this.color, @required this.onTap});
+      {required this.title, required this.color, required this.onTap});
 
   final String title;
   final Color color;
@@ -204,7 +204,7 @@ class _HeaderButton extends StatelessWidget {
 }
 
 class _Item extends StatelessWidget {
-  _Item({@required this.data});
+  _Item({required this.data});
 
   final LocationData data;
 
@@ -213,14 +213,14 @@ class _Item extends StatelessWidget {
     final List<Widget> content = <Widget>[];
 
     if (data.result != null) {
-      String text;
-      if (data.result.isSuccessful) {
+      late String text;
+      if (data.result!.isSuccessful!) {
         text =
-            'Lat: ${data.result.location.latitude} - Lng: ${data.result.location.longitude}';
+            'Lat: ${data.result!.location.latitude} - Lng: ${data.result!.location.longitude}';
       } else {
-        switch (data.result.error.type) {
+        switch (data.result!.error!.type) {
           case GeolocationResultErrorType.runtime:
-            text = 'Failure: ${data.result.error.message}';
+            text = 'Failure: ${data.result!.error!.message}';
             break;
           case GeolocationResultErrorType.locationNotFound:
             text = 'Location not found';
@@ -236,7 +236,7 @@ class _Item extends StatelessWidget {
             break;
           case GeolocationResultErrorType.playServicesUnavailable:
             text =
-                'Play services unavailable: ${data.result.error.additionalInfo}';
+                'Play services unavailable: ${data.result!.error!.additionalInfo}';
             break;
         }
       }
@@ -310,18 +310,18 @@ class _Item extends StatelessWidget {
 
 class LocationData {
   LocationData({
-    @required this.id,
+    required this.id,
     this.result,
-    @required this.origin,
-    @required this.color,
-    @required this.createdAtTimestamp,
+    required this.origin,
+    required this.color,
+    required this.createdAtTimestamp,
     this.elapsedTimeSeconds,
   });
 
   final int id;
-  final LocationResult result;
+  final LocationResult? result;
   final String origin;
   final Color color;
   final int createdAtTimestamp;
-  final int elapsedTimeSeconds;
+  final int? elapsedTimeSeconds;
 }

example/lib/tab_settings.dart

@@ -13,8 +13,8 @@ class TabSettings extends StatefulWidget {
 }
 
 class _TabSettingsState extends State<TabSettings> {
-  GeolocationResult _locationOperationalResult;
-  GeolocationResult _requestPermissionResult;
+  GeolocationResult? _locationOperationalResult;
+  GeolocationResult? _requestPermissionResult;
 
   _checkLocationOperational() async {
     final GeolocationResult result = await Geolocation.isLocationOperational();
@@ -71,32 +71,32 @@ class _TabSettingsState extends State<TabSettings> {
 
 class _Item extends StatelessWidget {
   _Item({
-    @required this.title,
-    @required this.successLabel,
-    @required this.result,
-    @required this.onPressed,
+    required this.title,
+    required this.successLabel,
+    required this.result,
+    required this.onPressed,
   });
 
   final String title;
   final String successLabel;
-  final GeolocationResult result;
+  final GeolocationResult? result;
   final VoidCallback onPressed;
 
   @override
   Widget build(BuildContext context) {
-    String value;
+    String? value;
     String status;
     Color color;
 
     if (result != null) {
-      if (result.isSuccessful) {
+      if (result!.isSuccessful!) {
         value = successLabel;
         status = 'success';
         color = Colors.green;
       } else {
-        switch (result.error.type) {
+        switch (result!.error!.type) {
           case GeolocationResultErrorType.runtime:
-            value = 'Failure: ${result.error.message}';
+            value = 'Failure: ${result!.error!.message}';
             break;
           case GeolocationResultErrorType.locationNotFound:
             value = 'Location not found';
@@ -111,7 +111,7 @@ class _Item extends StatelessWidget {
             value = 'Permission denied';
             break;
           case GeolocationResultErrorType.playServicesUnavailable:
-            value = 'Play services unavailable: ${result.error.additionalInfo}';
+            value = 'Play services unavailable: ${result!.error!.additionalInfo}';
             break;
         }
 

example/lib/tab_track.dart

@@ -16,14 +16,14 @@ class TabTrack extends StatefulWidget {
 
 class _TabTrackState extends State<TabTrack> {
   List<_LocationData> _locations = [];
-  StreamSubscription<LocationResult> _subscription;
-  int _subscriptionStartedTimestamp;
+  StreamSubscription<LocationResult>? _subscription;
+  int? _subscriptionStartedTimestamp;
   bool _isTracking = false;
 
   @override
   dispose() {
     super.dispose();
-    _subscription.cancel();
+    _subscription!.cancel();
   }
 
   _onTogglePressed() {
@@ -32,7 +32,7 @@ class _TabTrackState extends State<TabTrack> {
         _isTracking = false;
       });
 
-      _subscription.cancel();
+      _subscription!.cancel();
       _subscription = null;
       _subscriptionStartedTimestamp = null;
     } else {
@@ -49,7 +49,7 @@ class _TabTrackState extends State<TabTrack> {
         final location = new _LocationData(
           result: result,
           elapsedTimeSeconds: (new DateTime.now().millisecondsSinceEpoch -
-                  _subscriptionStartedTimestamp) ~/
+                  _subscriptionStartedTimestamp!) ~/
               1000,
         );
 
@@ -58,7 +58,7 @@ class _TabTrackState extends State<TabTrack> {
         });
       });
 
-      _subscription.onDone(() {
+      _subscription!.onDone(() {
         setState(() {
           _isTracking = false;
         });
@@ -92,10 +92,10 @@ class _TabTrackState extends State<TabTrack> {
 }
 
 class _Header extends StatelessWidget {
-  _Header({@required this.isRunning, this.onTogglePressed});
+  _Header({required this.isRunning, this.onTogglePressed});
 
   final bool isRunning;
-  final VoidCallback onTogglePressed;
+  final VoidCallback? onTogglePressed;
 
   @override
   Widget build(BuildContext context) {
@@ -114,11 +114,11 @@ class _Header extends StatelessWidget {
 
 class _HeaderButton extends StatelessWidget {
   _HeaderButton(
-      {@required this.title, @required this.color, @required this.onTap});
+      {required this.title, required this.color, required this.onTap});
 
   final String title;
   final Color color;
-  final VoidCallback onTap;
+  final VoidCallback? onTap;
 
   @override
   Widget build(BuildContext context) {
@@ -145,25 +145,25 @@ class _HeaderButton extends StatelessWidget {
 }
 
 class _Item extends StatelessWidget {
-  _Item({@required this.data});
+  _Item({required this.data});
 
   final _LocationData data;
 
   @override
   Widget build(BuildContext context) {
-    String text;
+    late String text;
     String status;
     Color color;
 
-    if (data.result.isSuccessful) {
+    if (data.result.isSuccessful!) {
       text =
           'Lat: ${data.result.location.latitude} - Lng: ${data.result.location.longitude}';
       status = 'success';
       color = Colors.green;
     } else {
-      switch (data.result.error.type) {
+      switch (data.result.error!.type) {
         case GeolocationResultErrorType.runtime:
-          text = 'Failure: ${data.result.error.message}';
+          text = 'Failure: ${data.result.error!.message}';
           break;
         case GeolocationResultErrorType.locationNotFound:
           text = 'Location not found';
@@ -179,7 +179,7 @@ class _Item extends StatelessWidget {
           break;
         case GeolocationResultErrorType.playServicesUnavailable:
           text =
-              'Play services unavailable: ${data.result.error.additionalInfo}';
+              'Play services unavailable: ${data.result.error!.additionalInfo}';
           break;
       }
 
@@ -249,8 +249,8 @@ class _Item extends StatelessWidget {
 
 class _LocationData {
   _LocationData({
-    @required this.result,
-    @required this.elapsedTimeSeconds,
+    required this.result,
+    required this.elapsedTimeSeconds,
   });
 
   final LocationResult result;

example/pubspec.yaml

@@ -4,13 +4,13 @@ version: 1.0.0+1
 publish_to: "none"
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
+  sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
   flutter:
     sdk: flutter
 
-  cupertino_icons: ^0.1.2
+  cupertino_icons: ^1.0.3
 
 dev_dependencies:
   geolocation:

lib/channel/codec.dart

@@ -23,7 +23,7 @@ class _Codec {
       json.encode(_JsonCodec.permissionRequestToJson(request));
 
   // see: https://stackoverflow.com/questions/49611724/dart-how-to-json-decode-0-as-double
-  static double parseJsonNumber(dynamic value) {
+  static double? parseJsonNumber(dynamic value) {
     return value.runtimeType == int ? (value as int).toDouble() : value;
   }
 
@@ -36,8 +36,8 @@ class _Codec {
   }
 
   static dynamic platformSpecific({
-    @required dynamic android,
-    @required dynamic ios,
+    required dynamic android,
+    required dynamic ios,
   }) {
     if (Platform.isAndroid) {
       return android;
@@ -50,8 +50,8 @@ class _Codec {
   }
 
   static Map<String, dynamic> platformSpecificMap({
-    @required Map<String, dynamic> android,
-    @required Map<String, dynamic> ios,
+    required Map<String, dynamic> android,
+    required Map<String, dynamic> ios,
   }) {
     if (Platform.isAndroid) {
       return android;
@@ -72,7 +72,7 @@ class _JsonCodec {
       );
 
   static GeolocationResultError resultErrorFromJson(Map<String, dynamic> json) {
-    final GeolocationResultErrorType type =
+    final GeolocationResultErrorType? type =
         _mapResultErrorTypeJson(json['type']);
 
     var additionalInfo;