diff --git a/lib/features/mailbox_dashboard/presentation/base_mailbox_dashboard_view.dart b/lib/features/mailbox_dashboard/presentation/base_mailbox_dashboard_view.dart index fed9861f3..e38501d6e 100644 --- a/lib/features/mailbox_dashboard/presentation/base_mailbox_dashboard_view.dart +++ b/lib/features/mailbox_dashboard/presentation/base_mailbox_dashboard_view.dart @@ -1,12 +1,11 @@ -import 'package:core/core.dart'; +import 'package:core/presentation/resources/image_paths.dart'; +import 'package:core/presentation/utils/responsive_utils.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; import 'package:tmail_ui_user/features/base/mixin/app_loader_mixin.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/mixin/filter_email_popup_menu_mixin.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/mixin/user_setting_popup_menu_mixin.dart'; -import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart'; abstract class BaseMailboxDashBoardView extends GetWidget with UserSettingPopupMenuMixin, FilterEmailPopupMenuMixin, @@ -15,34 +14,4 @@ abstract class BaseMailboxDashBoardView extends GetWidget(); final imagePaths = Get.find(); - - Widget buildQuickSearchFilterButton( - BuildContext context, QuickSearchFilter filter) { - return Obx(() { - final isQuickSearchFilterSelected = controller.checkQuickSearchFilterSelected( - quickSearchFilter: filter, - ); - - return Chip( - labelPadding: const EdgeInsets.only(top: 2, bottom: 2, right: 10), - label: Text( - filter.getTitle(context, receiveTimeType: controller.searchController.emailReceiveTimeType.value), - maxLines: 1, - overflow: TextOverflow.ellipsis, - style: filter.getTextStyle(quickSearchFilterSelected: isQuickSearchFilterSelected), - ), - avatar: SvgPicture.asset( - filter.getIcon(imagePaths, quickSearchFilterSelected: isQuickSearchFilterSelected), - width: 16, - height: 16, - fit: BoxFit.fill), - labelStyle: filter.getTextStyle(quickSearchFilterSelected: isQuickSearchFilterSelected), - backgroundColor: filter.getBackgroundColor(quickSearchFilterSelected: isQuickSearchFilterSelected), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(10), - side: BorderSide(color: filter.getBackgroundColor(quickSearchFilterSelected: isQuickSearchFilterSelected)), - ), - ); - }); - } } \ No newline at end of file diff --git a/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart index 5cbc1ac4e..ad5f69a9a 100644 --- a/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart +++ b/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart @@ -33,7 +33,6 @@ class AdvancedFilterController extends BaseController { final dateFilterSelectedFormAdvancedSearch = EmailReceiveTimeType.allTime.obs; final hasAttachment = false.obs; - final listEmailAddressInit = RxList(); final lastTextForm = ''.obs; final lastTextTo = ''.obs; TextEditingController subjectFilterInputController = TextEditingController(); @@ -84,10 +83,6 @@ class AdvancedFilterController extends BaseController { super.onReady(); } - void selectOpenAdvanceSearch() { - searchController.isAdvancedSearchViewOpen.toggle(); - } - void cleanSearchFilter(BuildContext context) { searchController.clearSearchFilter(); dateFilterSelectedFormAdvancedSearch.value = EmailReceiveTimeType.allTime; @@ -389,12 +384,12 @@ class AdvancedFilterController extends BaseController { void _registerWorkerListener() { _dashboardActionWorker = ever( - _mailboxDashBoardController.dashBoardAction, - (action) { - if (action is ClearAllFieldOfAdvancedSearchAction) { - _handleClearAllFieldOfAdvancedSearch(); - } + _mailboxDashBoardController.dashBoardAction, + (action) { + if (action is ClearAllFieldOfAdvancedSearchAction) { + _handleClearAllFieldOfAdvancedSearch(); } + } ); } diff --git a/lib/features/thread/presentation/thread_controller.dart b/lib/features/thread/presentation/thread_controller.dart index 0bafb3c15..595668d30 100644 --- a/lib/features/thread/presentation/thread_controller.dart +++ b/lib/features/thread/presentation/thread_controller.dart @@ -110,7 +110,6 @@ class ThreadController extends BaseController { final ScrollController listEmailController = ScrollController(); late Worker mailboxWorker, searchWorker, dashboardActionWorker, viewStateWorker, advancedSearchFilterWorker; - Set? get _sortOrder => {} ..add(EmailComparator(EmailComparatorProperty.receivedAt) ..setIsAscending(false));