Skip to content

Commit 396e437

Browse files
committed
Redesigned add task dialogue
1 parent 49bb285 commit 396e437

File tree

7 files changed

+745
-24
lines changed

7 files changed

+745
-24
lines changed

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

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import 'package:taskwarrior/app/utils/taskfunctions/projects.dart';
3232
import 'package:taskwarrior/app/utils/taskfunctions/query.dart';
3333
import 'package:taskwarrior/app/utils/taskfunctions/tags.dart';
3434
import 'package:taskwarrior/app/utils/app_settings/app_settings.dart';
35+
import 'package:textfield_tags/textfield_tags.dart';
3536
import 'package:tutorial_coach_mark/tutorial_coach_mark.dart';
3637

3738
class HomeController extends GetxController {
@@ -45,11 +46,13 @@ class HomeController extends GetxController {
4546
final RxSet<String> selectedTags = <String>{}.obs;
4647
final RxList<Task> queriedTasks = <Task>[].obs;
4748
final RxList<Task> searchedTasks = <Task>[].obs;
49+
final RxList<DateTime?> selectedDates = List<DateTime?>.filled(4, null).obs;
4850
final RxMap<String, TagMetadata> pendingTags = <String, TagMetadata>{}.obs;
4951
final RxMap<String, ProjectNode> projects = <String, ProjectNode>{}.obs;
5052
final RxBool sortHeaderVisible = false.obs;
5153
final RxBool searchVisible = false.obs;
5254
final TextEditingController searchController = TextEditingController();
55+
final StringTagController stringTagController = StringTagController();
5356
late RxBool serverCertExists;
5457
final Rx<SupportedLanguage> selectedLanguage = SupportedLanguage.english.obs;
5558
final ScrollController scrollController = ScrollController();
@@ -78,21 +81,20 @@ class HomeController extends GetxController {
7881
handleHomeWidgetClicked();
7982
}
8083
fetchTasksFromDB();
81-
everAll([
84+
everAll([
8285
pendingFilter,
8386
waitingFilter,
8487
projectFilter,
8588
tagUnion,
8689
selectedSort,
8790
selectedTags,
8891
], (_) {
89-
if (Platform.isAndroid) {
90-
WidgetController widgetController =
91-
Get.put(WidgetController());
92-
widgetController.fetchAllData();
92+
if (Platform.isAndroid) {
93+
WidgetController widgetController = Get.put(WidgetController());
94+
widgetController.fetchAllData();
9395

94-
widgetController.update();
95-
}
96+
widgetController.update();
97+
}
9698
});
9799
}
98100

@@ -508,15 +510,12 @@ class HomeController extends GetxController {
508510
final projectcontroller = TextEditingController();
509511
var due = Rxn<DateTime>();
510512
RxString dueString = ''.obs;
511-
final priorityList = ['L','X','M','H'];
513+
final priorityList = ['L', 'X', 'M', 'H'];
512514
final priorityColors = [
513515
TaskWarriorColors.green,
514516
TaskWarriorColors.grey,
515517
TaskWarriorColors.yellow,
516518
TaskWarriorColors.red,
517-
518-
519-
520519
];
521520
RxString priority = 'X'.obs;
522521

@@ -582,10 +581,9 @@ class HomeController extends GetxController {
582581
void initLanguageAndDarkMode() {
583582
isDarkModeOn.value = AppSettings.isDarkMode;
584583
selectedLanguage.value = AppSettings.selectedLanguage;
585-
HomeWidget.saveWidgetData("themeMode", AppSettings.isDarkMode ? "dark" : "light");
586-
HomeWidget.updateWidget(
587-
androidName: "TaskWarriorWidgetProvider"
588-
);
584+
HomeWidget.saveWidgetData(
585+
"themeMode", AppSettings.isDarkMode ? "dark" : "light");
586+
HomeWidget.updateWidget(androidName: "TaskWarriorWidgetProvider");
589587
// print("called and value is${isDarkModeOn.value}");
590588
}
591589

@@ -679,6 +677,7 @@ class HomeController extends GetxController {
679677
},
680678
);
681679
}
680+
682681
late RxString uuid = "".obs;
683682
late RxBool isHomeWidgetTaskTapped = false.obs;
684683

@@ -693,7 +692,7 @@ class HomeController extends GetxController {
693692
Get.toNamed(Routes.DETAIL_ROUTE, arguments: ["uuid", uuid.value]);
694693
});
695694
}
696-
}else if(uri.host == "addclicked"){
695+
} else if (uri.host == "addclicked") {
697696
showAddDialogAfterWidgetClick();
698697
}
699698
}
@@ -706,15 +705,17 @@ class HomeController extends GetxController {
706705
}
707706
debugPrint('uuid is $uuid');
708707
Get.toNamed(Routes.DETAIL_ROUTE, arguments: ["uuid", uuid.value]);
709-
}else if(uri.host == "addclicked"){
708+
} else if (uri.host == "addclicked") {
710709
showAddDialogAfterWidgetClick();
711710
}
712711
}
713-
714712
});
715713
}
714+
716715
void showAddDialogAfterWidgetClick() {
717-
Widget showDialog = taskchampion.value ? AddTaskToTaskcBottomSheet(homeController: this) : AddTaskBottomSheet(homeController: this);
716+
Widget showDialog = taskchampion.value
717+
? AddTaskToTaskcBottomSheet(homeController: this)
718+
: AddTaskBottomSheet(homeController: this);
718719
Get.dialog(showDialog);
719720
}
720721
}

0 commit comments

Comments
 (0)