diff --git a/lib/app/models/filters.dart b/lib/app/models/filters.dart index a2296246..d47cf749 100644 --- a/lib/app/models/filters.dart +++ b/lib/app/models/filters.dart @@ -1,23 +1,38 @@ -import 'package:taskwarrior/app/services/tag_filter.dart'; +// lib/app/models/filters.dart + +import 'package:taskwarrior/app/models/tag_filters.dart'; + class Filters { const Filters({ required this.pendingFilter, required this.waitingFilter, + required this.completedFilter, + required this.deletedFilter, required this.togglePendingFilter, required this.toggleWaitingFilter, + required this.toggleCompletedFilter, + required this.toggleDeletedFilter, required this.tagFilters, required this.projects, required this.projectFilter, required this.toggleProjectFilter, + required this.hideBlocked, // ADD + required this.toggleHideBlocked, }); final bool pendingFilter; final bool waitingFilter; + final bool completedFilter; + final bool deletedFilter; final void Function() togglePendingFilter; final void Function() toggleWaitingFilter; + final void Function() toggleCompletedFilter; + final void Function() toggleDeletedFilter; final TagFilters tagFilters; final dynamic projects; final String projectFilter; final void Function(String) toggleProjectFilter; + final bool hideBlocked; + final void Function() toggleHideBlocked; } \ No newline at end of file diff --git a/lib/app/models/tag_filters.dart b/lib/app/models/tag_filters.dart new file mode 100644 index 00000000..29fa88cb --- /dev/null +++ b/lib/app/models/tag_filters.dart @@ -0,0 +1,25 @@ +// lib/app/models/tag_filters.dart + +class TagFilterMetadata { + const TagFilterMetadata({ + required this.display, + required this.selected, + }); + + final String display; + final bool selected; +} + +class TagFilters { + const TagFilters({ + required this.tagUnion, + required this.toggleTagUnion, + required this.tags, + required this.toggleTagFilter, + }); + + final bool tagUnion; + final void Function() toggleTagUnion; + final Map tags; + final void Function(String) toggleTagFilter; +} diff --git a/lib/app/modules/home/controllers/home_controller.dart b/lib/app/modules/home/controllers/home_controller.dart index b4ba1f6f..dea84b13 100644 --- a/lib/app/modules/home/controllers/home_controller.dart +++ b/lib/app/modules/home/controllers/home_controller.dart @@ -1,8 +1,12 @@ // ignore_for_file: use_build_context_synchronously, unrelated_type_equality_checks +import 'package:taskwarrior/app/utils/language/sentences.dart'; + import 'dart:collection'; import 'dart:io'; +import 'package:taskwarrior/app/routes/app_pages.dart'; + import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; @@ -18,7 +22,8 @@ import 'package:taskwarrior/app/models/tag_meta_data.dart'; import 'package:taskwarrior/app/modules/home/controllers/widget.controller.dart'; import 'package:taskwarrior/app/modules/splash/controllers/splash_controller.dart'; import 'package:taskwarrior/app/services/deep_link_service.dart'; -import 'package:taskwarrior/app/services/tag_filter.dart'; +import 'package:taskwarrior/app/models/tag_filters.dart'; + import 'package:taskwarrior/app/tour/filter_drawer_tour.dart'; import 'package:taskwarrior/app/tour/home_page_tour.dart'; import 'package:taskwarrior/app/tour/task_swipe_tour.dart'; @@ -40,12 +45,19 @@ import 'package:textfield_tags/textfield_tags.dart'; import 'package:taskwarrior/app/utils/themes/theme_extension.dart'; import 'package:tutorial_coach_mark/tutorial_coach_mark.dart'; + + class HomeController extends GetxController { final SplashController splashController = Get.find(); late Storage storage; + final RxBool taskServerBannerShown = false.obs; + final Sentences sentences = Sentences(); final RxBool pendingFilter = false.obs; final RxBool waitingFilter = false.obs; + final RxBool hideBlocked = false.obs; final RxString projectFilter = ''.obs; + final RxBool completedFilter = false.obs; + final RxBool deletedFilter = false.obs; final RxBool tagUnion = false.obs; final RxString selectedSort = ''.obs; final RxSet selectedTags = {}.obs; @@ -97,6 +109,8 @@ class HomeController extends GetxController { everAll([ pendingFilter, waitingFilter, + completedFilter, + deletedFilter, projectFilter, tagUnion, selectedSort, @@ -233,15 +247,34 @@ class HomeController extends GetxController { } void _refreshTasks() { - if (pendingFilter.value) { + + if (deletedFilter.value) { + queriedTasks.value = storage.data + .completedData() + .where((task) => task.status == 'deleted') + .toList(); + } else if (completedFilter.value) { + queriedTasks.value = storage.data + .completedData() + .where((task) => task.status == 'completed') + .toList(); + } else if (pendingFilter.value) { queriedTasks.value = storage.data .pendingData() .where((task) => task.status == 'pending') .toList(); } else { - queriedTasks.value = storage.data.completedData(); + queriedTasks.value = storage.data.pendingData(); } + if (hideBlocked.value) { + queriedTasks.value = queriedTasks + .where((task) => task.depends == null || task.depends!.isEmpty) + .toList(); + } + + + // Rest of the method stays the same... if (waitingFilter.value) { var currentTime = DateTime.now(); queriedTasks.value = queriedTasks @@ -343,6 +376,22 @@ class HomeController extends GetxController { _refreshTasks(); } + void toggleCompletedFilter() { + completedFilter.toggle(); + if (completedFilter.value) { + deletedFilter.value = false; + } + _refreshTasks(); + } + + void toggleDeletedFilter() { + deletedFilter.toggle(); + if (deletedFilter.value) { + completedFilter.value = false; + } + _refreshTasks(); + } + void toggleProjectFilter(String project) { Query(storage.tabs.tab()).toggleProjectFilter(project); projectFilter.value = Query(storage.tabs.tab()).projectFilter(); @@ -528,6 +577,44 @@ class HomeController extends GetxController { _refreshTasks(); } + void showTaskServerNotConfiguredBanner(BuildContext context) { + if (taskServerBannerShown.value) return; + + taskServerBannerShown.value = true; + final messenger = ScaffoldMessenger.of(context); + + messenger.clearMaterialBanners(); + + messenger.showMaterialBanner( + MaterialBanner( + content: Text(sentences.homePageTaskWarriorNotConfigured), + actions: [ + TextButton( + onPressed: () { + messenger.hideCurrentMaterialBanner(); + taskServerBannerShown.value = false; // ✅ RESET flag + Get.toNamed(Routes.TASKSERVER_SETUP), + }, + child: Text(sentences.homePageSetup), + ), + TextButton( + onPressed: () { + messenger.hideCurrentMaterialBanner(); + taskServerBannerShown.value = false; // ✅ RESET flag + }, + child: const Text('Dismiss'), + ), + ], + ), + ); + + Future.delayed(const Duration(seconds: 5), () { + messenger.hideCurrentMaterialBanner(); + taskServerBannerShown.value = false; // ✅ RESET flag + }); + } + + void renameTab({ required String tab, required String name, @@ -556,9 +643,14 @@ class HomeController extends GetxController { clientId = await CredentialsStorage.getClientId(); encryptionSecret = await CredentialsStorage.getEncryptionSecret(); if (value) { + if (clientId == null || encryptionSecret == null) { + showTaskServerNotConfiguredBanner(context); + return; + } + synchronize(context, false); - refreshTasks(clientId!, encryptionSecret!); - } else {} + refreshTasks(clientId, encryptionSecret); + } } RxBool syncOnStart = false.obs; @@ -609,15 +701,26 @@ class HomeController extends GetxController { tags: tags, toggleTagFilter: toggleTagFilter, ); + + // REPLACE this entire Filters() instantiation: var filters = Filters( pendingFilter: pendingFilter.value, waitingFilter: waitingFilter.value, + completedFilter: completedFilter.value, + deletedFilter: deletedFilter.value, togglePendingFilter: togglePendingFilter, toggleWaitingFilter: toggleWaitingFilter, + toggleCompletedFilter: toggleCompletedFilter, + toggleDeletedFilter: toggleDeletedFilter, projects: projects, projectFilter: projectFilter.value, toggleProjectFilter: toggleProjectFilter, tagFilters: tagFilters, + hideBlocked: hideBlocked.value, + toggleHideBlocked: () { + hideBlocked.value = !hideBlocked.value; + _refreshTasks(); + }, ); return filters; } diff --git a/lib/app/modules/home/views/filter_drawer_home_page.dart b/lib/app/modules/home/views/filter_drawer_home_page.dart index 085a969d..12d9e563 100644 --- a/lib/app/modules/home/views/filter_drawer_home_page.dart +++ b/lib/app/modules/home/views/filter_drawer_home_page.dart @@ -97,17 +97,20 @@ class FilterDrawer extends StatelessWidget { color: tColors.primaryTextColor, )), TextSpan( - text: filters.pendingFilter - ? SentenceManager( - currentLanguage: homeController - .selectedLanguage.value) - .sentences - .filterDrawerPending - : SentenceManager( - currentLanguage: homeController - .selectedLanguage.value) - .sentences - .filterDrawerCompleted, + text: filters.deletedFilter + ? 'Deleted' + : filters.completedFilter + ? SentenceManager( + currentLanguage: + homeController.selectedLanguage.value) + .sentences + .filterDrawerCompleted + : SentenceManager( + currentLanguage: + homeController.selectedLanguage.value) + .sentences + .filterDrawerPending, + style: TextStyle( fontFamily: FontFamily.poppins, fontSize: TaskWarriorFonts.fontSizeMedium, @@ -116,7 +119,16 @@ class FilterDrawer extends StatelessWidget { ], ), ), - onTap: filters.togglePendingFilter, + onTap: () { + if (filters.deletedFilter) { + filters.toggleDeletedFilter(); + } else if (filters.completedFilter) { + filters.toggleCompletedFilter(); + } else { + filters.togglePendingFilter(); + } + }, + textColor: tColors.primaryTextColor, ), ), @@ -137,31 +149,52 @@ class FilterDrawer extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - !filters.waitingFilter - ? SentenceManager( - currentLanguage: homeController - .selectedLanguage.value) - .sentences - .filterDrawerShowWaiting - : SentenceManager( - currentLanguage: homeController - .selectedLanguage.value) - .sentences - .filterDrawerHideWaiting, - style: TextStyle( - fontFamily: FontFamily.poppins, - fontSize: TaskWarriorFonts.fontSizeMedium, - color: tColors.primaryTextColor, - )), + 'Show Deleted', + style: TextStyle( + fontFamily: FontFamily.poppins, + fontSize: TaskWarriorFonts.fontSizeMedium, + color: tColors.primaryTextColor, + ), + ), Switch( - value: filters.waitingFilter, - onChanged: (_) => filters.toggleWaitingFilter(), - ) + value: filters.deletedFilter, + onChanged: (_) => filters.toggleDeletedFilter(), + ), ], ), ), ), ), + + Container( + decoration: BoxDecoration( + color: tileColor, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: TaskWarriorColors.borderColor), + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + 'Hide Blocked Tasks', + style: TextStyle( + fontFamily: FontFamily.poppins, + fontSize: TaskWarriorFonts.fontSizeMedium, + color: tColors.primaryTextColor, + ), + ), + Obx(() => Switch( + value: homeController.hideBlocked.value, + onChanged: (_) => filters.toggleHideBlocked(), + )), + ], + ), + ), + ), + const Divider(color: Color.fromARGB(0, 48, 46, 46)), + const Divider( color: Color.fromARGB(0, 48, 46, 46), ), diff --git a/lib/app/modules/manageTaskServer/controllers/manage_task_server_controller.dart b/lib/app/modules/manageTaskServer/controllers/manage_task_server_controller.dart index 2fe75484..02b478c2 100644 --- a/lib/app/modules/manageTaskServer/controllers/manage_task_server_controller.dart +++ b/lib/app/modules/manageTaskServer/controllers/manage_task_server_controller.dart @@ -24,7 +24,9 @@ class ManageTaskServerController extends GetxController { late RxString alias; Server? server; Credentials? credentials; + String? trust; final TextEditingController taskrcContentController = TextEditingController(); + RxBool isTaskDServerActive = true.obs; RxBool hideKey = true.obs; @@ -37,13 +39,12 @@ class ManageTaskServerController extends GetxController { alias = RxString(splashController.profilesMap[profile.value] ?? ''); var contents = rc.Taskrc(storage.home.home).readTaskrc(); if (contents != null) { - server = Taskrc.fromString(contents).server; - credentials = Taskrc.fromString(contents).credentials; - } - if (contents != null) { - server = Taskrc.fromString(contents).server; - credentials = Taskrc.fromString(contents).credentials; + final taskrc = Taskrc.fromString(contents); + server = taskrc.server; + credentials = taskrc.credentials; + trust = taskrc.trust; // ⬅️ ADD THIS } + configureCredentialString(); update(); } @@ -53,8 +54,7 @@ class ManageTaskServerController extends GetxController { var contents = await rootBundle.loadString('assets/.taskrc'); rc.Taskrc(storage.home.home).addTaskrc(contents); var taskrc = Taskrc.fromString(contents); - server = taskrc.server; - credentials = taskrc.credentials; + trust = taskrc.trust; for (var entry in { 'taskd.certificate': '.task/first_last.cert.pem', 'taskd.key': '.task/first_last.key.pem', @@ -96,12 +96,12 @@ class ManageTaskServerController extends GetxController { // Check if the server and credentials are present in the Taskrc object if (taskrc.server != null && taskrc.credentials != null) { - // Update the server and credentials variables - server = taskrc.server; credentials = taskrc.credentials; + trust = taskrc.trust; // ⬅️ ADD THIS update(); + // Handle the case when server or credentials are missing in the Taskrc object Navigator.pop(context); @@ -162,8 +162,16 @@ class ManageTaskServerController extends GetxController { if (credentialsString!.value.isNotEmpty && server.toString().isNotEmpty) { //print(credentialsString.value); - taskrcContentController.text = - "taskd.server=$server\ntaskd.credentials=${credentials!.org}/${credentials!.user}/$key"; + var taskrcContent = + "taskd.server=$server\n" + "taskd.credentials=${credentials!.org}/${credentials!.user}/$key"; + + if (trust?.isNotEmpty == true) { + taskrcContent += "\ntaskd.trust=$trust"; // ⬅️ ADD THIS + } + + taskrcContentController.text = taskrcContent; + isTaskDServerActive.value = false; } diff --git a/lib/app/modules/taskc_details/controllers/taskc_details_controller.dart b/lib/app/modules/taskc_details/controllers/taskc_details_controller.dart index 6116cf7e..a6db9b9e 100644 --- a/lib/app/modules/taskc_details/controllers/taskc_details_controller.dart +++ b/lib/app/modules/taskc_details/controllers/taskc_details_controller.dart @@ -60,7 +60,8 @@ class TaskcDetailsController extends GetxController { ? task.tags!.map((e) => e.toString()).toList().obs : [].obs; previousTags = tags.toList().obs; - depends = "".split(",").obs; + // For TaskForC block: + depends = (task.depends ?? []).obs; rtype = "".obs; recur = "".obs; annotations = [].obs; @@ -81,7 +82,9 @@ class TaskcDetailsController extends GetxController { ? task.tags!.map((e) => e.toString()).toList().obs : [].obs; previousTags = tags.toList().obs; - depends = "".split(",").obs; + + // For TaskForReplica block: + depends = (task.depends ?? []).obs; rtype = "".obs; recur = "".obs; annotations = [].obs; @@ -501,4 +504,51 @@ class TaskcDetailsController extends GetxController { ), ); } + Future showDependencyPicker() async { + // Get all pending tasks except current + final allTasks = await taskDatabase.fetchTasksFromDatabase(); + final BuildContext context = Get.context!; + TaskwarriorColorTheme tColors = + Theme.of(context).extension()!; + + await Get.dialog( + AlertDialog( + backgroundColor: tColors.secondaryBackgroundColor, + title: Text('Select Dependencies', style: TextStyle(color: tColors.primaryTextColor)), + content: StatefulBuilder( + builder: (context, setState) { + return SizedBox( + width: double.maxFinite, + child: ListView( + shrinkWrap: true, + children: allTasks + .where((t) => t.uuid != initialTask.uuid && t.status == 'pending') + .map((t) => CheckboxListTile( + title: Text(t.description, style: TextStyle(color: tColors.primaryTextColor)), + value: depends.contains(t.uuid), + onChanged: (checked) { + setState(() { + if (checked == true) { + depends.add(t.uuid!); + } else { + depends.remove(t.uuid); + } + hasChanges.value = true; + }); + }, + )) + .toList(), + ), + ); + }, + ), + actions: [ + TextButton( + onPressed: () => Get.back(), + child: Text('Done', style: TextStyle(color: tColors.primaryTextColor)), + ), + ], + ), + ); + } } diff --git a/lib/app/modules/taskc_details/views/taskc_details_view.dart b/lib/app/modules/taskc_details/views/taskc_details_view.dart index a3938743..728f2611 100644 --- a/lib/app/modules/taskc_details/views/taskc_details_view.dart +++ b/lib/app/modules/taskc_details/views/taskc_details_view.dart @@ -41,6 +41,7 @@ class TaskcDetailsView extends GetView { (value) => controller.updateField(controller.description, value), ), + _buildDependsDetail(context), _buildEditableDetail( context, '${SentenceManager(currentLanguage: AppSettings.selectedLanguage).sentences.project}:', @@ -169,6 +170,20 @@ class TaskcDetailsView extends GetView { ); } + Widget _buildDependsDetail(BuildContext context) { + return InkWell( + onTap: () => controller.showDependencyPicker(), + child: Obx(() => _buildDetail( + context, + 'Dependencies:', + controller.depends.isEmpty || + (controller.depends.length == 1 && controller.depends[0].isEmpty) + ? 'None' + : controller.depends.join(', '), + )), + ); + } + Widget _buildEditableDetail(BuildContext context, String label, String value, Function(String) onChanged) { return InkWell( diff --git a/lib/app/services/tag_filter.dart b/lib/app/services/tag_filter.dart index 2eaa7a56..81fddff8 100644 --- a/lib/app/services/tag_filter.dart +++ b/lib/app/services/tag_filter.dart @@ -1,29 +1,5 @@ import 'package:flutter/material.dart'; - - -class TagFilterMetadata { - const TagFilterMetadata({ - required this.display, - required this.selected, - }); - - final String display; - final bool selected; -} - -class TagFilters { - const TagFilters({ - required this.tagUnion, - required this.toggleTagUnion, - required this.tags, - required this.toggleTagFilter, - }); - - final bool tagUnion; - final void Function() toggleTagUnion; - final Map tags; - final void Function(String) toggleTagFilter; -} +import 'package:taskwarrior/app/models/tag_filters.dart'; class TagFiltersWrap extends StatelessWidget { const TagFiltersWrap(this.filters, {super.key}); @@ -37,32 +13,12 @@ class TagFiltersWrap extends StatelessWidget { children: [ FilterChip( onSelected: (_) => filters.toggleTagUnion(), - label: Text( - filters.tagUnion ? 'OR' : 'AND', - // style: GoogleFonts.poppins( - // color: AppSettings.isDarkMode - // ? TaskWarriorColors.black - // : TaskWarriorColors.white) - ), - // backgroundColor: AppSettings.isDarkMode - // ? TaskWarriorColors.kLightSecondaryBackgroundColor - // : TaskWarriorColors.ksecondaryBackgroundColor, + label: Text(filters.tagUnion ? 'OR' : 'AND'), ), for (var entry in filters.tags.entries) FilterChip( onSelected: (_) => filters.toggleTagFilter(entry.key), - label: Text( - entry.value.display, - // style: GoogleFonts.poppins( - // fontWeight: - // entry.value.selected ? TaskWarriorFonts.bold : null, - // color: AppSettings.isDarkMode - // ? TaskWarriorColors.black - // : TaskWarriorColors.white), - ), - // backgroundColor: AppSettings.isDarkMode - // ? TaskWarriorColors.kLightSecondaryBackgroundColor - // : TaskWarriorColors.kprimaryBackgroundColor, + label: Text(entry.value.display), ), ], ); diff --git a/lib/app/utils/add_task_dialogue/date_picker_input.dart b/lib/app/utils/add_task_dialogue/date_picker_input.dart index 17a817d5..c4a0d807 100644 --- a/lib/app/utils/add_task_dialogue/date_picker_input.dart +++ b/lib/app/utils/add_task_dialogue/date_picker_input.dart @@ -154,4 +154,4 @@ class _AddTaskDatePickerInputState extends State { } return null; } -} +} \ No newline at end of file diff --git a/lib/app/utils/taskserver/taskrc.dart b/lib/app/utils/taskserver/taskrc.dart index 36348b9a..67dd406b 100644 --- a/lib/app/utils/taskserver/taskrc.dart +++ b/lib/app/utils/taskserver/taskrc.dart @@ -7,6 +7,7 @@ class Taskrc { Taskrc({ this.server, this.credentials, + this.trust, // ignore: always_put_required_named_parameters_first required this.pemFilePaths, }); @@ -20,15 +21,20 @@ class Taskrc { factory Taskrc.fromMap(Map taskrc) { var server = taskrc['taskd.server']; var credentials = taskrc['taskd.credentials']; + var trust = taskrc['taskd.trust']; // ⬅️ ADD THIS LINE + return Taskrc( server: (server == null) ? null : Server.fromString(server), credentials: (credentials == null) ? null : Credentials.fromString(credentials), + trust: trust, // ⬅️ ADD THIS LINE pemFilePaths: PemFilePaths.fromTaskrc(taskrc), ); } + final Server? server; final Credentials? credentials; + final String? trust; final PemFilePaths pemFilePaths; } diff --git a/test/models/filters_test.dart b/test/models/filters_test.dart index 8d577349..c1ea77fd 100644 --- a/test/models/filters_test.dart +++ b/test/models/filters_test.dart @@ -1,9 +1,14 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:taskwarrior/app/models/filters.dart'; -import 'package:taskwarrior/app/services/tag_filter.dart'; +import 'package:taskwarrior/app/models/tag_filters.dart'; + void main() { group('Filters', () { + + late bool completedFilter; + late bool deletedFilter; + late Filters filters; late bool pendingFilter; late bool waitingFilter; @@ -12,6 +17,9 @@ void main() { late Map tags; setUp(() { + completedFilter = false; + deletedFilter = false; + pendingFilter = false; waitingFilter = false; projectFilter = 'TestProject'; @@ -24,12 +32,20 @@ void main() { filters = Filters( pendingFilter: pendingFilter, waitingFilter: waitingFilter, + completedFilter: completedFilter, + deletedFilter: deletedFilter, togglePendingFilter: () { pendingFilter = !pendingFilter; }, toggleWaitingFilter: () { waitingFilter = !waitingFilter; }, + toggleCompletedFilter: () { + completedFilter = !completedFilter; + }, + toggleDeletedFilter: () { + deletedFilter = !deletedFilter; + }, tagFilters: TagFilters( tagUnion: tagUnion, toggleTagUnion: () { @@ -49,6 +65,7 @@ void main() { projectFilter = project; }, ); + }); test('should correctly initialize with given parameters', () {