Polished

lib/newActivity.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/painting.dart';
 import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
 import 'package:intl/intl.dart';
+import 'package:tasktracker/main.dart';
 import 'User.dart' as User;
 DateFormat dateFormat = DateFormat("yyyy-MM-dd HH:mm:ss");
 DateFormat durationFormat = DateFormat("HH:mm:ss");
@@ -292,16 +293,21 @@ class _NewActivity extends State<NewActivity> {
   }
 
   void add_action() async{
-
     print('adding Task Type : $selectedCat at $startTime - $endTime');
     bool failed=false;
-    await User.UserOperations.addActivity(selectedCat,startTime.toString(), endTime.toString(),metadata:metadataController.text, onOverlap: (overlapCount){
+    await User.UserOperations.addActivity(selectedCat,startTime, endTime,metadata:metadataController.text, onOverlap: (overlapCount){
       showAlertDialog(context, 'Error adding activity', 'Cannot add activity between ${dateFormat.format(startTime)} - ${dateFormat.format(endTime)}, $overlapCount activities are already added within this time range');
       failed=true;
     });
 
-    if(!failed)
-      Navigator.of(context).pop();
+    if(!failed) {
+      print("popping : ${navigatorKey.currentWidget?.toStringShort() ?? "n/a"}");
+      Navigator.of(navigatorKey.currentContext!).popUntil((route){
+        return route.isFirst;
+      });
+    }else{
+      print("Failed adding new activity");
+    }
   }
 }