TF-4229 Add quick search label filter button in dashboard view

This commit is contained in:
dab246
2026-01-05 12:20:34 +07:00
committed by Dat H. Pham
parent a35b263dca
commit cc508c210a
10 changed files with 125 additions and 38 deletions
@@ -28,6 +28,7 @@ mixin PopupContextMenuActionMixin {
required OnContextMenuActionClick onContextMenuActionClick, required OnContextMenuActionClick onContextMenuActionClick,
Key? key, Key? key,
bool useGroupedActions = false, bool useGroupedActions = false,
double? maxHeight,
}) async { }) async {
return await showModalBottomSheet( return await showModalBottomSheet(
context: context, context: context,
@@ -42,6 +43,9 @@ mixin PopupContextMenuActionMixin {
), ),
backgroundColor: Colors.white, backgroundColor: Colors.white,
barrierColor: Colors.black.withValues(alpha: 0.2), barrierColor: Colors.black.withValues(alpha: 0.2),
constraints: BoxConstraints(
maxHeight: maxHeight ?? double.infinity,
),
builder: (_) { builder: (_) {
return PointerInterceptor( return PointerInterceptor(
child: Container( child: Container(
@@ -63,6 +67,7 @@ mixin PopupContextMenuActionMixin {
BuildContext context, BuildContext context,
RelativeRect position, RelativeRect position,
List<PopupMenuEntry> popupMenuItems, List<PopupMenuEntry> popupMenuItems,
{double? maxHeight}
) async { ) async {
return await showMenu( return await showMenu(
context: context, context: context,
@@ -74,7 +79,11 @@ mixin PopupContextMenuActionMixin {
shape: const RoundedRectangleBorder( shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6)), borderRadius: BorderRadius.all(Radius.circular(6)),
), ),
constraints: const BoxConstraints(maxWidth: 300, minWidth: 178), constraints: BoxConstraints(
maxWidth: 300,
minWidth: 178,
maxHeight: maxHeight ?? double.infinity,
),
items: popupMenuItems, items: popupMenuItems,
); );
} }
@@ -46,6 +46,7 @@ class _PopupMenuItemActionWidgetState extends State<PopupMenuItemActionWidget> {
Widget? iconWidget; Widget? iconWidget;
Widget? selectedIconWidget; Widget? selectedIconWidget;
bool isSelected = false; bool isSelected = false;
bool isArrangeRTL = true;
if (widget.menuAction is PopupMenuItemActionRequiredIcon) { if (widget.menuAction is PopupMenuItemActionRequiredIcon) {
final specificMenuAction = final specificMenuAction =
@@ -75,6 +76,7 @@ class _PopupMenuItemActionWidgetState extends State<PopupMenuItemActionWidget> {
); );
isSelected = isSelected =
specificMenuAction.selectedAction == widget.menuAction.action; specificMenuAction.selectedAction == widget.menuAction.action;
isArrangeRTL = specificMenuAction.isArrangeRTL;
} else if (widget.menuAction is PopupMenuItemActionRequiredFull) { } else if (widget.menuAction is PopupMenuItemActionRequiredFull) {
final specificMenuAction = final specificMenuAction =
widget.menuAction as PopupMenuItemActionRequiredFull; widget.menuAction as PopupMenuItemActionRequiredFull;
@@ -100,6 +102,7 @@ class _PopupMenuItemActionWidgetState extends State<PopupMenuItemActionWidget> {
); );
isSelected = isSelected =
specificMenuAction.selectedAction == widget.menuAction.action; specificMenuAction.selectedAction == widget.menuAction.action;
isArrangeRTL = specificMenuAction.isArrangeRTL;
} else if (widget.menuAction } else if (widget.menuAction
is PopupMenuItemActionRequiredIconWithMultipleSelected) { is PopupMenuItemActionRequiredIconWithMultipleSelected) {
final specificMenuAction = widget.menuAction final specificMenuAction = widget.menuAction
@@ -126,6 +129,7 @@ class _PopupMenuItemActionWidgetState extends State<PopupMenuItemActionWidget> {
); );
isSelected = isSelected =
specificMenuAction.selectedActions.contains(widget.menuAction.action); specificMenuAction.selectedActions.contains(widget.menuAction.action);
isArrangeRTL = specificMenuAction.isArrangeRTL;
} }
if (widget.menuAction is PopupMenuItemEmailAction && if (widget.menuAction is PopupMenuItemEmailAction &&
@@ -217,6 +221,11 @@ class _PopupMenuItemActionWidgetState extends State<PopupMenuItemActionWidget> {
child: Row( child: Row(
children: [ children: [
if (iconWidget != null) iconWidget, if (iconWidget != null) iconWidget,
if (!isArrangeRTL && selectedIconWidget != null)
Padding(
padding: const EdgeInsetsDirectional.only(end: 16),
child: selectedIconWidget,
),
Expanded( Expanded(
child: Text( child: Text(
widget.menuAction.actionName, widget.menuAction.actionName,
@@ -227,7 +236,7 @@ class _PopupMenuItemActionWidgetState extends State<PopupMenuItemActionWidget> {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
), ),
if (isSelected && selectedIconWidget != null) if (isArrangeRTL && isSelected && selectedIconWidget != null)
selectedIconWidget, selectedIconWidget,
], ],
), ),
@@ -177,6 +177,7 @@ import 'package:tmail_ui_user/features/push_notification/presentation/controller
import 'package:tmail_ui_user/features/push_notification/presentation/notification/local_notification_manager.dart'; import 'package:tmail_ui_user/features/push_notification/presentation/notification/local_notification_manager.dart';
import 'package:tmail_ui_user/features/push_notification/presentation/services/fcm_service.dart'; import 'package:tmail_ui_user/features/push_notification/presentation/services/fcm_service.dart';
import 'package:tmail_ui_user/features/push_notification/presentation/utils/fcm_utils.dart'; import 'package:tmail_ui_user/features/push_notification/presentation/utils/fcm_utils.dart';
import 'package:tmail_ui_user/features/search/email/presentation/mixin/search_label_filter_modal_mixin.dart';
import 'package:tmail_ui_user/features/sending_queue/domain/model/sending_email.dart'; import 'package:tmail_ui_user/features/sending_queue/domain/model/sending_email.dart';
import 'package:tmail_ui_user/features/sending_queue/domain/state/get_all_sending_email_state.dart'; import 'package:tmail_ui_user/features/sending_queue/domain/state/get_all_sending_email_state.dart';
import 'package:tmail_ui_user/features/sending_queue/domain/state/update_sending_email_state.dart'; import 'package:tmail_ui_user/features/sending_queue/domain/state/update_sending_email_state.dart';
@@ -226,7 +227,8 @@ class MailboxDashBoardController extends ReloadableController
with ContactSupportMixin, with ContactSupportMixin,
OwnEmailAddressMixin, OwnEmailAddressMixin,
SaaSPremiumMixin, SaaSPremiumMixin,
AiScribeMixin { AiScribeMixin,
SearchLabelFilterModalMixin {
final RemoveEmailDraftsInteractor _removeEmailDraftsInteractor = Get.find<RemoveEmailDraftsInteractor>(); final RemoveEmailDraftsInteractor _removeEmailDraftsInteractor = Get.find<RemoveEmailDraftsInteractor>();
final EmailReceiveManager _emailReceiveManager = Get.find<EmailReceiveManager>(); final EmailReceiveManager _emailReceiveManager = Get.find<EmailReceiveManager>();
@@ -2363,6 +2365,9 @@ class MailboxDashBoardController extends ReloadableController
case QuickSearchFilter.unread: case QuickSearchFilter.unread:
deleteUnreadSearchFilter(); deleteUnreadSearchFilter();
break; break;
case QuickSearchFilter.labels:
deleteQuickSearchFilter(filter: searchFilter);
break;
default: default:
break; break;
} }
@@ -15,6 +15,7 @@ import 'package:jmap_dart_client/jmap/mail/email/email_comparator.dart';
import 'package:jmap_dart_client/jmap/mail/email/email_comparator_property.dart'; import 'package:jmap_dart_client/jmap/mail/email/email_comparator_property.dart';
import 'package:jmap_dart_client/jmap/mail/email/email_filter_condition.dart'; import 'package:jmap_dart_client/jmap/mail/email/email_filter_condition.dart';
import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart'; import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
import 'package:labels/model/label.dart';
import 'package:model/email/presentation_email.dart'; import 'package:model/email/presentation_email.dart';
import 'package:model/extensions/email_filter_condition_extension.dart'; import 'package:model/extensions/email_filter_condition_extension.dart';
import 'package:model/mailbox/presentation_mailbox.dart'; import 'package:model/mailbox/presentation_mailbox.dart';
@@ -209,6 +210,7 @@ class SearchController extends BaseController with DateRangePickerMixin {
Option<UTCDate>? endDateOption, Option<UTCDate>? endDateOption,
Option<int>? positionOption, Option<int>? positionOption,
Option<EmailSortOrderType>? sortOrderTypeOption, Option<EmailSortOrderType>? sortOrderTypeOption,
Option<Label>? labelOption,
}) { }) {
searchEmailFilter.value = searchEmailFilter.value.copyWith( searchEmailFilter.value = searchEmailFilter.value.copyWith(
fromOption: fromOption, fromOption: fromOption,
@@ -226,6 +228,7 @@ class SearchController extends BaseController with DateRangePickerMixin {
endDateOption: endDateOption, endDateOption: endDateOption,
positionOption: positionOption, positionOption: positionOption,
sortOrderTypeOption: sortOrderTypeOption, sortOrderTypeOption: sortOrderTypeOption,
labelOption: labelOption,
); );
searchEmailFilter.refresh(); searchEmailFilter.refresh();
} }
@@ -238,6 +241,8 @@ class SearchController extends BaseController with DateRangePickerMixin {
PresentationMailbox? get mailboxFiltered => searchEmailFilter.value.mailbox; PresentationMailbox? get mailboxFiltered => searchEmailFilter.value.mailbox;
Label? get labelFiltered => searchEmailFilter.value.label;
Set<String> get listAddressOfToFiltered => searchEmailFilter.value.to; Set<String> get listAddressOfToFiltered => searchEmailFilter.value.to;
Set<String> get listAddressOfFromFiltered => searchEmailFilter.value.from; Set<String> get listAddressOfFromFiltered => searchEmailFilter.value.from;
@@ -1,7 +1,9 @@
import 'package:dartz/dartz.dart'; import 'package:dartz/dartz.dart';
import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart'; import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
import 'package:labels/model/label.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/dashboard_action.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/dashboard_action.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart';
extension SelectSearchFilterActionExtension on MailboxDashBoardController { extension SelectSearchFilterActionExtension on MailboxDashBoardController {
void selectStarredSearchFilter() { void selectStarredSearchFilter() {
@@ -31,4 +33,20 @@ extension SelectSearchFilterActionExtension on MailboxDashBoardController {
searchController.updateFilterEmail(unreadOption: const None()); searchController.updateFilterEmail(unreadOption: const None());
dispatchAction(StartSearchEmailAction()); dispatchAction(StartSearchEmailAction());
} }
void deleteQuickSearchFilter({required QuickSearchFilter filter}) {
switch (filter) {
case QuickSearchFilter.labels:
searchController.updateFilterEmail(labelOption: const None());
break;
default:
break;
}
dispatchAction(StartSearchEmailAction());
}
void onSelectLabelFilter(Label? newLabel) {
searchController.updateFilterEmail(labelOption: optionOf(newLabel));
dispatchAction(StartSearchEmailAction());
}
} }
@@ -22,6 +22,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/das
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/base_mailbox_dashboard_view.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/base_mailbox_dashboard_view.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_open_context_menu_extension.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_open_context_menu_extension.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_profile_setting_action_type_click_extension.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_profile_setting_action_type_click_extension.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/labels/handle_logic_label_extension.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/open_and_close_composer_extension.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/open_and_close_composer_extension.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/select_search_filter_action_extension.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/select_search_filter_action_extension.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
@@ -644,8 +645,13 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
Widget _buildListButtonQuickSearchFilter(BuildContext context) { Widget _buildListButtonQuickSearchFilter(BuildContext context) {
return Obx(() { return Obx(() {
if (controller.searchController.isSearchEmailRunning && final isSearchEmailRunning =
controller.dashboardRoute.value == DashboardRoutes.thread) { controller.searchController.isSearchEmailRunning;
final isThreadRoute =
controller.dashboardRoute.value == DashboardRoutes.thread;
final isLabelAvailable = controller.isLabelAvailable;
if (isSearchEmailRunning && isThreadRoute) {
return Padding( return Padding(
padding: const EdgeInsetsDirectional.only(end: 16), padding: const EdgeInsetsDirectional.only(end: 16),
child: Row( child: Row(
@@ -672,6 +678,14 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
children: [ children: [
_buildQuickSearchFilterButton(context, QuickSearchFilter.folder), _buildQuickSearchFilterButton(context, QuickSearchFilter.folder),
MailboxDashboardViewWebStyle.searchFilterSizeBoxMargin, MailboxDashboardViewWebStyle.searchFilterSizeBoxMargin,
if (isLabelAvailable)
...[
_buildQuickSearchFilterButton(
context,
QuickSearchFilter.labels,
),
MailboxDashboardViewWebStyle.searchFilterSizeBoxMargin,
],
_buildQuickSearchFilterButton(context, QuickSearchFilter.from), _buildQuickSearchFilterButton(context, QuickSearchFilter.from),
MailboxDashboardViewWebStyle.searchFilterSizeBoxMargin, MailboxDashboardViewWebStyle.searchFilterSizeBoxMargin,
_buildQuickSearchFilterButton(context, QuickSearchFilter.to), _buildQuickSearchFilterButton(context, QuickSearchFilter.to),
@@ -732,6 +746,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
final endDate = controller.searchController.endDateFiltered; final endDate = controller.searchController.endDateFiltered;
final receiveTimeType = controller.searchController.receiveTimeFiltered; final receiveTimeType = controller.searchController.receiveTimeFiltered;
final mailbox = controller.searchController.mailboxFiltered; final mailbox = controller.searchController.mailboxFiltered;
final label = controller.searchController.labelFiltered;
final listAddressOfTo = controller.searchController.listAddressOfToFiltered; final listAddressOfTo = controller.searchController.listAddressOfToFiltered;
final listHasKeywordFiltered = controller.searchController.listHasKeywordFiltered; final listHasKeywordFiltered = controller.searchController.listHasKeywordFiltered;
final unreadFiltered = controller.searchController.unreadFiltered; final unreadFiltered = controller.searchController.unreadFiltered;
@@ -769,13 +784,15 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
listAddressOfFrom: listAddressOfFrom, listAddressOfFrom: listAddressOfFrom,
listAddressOfTo: listAddressOfTo, listAddressOfTo: listAddressOfTo,
mailbox: mailbox, mailbox: mailbox,
label: label,
buttonPadding: buttonPadding, buttonPadding: buttonPadding,
backgroundColor: searchFilter == QuickSearchFilter.sortBy backgroundColor: searchFilter == QuickSearchFilter.sortBy
? isSelected ? isSelected
? AppColor.primaryColor.withValues(alpha: 0.06) ? AppColor.primaryColor.withValues(alpha: 0.06)
: AppColor.colorFilterMessageButton.withValues(alpha: 0.6) : AppColor.colorFilterMessageButton.withValues(alpha: 0.6)
: null, : null,
isContextMenuAlignEndButton: isFilterApplied, isContextMenuAlignEndButton:
searchFilter != QuickSearchFilter.labels && isFilterApplied,
onSelectSearchFilterAction: _onSelectSearchFilterAction, onSelectSearchFilterAction: _onSelectSearchFilterAction,
onDeleteSearchFilterAction: controller.onDeleteSearchFilterAction, onDeleteSearchFilterAction: controller.onDeleteSearchFilterAction,
); );
@@ -820,6 +837,19 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
case QuickSearchFilter.unread: case QuickSearchFilter.unread:
controller.selectUnreadSearchFilter(); controller.selectUnreadSearchFilter();
break; break;
case QuickSearchFilter.labels:
final listLabels = controller.labelController.labels;
final selectedLabel = controller.searchController.labelFiltered;
controller.openLabelsFilterModal(
context: context,
position: buttonPosition,
labels: listLabels,
selectedLabel: selectedLabel,
imagePaths: controller.imagePaths,
onSelectLabelsActions: controller.onSelectLabelFilter,
);
break;
default: default:
break; break;
} }
@@ -172,7 +172,9 @@ enum QuickSearchFilter {
if (responsiveUtils.isMobile(context)) { if (responsiveUtils.isMobile(context)) {
return false; return false;
} else { } else {
return this == QuickSearchFilter.dateTime || this == QuickSearchFilter.sortBy; return this == QuickSearchFilter.dateTime ||
this == QuickSearchFilter.sortBy ||
this == QuickSearchFilter.labels;
} }
} }
@@ -152,7 +152,7 @@ class SearchEmailFilter with EquatableMixin, OptionParamMixin {
hasKeyword.map((e) => EmailFilterCondition(hasKeyword: e)).toSet(), hasKeyword.map((e) => EmailFilterCondition(hasKeyword: e)).toSet(),
), ),
if (label != null) if (label != null)
EmailFilterCondition(hasKeyword: label!.keyword), EmailFilterCondition(hasKeyword: label!.keyword?.value),
if (moreFilterCondition != null && moreFilterCondition.hasCondition) if (moreFilterCondition != null && moreFilterCondition.hasCondition)
moreFilterCondition moreFilterCondition
}; };
@@ -62,7 +62,7 @@ mixin SearchLabelFilterModalMixin on PopupContextMenuActionMixin {
); );
}).toList(); }).toList();
openPopupMenuAction(context, position, popupMenuItems); openPopupMenuAction(context, position, popupMenuItems, maxHeight: 400);
} }
void openContextMenuLabelsFilter({ void openContextMenuLabelsFilter({
@@ -87,6 +87,7 @@ mixin SearchLabelFilterModalMixin on PopupContextMenuActionMixin {
popBack(); popBack();
onSelectLabelsActions(menuAction.action); onSelectLabelsActions(menuAction.action);
}, },
maxHeight: 400,
); );
} }
} }
@@ -267,35 +267,43 @@ class SearchEmailView extends GetWidget<SearchEmailController>
scrollbars: false scrollbars: false
), ),
scrollController: controller.listSearchFilterScrollController, scrollController: controller.listSearchFilterScrollController,
child: ListView( child: Obx(() {
key: const Key('search_filter_list_view'), final isLabelAvailable =
scrollDirection: Axis.horizontal, controller.mailboxDashBoardController.isLabelAvailable;
shrinkWrap: true,
controller: controller.listSearchFilterScrollController, return ListView(
padding: SearchEmailViewStyle.getListSearchFilterButtonPadding( key: const Key('search_filter_list_view'),
context, scrollDirection: Axis.horizontal,
controller.responsiveUtils shrinkWrap: true,
), controller: controller.listSearchFilterScrollController,
children: [ padding: SearchEmailViewStyle.getListSearchFilterButtonPadding(
_buildSearchFilterButton(context, QuickSearchFilter.folder), context,
SearchEmailViewStyle.searchFilterSizeBoxMargin, controller.responsiveUtils
_buildSearchFilterButton(context, QuickSearchFilter.labels), ),
SearchEmailViewStyle.searchFilterSizeBoxMargin, children: [
_buildSearchFilterButton(context, QuickSearchFilter.from), _buildSearchFilterButton(context, QuickSearchFilter.folder),
SearchEmailViewStyle.searchFilterSizeBoxMargin, SearchEmailViewStyle.searchFilterSizeBoxMargin,
_buildSearchFilterButton(context, QuickSearchFilter.to), if (isLabelAvailable)
SearchEmailViewStyle.searchFilterSizeBoxMargin, ...[
_buildSearchFilterButton(context, QuickSearchFilter.hasAttachment), _buildSearchFilterButton(context, QuickSearchFilter.labels),
SearchEmailViewStyle.searchFilterSizeBoxMargin, SearchEmailViewStyle.searchFilterSizeBoxMargin,
_buildSearchFilterButton(context, QuickSearchFilter.dateTime), ],
SearchEmailViewStyle.searchFilterSizeBoxMargin, _buildSearchFilterButton(context, QuickSearchFilter.from),
_buildSearchFilterButton(context, QuickSearchFilter.starred), SearchEmailViewStyle.searchFilterSizeBoxMargin,
SearchEmailViewStyle.searchFilterSizeBoxMargin, _buildSearchFilterButton(context, QuickSearchFilter.to),
_buildSearchFilterButton(context, QuickSearchFilter.unread), SearchEmailViewStyle.searchFilterSizeBoxMargin,
SearchEmailViewStyle.searchFilterSizeBoxMargin, _buildSearchFilterButton(context, QuickSearchFilter.hasAttachment),
_buildSearchFilterButton(context, QuickSearchFilter.sortBy), SearchEmailViewStyle.searchFilterSizeBoxMargin,
], _buildSearchFilterButton(context, QuickSearchFilter.dateTime),
), SearchEmailViewStyle.searchFilterSizeBoxMargin,
_buildSearchFilterButton(context, QuickSearchFilter.starred),
SearchEmailViewStyle.searchFilterSizeBoxMargin,
_buildSearchFilterButton(context, QuickSearchFilter.unread),
SearchEmailViewStyle.searchFilterSizeBoxMargin,
_buildSearchFilterButton(context, QuickSearchFilter.sortBy),
],
);
}),
), ),
), ),
), ),