refactor: further relax null checks !. and prefer ?.

albertms10 · Dec 19, 2021 · 6cc7eb2 · 6cc7eb2
1 parent b3fddaf
commit 6cc7eb2
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/lib/src/model/booking/booking.dart b/lib/src/model/booking/booking.dart
@@ -57,9 +57,9 @@ class Booking extends Item {
   Map<String, dynamic> toJson() => {
         ...super.toJson(),
         _JsonFields.description: description,
-        _JsonFields.date: date!.toIso8601String().split('T').first,
-        _JsonFields.startTime: startTime!.format24Hour(),
-        _JsonFields.endTime: endTime!.format24Hour(),
+        _JsonFields.date: date?.toIso8601String().split('T').first,
+        _JsonFields.startTime: startTime?.format24Hour(),
+        _JsonFields.endTime: endTime?.format24Hour(),
         _JsonFields.status: status.index,
         _JsonFields.isLocked: isLocked,
       };
@@ -73,12 +73,12 @@ class Booking extends Item {
   Map<TimeOfDay, Duration> get hoursSpan {
     final timeRanges = <TimeOfDay, Duration>{};
 
-    var runTime = startTime;
+    var runTime = startTime!;
     var runDuration = Duration.zero;
 
     while (runDuration < duration) {
       final nextHour = TimeOfDay(
-        hour: (runTime!.hour + 1) % TimeOfDay.hoursPerDay,
+        hour: (runTime.hour + 1) % TimeOfDay.hoursPerDay,
         minute: 0,
       );
 
@@ -98,8 +98,8 @@ class Booking extends Item {
     return timeRanges;
   }
 
-  String get timeRange => '${startTime!.format24Hour()}'
-      '–${endTime!.format24Hour()}';
+  String get timeRange => '${startTime?.format24Hour()}'
+      '–${endTime?.format24Hour()}';
 
   String get dateTimeRange => '${DateFormat.yMd().format(date!)} $timeRange';
 

diff --git a/lib/src/model/booking/recurring_booking.dart b/lib/src/model/booking/recurring_booking.dart
@@ -85,7 +85,7 @@ class RecurringBooking extends Booking {
         _JsonFields.repeatEvery: repeatEvery,
         if (method == RecurringBookingMethod.endDate)
           _JsonFields.recurringEndDate:
-              _recurringEndDate!.toIso8601String().split('T').first
+              _recurringEndDate?.toIso8601String().split('T').first
         else if (method == RecurringBookingMethod.occurrences)
           _JsonFields.occurrences: _occurrences,
       };

diff --git a/lib/src/model/date/date_range.dart b/lib/src/model/date/date_range.dart
@@ -31,8 +31,8 @@ class DateRange extends Item {
   @override
   Map<String, dynamic> toJson() => {
         ...super.toJson(),
-        _JsonFields.startDate: startDate!.toIso8601String().split('T').first,
-        _JsonFields.endDate: endDate!.toIso8601String().split('T').first,
+        _JsonFields.startDate: startDate?.toIso8601String().split('T').first,
+        _JsonFields.endDate: endDate?.toIso8601String().split('T').first,
       };
 
   @override

diff --git a/lib/src/model/item.dart b/lib/src/model/item.dart
@@ -41,7 +41,7 @@ abstract class Item implements Comparable<Item>, Serializable {
         _JsonFields.creationDateTime: creationDateTime.toIso8601String(),
         if (modificationDateTime != null)
           _JsonFields.modificationDateTime:
-              modificationDateTime!.toIso8601String(),
+              modificationDateTime?.toIso8601String(),
         _JsonFields.modificationCount: modificationCount,
       };
 

diff --git a/lib/widgets/item/activity_line_chart.dart b/lib/widgets/item/activity_line_chart.dart
@@ -31,8 +31,8 @@ class ActivityLineChart extends StatelessWidget {
         width: 250.0,
         padding: const EdgeInsets.symmetric(vertical: 24.0),
         child: DetailLineChart(
-          minX: dateRange.startDate!.toDouble(),
-          maxX: dateRange.endDate!.toDouble(),
+          minX: dateRange.startDate?.toDouble(),
+          maxX: dateRange.endDate?.toDouble(),
           spots: [
             for (final entry in occupiedDurationPerWeek.entries)
               FlSpot(

diff --git a/lib/widgets/pages/summary_page.dart b/lib/widgets/pages/summary_page.dart
@@ -53,7 +53,7 @@ class _SummaryPageState extends State<SummaryPage>
                   onTap: widget.setNavigationPage == null
                       ? null
                       : () {
-                          widget.setNavigationPage!.call(AppPages.bookings);
+                          widget.setNavigationPage?.call(AppPages.bookings);
                         },
                   items: [
                     StatisticItem(
@@ -82,7 +82,7 @@ class _SummaryPageState extends State<SummaryPage>
                   onTap: widget.setNavigationPage == null
                       ? null
                       : () {
-                          widget.setNavigationPage!.call(AppPages.cabins);
+                          widget.setNavigationPage?.call(AppPages.cabins);
                         },
                   items: [
                     StatisticSimpleItem(
@@ -97,7 +97,7 @@ class _SummaryPageState extends State<SummaryPage>
                   onTap: widget.setNavigationPage == null
                       ? null
                       : () {
-                          widget.setNavigationPage!.call(AppPages.schoolYears);
+                          widget.setNavigationPage?.call(AppPages.schoolYears);
                         },
                   items: [
                     StatisticSimpleItem(
@@ -120,7 +120,7 @@ class _SummaryPageState extends State<SummaryPage>
                         : () {
                             dayHandler.dateTime =
                                 cabinManager.mostBookedDayEntry!.key;
-                            widget.setNavigationPage!.call(AppPages.bookings);
+                            widget.setNavigationPage?.call(AppPages.bookings);
                           },
                     items: [
                       StatisticSimpleItem(
@@ -179,7 +179,7 @@ class _SummaryPageState extends State<SummaryPage>
                         ? null
                         : (dateTime, value) {
                             dayHandler.dateTime = dateTime;
-                            widget.setNavigationPage!.call(AppPages.bookings);
+                            widget.setNavigationPage?.call(AppPages.bookings);
                           },
                     legendLessLabel: appLocalizations.less,
                     legendMoreLabel: appLocalizations.more,