nullsafety 1.2.0

Author: kvs-coder

README.md

@@ -18,6 +18,11 @@ A Flutter wrapper for [HealthKitReporter](https://cocoapods.org/pods/HealthKitRe
 dependencies:
      health_kit_reporter: ^1.1.1
 ```
+or with null safety:
+``` Dart
+dependencies:
+     health_kit_reporter: ^1.2.0-nullsafety.0
+```
 - Get dependencies
 
 ``` shell

example/ios/Podfile.lock

@@ -2,7 +2,7 @@ PODS:
   - Flutter (1.0.0)
   - flutter_local_notifications (0.0.1):
     - Flutter
-  - health_kit_reporter (1.1.0):
+  - health_kit_reporter (1.1.1):
     - Flutter
     - HealthKitReporter
   - HealthKitReporter (1.4.0)
@@ -27,7 +27,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
   flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
-  health_kit_reporter: 4f07356cf70fff8d50b92b76ee9beacf7e3d70f9
+  health_kit_reporter: 9ac0e8b9d1933d67b23f1ee8e4d45eb4611bfe84
   HealthKitReporter: 1bd60f53111044cc3a0d575d57dc4b23767c8ac6
 
 PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa

example/pubspec.lock

@@ -68,14 +68,14 @@ packages:
       name: flutter_local_notifications
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.0-nullsafety.0"
+    version: "5.0.0-nullsafety.1"
   flutter_local_notifications_platform_interface:
     dependency: transitive
     description:
       name: flutter_local_notifications_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0-nullsafety.2"
+    version: "3.0.0-nullsafety.4"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -87,7 +87,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.1.0"
+    version: "1.2.0-nullsafety.0"
   intl:
     dependency: transitive
     description:
@@ -129,7 +129,7 @@ packages:
       name: plugin_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "2.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -199,5 +199,5 @@ packages:
     source: hosted
     version: "2.1.0"
 sdks:
-  dart: ">=2.12.0-0.0 <3.0.0"
+  dart: ">=2.12.0 <3.0.0"
   flutter: ">=1.20.0"

example/pubspec.yaml

@@ -14,12 +14,12 @@ description: Demonstrates how to use the health_kit_reporter plugin.
 version: 1.0.0
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  flutter_local_notifications: ^5.0.0-nullsafety.0
+  flutter_local_notifications: ^5.0.0-nullsafety.1
   health_kit_reporter:
     # When depending on this package from a real application you should use:
     #   health_kit_reporter: ^x.y.z

example/test/widget_test.dart

@@ -7,7 +7,6 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-
 import 'package:health_kit_reporter_example/main.dart';
 
 void main() {
@@ -18,8 +17,8 @@ void main() {
     // Verify that platform version is retrieved.
     expect(
       find.byWidgetPredicate(
-        (Widget widget) => widget is Text &&
-                           widget.data.startsWith('Running on:'),
+        (Widget widget) =>
+            widget is Text && widget.data!.startsWith('Running on:'),
       ),
       findsOneWidget,
     );

lib/health_kit_reporter.dart

@@ -152,7 +152,7 @@ class HealthKitReporter {
   /// Provide the [predicate] to set the date interval.
   ///
   static StreamSubscription<dynamic> heartbeatSeriesQuery(Predicate predicate,
-      {Function(HeartbeatSerie) onUpdate}) {
+      {required Function(HeartbeatSerie) onUpdate}) {
     final arguments = predicate.map;
     return _heartbeatSeriesQueryChannel
         .receiveBroadcastStream(arguments)
@@ -169,7 +169,7 @@ class HealthKitReporter {
   /// Provide the [predicate] to set the date interval.
   ///
   static StreamSubscription<dynamic> workoutRouteQuery(Predicate predicate,
-      {Function(WorkoutRoute) onUpdate}) {
+      {required Function(WorkoutRoute) onUpdate}) {
     final arguments = predicate.map;
     return _workoutRouteQueryChannel
         .receiveBroadcastStream(arguments)
@@ -188,7 +188,7 @@ class HealthKitReporter {
   ///
   static StreamSubscription<dynamic> observerQuery(
       String identifier, Predicate predicate,
-      {Function(String) onUpdate}) {
+      {required Function(String) onUpdate}) {
     final arguments = <String, dynamic>{
       'identifier': identifier,
     };
@@ -211,7 +211,7 @@ class HealthKitReporter {
   ///
   static StreamSubscription<dynamic> anchoredObjectQuery(
       String identifier, Predicate predicate,
-      {Function(List<Sample>, List<DeletedObject>) onUpdate}) {
+      {required Function(List<Sample>, List<DeletedObject>) onUpdate}) {
     final arguments = <String, dynamic>{
       'identifier': identifier,
     };
@@ -225,7 +225,9 @@ class HealthKitReporter {
       for (final String element in samplesList) {
         final json = jsonDecode(element);
         final sample = Sample.factory(json);
-        samples.add(sample);
+        if (sample != null) {
+          samples.add(sample);
+        }
       }
       final deletedObjectsList = List.from(map['deletedObjects']);
       final deletedObjects = <DeletedObject>[];
@@ -247,7 +249,7 @@ class HealthKitReporter {
   ///
   static StreamSubscription<dynamic> queryActivitySummaryUpdates(
       Predicate predicate,
-      {Function(List<ActivitySummary>) onUpdate}) {
+      {required Function(List<ActivitySummary>) onUpdate}) {
     final arguments = predicate.map;
     return _queryActivitySummaryChannel
         .receiveBroadcastStream(arguments)
@@ -281,7 +283,7 @@ class HealthKitReporter {
       DateTime enumerateFrom,
       DateTime enumerateTo,
       DateComponents intervalComponents,
-      {Function(Statistics) onUpdate}) {
+      {required Function(Statistics) onUpdate}) {
     final arguments = {
       'identifier': type.identifier,
       'unit': unit,
@@ -446,7 +448,9 @@ class HealthKitReporter {
     for (final String element in list) {
       final json = jsonDecode(element);
       final sample = Sample.factory(json);
-      samples.add(sample);
+      if (sample != null) {
+        samples.add(sample);
+      }
     }
     return samples;
   }
@@ -559,7 +563,7 @@ class HealthKitReporter {
   ///
   static Future<List<Correlation>> correlationQuery(
       String identifier, Predicate predicate,
-      {Map<String, Predicate> typePredicates}) async {
+      {Map<String, Predicate>? typePredicates}) async {
     final arguments = {
       'identifier': identifier,
       'typePredicates': typePredicates,
@@ -598,7 +602,7 @@ class HealthKitReporter {
   /// [device] is optional.
   ///
   static Future<bool> addCategory(List<Category> categories, Workout workout,
-      {Device device}) async {
+      {Device? device}) async {
     final arguments = {
       'categories': categories.map((e) => e.map).toList(),
       'workout': workout.map,
@@ -611,7 +615,7 @@ class HealthKitReporter {
   /// [device] is optional.
   ///
   static Future<bool> addQuantity(List<Quantity> quantities, Workout workout,
-      {Device device}) async {
+      {Device? device}) async {
     final arguments = {
       'quantities': quantities.map((e) => e.map).toList(),
       'workout': workout.map,

lib/model/decorator/extensions.dart

@@ -4,5 +4,5 @@ extension Date on String {
   /// Try to parse the date coming from native side
   /// Expected format from native side is [yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ]
   ///
-  DateTime get date => this != null ? DateTime.tryParse(this) : null;
+  DateTime get date => DateTime.parse(this);
 }

lib/model/payload/activity_summary.dart

@@ -35,7 +35,7 @@ class ActivitySummary {
   ///
   ActivitySummary.fromJson(Map<String, dynamic> json)
       : identifier = json['identifier'],
-        date = json['date']?.toString()?.date,
+        date = json['date'].toString().date,
         harmonized = ActivitySummaryHarmonized.fromJson(json['harmonized']);
 }
 

lib/model/payload/category.dart

@@ -19,7 +19,7 @@ class Category extends Sample<CategoryHarmonized> {
     String identifier,
     num startTimestamp,
     num endTimestamp,
-    Device device,
+    Device? device,
     SourceRevision sourceRevision,
     CategoryHarmonized harmonized,
   ) : super(
@@ -40,16 +40,15 @@ class Category extends Sample<CategoryHarmonized> {
         'identifier': identifier,
         'startTimestamp': startTimestamp,
         'endTimestamp': endTimestamp,
-        'device': device.map,
+        'device': device?.map,
         'sourceRevision': sourceRevision.map,
         'harmonized': harmonized.map,
       };
 
   /// General constructor from JSON payload
   ///
   Category.fromJson(Map<String, dynamic> json)
-      : super.fromJson(json,
-            harmonized: CategoryHarmonized.fromJson(json['harmonized']));
+      : super.from(json, CategoryHarmonized.fromJson(json['harmonized']));
 
   /// Simplifies creating a list of objects from JSON payload.
   ///
@@ -80,7 +79,7 @@ class CategoryHarmonized {
 
   final num value;
   final String description;
-  final Map<String, dynamic> metadata;
+  final Map<String, dynamic>? metadata;
 
   /// General map representation
   ///

lib/model/payload/characteristic/biological_sex.dart

@@ -30,7 +30,6 @@ extension Description on BiologicalSex {
       case BiologicalSex.other:
         return 'Other';
     }
-    throw InvalidValueException('Unknown case: $this');
   }
 }
 
@@ -46,7 +45,7 @@ extension BiologicalSexFactory on BiologicalSex {
       case 'Other':
         return BiologicalSex.other;
       default:
-        return null;
+        throw InvalidValueException('Unknown case: $string');
     }
   }
 }

lib/model/payload/characteristic/blood_type.dart

@@ -43,7 +43,6 @@ extension Description on BloodType {
       case BloodType.oNegative:
         return 'O-';
     }
-    throw InvalidValueException('Unknown case: $this');
   }
 }
 
@@ -69,7 +68,7 @@ extension BloodTypeFactory on BloodType {
       case 'O-':
         return BloodType.oNegative;
       default:
-        return null;
+        throw InvalidValueException('Unknown case: $string');
     }
   }
 }

lib/model/payload/characteristic/characteristic.dart

@@ -23,23 +23,23 @@ class Characteristic {
     this.skinType,
   );
 
-  final BiologicalSex biologicalSex;
-  final DateTime birthday;
-  final BloodType bloodType;
-  final FitzpatrickSkinType skinType;
+  final BiologicalSex? biologicalSex;
+  final DateTime? birthday;
+  final BloodType? bloodType;
+  final FitzpatrickSkinType? skinType;
 
-  Map<String, String> get map => {
-        'biologicalSex': biologicalSex.string,
+  Map<String, String?> get map => {
+        'biologicalSex': biologicalSex?.string,
         'birthday': birthday?.toIso8601String(),
-        'bloodType': bloodType.string,
-        'skinType': skinType.string,
+        'bloodType': bloodType?.string,
+        'skinType': skinType?.string,
       };
 
   /// General constructor from JSON payload
   ///
   Characteristic.fromJson(Map<String, dynamic> json)
       : biologicalSex = BiologicalSexFactory.from(json['biologicalSex']),
-        birthday = json['birthday']?.toString()?.date,
+        birthday = json['birthday']?.toString().date,
         bloodType = BloodTypeFactory.from(json['bloodType']),
         skinType = FitzpatrickSkinTypeFactory.from(json['skinType']);
 }

lib/model/payload/characteristic/fitzpatrick_skin_type.dart

@@ -37,7 +37,6 @@ extension Description on FitzpatrickSkinType {
       case FitzpatrickSkinType.VI:
         return 'VI';
     }
-    throw InvalidValueException('Unknown case: $this');
   }
 }
 
@@ -59,7 +58,7 @@ extension FitzpatrickSkinTypeFactory on FitzpatrickSkinType {
       case 'VI':
         return FitzpatrickSkinType.VI;
       default:
-        return null;
+        throw InvalidValueException('Unknown case: $string');
     }
   }
 }

lib/model/payload/correlation.dart

@@ -22,7 +22,7 @@ class Correlation extends Sample<CorrelationHarmonized> {
     String identifier,
     num startTimestamp,
     num endTimestamp,
-    Device device,
+    Device? device,
     SourceRevision sourceRevision,
     CorrelationHarmonized harmonized,
   ) : super(
@@ -38,8 +38,7 @@ class Correlation extends Sample<CorrelationHarmonized> {
   /// General constructor from JSON payload
   ///
   Correlation.fromJson(Map<String, dynamic> json)
-      : super.fromJson(json,
-            harmonized: CorrelationHarmonized.fromJson(json['harmonized']));
+      : super.from(json, CorrelationHarmonized.fromJson(json['harmonized']));
 
   /// General map representation
   ///
@@ -49,7 +48,7 @@ class Correlation extends Sample<CorrelationHarmonized> {
         'identifier': identifier,
         'startTimestamp': startTimestamp,
         'endTimestamp': endTimestamp,
-        'device': device.map,
+        'device': device?.map,
         'sourceRevision': sourceRevision.map,
         'harmonized': harmonized.map,
       };
@@ -72,7 +71,7 @@ class CorrelationHarmonized {
 
   final List<Quantity> quantitySamples;
   final List<Category> categorySamples;
-  final Map<String, dynamic> metadata;
+  final Map<String, dynamic>? metadata;
 
   /// General map representation
   ///

lib/model/payload/date_components.dart

@@ -20,24 +20,24 @@ class DateComponents {
     this.weekOfYear,
     this.yearForWeekOfYear,
   });
-  final int era;
-  final int year;
-  final int month;
-  final int day;
-  final int hour;
-  final int minute;
-  final int second;
-  final int nanosecond;
-  final int weekday;
-  final int weekdayOrdinal;
-  final int quarter;
-  final int weekOfMonth;
-  final int weekOfYear;
-  final int yearForWeekOfYear;
+  final int? era;
+  final int? year;
+  final int? month;
+  final int? day;
+  final int? hour;
+  final int? minute;
+  final int? second;
+  final int? nanosecond;
+  final int? weekday;
+  final int? weekdayOrdinal;
+  final int? quarter;
+  final int? weekOfMonth;
+  final int? weekOfYear;
+  final int? yearForWeekOfYear;
 
   /// General map representation
   ///
-  Map<String, int> get map => {
+  Map<String, int?> get map => {
         'era': era,
         'year': year,
         'month': month,

lib/model/payload/deleted_object.dart

@@ -10,7 +10,7 @@ class DeletedObject {
   const DeletedObject(this.uuid, this.metadata);
 
   final String uuid;
-  final Map<String, dynamic> metadata;
+  final Map<String, dynamic>? metadata;
 
   /// General map representation
   ///

lib/model/payload/device.dart

@@ -18,16 +18,16 @@ class Device {
     this.udiDeviceIdentifier,
   );
 
-  final String name;
-  final String manufacturer;
-  final String model;
-  final String hardwareVersion;
-  final String firmwareVersion;
-  final String softwareVersion;
-  final String localIdentifier;
-  final String udiDeviceIdentifier;
+  final String? name;
+  final String? manufacturer;
+  final String? model;
+  final String? hardwareVersion;
+  final String? firmwareVersion;
+  final String? softwareVersion;
+  final String? localIdentifier;
+  final String? udiDeviceIdentifier;
 
-  Map<String, String> get map => {
+  Map<String, String?> get map => {
         'name': name,
         'manufacturer': manufacturer,
         'model': model,

lib/model/payload/electrocardiogram.dart

@@ -20,7 +20,7 @@ class Electrocardiogram extends Sample<ElectrocardiogramHarmonized> {
     String identifier,
     num startTimestamp,
     num endTimestamp,
-    Device device,
+    Device? device,
     SourceRevision sourceRevision,
     ElectrocardiogramHarmonized harmonized,
     this.numberOfMeasurements,
@@ -44,7 +44,7 @@ class Electrocardiogram extends Sample<ElectrocardiogramHarmonized> {
         'identifier': identifier,
         'startTimestamp': startTimestamp,
         'endTimestamp': endTimestamp,
-        'device': device.map,
+        'device': device?.map,
         'sourceRevision': sourceRevision.map,
         'harmonized': harmonized.map,
         'numberOfMeasurements': numberOfMeasurements,
@@ -54,9 +54,8 @@ class Electrocardiogram extends Sample<ElectrocardiogramHarmonized> {
   ///
   Electrocardiogram.fromJson(Map<String, dynamic> json)
       : numberOfMeasurements = json['numberOfMeasurements'],
-        super.fromJson(json,
-            harmonized:
-                ElectrocardiogramHarmonized.fromJson(json['harmonized']));
+        super.from(
+            json, ElectrocardiogramHarmonized.fromJson(json['harmonized']));
 }
 
 /// Equivalent of [Electrocardiogram.Harmonized]
@@ -84,7 +83,7 @@ class ElectrocardiogramHarmonized {
   final String samplingFrequencyUnit;
   final String classification;
   final String symptomsStatus;
-  final Map<String, dynamic> metadata;
+  final Map<String, dynamic>? metadata;
 
   /// General map representation
   ///

lib/model/payload/quantity.dart

@@ -19,7 +19,7 @@ class Quantity extends Sample<QuantityHarmonized> {
     String identifier,
     num startTimestamp,
     num endTimestamp,
-    Device device,
+    Device? device,
     SourceRevision sourceRevision,
     QuantityHarmonized harmonized,
   ) : super(
@@ -40,16 +40,15 @@ class Quantity extends Sample<QuantityHarmonized> {
         'identifier': identifier,
         'startTimestamp': startTimestamp,
         'endTimestamp': endTimestamp,
-        'device': device.map,
+        'device': device?.map,
         'sourceRevision': sourceRevision.map,
         'harmonized': harmonized.map,
       };
 
   /// General constructor from JSON payload
   ///
   Quantity.fromJson(Map<String, dynamic> json)
-      : super.fromJson(json,
-            harmonized: QuantityHarmonized.fromJson(json['harmonized']));
+      : super.from(json, QuantityHarmonized.fromJson(json['harmonized']));
 
   /// Simplifies creating a list of objects from JSON payload.
   ///
@@ -80,7 +79,7 @@ class QuantityHarmonized {
 
   final num value;
   final String unit;
-  final Map<String, dynamic> metadata;
+  final Map<String, dynamic>? metadata;
 
   /// General map representation
   ///

lib/model/payload/sample.dart

@@ -18,8 +18,8 @@ import 'workout.dart';
 ///
 /// Supports [map] representation.
 ///
-/// Has a [Sample.fromJson] constructor
-/// to create instances from JSON payload coming from iOS native code.
+/// Has a [Sample.from] constructor
+/// to create instances from JSON payload coming from iOS native code and a generic Harmonized object.
 ///
 /// Has a [factory] method for creating a specific instance of types:
 /// - [Quantity]
@@ -56,7 +56,7 @@ abstract class Sample<Harmonized> {
   final String identifier;
   final num startTimestamp;
   final num endTimestamp;
-  final Device device;
+  final Device? device;
   final SourceRevision sourceRevision;
   final Harmonized harmonized;
 
@@ -66,13 +66,12 @@ abstract class Sample<Harmonized> {
 
   /// General constructor from JSON payload
   ///
-  Sample.fromJson(Map<String, dynamic> json, {Harmonized harmonized})
+  Sample.from(Map<String, dynamic> json, Harmonized harmonized)
       : uuid = json['uuid'],
         identifier = json['identifier'],
         startTimestamp = json['startTimestamp'],
         endTimestamp = json['endTimestamp'],
-        device =
-            json['device'] != null ? Device.fromJson(json['device']) : null,
+        device = Device.fromJson(json['device']),
         sourceRevision = SourceRevision.fromJson(json['sourceRevision']),
         harmonized = harmonized;
 
@@ -90,7 +89,7 @@ abstract class Sample<Harmonized> {
   /// Factory method to create instances as a result of
   /// [HealthKitReporter.sampleQuery]
   ///
-  static Sample factory(Map<String, dynamic> json) {
+  static Sample? factory(Map<String, dynamic> json) {
     final identifier = json['identifier'];
     final quantityType = QuantityTypeFactory.tryFrom(identifier);
     if (quantityType != null) {

lib/model/payload/source_revision.dart

@@ -18,8 +18,8 @@ class SourceRevision {
   );
 
   final Source source;
-  final String version;
-  final String productType;
+  final String? version;
+  final String? productType;
   final String systemVersion;
   final OperatingSystem operatingSystem;
 

lib/model/payload/statistics.dart

@@ -35,13 +35,11 @@ class Statistics {
         'harmonized': harmonized.map,
       };
 
-  Statistics.fromJson(Map<String, dynamic> json,
-      {StatisticsHarmonized harmonized})
+  Statistics.fromJson(Map<String, dynamic> json)
       : identifier = json['identifier'],
         startTimestamp = json['startTimestamp'],
         endTimestamp = json['endTimestamp'],
-        sources =
-            json['sources'] != null ? Source.collect(json['sources']) : null,
+        sources = Source.collect(json['sources']),
         harmonized = StatisticsHarmonized.fromJson(json['harmonized']);
 }
 
@@ -61,9 +59,9 @@ class StatisticsHarmonized {
     this.unit,
   );
 
-  final num summary;
-  final num average;
-  final num recent;
+  final num? summary;
+  final num? average;
+  final num? recent;
   final String unit;
 
   /// General map representation

lib/model/payload/workout.dart

@@ -20,7 +20,7 @@ class Workout extends Sample<WorkoutHarmonized> {
     String identifier,
     num startTimestamp,
     num endTimestamp,
-    Device device,
+    Device? device,
     SourceRevision sourceRevision,
     WorkoutHarmonized harmonized,
     this.workoutName,
@@ -49,7 +49,7 @@ class Workout extends Sample<WorkoutHarmonized> {
         'startTimestamp': startTimestamp,
         'endTimestamp': endTimestamp,
         'workoutName': workoutName,
-        'device': device.map,
+        'device': device?.map,
         'sourceRevision': sourceRevision.map,
         'duration': duration,
         'workoutEvents': workoutEvents.map((e) => e.map).toList(),
@@ -62,8 +62,7 @@ class Workout extends Sample<WorkoutHarmonized> {
       : workoutName = json['workoutName'],
         duration = json['duration'],
         workoutEvents = WorkoutEvent.collect(json['workoutEvents']),
-        super.fromJson(json,
-            harmonized: WorkoutHarmonized.fromJson(json['harmonized']));
+        super.from(json, WorkoutHarmonized.fromJson(json['harmonized']));
 }
 
 /// Equivalent of [Workout.Harmonized]
@@ -89,15 +88,15 @@ class WorkoutHarmonized {
   );
 
   final int value;
-  final num totalEnergyBurned;
+  final num? totalEnergyBurned;
   final String totalEnergyBurnedUnit;
-  final num totalDistance;
+  final num? totalDistance;
   final String totalDistanceUnit;
-  final num totalSwimmingStrokeCount;
+  final num? totalSwimmingStrokeCount;
   final String totalSwimmingStrokeCountUnit;
-  final num totalFlightsClimbed;
+  final num? totalFlightsClimbed;
   final String totalFlightsClimbedUnit;
-  final Map<String, dynamic> metadata;
+  final Map<String, dynamic>? metadata;
 
   /// General map representation
   ///

lib/model/payload/workout_event.dart

@@ -70,7 +70,7 @@ class WorkoutEventHarmonized {
   );
 
   final int value;
-  final Map<String, dynamic> metadata;
+  final Map<String, dynamic>? metadata;
 
   /// General map representation
   ///

lib/model/type/activity_summary_type.dart

@@ -1,5 +1,3 @@
-import '../../exceptions.dart';
-
 /// Equivalent of [ActivitySummaryType]
 /// from [HealthKitReporter] https://cocoapods.org/pods/HealthKitReporter
 ///
@@ -16,6 +14,5 @@ extension ActivitySummaryTypeIdentifier on ActivitySummaryType {
       case ActivitySummaryType.activitySummaryType:
         return 'HKActivitySummaryTypeIdentifier';
     }
-    throw InvalidValueException('Unknown case: $this');
   }
 }

lib/model/type/category_type.dart

@@ -193,7 +193,6 @@ extension CategoryTypeIdentifier on CategoryType {
       case CategoryType.wheezing:
         return 'HKCategoryTypeIdentifierWheezing';
     }
-    throw InvalidValueException('Unknown case: $this');
   }
 }
 
@@ -209,7 +208,7 @@ extension CategoryTypeFactory on CategoryType {
 
   /// The [from] exception handling
   ///
-  static CategoryType tryFrom(String identifier) {
+  static CategoryType? tryFrom(String identifier) {
     try {
       return from(identifier);
     } on InvalidValueException {

lib/model/type/characteristic_type.dart

@@ -1,5 +1,3 @@
-import '../../exceptions.dart';
-
 /// Equivalent of [CharacteristicType]
 /// from [HealthKitReporter] https://cocoapods.org/pods/HealthKitReporter
 ///
@@ -31,6 +29,5 @@ extension CharacteristicTypeIdentifier on CharacteristicType {
       case CharacteristicType.activityMoveMode:
         return 'HKCharacteristicTypeIdentifierActivityMoveMode';
     }
-    throw InvalidValueException('Unknown case: $this');
   }
 }

lib/model/type/correlation_type.dart

@@ -22,7 +22,6 @@ extension CorrelationTypeIdentifier on CorrelationType {
       case CorrelationType.food:
         return 'HKCorrelationTypeIdentifierFood';
     }
-    throw InvalidValueException('Unknown case: $this');
   }
 }
 
@@ -38,7 +37,7 @@ extension CorrelationTypeFactory on CorrelationType {
 
   /// The [from] exception handling
   ///
-  static CorrelationType tryFrom(String identifier) {
+  static CorrelationType? tryFrom(String identifier) {
     try {
       return from(identifier);
     } on InvalidValueException {

lib/model/type/document_type.dart

@@ -1,5 +1,3 @@
-import '../../exceptions.dart';
-
 /// Equivalent of [DocumentType]
 /// from [HealthKitReporter] https://cocoapods.org/pods/HealthKitReporter
 ///
@@ -16,6 +14,5 @@ extension DocumentTypeIdentifier on DocumentType {
       case DocumentType.cda:
         return 'HKDocumentTypeIdentifierCDA';
     }
-    throw InvalidValueException('Unknown case: $this');
   }
 }

lib/model/type/electrocardiogram_type.dart

@@ -19,7 +19,6 @@ extension ElectrocardiogramTypeIdentifier on ElectrocardiogramType {
       case ElectrocardiogramType.electrocardiogramType:
         return 'HKDataTypeIdentifierElectrocardiogram';
     }
-    throw InvalidValueException('Unknown case: $this');
   }
 }
 
@@ -35,7 +34,7 @@ extension ElectrocardiogramTypeFactory on ElectrocardiogramType {
 
   /// The [from] exception handling
   ///
-  static ElectrocardiogramType tryFrom(String identifier) {
+  static ElectrocardiogramType? tryFrom(String identifier) {
     try {
       return from(identifier);
     } on InvalidValueException {

lib/model/type/quantity_type.dart

@@ -286,7 +286,6 @@ extension QuantityTypeIdentifier on QuantityType {
       case QuantityType.uvExposure:
         return 'HKQuantityTypeIdentifierUVExposure';
     }
-    throw InvalidValueException('Unknown case: $this');
   }
 }
 
@@ -302,7 +301,7 @@ extension QuantityTypeFactory on QuantityType {
 
   /// The [from] exception handling
   ///
-  static QuantityType tryFrom(String identifier) {
+  static QuantityType? tryFrom(String identifier) {
     try {
       return from(identifier);
     } on InvalidValueException {

lib/model/type/series_type.dart

@@ -1,5 +1,3 @@
-import '../../exceptions.dart';
-
 /// Equivalent of [SeriesType]
 /// from [HealthKitReporter] https://cocoapods.org/pods/HealthKitReporter
 ///
@@ -19,6 +17,5 @@ extension SeriesTypeIdentifier on SeriesType {
       case SeriesType.route:
         return 'HKWorkoutRouteTypeIdentifier';
     }
-    throw InvalidValueException('Unknown case: $this');
   }
 }

lib/model/type/workout_type.dart

@@ -16,7 +16,6 @@ extension WorkoutTypeIdentifier on WorkoutType {
       case WorkoutType.workoutType:
         return 'HKWorkoutTypeIdentifier';
     }
-    throw InvalidValueException('Unknown case: $this');
   }
 }
 
@@ -32,7 +31,7 @@ extension WorkoutTypeFactory on WorkoutType {
 
   /// The [from] exception handling
   ///
-  static WorkoutType tryFrom(String identifier) {
+  static WorkoutType? tryFrom(String identifier) {
     try {
       return from(identifier);
     } on InvalidValueException {

lib/model/update_frequency.dart

@@ -1,5 +1,3 @@
-import '../exceptions.dart';
-
 /// Equivalent of [UpdateFrequency]
 /// from [HealthKitReporter] https://cocoapods.org/pods/HealthKitReporter
 ///
@@ -25,6 +23,5 @@ extension Value on UpdateFrequency {
       case UpdateFrequency.weekly:
         return 4;
     }
-    throw InvalidValueException('Unknown case: $this');
   }
 }

pubspec.lock

@@ -157,5 +157,5 @@ packages:
     source: hosted
     version: "2.1.0"
 sdks:
-  dart: ">=2.12.0-0.0 <3.0.0"
+  dart: ">=2.12.0 <3.0.0"
   flutter: ">=1.20.0"

pubspec.yaml

@@ -1,10 +1,10 @@
 name: health_kit_reporter
 description: Helps to write or read data from Apple Health via HealthKit framework.
-version: 1.1.1
+version: 1.2.0-nullsafety.0
 homepage: https://github.com/VictorKachalov/health_kit_reporter
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
   flutter: ">=1.20.0"
 
 dependencies: