migrate to null-safety, fix errors after package upgrades

onur-yildiz · Apr 24, 2021 · 60005c0 · 60005c0
1 parent 269991f
commit 60005c0
Show file tree

Hide file tree

Showing 29 changed files with 424 additions and 421 deletions.
diff --git a/lib/helpers/db_helper.dart b/lib/helpers/db_helper.dart
@@ -21,7 +21,7 @@ class DBHelper {
     );
   }
 
-  static Future<void> insert(String table, Map<String, Object> data) async {
+  static Future<int> insert(String table, Map<String, Object?> data) async {
     final db = await DBHelper.database();
     return db.insert(
       table,
@@ -30,10 +30,10 @@ class DBHelper {
     );
   }
 
-  static Future<void> update(
+  static Future<int> update(
     String table,
     String column,
-    String id,
+    String? id,
     dynamic data,
   ) async {
     final db = await DBHelper.database();
@@ -46,7 +46,7 @@ class DBHelper {
     String column,
     int oldIndex,
     int newIndex, [
-    String groupingColStr = '',
+    String? groupingColStr = '',
     String groupingCol = '',
   ]) async {
     final db = await DBHelper.database();
@@ -78,7 +78,7 @@ class DBHelper {
     );
   }
 
-  static Future<void> reorderGroupedBy(
+  static Future<int> reorderGroupedBy(
     String table,
     String column,
     String groupingColVal,
@@ -101,15 +101,15 @@ class DBHelper {
     );
   }
 
-  static Future<void> delete(String table, String id) async {
+  static Future<int> delete(String table, String? id) async {
     final db = await DBHelper.database();
     return db.rawDelete('DELETE FROM $table WHERE id = ?', [id]);
   }
 
-  static Future<List<Map<String, Object>>> getData(
+  static Future<List<Map<String, Object?>>> getData(
     String table, [
     String column = '',
-    String id = '',
+    String? id = '',
   ]) async {
     final db = await DBHelper.database();
     if (id == '' || column == '') {

diff --git a/lib/main.dart b/lib/main.dart
@@ -26,15 +26,15 @@ final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
 final BehaviorSubject<ReceivedNotification> didReceiveLocalNotificationSubject =
     BehaviorSubject<ReceivedNotification>();
 
-final BehaviorSubject<String> selectNotificationSubject =
-    BehaviorSubject<String>();
+final BehaviorSubject<String?> selectNotificationSubject =
+    BehaviorSubject<String?>();
 
 class ReceivedNotification {
   ReceivedNotification({
-    @required this.id,
-    @required this.title,
-    @required this.body,
-    @required this.payload,
+    required this.id,
+    required this.title,
+    required this.body,
+    required this.payload,
   });
 
   final int id;
@@ -43,12 +43,12 @@ class ReceivedNotification {
   final String payload;
 }
 
-String selectedNotificationPayload;
+String? selectedNotificationPayload;
 // String _initialRoute;
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  Workmanager.initialize(
+  Workmanager().initialize(
     callbackDispatcher,
   );
 
@@ -70,7 +70,7 @@ void main() async {
   );
 
   await flutterLocalNotificationsPlugin.initialize(initializationSettings,
-      onSelectNotification: (String payload) async {
+      onSelectNotification: (String? payload) async {
     if (payload != null) {
       debugPrint('notification payload: $payload');
     }
@@ -187,12 +187,12 @@ Future<void> _fetchStartupData(BuildContext context) async {
 
 void _setDailyQuoteNotification(BuildContext context) async {
   if (Provider.of<SettingsProvider>(context, listen: false)
-      .receiveQuoteNotifs) {
-    Workmanager.registerPeriodicTask(
+      .receiveQuoteNotifs!) {
+    Workmanager().registerPeriodicTask(
       'quote-notification',
       'quote-notification',
       inputData: {
-        'locale': AppLocalizations.of(context).localeName,
+        'locale': AppLocalizations.of(context)!.localeName,
       },
       frequency: Duration(days: 1),
       existingWorkPolicy: ExistingWorkPolicy.keep,
@@ -205,26 +205,26 @@ void _setDailyQuoteNotification(BuildContext context) async {
       ),
     );
   } else {
-    Workmanager.cancelByUniqueName('quote-notification');
+    Workmanager().cancelByUniqueName('quote-notification');
   }
 }
 
 void callbackDispatcher() {
-  Workmanager.executeTask((taskName, inputData) async {
+  Workmanager().executeTask((taskName, inputData) async {
     switch (taskName) {
       case 'progress-notification':
         final addictionData =
-            await DBHelper.getData('addictions', 'id', inputData['id']);
+            await DBHelper.getData('addictions', 'id', inputData!['id']);
         final addiction = Addiction(
-          id: addictionData[0]['id'],
-          name: addictionData[0]['name'],
-          quitDate: addictionData[0]['quit_date'],
-          consumptionType: addictionData[0]['consumption_type'],
-          dailyConsumption: addictionData[0]['daily_consumption'],
-          unitCost: addictionData[0]['unit_cost'],
-          level: addictionData[0]['level'],
+          id: addictionData[0]['id'] as String,
+          name: addictionData[0]['name'] as String,
+          quitDate: addictionData[0]['quit_date'] as String,
+          consumptionType: addictionData[0]['consumption_type'] as int,
+          dailyConsumption: addictionData[0]['daily_consumption'] as double,
+          unitCost: addictionData[0]['unit_cost'] as double,
+          level: addictionData[0]['level'] as int?,
         );
-        final nextLevel = addiction.level + 1;
+        final nextLevel = addiction.level! + 1;
         if (addiction.abstinenceTime.inSeconds >=
             levelDurations[nextLevel].inSeconds) {
           await DBHelper.update(
@@ -240,11 +240,11 @@ void callbackDispatcher() {
         }
         // if last achievement level, cancel
         if (addiction.level == 8) {
-          Workmanager.cancelByUniqueName(addiction.id);
+          Workmanager().cancelByUniqueName(addiction.id);
         }
         break;
       case 'quote-notification':
-        final quoteList = quotes[inputData['locale']];
+        final quoteList = quotes[inputData!['locale']]!;
         Random random = new Random(DateTime.now().millisecondsSinceEpoch);
         int rndi = random.nextInt(quoteList.length);
         showQuoteNotification(
@@ -276,7 +276,8 @@ void showProgressNotification(
   );
 }
 
-void showQuoteNotification(String notificationTitle, String notificationBody) {
+void showQuoteNotification(
+    String? notificationTitle, String? notificationBody) {
   final androidDetails = AndroidNotificationDetails(
     'quitAllProgress',
     'progressNotifications',

diff --git a/lib/models/addiction.dart b/lib/models/addiction.dart
@@ -12,19 +12,19 @@ class Addiction {
   final int consumptionType;
   final double dailyConsumption;
   final double unitCost;
-  List<PersonalNote> personalNotes;
-  List<Gift> gifts;
-  int level;
-  int achievementLevel;
-  int sortOrder;
+  List<PersonalNote>? personalNotes;
+  List<Gift>? gifts;
+  int? level;
+  int? achievementLevel;
+  int? sortOrder;
 
   Addiction({
-    @required this.id,
-    @required this.name,
-    @required this.quitDate,
-    @required this.consumptionType,
-    @required this.dailyConsumption,
-    @required this.unitCost,
+    required this.id,
+    required this.name,
+    required this.quitDate,
+    required this.consumptionType,
+    required this.dailyConsumption,
+    required this.unitCost,
     this.personalNotes,
     this.gifts,
     this.level,
@@ -56,8 +56,8 @@ class Addiction {
 
   double get totalSpent {
     double total = 0.0;
-    gifts.forEach((gift) {
-      total += gift.price * gift.count;
+    gifts!.forEach((gift) {
+      total += gift.price! * gift.count!;
     });
     return total;
   }
@@ -67,9 +67,9 @@ class Addiction {
   }
 
   List<PersonalNote> get personalNotesDateSorted {
-    List<PersonalNote> list = [...personalNotes];
+    List<PersonalNote> list = [...personalNotes!];
     list.sort((a, b) {
-      return DateTime.parse(b.date).compareTo(DateTime.parse(a.date));
+      return DateTime.parse(b.date!).compareTo(DateTime.parse(a.date!));
     });
     return list;
   }

diff --git a/lib/models/gift.dart b/lib/models/gift.dart
@@ -1,20 +1,20 @@
 import 'package:flutter/foundation.dart';
 
 class Gift {
-  final String id;
-  final String addictionId;
-  final String name;
-  final double price;
-  int sortOrder;
-  int count;
+  final String? id;
+  final String? addictionId;
+  final String? name;
+  final double? price;
+  int? sortOrder;
+  int? count;
 
   Gift({
-    @required this.id,
-    @required this.addictionId,
-    @required this.name,
-    @required this.price,
-    @required this.sortOrder,
-    int count,
+    required this.id,
+    required this.addictionId,
+    required this.name,
+    required this.price,
+    required this.sortOrder,
+    int? count,
   }) {
     this.count = count ?? 0;
   }

diff --git a/lib/models/personal_note.dart b/lib/models/personal_note.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/foundation.dart';
 
 class PersonalNote {
-  final String title;
-  final String text;
-  final String date;
+  final String? title;
+  final String? text;
+  final String? date;
 
   PersonalNote({
-    @required this.title,
-    @required this.text,
-    @required this.date,
+    required this.title,
+    required this.text,
+    required this.date,
   });
 }