Merge branch 'main' into snackbar-and-dialog-box

Author: 100RAV-AGGARWAL

lib/services/task_details.dart

@@ -3,6 +3,7 @@
 import 'package:flutter/material.dart';
 import 'package:built_collection/built_collection.dart';
 import 'package:google_fonts/google_fonts.dart';
+import 'package:intl/intl.dart';
 import 'package:taskwarrior/config/app_settings.dart';
 import 'package:taskwarrior/model/storage/storage_widget.dart';
 import 'package:taskwarrior/widgets/pallete.dart';
@@ -157,7 +158,8 @@ class AttributeWidget extends StatelessWidget {
         : DateTime.now().toUtc();
     var localValue = (value is DateTime)
         ? // now = (value as DateTime).toLocal(),
-        '${format.day}-${format.month}-${format.year} ${format.hour}:${format.minute}'
+        // '${format.day}-${format.month}-${format.year} ${format.hour}:${format.minute}'
+        DateFormat("dd-MM-yyyy HH:mm").format(value)
         : ((value is BuiltList) ? (value as BuiltList).toBuilder() : value);
     switch (name) {
       case 'description':

lib/widgets/addTask.dart

@@ -108,7 +108,7 @@ class _AddTaskBottomSheetState extends State<AddTaskBottomSheet> {
                                   );
                                   due = dateTime.toUtc();
                                   dueString = Jiffy(dateTime)
-                                      .format('MMM do yyyy, h:mm:ss a');
+                                      .format('dd/MM/yyyy HH:mm');
                                 }
                               }
                               setState(() {});
@@ -189,12 +189,12 @@ class _AddTaskBottomSheetState extends State<AddTaskBottomSheet> {
   Widget buildAddButton(BuildContext context) {
     return TextButton(
       child: const Text("Add"),
-      onPressed: () async {
+      onPressed: () {
         try {
-          formKey.currentState!.validate();
-          var task = taskParser(namecontroller.text)
-              .rebuild((b) => b..due = due)
-              .rebuild((p) => p..priority = priority);
+          if (formKey.currentState!.validate()) {
+            var task = taskParser(namecontroller.text)
+                .rebuild((b) => b..due = due)
+                .rebuild((p) => p..priority = priority);
 
           StorageWidget.of(context).mergeTask(task);
           //StorageWidget.of(context).mergeTask(prioritytask);

lib/widgets/taskdetails/dateTimePicker.dart

@@ -1,6 +1,7 @@
 // ignore_for_file: file_names
 
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
 import 'package:taskwarrior/config/app_settings.dart';
 
 class DateTimeWidget extends StatelessWidget {
@@ -36,7 +37,9 @@ class DateTimeWidget extends StatelessWidget {
           ),
         ),
         onTap: () async {
-          var initialDate = DateTime.tryParse('$value') ?? DateTime.now();
+          var initialDate = DateFormat("dd-MM-yyyy HH:mm").parse(
+              value ?? DateFormat("dd-MM-yyyy HH:mm").format(DateTime.now()));
+          // var initialDate = DateTime.tryParse('$value') ?? DateTime.now();
           var date = await showDatePicker(
             context: context,
             initialDate: initialDate,