From 17340890edeb81cd6c7795babbf9a722bb0d21de Mon Sep 17 00:00:00 2001
From: Sewmina <Sewmina Dilshan>
Date: Fri, 8 Apr 2022 06:32:40 +0530
Subject: [PATCH] Todos Done!?

---
 lib/Todos.dart       |  2 +-
 lib/main.dart        |  2 +-
 lib/newActivity.dart | 11 ++++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/Todos.dart b/lib/Todos.dart
index 7da7067..d73aff8 100644
--- a/lib/Todos.dart
+++ b/lib/Todos.dart
@@ -268,7 +268,7 @@ class _TodosPageState extends State<TodosPage> {
                                 }
                                 setState(() {});
                               } else {
-                                Navigator.of(context).push(MaterialPageRoute(builder: (context)=> NewActivity(selectedTask: TaskType.getDisplayName(todo.task!), metadata: todo.metadata ,)));
+                                Navigator.of(context).push(MaterialPageRoute(builder: (context)=> NewActivity(selectedTask: TaskType.getDisplayName(todo.task!), metadata: todo.metadata ,todo: todo,)));
                                 setState(() {
 
                                 });
diff --git a/lib/main.dart b/lib/main.dart
index 5bfc6f0..7ebb11c 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -553,7 +553,7 @@ class _MyHomePageState extends State<MyHomePage> {
                       : InkWell(
                           onTap: () {
                             setState(() async {
-                              //await User.refreshUserData();
+                              await User.refreshUserData();
                               LoadStats();
                             });
                           },
diff --git a/lib/newActivity.dart b/lib/newActivity.dart
index 605879c..9b3d604 100644
--- a/lib/newActivity.dart
+++ b/lib/newActivity.dart
@@ -12,20 +12,22 @@ DateFormat dateTimeFormat = DateFormat("yyyy-MM-dd HH:mm:ss");
 DateFormat durationFormat = DateFormat("HH:mm:ss");
 
 class NewActivity extends StatefulWidget {
-  NewActivity({Key? key, this.selectedTask, this.sTime, this.eTime, this.metadata}) : super(key: key);
+  NewActivity({Key? key, this.selectedTask, this.sTime, this.eTime, this.metadata, this.todo}) : super(key: key);
+  late Todo? todo;
   late DateTime? sTime;
   late DateTime? eTime;
   late String? metadata;
   late String? selectedTask;
   @override
-  _NewActivity createState() => _NewActivity(eTime: eTime, sTime: sTime, selectedCat: selectedTask, metadata: metadata);
+  _NewActivity createState() => _NewActivity(eTime: eTime, sTime: sTime, selectedCat: selectedTask, metadata: metadata,todo:todo);
 }
 
 class _NewActivity extends State<NewActivity> {
   late DateTime init_sTime;
   late DateTime init_eTime;
   late String init_selectedTask;
-  _NewActivity({DateTime? eTime, DateTime? sTime, String? metadata, String? selectedCat}) {
+  Todo? todo;
+  _NewActivity({DateTime? eTime, DateTime? sTime, String? metadata, String? selectedCat, this.todo}) {
     editing = sTime != null && eTime != null && selectedCat != null;
 
     this.init_sTime = this.startTime = sTime ?? DateTime.now();
@@ -409,6 +411,9 @@ class _NewActivity extends State<NewActivity> {
 
     if (!failed) {
       print("popping : ${navigatorKey.currentWidget?.toStringShort() ?? "n/a"}");
+      if(todo!=null){
+        await User.UserOperations.deleteTodo(todo!.id);
+      }
       Navigator.of(navigatorKey.currentContext!).popUntil((route) {
         return route.isFirst;
       });