TF-460 Separate the header of MailboxDashboard on the browser

2022-04-25 15:56:36 +07:00
parent d0a54a2652
commit 52fd989272
36 changed files with 1033 additions and 643 deletions
@@ -36,8 +36,8 @@ import 'package:tmail_ui_user/features/email/domain/usecases/move_to_mailbox_int
 import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_actions.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/remove_email_drafts_state.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/dashboard_action.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/mailbox_dashboard_controller.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_action.dart';
 import 'package:tmail_ui_user/features/thread/domain/constants/thread_constants.dart';
 import 'package:tmail_ui_user/features/thread/domain/model/get_email_request.dart';
 import 'package:tmail_ui_user/features/thread/domain/model/search_query.dart';
@@ -91,8 +91,6 @@ class ThreadController extends BaseController {

  final emailList = <PresentationEmail>[].obs;
  final emailListSearch = <PresentationEmail>[].obs;
-  final currentSelectMode = SelectMode.INACTIVE.obs;
-  final filterMessageOption = FilterMessageOption.all.obs;

  bool canLoadMore = true;
  bool canSearchMore = true;
@@ -131,50 +129,20 @@ class ThreadController extends BaseController {

  @override
  void onInit() {
+    _onMailboxDashBoardListener();
    super.onInit();
-    mailboxDashBoardController.selectedMailbox.listen((selectedMailbox) {
-      if (_currentMailboxId != selectedMailbox?.id) {
-        log('ThreadController::onReady(): selectMailbox: ${selectedMailbox?.name?.name}(${selectedMailbox?.id})');
-        _currentMailboxId = selectedMailbox?.id;
-        _resetToOriginalValue();
-        _getAllEmail();
-      }
-    });
-    super.onInit();
-    dispatchState(Right(LoadingState()));
  }

  @override
  void onReady() {
+    dispatchState(Right(LoadingState()));
    super.onReady();
-    mailboxDashBoardController.viewState.listen((state) {
-      state.map((success) {
-        if (success is SearchEmailNewQuery){
-          mailboxDashBoardController.clearState();
-          _searchEmail();
-        } else if (success is MarkAsEmailReadSuccess
-            || success is MoveToMailboxSuccess
-            || success is MarkAsStarEmailSuccess
-            || success is DeleteEmailPermanentlySuccess
-            || success is SaveEmailAsDraftsSuccess
-            || success is RemoveEmailDraftsSuccess
-            || success is SendEmailSuccess
-            || success is UpdateEmailDraftsSuccess) {
-          _refreshEmailChanges();
-        }
-      });
-    });
-
-    mailboxDashBoardController.searchState.listen((state) {
-      if (state.searchStatus == SearchStatus.INACTIVE) {
-        emailListSearch.clear();
-      }
-    });
  }

  @override
  void onClose() {
    mailboxDashBoardController.selectedMailbox.close();
+    mailboxDashBoardController.dashBoardAction.close();
    mailboxDashBoardController.viewState.close();
    mailboxDashBoardController.searchState.close();
    listEmailController.dispose();
@@ -214,6 +182,7 @@ class ThreadController extends BaseController {
  void onDone() {
    viewState.value.fold(
      (failure) {
+        log('ThreadController::onDone(): failure: $failure');
        if (failure is MarkAsMultipleEmailReadAllFailure
            || failure is MarkAsMultipleEmailReadFailure) {
          _markAsReadSelectedMultipleEmailFailure(failure);
@@ -229,6 +198,7 @@ class ThreadController extends BaseController {
      (success) {
        if (success is MarkAsMultipleEmailReadAllSuccess
            || success is MarkAsMultipleEmailReadHasSomeEmailFailure) {
+          log('ThreadController::onDone(): success: $success');
          _markAsReadSelectedMultipleEmailSuccess(success);
        } else if (success is MoveMultipleEmailToMailboxAllSuccess
            || success is MoveMultipleEmailToMailboxHasSomeEmailFailure) {
@@ -257,6 +227,69 @@ class ThreadController extends BaseController {
  @override
  void onError(error) {}

+  void _onMailboxDashBoardListener() {
+    mailboxDashBoardController.selectedMailbox.listen((selectedMailbox) {
+      log('ThreadController::_onMailboxDashBoardListener(): selectMailbox: ${selectedMailbox?.name?.name}(${selectedMailbox?.id})');
+      if (_currentMailboxId != selectedMailbox?.id) {
+        _currentMailboxId = selectedMailbox?.id;
+        _resetToOriginalValue();
+        _getAllEmail();
+      }
+    });
+
+    mailboxDashBoardController.searchState.listen((state) {
+      log('ThreadController::_onMailboxDashBoardListener(): searchState: $state');
+      if (state.searchStatus == SearchStatus.INACTIVE) {
+        emailListSearch.clear();
+      } else if (state.searchStatus == SearchStatus.ACTIVE) {
+        cancelSelectEmail();
+      }
+    });
+
+    mailboxDashBoardController.dashBoardAction.listen((action) {
+      log('ThreadController::_onMailboxDashBoardListener(): dashBoardAction: ${action.runtimeType}');
+      if (action is RefreshAllEmailAction) {
+        refreshAllEmail();
+        mailboxDashBoardController.clearDashBoardAction();
+      } else if (action is MarkAsReadAllEmailAction) {
+        markAsReadAllEmails();
+        mailboxDashBoardController.clearDashBoardAction();
+      } if (action is SelectionAllEmailAction) {
+        setSelectAllEmailAction();
+        mailboxDashBoardController.clearDashBoardAction();
+      } if (action is CancelSelectionAllEmailAction) {
+        cancelSelectEmail();
+        mailboxDashBoardController.clearDashBoardAction();
+      } if (action is FilterMessageAction) {
+        filterMessagesAction(action.context, action.option);
+        mailboxDashBoardController.clearDashBoardAction();
+      } if (action is HandleEmailActionTypeAction) {
+        log('ThreadController::_onMailboxDashBoardListener(): ${action.listEmailSelected.length}');
+        pressEmailSelectionAction(action.context, action.emailAction, action.listEmailSelected);
+        mailboxDashBoardController.clearDashBoardAction();
+      }
+    });
+
+    mailboxDashBoardController.viewState.listen((state) {
+      log('ThreadController::_onMailboxDashBoardListener(): viewState: $state');
+      state.map((success) {
+        if (success is SearchEmailNewQuery){
+          mailboxDashBoardController.clearState();
+          _searchEmail();
+        } else if (success is MarkAsEmailReadSuccess
+            || success is MoveToMailboxSuccess
+            || success is MarkAsStarEmailSuccess
+            || success is DeleteEmailPermanentlySuccess
+            || success is SaveEmailAsDraftsSuccess
+            || success is RemoveEmailDraftsSuccess
+            || success is SendEmailSuccess
+            || success is UpdateEmailDraftsSuccess) {
+          _refreshEmailChanges();
+        }
+      });
+    });
+  }
+
  void _getAllEmail() {
    if (_accountId != null) {
      _getAllEmailAction(_accountId!, mailboxId: _currentMailboxId);
@@ -303,7 +336,7 @@ class ThreadController extends BaseController {
      sort: _sortOrder,
      emailFilter: EmailFilter(
        filter: _getFilterCondition(),
-        filterOption: filterMessageOption.value,
+        filterOption: mailboxDashBoardController.filterMessageOption.value,
        mailboxId: mailboxId ?? _currentMailboxId),
      propertiesCreated: ThreadConstants.propertiesDefault,
      propertiesUpdated: ThreadConstants.propertiesUpdatedDefault,
@@ -311,7 +344,7 @@ class ThreadController extends BaseController {
  }

  EmailFilterCondition _getFilterCondition({bool isLoadMore = false}) {
-    switch(filterMessageOption.value) {
+    switch(mailboxDashBoardController.filterMessageOption.value) {
      case FilterMessageOption.all:
        return EmailFilterCondition(
          inMailbox: mailboxDashBoardController.selectedMailbox.value?.id,
@@ -350,7 +383,7 @@ class ThreadController extends BaseController {
        sort: _sortOrder,
        emailFilter: EmailFilter(
            filter: _getFilterCondition(),
-            filterOption: filterMessageOption.value,
+            filterOption: mailboxDashBoardController.filterMessageOption.value,
            mailboxId: _currentMailboxId),
        propertiesCreated: ThreadConstants.propertiesDefault,
        propertiesUpdated: ThreadConstants.propertiesUpdatedDefault,
@@ -359,6 +392,7 @@ class ThreadController extends BaseController {
  }

  void _refreshEmailChanges() {
+    log('ThreadController::_refreshEmailChanges(): ');
    if (isSearchActive()) {
      if (_accountId != null && searchQuery != null) {
        final limit = emailListSearch.isNotEmpty ? UnsignedInt(emailListSearch.length) : ThreadConstants.defaultLimit;
@@ -379,7 +413,7 @@ class ThreadController extends BaseController {
        propertiesCreated: ThreadConstants.propertiesDefault,
        propertiesUpdated: ThreadConstants.propertiesUpdatedDefault,
        inMailboxId: _currentMailboxId,
-        filterOption: filterMessageOption.value
+        filterOption: mailboxDashBoardController.filterMessageOption.value
      ));
    }
  }
@@ -439,16 +473,18 @@ class ThreadController extends BaseController {
    }

    if (_isUnSelectedAll()) {
-      currentSelectMode.value = SelectMode.INACTIVE;
+      mailboxDashBoardController.currentSelectMode.value = SelectMode.INACTIVE;
+      mailboxDashBoardController.listEmailSelected.clear();
    } else {
-      if (currentSelectMode.value == SelectMode.INACTIVE) {
-        currentSelectMode.value = SelectMode.ACTIVE;
+      if (mailboxDashBoardController.currentSelectMode.value == SelectMode.INACTIVE) {
+        mailboxDashBoardController.currentSelectMode.value = SelectMode.ACTIVE;
      }
+      mailboxDashBoardController.listEmailSelected.value = listEmailSelected;
    }
  }

  void enableSelectionEmail() {
-    currentSelectMode.value = SelectMode.ACTIVE;
+    mailboxDashBoardController.currentSelectMode.value = SelectMode.ACTIVE;
  }

  void setSelectAllEmailAction() {
@@ -457,7 +493,8 @@ class ThreadController extends BaseController {
    } else {
      emailList.value = emailList.map((email) => email.toSelectedEmail(selectMode: SelectMode.ACTIVE)).toList();
    }
-    currentSelectMode.value = SelectMode.ACTIVE;
+    mailboxDashBoardController.currentSelectMode.value = SelectMode.ACTIVE;
+    mailboxDashBoardController.listEmailSelected.value = listEmailSelected;
  }

  List<PresentationEmail> get listEmailSelected {
@@ -477,20 +514,28 @@ class ThreadController extends BaseController {
  }

  void cancelSelectEmail() {
-    if (isSearchActive()) {
-      emailListSearch.value = emailListSearch.map((email) => email.toSelectedEmail(selectMode: SelectMode.INACTIVE)).toList();
-    } else {
-      emailList.value = emailList.map((email) => email.toSelectedEmail(selectMode: SelectMode.INACTIVE)).toList();
+    emailListSearch.value = emailListSearch.map((email) => email.toSelectedEmail(selectMode: SelectMode.INACTIVE)).toList();
+    emailList.value = emailList.map((email) => email.toSelectedEmail(selectMode: SelectMode.INACTIVE)).toList();
+    mailboxDashBoardController.currentSelectMode.value = SelectMode.INACTIVE;
+    mailboxDashBoardController.listEmailSelected.clear();
+  }
+
+  void markAsReadAllEmails() {
+    final listEmail = isSearchActive() ? emailListSearch.allEmailUnread : emailList.allEmailUnread;
+    log('ThreadController::markAsReadAllEmails(): ${listEmail.length}');
+    if (listEmail.isNotEmpty) {
+      markAsReadSelectedMultipleEmail(listEmail);
    }
-    currentSelectMode.value = SelectMode.INACTIVE;
  }

  void markAsReadSelectedMultipleEmail(List<PresentationEmail> listPresentationEmail) {
+    final listEmail = listPresentationEmail.map((presentationEmail) => presentationEmail.toEmail()).toList();
+    log('ThreadController::markAsReadSelectedMultipleEmail(): listPresentationEmail: ${listPresentationEmail.length}');
    final readAction = listPresentationEmail.isAllEmailRead ? ReadActions.markAsUnread : ReadActions.markAsRead;
    final mailboxCurrent = mailboxDashBoardController.selectedMailbox.value;
    if (_accountId != null && mailboxCurrent != null) {
      cancelSelectEmail();
-      final listEmail = listPresentationEmail.map((presentationEmail) => presentationEmail.toEmail()).toList();
+      log('ThreadController::markAsReadSelectedMultipleEmail(): listEmail: ${listEmail.length}');
      consumeState(_markAsMultipleEmailReadInteractor.execute(_accountId!, listEmail, readAction));
    }
  }
@@ -515,7 +560,7 @@ class ThreadController extends BaseController {
          message: message,
          icon: readActions == ReadActions.markAsUnread ? _imagePaths.icUnreadToast : _imagePaths.icReadToast);
    }
-
+    log('ThreadController::_markAsReadSelectedMultipleEmailSuccess(): _refreshEmailChanges');
    _refreshEmailChanges();
  }

@@ -549,8 +594,15 @@ class ThreadController extends BaseController {
  void filterMessagesAction(BuildContext context, FilterMessageOption filterOption) {
    popBack();

-    final newFilterOption = filterMessageOption.value == filterOption ? FilterMessageOption.all : filterOption;
-    filterMessageOption.value = newFilterOption;
+    final newFilterOption = mailboxDashBoardController.filterMessageOption.value == filterOption
+        ? FilterMessageOption.all
+        : filterOption;
+
+    log('ThreadController::filterMessagesAction(): newFilterOption: $newFilterOption');
+
+    mailboxDashBoardController.filterMessageOption.value = newFilterOption;
+
+    log('ThreadController::filterMessagesAction(): filterMessageOption: ${mailboxDashBoardController.filterMessageOption}');

    _appToast.showToastWithIcon(
        currentOverlayContext!,
@@ -737,10 +789,10 @@ class ThreadController extends BaseController {
  }

  void markAsStarSelectedMultipleEmail(List<PresentationEmail> listPresentationEmail) {
+    final listEmail = listPresentationEmail.map((presentationEmail) => presentationEmail.toEmail()).toList();
    final starAction = listPresentationEmail.isAllEmailStarred ? MarkStarAction.unMarkStar : MarkStarAction.markStar;
    if (_accountId != null) {
      cancelSelectEmail();
-      final listEmail = listPresentationEmail.map((presentationEmail) => presentationEmail.toEmail()).toList();
      consumeState(_markAsStarMultipleEmailInteractor.execute(_accountId!, listEmail, starAction));
    }
  }
@@ -840,9 +892,10 @@ class ThreadController extends BaseController {
    _isLoadingMore = false;
  }

-  bool isSelectionEnabled() => currentSelectMode.value == SelectMode.ACTIVE;
+  bool isSelectionEnabled() => mailboxDashBoardController.currentSelectMode.value == SelectMode.ACTIVE;

  void pressEmailSelectionAction(BuildContext context, EmailActionType actionType, List<PresentationEmail> selectionEmail) {
+    log('ThreadController::pressEmailSelectionAction(): selectionEmail: ${selectionEmail.length}');
    switch(actionType) {
      case EmailActionType.markAsRead:
      case EmailActionType.markAsUnread:
@@ -1115,9 +1168,8 @@ class ThreadController extends BaseController {
  }

  void _deleteMultipleEmailsPermanently(List<PresentationEmail> emailList) {
-    cancelSelectEmail();
-
    final listEmailIds = emailList.map((email) => email.id).toList();
+    cancelSelectEmail();
    if ( _accountId != null && listEmailIds.isNotEmpty) {
      consumeState(_deleteMultipleEmailsPermanentlyInteractor.execute(_accountId!, listEmailIds));
    }
@@ -1188,7 +1240,7 @@ class ThreadController extends BaseController {
        mailboxRole: mailboxDashBoardController.selectedMailbox.value?.role);

    if (kIsWeb) {
-      mailboxDashBoardController.dispatchDashBoardAction(DashBoardAction.compose, arguments: arguments);
+      mailboxDashBoardController.dispatchAction(ComposeEmailAction(arguments: arguments));
    } else {
      push(AppRoutes.COMPOSER, arguments: arguments);
    }
@@ -1,15 +1,13 @@
 import 'package:core/core.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:get/get.dart';
 import 'package:model/model.dart';
+import 'package:tmail_ui_user/features/base/mixin/app_loader_mixin.dart';
 import 'package:tmail_ui_user/features/email/presentation/widgets/email_action_cupertino_action_sheet_action_builder.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/user_setting_popup_menu_mixin.dart';
 import 'package:tmail_ui_user/features/thread/domain/state/search_email_state.dart';
 import 'package:tmail_ui_user/features/thread/domain/state/search_more_email_state.dart';
-import 'package:tmail_ui_user/features/thread/presentation/extensions/filter_message_option_extension.dart';
 import 'package:tmail_ui_user/features/thread/presentation/model/delete_action_type.dart';
 import 'package:tmail_ui_user/features/thread/presentation/thread_controller.dart';
 import 'package:tmail_ui_user/features/thread/presentation/widgets/app_bar_thread_widget_builder.dart';
@@ -21,7 +19,7 @@ import 'package:tmail_ui_user/features/thread/presentation/widgets/search_app_ba
 import 'package:tmail_ui_user/features/thread/presentation/widgets/suggestion_box_widget.dart';
 import 'package:tmail_ui_user/main/localizations/app_localizations.dart';

-class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMixin {
+class ThreadView extends GetWidget<ThreadController> with AppLoaderMixin {

  final _responsiveUtils = Get.find<ResponsiveUtils>();
  final _imagePaths = Get.find<ImagePaths>();
@@ -44,11 +42,6 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
              child: Column(
                  crossAxisAlignment: CrossAxisAlignment.start,
                  children: [
-                    if (_responsiveUtils.isDesktop(context))
-                      Container(
-                          color: Colors.white,
-                          padding: const EdgeInsets.only(right: 10, top: 16, bottom: 10, left: 32),
-                          child: _buildHeader(context)),
                    Obx(() => !controller.isSearchActive() && !_responsiveUtils.isDesktop(context)
                      ? _buildAppBarNormal(context)
                      : const SizedBox.shrink()),
@@ -92,154 +85,6 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
    );
  }

-  Widget _buildHeader(BuildContext context) {
-    return Row(children: [
-      Obx(() => !controller.isSelectionEnabled() ? _buildListButtonTopBar(context) : const SizedBox.shrink()),
-      Obx(() => controller.isSelectionEnabled() ? _buildListButtonSelectionForDesktop(context) : const SizedBox.shrink()),
-      const SizedBox(width: 16),
-      Obx(() => !controller.isSearchActive() ? const Spacer() : const SizedBox.shrink()),
-      Expanded(child: _buildSearchInputFormForDesktop(context)),
-      _buildSearchButtonViewForDesktop(context),
-      Padding(
-          padding: const EdgeInsets.only(right: 16),
-          child: (AvatarBuilder()
-              ..text(controller.mailboxDashBoardController.userProfile.value?.getAvatarText() ?? '')
-              ..backgroundColor(Colors.white)
-              ..textColor(Colors.black)
-              ..context(context)
-              ..addOnTapAvatarActionWithPositionClick((position) => openUserSettingAction(
-                  context,
-                  position,
-                  popupMenuUserSettingActionTile(context, () => controller.mailboxDashBoardController.logoutAction())))
-              ..addBoxShadows([const BoxShadow(
-                  color: AppColor.colorShadowBgContentEmail,
-                  spreadRadius: 1, blurRadius: 1, offset: Offset(0, 0.5))])
-              ..size(48))
-            .build()),
-    ]);
-  }
-
-  Widget _buildListButtonTopBar(BuildContext context) {
-    return Row(children: [
-      if (!controller.isSearchActive())
-        (ButtonBuilder(_imagePaths.icRefresh)
-            ..key(const Key('button_reload_thread'))
-            ..decoration(BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.colorButtonHeaderThread))
-            ..paddingIcon(EdgeInsets.zero)
-            ..size(16)
-            ..radiusSplash(10)
-            ..padding(const EdgeInsets.symmetric(horizontal: 8, vertical: 8))
-            ..onPressActionClick(() => controller.refreshAllEmail()))
-          .build(),
-      if (!controller.isSearchActive()) const SizedBox(width: 16),
-      (ButtonBuilder(_imagePaths.icSelectAll)
-          ..key(const Key('button_select_all'))
-          ..decoration(BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.colorButtonHeaderThread))
-          ..paddingIcon(const EdgeInsets.only(right: 8))
-          ..size(16)
-          ..radiusSplash(10)
-          ..padding(const EdgeInsets.symmetric(horizontal: 12, vertical: 8))
-          ..textStyle(const TextStyle(fontSize: 12, color: AppColor.colorTextButtonHeaderThread))
-          ..onPressActionClick(() => controller.setSelectAllEmailAction())
-          ..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(() {
-            final listEmail = controller.isSearchActive()
-              ? controller.emailListSearch.allEmailUnread
-              : controller.emailList.allEmailUnread;
-
-            if (listEmail.isNotEmpty) {
-              controller.markAsReadSelectedMultipleEmail(listEmail);
-            }
-          })
-          ..text(AppLocalizations.of(context).mark_all_as_read, isVertical: false))
-        .build(),
-      if (!controller.isSearchActive()) const SizedBox(width: 16),
-      if (!controller.isSearchActive())
-        (ButtonBuilder(_imagePaths.icFilterWeb)
-            ..key(const Key('button_filter_messages'))
-            ..context(context)
-            ..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(TextStyle(
-                fontSize: 12,
-                color: controller.filterMessageOption.value == FilterMessageOption.all ? AppColor.colorTextButtonHeaderThread : AppColor.colorNameEmail,
-                fontWeight: controller.filterMessageOption.value == FilterMessageOption.all ? FontWeight.normal : FontWeight.w500))
-            ..addIconAction(Padding(
-                padding: const EdgeInsets.only(left: 8),
-                child: SvgPicture.asset(_imagePaths.icArrowDown, fit: BoxFit.fill)))
-            ..addOnPressActionWithPositionClick((position) =>
-                controller.openFilterMessagesForTablet(
-                    context,
-                    position,
-                    _popupMenuEmailActionTile(context, controller.filterMessageOption.value)))
-            ..text(controller.filterMessageOption.value == FilterMessageOption.all
-                ? AppLocalizations.of(context).filter_messages
-                : controller.filterMessageOption.value.getTitle(context), isVertical: false))
-          .build(),
-    ]);
-  }
-
-  Widget _buildListButtonSelectionForDesktop(BuildContext context) {
-    return Row(children: [
-      buildIconWeb(
-          icon: SvgPicture.asset(_imagePaths.icCloseComposer, color: AppColor.colorTextButton, fit: BoxFit.fill),
-          tooltip: AppLocalizations.of(context).cancel,
-          onTap: () => controller.cancelSelectEmail()),
-      Text(
-        AppLocalizations.of(context).count_email_selected(controller.listEmailSelected.length),
-        style: const TextStyle(fontSize: 17, fontWeight: FontWeight.w500, color: AppColor.colorTextButton),),
-      const SizedBox(width: 30),
-      buildIconWeb(
-          icon: SvgPicture.asset(controller.listEmailSelected.isAllEmailRead ? _imagePaths.icUnread : _imagePaths.icRead, fit: BoxFit.fill),
-          tooltip: controller.listEmailSelected.isAllEmailRead ? AppLocalizations.of(context).mark_as_unread : AppLocalizations.of(context).mark_as_read,
-          onTap: () => controller.pressEmailSelectionAction(
-              context,
-              controller.listEmailSelected.isAllEmailRead ? EmailActionType.markAsUnread : EmailActionType.markAsRead,
-              controller.listEmailSelected)),
-      buildIconWeb(
-          icon: SvgPicture.asset(controller.listEmailSelected.isAllEmailStarred ? _imagePaths.icUnStar : _imagePaths.icStar, fit: BoxFit.fill),
-          tooltip: controller.listEmailSelected.isAllEmailStarred ? AppLocalizations.of(context).un_star : AppLocalizations.of(context).star,
-          onTap: () => controller.pressEmailSelectionAction(
-              context,
-              controller.listEmailSelected.isAllEmailStarred ? EmailActionType.markAsStarred : EmailActionType.unMarkAsStarred,
-              controller.listEmailSelected)),
-      if (controller.currentMailbox?.isDrafts == false)
-        buildIconWeb(
-            icon: SvgPicture.asset(_imagePaths.icMove, fit: BoxFit.fill),
-            tooltip: AppLocalizations.of(context).move,
-            onTap: () => controller.pressEmailSelectionAction(context, EmailActionType.moveToMailbox, controller.listEmailSelected)),
-      if (controller.currentMailbox?.isDrafts == false)
-        buildIconWeb(
-            icon: SvgPicture.asset(controller.currentMailbox?.isSpam == true ? _imagePaths.icNotSpam : _imagePaths.icSpam,
-                fit: BoxFit.fill),
-            tooltip: controller.currentMailbox?.isSpam == true ? AppLocalizations.of(context).un_spam : AppLocalizations.of(context).mark_as_spam,
-            onTap: () => controller.currentMailbox?.isSpam == true
-                ? controller.pressEmailSelectionAction(context, EmailActionType.unSpam, controller.listEmailSelected)
-                : controller.pressEmailSelectionAction(context, EmailActionType.moveToSpam, controller.listEmailSelected)),
-      buildIconWeb(
-          icon: SvgPicture.asset(_imagePaths.icDelete, fit: BoxFit.fill),
-          tooltip: controller.currentMailbox?.isTrash == true
-              ? AppLocalizations.of(context).delete_permanently
-              : AppLocalizations.of(context).move_to_trash,
-          onTap: () => controller.currentMailbox?.isTrash == true
-              ? controller.deleteSelectionEmailsPermanently(context, DeleteActionType.multiple, selectedEmails: controller.listEmailSelected)
-              : controller.pressEmailSelectionAction(context, EmailActionType.moveToTrash, controller.listEmailSelected)),
-    ]);
-  }
-
  Widget _buildListButtonSelectionForMobile(BuildContext context) {
    return Obx(() {
      if (controller.isSelectionEnabled() && !_responsiveUtils.isDesktop(context) && controller.listEmailSelected.isNotEmpty) {
@@ -292,54 +137,6 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
    });
  }

-  Widget _buildSearchButtonViewForDesktop(BuildContext context) {
-    return Obx(() {
-      if (!controller.isSearchActive() && _responsiveUtils.isDesktop(context)) {
-        return Padding(
-            padding: const EdgeInsets.only(right: 16),
-            child: (SearchBarView(_imagePaths)
-                ..hintTextSearch(AppLocalizations.of(context).search_emails)
-                ..maxSizeWidth(240)
-                ..addOnOpenSearchViewAction(() => controller.enableSearch(context)))
-              .build());
-      } else {
-        return const SizedBox.shrink();
-      }
-    });
-  }
-
-  Widget _buildSearchInputFormForDesktop(BuildContext context) {
-    return Obx(() {
-      if (controller.isSearchActive() && _responsiveUtils.isDesktop(context)) {
-        return _buildSearchFormForDesktop(context);
-      } else {
-        return const SizedBox.shrink();
-      }
-    });
-  }
-
-  Widget _buildSearchFormForDesktop(BuildContext context) {
-    return (SearchAppBarWidget(
-          context,
-          _imagePaths,
-          _responsiveUtils,
-          controller.searchQuery,
-          controller.mailboxDashBoardController.searchFocus,
-          controller.mailboxDashBoardController.searchInputController,
-          suggestionSearch: controller.mailboxDashBoardController.suggestionSearch,)
-      ..addDecoration(const BoxDecoration(
-          borderRadius: BorderRadius.all(Radius.circular(10)),
-          color: AppColor.colorBgSearchBar))
-      ..setMargin(const EdgeInsets.only(right: 10))
-      ..setHeightSearchBar(45)
-      ..setHintText(AppLocalizations.of(context).search_mail)
-      ..addOnCancelSearchPressed(() => controller.disableSearch())
-      ..addOnClearTextSearchAction(() => controller.mailboxDashBoardController.clearSearchText())
-      ..addOnTextChangeSearchAction((query) => controller.mailboxDashBoardController.addSuggestionSearch(query))
-      ..addOnSearchTextAction((query) => controller.mailboxDashBoardController.searchEmail(context, query)))
-    .build();
-  }
-
  Widget _buildSearchForm(BuildContext context) {
    return (SearchAppBarWidget(
          context,
@@ -366,19 +163,18 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
              _responsiveUtils,
              controller.mailboxDashBoardController.selectedMailbox.value,
              controller.listEmailSelected,
-              controller.currentSelectMode.value,
-              controller.filterMessageOption.value)
+              controller.mailboxDashBoardController.currentSelectMode.value,
+              controller.mailboxDashBoardController.filterMessageOption.value)
          ..addOpenMailboxMenuActionClick(() => controller.openMailboxLeftMenu())
          ..addOnEditThreadAction(() => controller.enableSelectionEmail())
          ..addOnEmailSelectionAction((actionType, selectionEmail) =>
              controller.pressEmailSelectionAction(context, actionType, selectionEmail))
          ..addOnFilterEmailAction((filterMessageOption, position) =>
              _responsiveUtils.isMobileDevice(context)
-                ? controller.openFilterMessagesCupertinoActionSheet(
+                ? controller.openContextMenuAction(
                    context,
-                    _filterMessagesCupertinoActionTile(context, filterMessageOption),
-                    cancelButton: _buildCupertinoActionCancelButton(context))
-                : controller.openFilterMessagesForTablet(
+                    _filterMessagesCupertinoActionTile(context, filterMessageOption))
+                : controller.openPopupMenuAction(
                    context,
                    position,
                    _popupMenuEmailActionTile(context, filterMessageOption)))
@@ -423,15 +219,6 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
    ];
  }

-  Widget _buildCupertinoActionCancelButton(BuildContext context) {
-    return CupertinoActionSheetAction(
-      child: Text(
-        AppLocalizations.of(context).cancel,
-        style: const TextStyle(fontWeight: FontWeight.w500, fontSize: 20, color: AppColor.colorTextButton)),
-      onPressed: () => controller.closeFilterMessageActionSheet(),
-    );
-  }
-
  Widget _filterMessageWithAttachmentsAction(BuildContext context, FilterMessageOption optionCurrent) {
    return (FilterMessageCupertinoActionSheetActionBuilder(
          const Key('filter_attachment_action'),
@@ -502,36 +289,27 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
      (success) {
        if (controller.isSearchActive()) {
          return success is SearchingState
-              ? Padding(padding: const EdgeInsets.symmetric(vertical: 16), child: _loadingWidget)
+              ? Padding(padding: const EdgeInsets.symmetric(vertical: 16), child: loadingWidget)
              : const SizedBox.shrink();
        } else {
          return success is LoadingState
-              ? Padding(padding: const EdgeInsets.symmetric(vertical: 16), child: _loadingWidget)
+              ? Padding(padding: const EdgeInsets.symmetric(vertical: 16), child: loadingWidget)
              : const SizedBox.shrink();
        }
      }));
  }

-  Widget get _loadingWidget {
-    return const Center(child: Padding(
-        padding: EdgeInsets.zero,
-        child: SizedBox(
-            width: 24,
-            height: 24,
-            child: CupertinoActivityIndicator(color: AppColor.colorTextButton))));
-  }
-
  Widget _buildLoadingViewLoadMore() {
    return Obx(() => controller.viewState.value.fold(
      (failure) => const SizedBox.shrink(),
      (success) {
        if (controller.isSearchActive()) {
          return success is SearchingMoreState
-              ? Padding(padding: const EdgeInsets.only(bottom: 16), child: _loadingWidget)
+              ? Padding(padding: const EdgeInsets.only(bottom: 16), child: loadingWidget)
              : const SizedBox.shrink();
        } else {
          return success is LoadingMoreState
-              ? Padding(padding: const EdgeInsets.only(bottom: 16), child: _loadingWidget)
+              ? Padding(padding: const EdgeInsets.only(bottom: 16), child: loadingWidget)
              : const SizedBox.shrink();
        }
      }));
@@ -566,7 +344,7 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
  }

  Widget _buildResultListEmail(BuildContext context, List<PresentationEmail> listPresentationEmail) {
-    if (controller.currentSelectMode.value == SelectMode.INACTIVE) {
+    if (controller.mailboxDashBoardController.currentSelectMode.value == SelectMode.INACTIVE) {
      return listPresentationEmail.isNotEmpty
        ? RefreshIndicator(
            color: AppColor.colorTextButton,
@@ -608,7 +386,7 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
                context,
                listPresentationEmail[index],
                controller.currentMailbox?.role,
-                controller.currentSelectMode.value,
+                controller.mailboxDashBoardController.currentSelectMode.value,
                controller.mailboxDashBoardController.searchState.value.searchStatus,
                controller.searchQuery)
            ..addOnPressEmailActionClick((action, email) => controller.pressEmailAction(context, action, email))
@@ -98,7 +98,7 @@ class AppBarThreadWidgetBuilder {
        AppLocalizations.of(_context).count_email_selected(_listSelectionEmail.length),
        style: const TextStyle(fontSize: 17, fontWeight: FontWeight.w500, color: AppColor.colorTextButton))),
      buildIconWeb(
-          icon: SvgPicture.asset(_listSelectionEmail.isAllEmailRead ? _imagePaths.icUnread : _imagePaths.icRead, fit: BoxFit.fill),
+          icon: SvgPicture.asset(_listSelectionEmail.isAllEmailRead ? _imagePaths.icRead : _imagePaths.icUnread, fit: BoxFit.fill),
          tooltip: _listSelectionEmail.isAllEmailRead ? AppLocalizations.of(_context).unread : AppLocalizations.of(_context).read,
          onTap: () => _onEmailSelectionAction?.call(
              _listSelectionEmail.isAllEmailRead ? EmailActionType.markAsUnread : EmailActionType.markAsRead,
@@ -52,21 +52,31 @@ class EmailTileBuilder {
      data: ThemeData(splashColor: Colors.transparent, highlightColor: Colors.transparent),
      child: ResponsiveWidget(
        responsiveUtils: _responsiveUtils,
-        mobile: _buildListTile(),
-        desktop: Container(
-          margin: _selectModeAll == SelectMode.ACTIVE ? const EdgeInsets.only(top: 3, left: 8, right: 8) : EdgeInsets.zero,
-          padding: _selectModeAll == SelectMode.ACTIVE ? const EdgeInsets.symmetric(vertical: 8) : EdgeInsets.zero,
-          decoration: _selectModeAll == SelectMode.ACTIVE && _presentationEmail.selectMode == SelectMode.ACTIVE
-            ? BoxDecoration(
-                borderRadius: BorderRadius.circular(14),
-                color: AppColor.colorItemEmailSelectedDesktop)
-            : null,
-          child: _buildListTileForDesktop(),
-        ),
+        mobile: _wrapContainerForTile(_buildListTile()),
+        desktop: _wrapContainerForTile(_buildListTileForDesktop()),
      )
    );
  }

+  Widget _wrapContainerForTile(Widget tile) {
+    if (_responsiveUtils.isDesktop(_context)) {
+      return Container(
+        margin: _selectModeAll == SelectMode.ACTIVE ? EdgeInsets.only(top: 3, left: 8, right: 8) : EdgeInsets.zero,
+        padding: _selectModeAll == SelectMode.ACTIVE ? EdgeInsets.symmetric(vertical: 8) : EdgeInsets.zero,
+        decoration: _selectModeAll == SelectMode.ACTIVE && _presentationEmail.selectMode == SelectMode.ACTIVE
+            ? BoxDecoration(borderRadius: BorderRadius.circular(14), color: AppColor.colorItemEmailSelectedDesktop)
+            : null,
+        child: tile);
+    } else {
+      return Container(
+          margin: EdgeInsets.zero,
+          padding: EdgeInsets.only(bottom: 10, left: 16, right: 16),
+          decoration: BoxDecoration(borderRadius: BorderRadius.circular(0), color: Colors.white),
+          alignment: Alignment.center,
+          child: tile);
+    }
+  }
+
  Widget _buildListTile() {
    return Container(
        margin: EdgeInsets.zero,
@@ -51,54 +51,37 @@ class EmailTileBuilder {
      data: ThemeData(splashColor: Colors.transparent, highlightColor: Colors.transparent),
      child: ResponsiveWidget(
        responsiveUtils: _responsiveUtils,
-        mobile: Container(
+        mobile: _wrapContainerForTile(_buildListTile()),
+        tablet: _wrapContainerForTile(_buildListTileTablet()),
+        desktop: _wrapContainerForTile(_buildListTileForDesktop()),
+      )
+    );
+  }
+
+  Widget _wrapContainerForTile(Widget tile) {
+    if (_responsiveUtils.isDesktop(_context)) {
+      return Container(
+        margin: _selectModeAll == SelectMode.ACTIVE ? EdgeInsets.only(top: 3, left: 8, right: 8) : EdgeInsets.zero,
+        padding: _selectModeAll == SelectMode.ACTIVE ? EdgeInsets.symmetric(vertical: 8) : EdgeInsets.zero,
+        decoration: _selectModeAll == SelectMode.ACTIVE && _presentationEmail.selectMode == SelectMode.ACTIVE
+            ? BoxDecoration(borderRadius: BorderRadius.circular(14), color: AppColor.colorItemEmailSelectedDesktop)
+            : null,
+        child: tile,
+      );
+    } else {
+      return Container(
          margin: _selectModeAll == SelectMode.ACTIVE
-              ? const EdgeInsets.only(top: 3, left: 16, right: 16)
+              ? EdgeInsets.only(top: 3, left: 16, right: 16)
              : EdgeInsets.zero,
          padding: _selectModeAll == SelectMode.ACTIVE
-              ? const EdgeInsets.only(top: 8, bottom: 16, right: 8)
-              : const EdgeInsets.only(bottom: 10, left: 16, right: 16),
+              ? EdgeInsets.only(top: 8, bottom: 16, right: 8)
+              : EdgeInsets.only(bottom: 10, left: 16, right: 16),
          decoration: _selectModeAll == SelectMode.ACTIVE && _presentationEmail.selectMode == SelectMode.ACTIVE
              ? BoxDecoration(borderRadius: BorderRadius.circular(14), color: AppColor.colorItemEmailSelectedDesktop)
              : BoxDecoration(borderRadius: BorderRadius.circular(0), color: Colors.white),
          alignment: Alignment.center,
-          child: _buildListTile()),
-        tablet: Container(
-            margin: _selectModeAll == SelectMode.ACTIVE
-                ? const EdgeInsets.only(top: 3, left: 16, right: 16)
-                : EdgeInsets.zero,
-            padding: _selectModeAll == SelectMode.ACTIVE
-                ? const EdgeInsets.only(top: 8, bottom: 16, right: 8)
-                : const EdgeInsets.only(bottom: 10, left: 16, right: 16),
-            decoration: _selectModeAll == SelectMode.ACTIVE && _presentationEmail.selectMode == SelectMode.ACTIVE
-                ? BoxDecoration(borderRadius: BorderRadius.circular(14), color: AppColor.colorItemEmailSelectedDesktop)
-                : BoxDecoration(borderRadius: BorderRadius.circular(0), color: Colors.white),
-            alignment: Alignment.center,
-            child: _buildListTileTabletLarge()),
-        tabletLarge: Container(
-            margin: _selectModeAll == SelectMode.ACTIVE
-                ? const EdgeInsets.only(top: 3, left: 16, right: 16)
-                : EdgeInsets.zero,
-            padding: _selectModeAll == SelectMode.ACTIVE
-                ? const EdgeInsets.only(top: 8, bottom: 16, right: 8)
-                : const EdgeInsets.only(bottom: 10, left: 16, right: 16),
-            decoration: _selectModeAll == SelectMode.ACTIVE && _presentationEmail.selectMode == SelectMode.ACTIVE
-                ? BoxDecoration(borderRadius: BorderRadius.circular(14), color: AppColor.colorItemEmailSelectedDesktop)
-                : BoxDecoration(borderRadius: BorderRadius.circular(0), color: Colors.white),
-            alignment: Alignment.center,
-            child: _buildListTileTabletLarge()),
-        desktop: Container(
-          margin: _selectModeAll == SelectMode.ACTIVE ? const EdgeInsets.only(top: 3, left: 8, right: 8) : EdgeInsets.zero,
-          padding: _selectModeAll == SelectMode.ACTIVE ? const EdgeInsets.symmetric(vertical: 8) : EdgeInsets.zero,
-          decoration: _selectModeAll == SelectMode.ACTIVE && _presentationEmail.selectMode == SelectMode.ACTIVE
-            ? BoxDecoration(
-                borderRadius: BorderRadius.circular(14),
-                color: AppColor.colorItemEmailSelectedDesktop)
-            : null,
-          child: _buildListTileForDesktop(),
-        ),
-      )
-    );
+          child: tile);
+    }
  }

  Widget _buildListTile() {
@@ -208,7 +191,7 @@ class EmailTileBuilder {
    ]);
  }

-  Widget _buildListTileTabletLarge() {
+  Widget _buildListTileTablet() {
    return StatefulBuilder(builder: (BuildContext context, StateSetter setState) {
      return InkWell(
        onTap: () => _emailActionClick?.call(EmailActionType.preview, _presentationEmail),
@@ -523,11 +506,13 @@ class EmailTileBuilder {
    TextStyle? textStyle
  }) {
    if (_selectModeAll == SelectMode.ACTIVE) {
-      return Tooltip(
-          child: Padding(
-              padding: const EdgeInsets.all(12),
-              child: SvgPicture.asset(_presentationEmail.selectMode == SelectMode.ACTIVE ? _imagePaths.icSelected : _imagePaths.icUnSelected, fit: BoxFit.fill)),
-          message: AppLocalizations.of(_context).select);
+      return Padding(
+          padding: EdgeInsets.all(12),
+          child: SvgPicture.asset(
+              _presentationEmail.selectMode == SelectMode.ACTIVE
+                  ? _imagePaths.icSelected
+                  : _imagePaths.icUnSelected,
+              fit: BoxFit.fill));
    } else {
      return Container(
          width: iconSize ?? 48,