From 95721008c14649ff8f270f692179a203a06cb7e9 Mon Sep 17 00:00:00 2001 From: dab246 Date: Thu, 3 Nov 2022 01:23:47 +0700 Subject: [PATCH] TF-1063 Hide `MarkAsAllRead` button when search activated on web --- .../mailbox_dashboard_view_web.dart | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart index bf924949b..29cf1e195 100644 --- a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart +++ b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart @@ -336,20 +336,23 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView { ..onPressActionClick(() => controller.dispatchAction(SelectionAllEmailAction())) ..text(AppLocalizations.of(context).select_all, isVertical: false)) .build(), - const SizedBox(width: 16), - (ButtonBuilder(imagePaths.icMarkAllAsRead) - ..key(const Key('button_mark_all_as_read')) - ..decoration(BoxDecoration( - borderRadius: BorderRadius.circular(10), - color: AppColor.colorButtonHeaderThread)) - ..paddingIcon(const EdgeInsets.only(right: 8)) - ..size(16) - ..padding(const EdgeInsets.symmetric(horizontal: 12, vertical: 8)) - ..radiusSplash(10) - ..textStyle(const TextStyle(fontSize: 12, color: AppColor.colorTextButtonHeaderThread)) - ..onPressActionClick(() => controller.markAsReadMailboxAction()) - ..text(AppLocalizations.of(context).mark_all_as_read, isVertical: false)) - .build(), + if (!searchController.isSearchEmailRunning) + Padding( + padding: const EdgeInsets.only(left: 16), + child: (ButtonBuilder(imagePaths.icMarkAllAsRead) + ..key(const Key('button_mark_all_as_read')) + ..decoration(BoxDecoration( + borderRadius: BorderRadius.circular(10), + color: AppColor.colorButtonHeaderThread)) + ..paddingIcon(const EdgeInsets.only(right: 8)) + ..size(16) + ..padding(const EdgeInsets.symmetric(horizontal: 12, vertical: 8)) + ..radiusSplash(10) + ..textStyle(const TextStyle(fontSize: 12, color: AppColor.colorTextButtonHeaderThread)) + ..onPressActionClick(() => controller.markAsReadMailboxAction()) + ..text(AppLocalizations.of(context).mark_all_as_read, isVertical: false)) + .build(), + ), const SizedBox(width: 16), Obx(() => (ButtonBuilder(imagePaths.icFilterAdvanced) ..key(const Key('button_filter_messages')) @@ -459,10 +462,8 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView { } bool supportListButtonQuickSearchFilter(BuildContext context) { - return controller.searchController.isSearchActive() - && controller.searchController.searchIsActive.isTrue - && responsiveUtils.isWebDesktop(context) - && controller.dashboardRoute.value != DashboardRoutes.emailDetailed; + return controller.searchController.isSearchEmailRunning + && controller.dashboardRoute.value == DashboardRoutes.thread; } Widget _buildListButtonQuickSearchFilter(BuildContext context) { @@ -470,10 +471,10 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView { if (supportListButtonQuickSearchFilter(context)) { return Padding( padding: const EdgeInsets.only(right: 16, top: 16), - child: Row( - children: QuickSearchFilter.values - .map((filter) => _buildQuickSearchFilterButton(context, filter)) - .toList()), + child: Row(children: QuickSearchFilter.values + .map((filter) => _buildQuickSearchFilterButton(context, filter)) + .toList() + ), ); } else { return const SizedBox.shrink();