Merge pull request #275 from abhisheksharma010/main

Resolve the deadline bug
CCExtractor · Feb 3, 2024 · 8ab5b70 · 8ab5b70
2 parents b6681df + 4a05625
commit 8ab5b70
Showing 1 changed file with 24 additions and 16 deletions.
diff --git a/lib/widgets/add_Task.dart b/lib/widgets/add_Task.dart
@@ -275,27 +275,35 @@ class _AddTaskBottomSheetState extends State<AddTaskBottomSheet> {
                           minutes: time.minute,
                         ),
                       );
-                      dateTime = dateTime.add(
-                        Duration(
-                          hours: time.hour - dateTime.hour,
-                        ),
-                      );
-                      due = dateTime.toUtc();
-                      NotificationService notificationService =
-                          NotificationService();
-                      notificationService.initiliazeNotification();
+                      if (dateTime.isAfter(DateTime.now())) {
+                        due = dateTime.toUtc();
+                        NotificationService notificationService =
+                            NotificationService();
+                        notificationService.initiliazeNotification();
 
-                      if ((dateTime.millisecondsSinceEpoch -
-                              DateTime.now().millisecondsSinceEpoch) >
-                          0) {
                         notificationService.sendNotification(
                             dateTime, namecontroller.text);
-                      }
 
-                      dueString =
-                          DateFormat("dd-MM-yyyy HH:mm").format(dateTime);
+                        dueString =
+                            DateFormat("dd-MM-yyyy HH:mm").format(dateTime);
+                        setState(() {});
+                      } else {
+                        ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+                          content: Text(
+                            'Please select a due date and time in the future.',
+                            style: TextStyle(
+                              color: AppSettings.isDarkMode
+                                  ? Colors.white
+                                  : Colors.black,
+                            ),
+                          ),
+                          backgroundColor: AppSettings.isDarkMode
+                              ? Colors.black
+                              : Colors.white,
+                          duration: const Duration(seconds: 2),
+                        ));
+                      }
                     }
-                    setState(() {});
                   }
                 },
               ),