Skip to content

Commit 1933da4

Browse files
authored
Merge pull request #424 from SGI-CAPP-AT2/fix_datepicker_bug
fix: datepicker error fixed
2 parents 27af7b1 + f7ef84a commit 1933da4

File tree

1 file changed

+25
-3
lines changed

1 file changed

+25
-3
lines changed

lib/app/modules/home/views/add_task_bottom_sheet.dart

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ class AddTaskBottomSheet extends StatelessWidget {
250250
},
251251
fieldHintText: "Month/Date/Year",
252252
context: context,
253-
initialDate: homeController.due.value ?? DateTime.now(),
253+
initialDate: homeController.due.value?? DateTime.now(),
254254
firstDate: DateTime.now(),
255255
lastDate: DateTime(2037, 12, 31),
256256
);
@@ -305,7 +305,7 @@ class AddTaskBottomSheet extends StatelessWidget {
305305
),
306306
);
307307
// print(dateTime);
308-
homeController.due.value = dateTime.toUtc();
308+
homeController.due.value = dateTime;
309309

310310
// print("due value ${homeController.due}");
311311
homeController.dueString.value =
@@ -460,10 +460,31 @@ class AddTaskBottomSheet extends StatelessWidget {
460460
),
461461
onPressed: () async {
462462
// print(homeController.formKey.currentState);
463+
if(homeController.due.value!=null&&DateTime.now().isAfter(homeController.due.value!)){
464+
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
465+
content: Text(
466+
SentenceManager(
467+
currentLanguage:
468+
homeController.selectedLanguage.value)
469+
.sentences
470+
.addTaskTimeInPast,
471+
style: TextStyle(
472+
color: AppSettings.isDarkMode
473+
? TaskWarriorColors.kprimaryTextColor
474+
: TaskWarriorColors.kLightPrimaryTextColor,
475+
),
476+
),
477+
backgroundColor: AppSettings.isDarkMode
478+
? TaskWarriorColors.ksecondaryBackgroundColor
479+
: TaskWarriorColors
480+
.kLightSecondaryBackgroundColor,
481+
duration: const Duration(seconds: 2)));
482+
return;
483+
}
463484
if (homeController.formKey.currentState!.validate()) {
464485
try {
465486
var task = taskParser(homeController.namecontroller.text)
466-
.rebuild((b) => b..due = homeController.due.value)
487+
.rebuild((b) => b..due = homeController.due.value?.toUtc())
467488
.rebuild((p) => p..priority = homeController.priority.value);
468489
if (homeController.tagcontroller.text != "") {
469490
homeController.tags.add(homeController.tagcontroller.text.trim());
@@ -480,6 +501,7 @@ class AddTaskBottomSheet extends StatelessWidget {
480501
homeController.priority.value = 'M';
481502
homeController.tagcontroller.text = '';
482503
homeController.tags.value = [];
504+
homeController.due.value=null;
483505
homeController.update();
484506
// Navigator.of(context).pop();
485507
Get.back();

0 commit comments

Comments
 (0)