fix: resolved conflicts

Author: SGI-CAPP-AT2

CONTRIBUTING.md

@@ -35,7 +35,7 @@ flutter doctor
 flutter pub get
 ```
 
-%. Run the app:
+5. Run the app:
 
 ```bash
 flutter run
@@ -60,9 +60,17 @@ ___
 ## Contributing
 
 1. Fork the Project
-2. Create your Feature Branch (`git checkout -b feature/AmazingFeature`)
-2. Create your Fix Branch (`git checkout -b fix/BugFix`)
-3. Add all files(`git add .`)
-3. Commit your Changes (`git commit -m 'Add some AmazingFeature'`)
-4. Push to the Branch (`git push origin feature/AmazingFeature`)
-5. Open a Pull Request in the **develop branch**
+2. Clone the Forked Repo. `git clone https://github.com/[username]/taskwarrior-flutter.git`
+3. Create a branch
+	- For your Feature Branch (`git checkout -b feature/AmazingFeature`)
+	- For your Fix Branch (`git checkout -b fix/BugFix`)
+4. Do the changes in that branch
+5. Add all files (`git add .`)
+	- Do Not add files generated by code editor of Android Studio IDE
+	- Only add files that related to your feature
+6. Commit your Changes (`git commit -m 'Add some AmazingFeature'`)
+7. Make sure branch is synced with main branch of `CCExtractor/taskwarrior-flutter`
+	- If not, please sync it and test again
+	- If any conflict, resolve according to feature and test again
+7. Push to the Branch (`git push origin feature/AmazingFeature`)
+8. Open a Pull Request for the `main` branch.

lib/app/modules/home/controllers/home_controller.dart

@@ -57,6 +57,7 @@ class HomeController extends GetxController {
   final RxBool showbtn = false.obs;
   late TaskDatabase taskdb;
   var tasks = <Tasks>[].obs;
+  final RxBool isRefreshing = false.obs;
 
   @override
   void onInit() {
@@ -79,21 +80,20 @@ class HomeController extends GetxController {
       handleHomeWidgetClicked();
     }
     fetchTasksFromDB();
-        everAll([
+    everAll([
       pendingFilter,
       waitingFilter,
       projectFilter,
       tagUnion,
       selectedSort,
       selectedTags,
     ], (_) {
-        if (Platform.isAndroid) {
-          WidgetController widgetController =
-              Get.put(WidgetController());
-          widgetController.fetchAllData();
+      if (Platform.isAndroid) {
+        WidgetController widgetController = Get.put(WidgetController());
+        widgetController.fetchAllData();
 
-          widgetController.update();
-        }
+        widgetController.update();
+      }
     });
   }
 
@@ -502,15 +502,12 @@ class HomeController extends GetxController {
   final projectcontroller = TextEditingController();
   var due = Rxn<DateTime>();
   RxString dueString = ''.obs;
-  final priorityList = ['L','X','M','H'];
+  final priorityList = ['L', 'X', 'M', 'H'];
   final priorityColors = [
     TaskWarriorColors.green,
     TaskWarriorColors.grey,
     TaskWarriorColors.yellow,
     TaskWarriorColors.red,
-
-
-
   ];
   RxString priority = 'X'.obs;
 
@@ -576,10 +573,9 @@ class HomeController extends GetxController {
   void initLanguageAndDarkMode() {
     isDarkModeOn.value = AppSettings.isDarkMode;
     selectedLanguage.value = AppSettings.selectedLanguage;
-    HomeWidget.saveWidgetData("themeMode", AppSettings.isDarkMode ? "dark" : "light");
-    HomeWidget.updateWidget(
-      androidName: "TaskWarriorWidgetProvider"
-    );
+    HomeWidget.saveWidgetData(
+        "themeMode", AppSettings.isDarkMode ? "dark" : "light");
+    HomeWidget.updateWidget(androidName: "TaskWarriorWidgetProvider");
     // print("called and value is${isDarkModeOn.value}");
   }
 
@@ -673,6 +669,7 @@ class HomeController extends GetxController {
       },
     );
   }
+
   late RxString uuid = "".obs;
   late RxBool isHomeWidgetTaskTapped = false.obs;
 
@@ -687,7 +684,7 @@ class HomeController extends GetxController {
             Get.toNamed(Routes.DETAIL_ROUTE, arguments: ["uuid", uuid.value]);
           });
         }
-      }else if(uri.host == "addclicked"){
+      } else if (uri.host == "addclicked") {
         showAddDialogAfterWidgetClick();
       }
     }
@@ -700,15 +697,17 @@ class HomeController extends GetxController {
           }
           debugPrint('uuid is $uuid');
           Get.toNamed(Routes.DETAIL_ROUTE, arguments: ["uuid", uuid.value]);
-        }else if(uri.host == "addclicked"){
+        } else if (uri.host == "addclicked") {
           showAddDialogAfterWidgetClick();
         }
       }
-      
     });
   }
+
   void showAddDialogAfterWidgetClick() {
-    Widget showDialog = taskchampion.value ? AddTaskToTaskcBottomSheet(homeController: this) : AddTaskBottomSheet(homeController: this);
+    Widget showDialog = taskchampion.value
+        ? AddTaskToTaskcBottomSheet(homeController: this)
+        : AddTaskBottomSheet(homeController: this);
     Get.dialog(showDialog);
   }
 }