Polished

lib/Activities.dart

@@ -1,12 +1,10 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
-import 'main.dart';
+import 'main.dart' as Main;
 import 'newActivity.dart';
 import 'Data.dart';
 import 'User.dart' as User;
-import 'package:sn_progress_dialog/sn_progress_dialog.dart';
-
 class Activities extends StatefulWidget {
   const Activities({Key? key}) : super(key: key);
 
@@ -14,9 +12,10 @@ class Activities extends StatefulWidget {
   _ActivitiesState createState() => _ActivitiesState();
 }
 
-late ProgressDialog progressDialog;
+
 
 class _ActivitiesState extends State<Activities> {
+  //late ProgressDialog progressDialog;
   TextEditingController searchController = TextEditingController();
   FocusNode _focus = FocusNode();
   bool searching = false;
@@ -38,6 +37,7 @@ class _ActivitiesState extends State<Activities> {
     super.initState();
     _focus.addListener(_onFocusChange);
     UpdateList();
+    //init(context);
   }
 
   @override
@@ -47,10 +47,20 @@ class _ActivitiesState extends State<Activities> {
     _focus.removeListener(_onFocusChange);
     _focus.dispose();
   }
+  void UpdateList() async {
+    try {
+      //progressDialog.show(max: 100, msg: 'Loading Activities');
+    } catch (e) {}
+    await User.refreshUserData();
+    setState(() {});
+    try {
+      // progressDialog.update(value: 100);
+    } catch (e) {}
+  }
 
   @override
   Widget build(BuildContext context) {
-    progressDialog = ProgressDialog(context: context);
+   // progressDialog = ProgressDialog(context: context);
     return Scaffold(
         floatingActionButton: FloatingActionButton.extended(
             onPressed: () {
@@ -129,9 +139,9 @@ class _ActivitiesState extends State<Activities> {
                                 ),
                                 InkWell(
                                   onTap: () {
-                                    setState(() async {
-                                      await User.refreshUserData();
-                                      UpdateList();
+                                    UpdateList();
+                                    setState(() {
+
                                     });
                                   },
                                   child: Icon(Icons.refresh, size: 30),
@@ -140,7 +150,7 @@ class _ActivitiesState extends State<Activities> {
                             ),
                     ],
                   )),
-        drawer: navDrawer(context, 2),
+        drawer: Main.navDrawer(context, 2),
         body: Container(
             padding: EdgeInsets.all(0),
             child: SingleChildScrollView(
@@ -149,16 +159,6 @@ class _ActivitiesState extends State<Activities> {
             ))));
   }
 
-  void UpdateList() async {
-    try {
-      progressDialog.show(max: 100, msg: 'Loading Activities');
-    } catch (e) {}
-    await User.updateActList();
-    setState(() {});
-    try {
-      progressDialog.update(value: 100);
-    } catch (e) {}
-  }
 
   List<Widget> PrintTasks() {
     List<Widget> _tasks = [];
@@ -214,9 +214,10 @@ class _ActivitiesState extends State<Activities> {
       if (element.taskType.cat == null) {
         print('Got some null cat : ${element.taskType.name}');
       } else {
-        Color color = HexColor.fromHex(element.taskType.cat?.color ?? '#000000');
+        Color color = Main.HexColor.fromHex(element.taskType.cat?.color ?? '#000000');
         bool productive = element.taskType.cat?.productive ?? true;
         Widget task = ActivityCard(context, name, element.startTime, element.endTime, productive, color, element, totalMinutes[thisDate] ?? 0);
+       // print('Activity : ${name} ,sTime: ${element.startTime}, eTime: ${element.endTime}');
         _tasks.add(task);
       }
     }
@@ -252,7 +253,7 @@ class _ActivitiesState extends State<Activities> {
                     children: [
                       Container(
                         child: Align(
-                          child: FittedBox(fit: BoxFit.fitWidth,child: Text(MinutesToTimeString(prodActs),)),
+                          child: FittedBox(fit: BoxFit.fitWidth,child: Text(Main.MinutesToTimeString(prodActs),)),
                           alignment: Alignment.center,
                         ),
                         width: (prodPercentage) * 1.7,
@@ -261,7 +262,7 @@ class _ActivitiesState extends State<Activities> {
                       ),
                       Container(
                         child: Align(
-                          child: Text(MinutesToTimeString(unprodActs)),
+                          child: Text(Main.MinutesToTimeString(unprodActs)),
                           alignment: Alignment.center,
                         ),
                         width: (100 - prodPercentage) * 1.7,
@@ -400,7 +401,7 @@ class _ActivitiesState extends State<Activities> {
   }
 
   void DeleteSelectedTasks() async {
-    progressDialog.show(max: 100, msg: 'Deleteing ${selectedActivities.length} Activities');
+    //progressDialog.show(max: 100, msg: 'Deleteing ${selectedActivities.length} Activities');
     selectedActivities.forEach((element) async {
       await User.UserOperations.deleteActivity(element, bulk: true);
     });
@@ -411,7 +412,7 @@ class _ActivitiesState extends State<Activities> {
     selectedActivities = [];
     selecting = false;
     setState(() {
-      progressDialog.update(value: 100);
+     // progressDialog.update(value: 100);
     });
   }
 }