CCExtractor · SheryarTahir · Sep 14, 2024
diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import UIKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

diff --git a/lib/app/data/models/alarm_model.dart b/lib/app/data/models/alarm_model.dart
@@ -62,54 +62,55 @@ class AlarmModel {
   @ignore
   Map? offsetDetails;
 
-  AlarmModel(
-      {required this.alarmTime,
-      required this.alarmID,
-      this.sharedUserIds = const [],
-      required this.ownerId,
-      required this.ownerName,
-      required this.lastEditedUserId,
-      required this.mutexLock,
-      this.isEnabled = true,
-      required this.days,
-      required this.intervalToAlarm,
-      required this.isActivityEnabled,
-      required this.minutesSinceMidnight,
-      required this.isLocationEnabled,
-      required this.isSharedAlarmEnabled,
-      required this.isWeatherEnabled,
-      required this.location,
-      required this.weatherTypes,
-      required this.isMathsEnabled,
-      required this.mathsDifficulty,
-      required this.numMathsQuestions,
-      required this.isShakeEnabled,
-      required this.shakeTimes,
-      required this.isQrEnabled,
-      required this.qrValue,
-      required this.isPedometerEnabled,
-      required this.numberOfSteps,
-      required this.activityInterval,
-      this.offsetDetails = const {},
-      required this.mainAlarmTime,
-      required this.label,
-      required this.isOneTime,
-      required this.snoozeDuration,
-      required this.gradient,
-      required this.ringtoneName,
-      required this.note,
-      required this.deleteAfterGoesOff,
-      required this.showMotivationalQuote,
-      required this.volMax,
-      required this.volMin,
-      required this.activityMonitor,
-      required this.ringOn,
-      required this.alarmDate,
-      required this.profile,
-      required this.isGuardian,
-      required this.guardianTimer,
-      required this.guardian,
-      required this.isCall});
+  AlarmModel({
+    required this.alarmTime,
+    required this.alarmID,
+    this.sharedUserIds = const [],
+    required this.ownerId,
+    required this.ownerName,
+    required this.lastEditedUserId,
+    required this.mutexLock,
+    this.isEnabled = true,
+    required this.days,
+    required this.intervalToAlarm,
+    required this.isActivityEnabled,
+    required this.minutesSinceMidnight,
+    required this.isLocationEnabled,
+    required this.isSharedAlarmEnabled,
+    required this.isWeatherEnabled,
+    required this.location,
+    required this.weatherTypes,
+    required this.isMathsEnabled,
+    required this.mathsDifficulty,
+    required this.numMathsQuestions,
+    required this.isShakeEnabled,
+    required this.shakeTimes,
+    required this.isQrEnabled,
+    required this.qrValue,
+    required this.isPedometerEnabled,
+    required this.numberOfSteps,
+    required this.activityInterval,
+    this.offsetDetails = const {},
+    required this.mainAlarmTime,
+    required this.label,
+    required this.isOneTime,
+    required this.snoozeDuration,
+    required this.gradient,
+    required this.ringtoneName,
+    required this.note,
+    required this.deleteAfterGoesOff,
+    required this.showMotivationalQuote,
+    required this.volMax,
+    required this.volMin,
+    required this.activityMonitor,
+    required this.ringOn,
+    required this.alarmDate,
+    required this.profile,
+    required this.isGuardian,
+    required this.guardianTimer,
+    required this.guardian,
+    required this.isCall,
+  });
 
   AlarmModel.fromDocumentSnapshot({
     required firestore.DocumentSnapshot documentSnapshot,
@@ -395,7 +396,7 @@ class AlarmModel {
       'guardianTimer': alarmRecord.guardianTimer,
       'guardian': alarmRecord.guardian,
       'isCall': alarmRecord.isCall,
-      'ringOn': alarmRecord.ringOn
+      'ringOn': alarmRecord.ringOn,
     };
 
     if (alarmRecord.isSharedAlarmEnabled) {

diff --git a/lib/app/data/models/profile_model.dart b/lib/app/data/models/profile_model.dart
@@ -57,51 +57,52 @@ class ProfileModel {
   @ignore
   Map? offsetDetails;
 
-  ProfileModel(
-      {required this.profileName,
-      this.sharedUserIds = const [],
-      required this.ownerId,
-      required this.ownerName,
-      required this.lastEditedUserId,
-      required this.mutexLock,
-      this.isEnabled = true,
-      required this.days,
-      required this.intervalToAlarm,
-      required this.isActivityEnabled,
-      required this.minutesSinceMidnight,
-      required this.isLocationEnabled,
-      required this.isSharedAlarmEnabled,
-      required this.isWeatherEnabled,
-      required this.location,
-      required this.weatherTypes,
-      required this.isMathsEnabled,
-      required this.mathsDifficulty,
-      required this.numMathsQuestions,
-      required this.isShakeEnabled,
-      required this.shakeTimes,
-      required this.isQrEnabled,
-      required this.qrValue,
-      required this.isPedometerEnabled,
-      required this.numberOfSteps,
-      required this.activityInterval,
-      this.offsetDetails = const {},
-      required this.label,
-      required this.isOneTime,
-      required this.snoozeDuration,
-      required this.gradient,
-      required this.ringtoneName,
-      required this.note,
-      required this.deleteAfterGoesOff,
-      required this.showMotivationalQuote,
-      required this.volMax,
-      required this.volMin,
-      required this.activityMonitor,
-      required this.alarmDate,
-      required this.ringOn,
-      required this.isGuardian,
-      required this.guardianTimer,
-      required this.guardian,
-      required this.isCall});
+  ProfileModel({
+    required this.profileName,
+    this.sharedUserIds = const [],
+    required this.ownerId,
+    required this.ownerName,
+    required this.lastEditedUserId,
+    required this.mutexLock,
+    this.isEnabled = true,
+    required this.days,
+    required this.intervalToAlarm,
+    required this.isActivityEnabled,
+    required this.minutesSinceMidnight,
+    required this.isLocationEnabled,
+    required this.isSharedAlarmEnabled,
+    required this.isWeatherEnabled,
+    required this.location,
+    required this.weatherTypes,
+    required this.isMathsEnabled,
+    required this.mathsDifficulty,
+    required this.numMathsQuestions,
+    required this.isShakeEnabled,
+    required this.shakeTimes,
+    required this.isQrEnabled,
+    required this.qrValue,
+    required this.isPedometerEnabled,
+    required this.numberOfSteps,
+    required this.activityInterval,
+    this.offsetDetails = const {},
+    required this.label,
+    required this.isOneTime,
+    required this.snoozeDuration,
+    required this.gradient,
+    required this.ringtoneName,
+    required this.note,
+    required this.deleteAfterGoesOff,
+    required this.showMotivationalQuote,
+    required this.volMax,
+    required this.volMin,
+    required this.activityMonitor,
+    required this.alarmDate,
+    required this.ringOn,
+    required this.isGuardian,
+    required this.guardianTimer,
+    required this.guardian,
+    required this.isCall,
+  });
 
   ProfileModel.fromDocumentSnapshot({
     required firestore.DocumentSnapshot documentSnapshot,
@@ -274,7 +275,7 @@ class ProfileModel {
       'guardianTimer': profileRecord.guardianTimer,
       'guardian': profileRecord.guardian,
       'isCall': profileRecord.isCall,
-      'ringOn': profileRecord.ringOn
+      'ringOn': profileRecord.ringOn,
     };
 
     if (profileRecord.isSharedAlarmEnabled) {

diff --git a/lib/app/data/models/timer_model.dart b/lib/app/data/models/timer_model.dart
@@ -11,13 +11,14 @@ class TimerModel {
   late String ringtoneName;
   late int isPaused;
 
-  TimerModel(
-      {required this.timerValue,
-      required this.startedOn,
-      required this.ringtoneName,
-      required this.timerName,
-      this.isPaused = 0,
-      this.timeElapsed = 0});
+  TimerModel({
+    required this.timerValue,
+    required this.startedOn,
+    required this.ringtoneName,
+    required this.timerName,
+    this.isPaused = 0,
+    this.timeElapsed = 0,
+  });
 
   Map<String, dynamic> toMap() {
     return {
@@ -36,7 +37,7 @@ class TimerModel {
     timerId = map['id'];
     startedOn = map['startedOn'];
     timerValue = map['timerValue'];
-    timeElapsed= map['timeElapsed'];
+    timeElapsed = map['timeElapsed'];
     ringtoneName = map['ringtoneName'];
     timerName = map['timerName'];
     isPaused = map['isPaused'];

diff --git a/lib/app/data/models/user_model.dart b/lib/app/data/models/user_model.dart
@@ -22,7 +22,7 @@ class UserModel {
       'lastName': lastName,
       'email': email,
       'id': id,
-      'receivedItems': receivedItems
+      'receivedItems': receivedItems,
     };
   }
 

diff --git a/lib/app/data/providers/firestore_provider.dart b/lib/app/data/providers/firestore_provider.dart
@@ -315,7 +315,7 @@ class FirestoreDb {
     Map sharedItem = {
       'type': 'profile',
       'profileName': currentProfileName,
-      'owner': currentUserEmail
+      'owner': currentUserEmail,
     };
     await _firebaseFirestore
         .collection('users')
@@ -326,10 +326,9 @@ class FirestoreDb {
         .then((v) {
       Get.snackbar('Notification', 'Item Shared!');
     });
-    ;
     for (final email in emails) {
       await _firebaseFirestore.collection('users').doc(email).update({
-        'receivedItems': FieldValue.arrayUnion([sharedItem])
+        'receivedItems': FieldValue.arrayUnion([sharedItem]),
       });
     }
   }
@@ -341,7 +340,7 @@ class FirestoreDb {
       'type': 'alarm',
       'AlarmName': alarm.alarmID,
       'owner': currentUserEmail,
-      'alarmTime': alarm.alarmTime
+      'alarmTime': alarm.alarmTime,
     };
     await _firebaseFirestore
         .collection('users')
@@ -354,7 +353,7 @@ class FirestoreDb {
     });
     for (final email in emails) {
       await _firebaseFirestore.collection('users').doc(email).update({
-        'receivedItems': FieldValue.arrayUnion([sharedItem])
+        'receivedItems': FieldValue.arrayUnion([sharedItem]),
       });
     }
   }
@@ -529,7 +528,7 @@ class FirestoreDb {
         .collection('users')
         .doc(_firebaseAuthInstance.currentUser!.email)
         .update({
-      'receivedItems': FieldValue.arrayRemove([item])
+      'receivedItems': FieldValue.arrayRemove([item]),
     });
   }
 }
diff --git a/lib/app/data/providers/get_storage_provider.dart b/lib/app/data/providers/get_storage_provider.dart
@@ -14,11 +14,7 @@ class GetStorageProvider {
 
   Future<String> readCurrentLanguage() async {
     print(_getStorage.read('currentLanguageKey'));
-    String? language = await _getStorage.read(('currentLanguageKey'));
-    if (language == null) {
-      language = Get.locale.toString();
-      writeCurrentLanguage(language);
-    }
+    String? language = _getStorage.read(('currentLanguageKey'));
     return language;
   }
 
@@ -49,7 +45,7 @@ class GetStorageProvider {
   }
 
   Future<String> readProfile() async {
-    String profile = await _getStorage.read('profile') ?? 'Default';
+    String profile = _getStorage.read('profile') ?? 'Default';
     return profile;
   }
 }
diff --git a/lib/app/data/providers/google_cloud_api_provider.dart b/lib/app/data/providers/google_cloud_api_provider.dart
@@ -23,7 +23,7 @@ class GoogleCloudProvider {
     Get.put(SettingsController());
     SettingsController settingsController = Get.find<SettingsController>();
 
-    if (await _firebaseAuthInstance.currentUser == null) {
+    if (_firebaseAuthInstance.currentUser == null) {
       var googleSignInAccount = await _googleSignIn.signIn();
       final GoogleSignInAuthentication? googleAuth =
           await googleSignInAccount?.authentication;
@@ -76,8 +76,8 @@ class GoogleCloudProvider {
     }
   }
 
-  static isUserLoggedin()  {
-    return  _firebaseAuthInstance.currentUser != null;
+  static isUserLoggedin() {
+    return _firebaseAuthInstance.currentUser != null;
   }
 
   static Future<List<CalendarListEntry>?> getCalenders() async {
@@ -120,6 +120,6 @@ class GoogleCloudProvider {
     homeController.isUserSignedIn.value = false;
     homeController.userModel.value = null;
     homeController.Calendars.value = [];
-    homeController.calendarFetchStatus.value = "Loading";
+    homeController.calendarFetchStatus.value = 'Loading';
   }
 }