TF-3002 [WEB] Remove BuildContext in dashboard action

This commit is contained in:
dab246
2024-09-16 13:14:25 +07:00
committed by Dat H. Pham
parent e1357b1a79
commit f7ff775a10
15 changed files with 113 additions and 193 deletions
@@ -1,35 +0,0 @@
import 'package:core/presentation/state/success.dart';
import 'package:flutter/widgets.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/session/session.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.dart';
class SaveToDraftViewEvent extends ViewEvent {
final BuildContext context;
final Session session;
final AccountId accountId;
final MailboxId draftMailboxId;
final EmailId? emailIdEditing;
final ComposerArguments? arguments;
SaveToDraftViewEvent({
required this.context,
required this.session,
required this.accountId,
required this.draftMailboxId,
this.emailIdEditing,
this.arguments,
});
@override
List<Object?> get props => [
context,
session,
accountId,
draftMailboxId,
emailIdEditing,
arguments,
];
}
@@ -1,5 +1,4 @@
import 'package:flutter/cupertino.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart'; import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart'; import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
import 'package:model/email/email_action_type.dart'; import 'package:model/email/email_action_type.dart';
@@ -26,36 +25,33 @@ class CancelSelectionAllEmailAction extends DashBoardAction {}
class FilterMessageAction extends DashBoardAction { class FilterMessageAction extends DashBoardAction {
final BuildContext context;
final FilterMessageOption option; final FilterMessageOption option;
FilterMessageAction(this.context, this.option); FilterMessageAction(this.option);
@override @override
List<Object?> get props => [context, option]; List<Object?> get props => [option];
} }
class HandleEmailActionTypeAction extends DashBoardAction { class HandleEmailActionTypeAction extends DashBoardAction {
final BuildContext context;
final EmailActionType emailAction; final EmailActionType emailAction;
final List<PresentationEmail> listEmailSelected; final List<PresentationEmail> listEmailSelected;
HandleEmailActionTypeAction(this.context, this.listEmailSelected, this.emailAction); HandleEmailActionTypeAction(this.listEmailSelected, this.emailAction);
@override @override
List<Object> get props => [context, listEmailSelected, emailAction]; List<Object> get props => [listEmailSelected, emailAction];
} }
class OpenEmailDetailedFromSuggestionQuickSearchAction extends DashBoardAction { class OpenEmailDetailedFromSuggestionQuickSearchAction extends DashBoardAction {
final BuildContext context;
final PresentationEmail presentationEmail; final PresentationEmail presentationEmail;
OpenEmailDetailedFromSuggestionQuickSearchAction(this.context, this.presentationEmail); OpenEmailDetailedFromSuggestionQuickSearchAction(this.presentationEmail);
@override @override
List<Object?> get props => [context, presentationEmail]; List<Object?> get props => [presentationEmail];
} }
class StartSearchEmailAction extends DashBoardAction { class StartSearchEmailAction extends DashBoardAction {
@@ -67,15 +63,7 @@ class StartSearchEmailAction extends DashBoardAction {
List<Object?> get props => [filter]; List<Object?> get props => [filter];
} }
class EmptyTrashAction extends DashBoardAction { class EmptyTrashAction extends DashBoardAction {}
final BuildContext context;
EmptyTrashAction(this.context);
@override
List<Object?> get props => [context];
}
class ClearSearchEmailAction extends DashBoardAction {} class ClearSearchEmailAction extends DashBoardAction {}
@@ -163,20 +151,6 @@ class CloseSearchEmailViewAction extends DashBoardAction {}
class CancelSelectionSearchEmailAction extends DashBoardAction {} class CancelSelectionSearchEmailAction extends DashBoardAction {}
class OpenAdvancedSearchViewAction extends DashBoardAction { class OpenAdvancedSearchViewAction extends DashBoardAction {}
final BuildContext context;
OpenAdvancedSearchViewAction(this.context); class ClearSearchFilterAppliedAction extends DashBoardAction {}
@override
List<Object?> get props => [context];
}
class ClearSearchFilterAppliedAction extends DashBoardAction {
final BuildContext context;
ClearSearchFilterAppliedAction(this.context);
@override
List<Object?> get props => [context];
}
@@ -78,7 +78,7 @@ class AdvancedFilterController extends BaseController {
super.onReady(); super.onReady();
} }
void clearSearchFilter(BuildContext context) { void clearSearchFilter() {
searchController.clearSearchFilter(); searchController.clearSearchFilter();
_resetAllToOriginalValue(); _resetAllToOriginalValue();
_clearAllTextFieldInput(); _clearAllTextFieldInput();
@@ -86,7 +86,7 @@ class AdvancedFilterController extends BaseController {
searchController.clearSortOrder(); searchController.clearSortOrder();
searchController.deactivateAdvancedSearch(); searchController.deactivateAdvancedSearch();
searchController.isAdvancedSearchViewOpen.value = false; searchController.isAdvancedSearchViewOpen.value = false;
_mailboxDashBoardController.searchEmail(context); _mailboxDashBoardController.searchEmail();
} }
void _updateFilterEmailFromAdvancedSearchView() { void _updateFilterEmailFromAdvancedSearchView() {
@@ -156,7 +156,7 @@ class AdvancedFilterController extends BaseController {
} }
} }
void applyAdvancedSearchFilter(BuildContext context) { void applyAdvancedSearchFilter() {
_updateFilterEmailFromAdvancedSearchView(); _updateFilterEmailFromAdvancedSearchView();
if (isAdvancedSearchHasApplied) { if (isAdvancedSearchHasApplied) {
searchController.activateAdvancedSearch(); searchController.activateAdvancedSearch();
@@ -167,7 +167,7 @@ class AdvancedFilterController extends BaseController {
searchController.updateFilterEmail(beforeOption: const None()); searchController.updateFilterEmail(beforeOption: const None());
} }
searchController.isAdvancedSearchViewOpen.value = false; searchController.isAdvancedSearchViewOpen.value = false;
_mailboxDashBoardController.searchEmail(context); _mailboxDashBoardController.searchEmail();
} }
Future<List<EmailAddress>> getAutoCompleteSuggestion(String word) async { Future<List<EmailAddress>> getAutoCompleteSuggestion(String word) async {
@@ -197,16 +197,20 @@ class AdvancedFilterController extends BaseController {
hasAttachment.isTrue; hasAttachment.isTrue;
} }
void initSearchFilterField(BuildContext context) { void initSearchFilterField() {
subjectFilterInputController.text = StringConvert.writeNullToEmpty(searchEmailFilter.subject); subjectFilterInputController.text = StringConvert.writeNullToEmpty(searchEmailFilter.subject);
hasKeyWordFilterInputController.text = StringConvert.writeNullToEmpty(searchEmailFilter.text?.value); hasKeyWordFilterInputController.text = StringConvert.writeNullToEmpty(searchEmailFilter.text?.value);
notKeyWordFilterInputController.text = StringConvert.writeNullToEmpty(searchEmailFilter.notKeyword.firstOrNull); notKeyWordFilterInputController.text = StringConvert.writeNullToEmpty(searchEmailFilter.notKeyword.firstOrNull);
dateFilterSelectedFormAdvancedSearch.value = searchEmailFilter.emailReceiveTimeType; dateFilterSelectedFormAdvancedSearch.value = searchEmailFilter.emailReceiveTimeType;
_destinationMailboxSelected = searchEmailFilter.mailbox; _destinationMailboxSelected = searchEmailFilter.mailbox;
if (searchEmailFilter.mailbox == null) { if (currentContext != null) {
mailBoxFilterInputController.text = AppLocalizations.of(context).allFolders; if (searchEmailFilter.mailbox == null) {
} else { mailBoxFilterInputController.text = AppLocalizations.of(currentContext!).allFolders;
mailBoxFilterInputController.text = StringConvert.writeNullToEmpty(searchEmailFilter.mailbox?.getDisplayName(context)); } else {
mailBoxFilterInputController.text = StringConvert.writeNullToEmpty(
searchEmailFilter.mailbox?.getDisplayName(currentContext!)
);
}
} }
hasAttachment.value = searchEmailFilter.hasAttachment; hasAttachment.value = searchEmailFilter.hasAttachment;
if (searchEmailFilter.from.isEmpty) { if (searchEmailFilter.from.isEmpty) {
@@ -423,9 +427,9 @@ class AdvancedFilterController extends BaseController {
_mailboxDashBoardController.dispatchAction(StartSearchEmailAction()); _mailboxDashBoardController.dispatchAction(StartSearchEmailAction());
} else if (action is OpenAdvancedSearchViewAction) { } else if (action is OpenAdvancedSearchViewAction) {
initSearchFilterField(action.context); initSearchFilterField();
} else if (action is ClearSearchFilterAppliedAction) { } else if (action is ClearSearchFilterAppliedAction) {
clearSearchFilter(action.context); clearSearchFilter();
} }
} }
); );
@@ -468,9 +472,9 @@ class AdvancedFilterController extends BaseController {
} }
} }
void onSearchAction(BuildContext context) { void onSearchAction() {
FocusScope.of(context).unfocus(); FocusManager.instance.primaryFocus?.unfocus();
applyAdvancedSearchFilter(context); applyAdvancedSearchFilter();
} }
@override @override
@@ -667,7 +667,7 @@ class MailboxDashBoardController extends ReloadableController with UserSettingPo
bool isSelectionEnabled() => currentSelectMode.value == SelectMode.ACTIVE; bool isSelectionEnabled() => currentSelectMode.value == SelectMode.ACTIVE;
void searchEmail(BuildContext context, {String? queryString}) { void searchEmail({String? queryString}) {
log('MailboxDashBoardController::searchEmail():'); log('MailboxDashBoardController::searchEmail():');
clearFilterMessageOption(); clearFilterMessageOption();
searchController.clearFilterSuggestion(); searchController.clearFilterSuggestion();
@@ -676,17 +676,18 @@ class MailboxDashBoardController extends ReloadableController with UserSettingPo
} }
searchController.updateFilterEmail(sortOrderOption: searchController.sortOrderFiltered.value.getSortOrder()); searchController.updateFilterEmail(sortOrderOption: searchController.sortOrderFiltered.value.getSortOrder());
dispatchAction(StartSearchEmailAction()); dispatchAction(StartSearchEmailAction());
KeyboardUtils.hideKeyboard(context); FocusManager.instance.primaryFocus?.unfocus();
if (_searchInsideEmailDetailedViewIsActive(context)) { if (_searchInsideEmailDetailedViewIsActive()) {
_closeEmailDetailedView(); _closeEmailDetailedView();
} }
_unSelectedMailbox(); _unSelectedMailbox();
} }
bool _searchInsideEmailDetailedViewIsActive(BuildContext context) { bool _searchInsideEmailDetailedViewIsActive() {
return PlatformInfo.isWeb return PlatformInfo.isWeb
&& responsiveUtils.isDesktop(context) && currentContext != null
&& dashboardRoute.value == DashboardRoutes.emailDetailed; && responsiveUtils.isDesktop(currentContext!)
&& dashboardRoute.value == DashboardRoutes.emailDetailed;
} }
void clearSearchEmail() { void clearSearchEmail() {
@@ -913,7 +914,6 @@ class MailboxDashBoardController extends ReloadableController with UserSettingPo
} }
void moveSelectedMultipleEmailToMailbox( void moveSelectedMultipleEmailToMailbox(
BuildContext context,
List<PresentationEmail> listEmails, List<PresentationEmail> listEmails,
PresentationMailbox currentMailbox PresentationMailbox currentMailbox
) async { ) async {
@@ -1864,8 +1864,8 @@ class MailboxDashBoardController extends ReloadableController with UserSettingPo
!responsiveUtils.isWebDesktop(context); !responsiveUtils.isWebDesktop(context);
} }
void emptyTrashAction(BuildContext context) { void emptyTrashAction() {
dispatchAction(EmptyTrashAction(context)); dispatchAction(EmptyTrashAction());
} }
void showAppDashboardAction() async { void showAppDashboardAction() async {
@@ -2487,11 +2487,11 @@ class MailboxDashBoardController extends ReloadableController with UserSettingPo
return listEmailAddress; return listEmailAddress;
} }
void searchEmailByFromFields(BuildContext context, EmailAddress emailAddress) { void searchEmailByFromFields(EmailAddress emailAddress) {
KeyboardUtils.hideKeyboard(context); FocusManager.instance.primaryFocus?.unfocus();
clearFilterMessageOption(); clearFilterMessageOption();
searchController.clearFilterSuggestion(); searchController.clearFilterSuggestion();
if (_searchInsideEmailDetailedViewIsActive(context)) { if (_searchInsideEmailDetailedViewIsActive()) {
_closeEmailDetailedView(); _closeEmailDetailedView();
} }
_unSelectedMailbox(); _unSelectedMailbox();
@@ -2820,13 +2820,13 @@ class MailboxDashBoardController extends ReloadableController with UserSettingPo
filterMessageOption.value != FilterMessageOption.all; filterMessageOption.value != FilterMessageOption.all;
} }
void openAdvancedSearchView(BuildContext context) { void openAdvancedSearchView() {
dispatchAction(OpenAdvancedSearchViewAction(context)); dispatchAction(OpenAdvancedSearchViewAction());
searchController.openAdvanceSearch(); searchController.openAdvanceSearch();
} }
void clearAllSearchFilterApplied(BuildContext context) { void clearAllSearchFilterApplied() {
dispatchAction(ClearSearchFilterAppliedAction(context)); dispatchAction(ClearSearchFilterAppliedAction());
} }
@override @override
@@ -108,7 +108,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
final presentationMailbox = controller.selectedMailbox.value; final presentationMailbox = controller.selectedMailbox.value;
if (controller.isEmptyTrashBannerEnabledOnWeb(context, presentationMailbox)) { if (controller.isEmptyTrashBannerEnabledOnWeb(context, presentationMailbox)) {
return BannerEmptyTrashWidget( return BannerEmptyTrashWidget(
onTapAction: () => controller.emptyTrashAction(context) onTapAction: controller.emptyTrashAction
); );
} else { } else {
return const SizedBox.shrink(); return const SizedBox.shrink();
@@ -236,7 +236,6 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
controller.dispatchAction(CancelSelectionAllEmailAction()), controller.dispatchAction(CancelSelectionAllEmailAction()),
onEmailActionTypeAction: (listEmails, actionType) => onEmailActionTypeAction: (listEmails, actionType) =>
controller.dispatchAction(HandleEmailActionTypeAction( controller.dispatchAction(HandleEmailActionTypeAction(
context,
listEmails, listEmails,
actionType actionType
)), )),
@@ -353,7 +352,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
imagePaths: controller.imagePaths, imagePaths: controller.imagePaths,
isSelected: filterMessageCurrent != FilterMessageOption.all, isSelected: filterMessageCurrent != FilterMessageOption.all,
onSelectFilterMessageOptionAction: _onSelectFilterMessageOptionAction, onSelectFilterMessageOptionAction: _onSelectFilterMessageOptionAction,
onDeleteFilterMessageOptionAction: (_) => _onDeleteFilterMessageOptionAction(context), onDeleteFilterMessageOptionAction: (_) => _onDeleteFilterMessageOptionAction(),
), ),
); );
} }
@@ -397,17 +396,15 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
context, context,
filterMessageCurrent, filterMessageCurrent,
(filterMessageSelected) { (filterMessageSelected) {
controller.dispatchAction(FilterMessageAction( controller.dispatchAction(FilterMessageAction(filterMessageSelected));
context,
filterMessageSelected));
}, },
isSearchEmailRunning: controller.searchController.isSearchEmailRunning isSearchEmailRunning: controller.searchController.isSearchEmailRunning
) )
); );
} }
void _onDeleteFilterMessageOptionAction(BuildContext context) { void _onDeleteFilterMessageOptionAction() {
controller.dispatchAction(FilterMessageAction(context, FilterMessageOption.all)); controller.dispatchAction(FilterMessageAction(FilterMessageOption.all));
} }
Widget _buildDownloadTaskStateWidget() { Widget _buildDownloadTaskStateWidget() {
@@ -509,7 +506,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
color: AppColor.primaryColor, color: AppColor.primaryColor,
fontSize: 13, fontSize: 13,
fontWeight: FontWeight.w500), fontWeight: FontWeight.w500),
onTapActionCallback: () => controller.clearAllSearchFilterApplied(context)) onTapActionCallback: controller.clearAllSearchFilterApplied)
else else
TMailButtonWidget.fromText( TMailButtonWidget.fromText(
text: AppLocalizations.of(context).advancedSearch, text: AppLocalizations.of(context).advancedSearch,
@@ -520,7 +517,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
color: AppColor.primaryColor, color: AppColor.primaryColor,
fontSize: 13, fontSize: 13,
fontWeight: FontWeight.w500), fontWeight: FontWeight.w500),
onTapActionCallback: () => controller.openAdvancedSearchView(context)) onTapActionCallback: controller.openAdvancedSearchView)
] ]
), ),
); );
@@ -45,7 +45,7 @@ class AdvancedSearchFilterFormBottomView extends GetWidget<AdvancedFilterControl
Expanded( Expanded(
child: _buildButton( child: _buildButton(
onAction: () { onAction: () {
controller.clearSearchFilter(context); controller.clearSearchFilter();
popBack(); popBack();
}, },
colorButton: Colors.white, colorButton: Colors.white,
@@ -59,7 +59,7 @@ class AdvancedSearchFilterFormBottomView extends GetWidget<AdvancedFilterControl
Expanded( Expanded(
child: _buildButton( child: _buildButton(
onAction: () { onAction: () {
controller.applyAdvancedSearchFilter(context); controller.applyAdvancedSearchFilter();
popBack(); popBack();
}, },
colorButton: AppColor.primaryColor, colorButton: AppColor.primaryColor,
@@ -77,7 +77,7 @@ class AdvancedSearchFilterFormBottomView extends GetWidget<AdvancedFilterControl
const Spacer(), const Spacer(),
_buildButton( _buildButton(
onAction: () { onAction: () {
controller.clearSearchFilter(context); controller.clearSearchFilter();
popBack(); popBack();
}, },
colorButton: Colors.transparent, colorButton: Colors.transparent,
@@ -90,7 +90,7 @@ class AdvancedSearchFilterFormBottomView extends GetWidget<AdvancedFilterControl
const SizedBox(width: 12), const SizedBox(width: 12),
_buildButton( _buildButton(
onAction: () { onAction: () {
controller.applyAdvancedSearchFilter(context); controller.applyAdvancedSearchFilter();
popBack(); popBack();
}, },
colorButton: AppColor.primaryColor, colorButton: AppColor.primaryColor,
@@ -38,7 +38,7 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController>
onShowFullListEmailAddressAction: controller.showFullEmailAddress, onShowFullListEmailAddressAction: controller.showFullEmailAddress,
onUpdateListEmailAddressAction: controller.updateListEmailAddress, onUpdateListEmailAddressAction: controller.updateListEmailAddress,
onSuggestionEmailAddress: controller.getAutoCompleteSuggestion, onSuggestionEmailAddress: controller.getAutoCompleteSuggestion,
onSearchAction: () => controller.onSearchAction.call(context), onSearchAction: controller.onSearchAction,
)), )),
Obx(() => TextFieldAutocompleteEmailAddressWeb( Obx(() => TextFieldAutocompleteEmailAddressWeb(
field: AdvancedSearchFilterField.to, field: AdvancedSearchFilterField.to,
@@ -51,7 +51,7 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController>
onShowFullListEmailAddressAction: controller.showFullEmailAddress, onShowFullListEmailAddressAction: controller.showFullEmailAddress,
onUpdateListEmailAddressAction: controller.updateListEmailAddress, onUpdateListEmailAddressAction: controller.updateListEmailAddress,
onSuggestionEmailAddress: controller.getAutoCompleteSuggestion, onSuggestionEmailAddress: controller.getAutoCompleteSuggestion,
onSearchAction: () => controller.onSearchAction.call(context), onSearchAction: controller.onSearchAction,
)), )),
_buildFilterField( _buildFilterField(
textEditingController: controller.subjectFilterInputController, textEditingController: controller.subjectFilterInputController,
@@ -287,7 +287,7 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController>
if (isSelectFormList) { if (isSelectFormList) {
onTap?.call(); onTap?.call();
} else { } else {
controller.onSearchAction.call(context); controller.onSearchAction();
popBack(); popBack();
} }
}, },
@@ -39,7 +39,7 @@ class IconOpenAdvancedSearchWidget extends StatelessWidget {
height: 16), height: 16),
onTap: () { onTap: () {
log('IconOpenAdvancedSearchWidget::build(): clicked'); log('IconOpenAdvancedSearchWidget::build(): clicked');
advancedFilterController.initSearchFilterField(context); advancedFilterController.initSearchFilterField();
searchController.openAdvanceSearch(); searchController.openAdvanceSearch();
}), }),
), ),
@@ -111,20 +111,20 @@ class SearchInputFormWidget extends StatelessWidget with AppLoaderMixin {
), ),
fetchRecentActionCallback: _searchController.getAllRecentSearchAction, fetchRecentActionCallback: _searchController.getAllRecentSearchAction,
itemRecentBuilder: (context, recent) => RecentSearchItemTileWidget(recent), itemRecentBuilder: (context, recent) => RecentSearchItemTileWidget(recent),
onRecentSelected: (recent) => _invokeSelectRecentItem(context, recent), onRecentSelected: _invokeSelectRecentItem,
suggestionsCallback: _dashBoardController.quickSearchEmails, suggestionsCallback: _dashBoardController.quickSearchEmails,
itemBuilder: (context, email) => EmailQuickSearchItemTileWidget(email, _dashBoardController.selectedMailbox.value), itemBuilder: (context, email) => EmailQuickSearchItemTileWidget(email, _dashBoardController.selectedMailbox.value),
onSuggestionSelected: (presentationEmail) => _invokeSelectSuggestionItem(context, presentationEmail), onSuggestionSelected: _invokeSelectSuggestionItem,
contactItemBuilder: (context, emailAddress) => ContactQuickSearchItem(emailAddress: emailAddress), contactItemBuilder: (context, emailAddress) => ContactQuickSearchItem(emailAddress: emailAddress),
contactSuggestionsCallback: _dashBoardController.getContactSuggestion, contactSuggestionsCallback: _dashBoardController.getContactSuggestion,
onContactSuggestionSelected: (emailAddress) => _invokeSelectContactSuggestion(context, emailAddress), onContactSuggestionSelected: _invokeSelectContactSuggestion,
) )
), ),
); );
}); });
} }
void _invokeSearchEmailAction(BuildContext context, String query) { void _invokeSearchEmailAction(String query) {
_searchController.searchFocus.unfocus(); _searchController.searchFocus.unfocus();
_searchController.enableSearch(); _searchController.enableSearch();
@@ -134,33 +134,32 @@ class SearchInputFormWidget extends StatelessWidget with AppLoaderMixin {
if (query.isNotEmpty || _searchController.listFilterOnSuggestionForm.isNotEmpty) { if (query.isNotEmpty || _searchController.listFilterOnSuggestionForm.isNotEmpty) {
_searchController.applyFilterSuggestionToSearchFilter(_dashBoardController.sessionCurrent?.username); _searchController.applyFilterSuggestionToSearchFilter(_dashBoardController.sessionCurrent?.username);
_dashBoardController.searchEmail(context, queryString: query); _dashBoardController.searchEmail(queryString: query);
} else { } else {
_dashBoardController.clearSearchEmail(); _dashBoardController.clearSearchEmail();
} }
} }
void _invokeSelectSuggestionItem(BuildContext context, PresentationEmail presentationEmail) { void _invokeSelectSuggestionItem(PresentationEmail presentationEmail) {
_dashBoardController.dispatchAction( _dashBoardController.dispatchAction(
OpenEmailDetailedFromSuggestionQuickSearchAction( OpenEmailDetailedFromSuggestionQuickSearchAction(
context,
presentationEmail presentationEmail
) )
); );
} }
void _invokeSelectRecentItem(BuildContext context, RecentSearch recent) { void _invokeSelectRecentItem(RecentSearch recent) {
_searchController.searchInputController.text = recent.value; _searchController.searchInputController.text = recent.value;
_searchController.searchFocus.unfocus(); _searchController.searchFocus.unfocus();
_searchController.enableSearch(); _searchController.enableSearch();
_searchController.applyFilterSuggestionToSearchFilter(_dashBoardController.sessionCurrent?.username); _searchController.applyFilterSuggestionToSearchFilter(_dashBoardController.sessionCurrent?.username);
_dashBoardController.searchEmail(context, queryString: recent.value); _dashBoardController.searchEmail(queryString: recent.value);
} }
Widget _buildShowAllResultButton(BuildContext context, String keyword) { Widget _buildShowAllResultButton(BuildContext context, String keyword) {
return InkWell( return InkWell(
onTap: () => _invokeSearchEmailAction(context, keyword.trim()), onTap: () => _invokeSearchEmailAction(keyword.trim()),
child: Padding( child: Padding(
padding: const EdgeInsets.all(12), padding: const EdgeInsets.all(12),
child: Row(children: [ child: Row(children: [
@@ -193,7 +192,7 @@ class SearchInputFormWidget extends StatelessWidget with AppLoaderMixin {
textInputAction: TextInputAction.done, textInputAction: TextInputAction.done,
cursorColor: AppColor.primaryColor, cursorColor: AppColor.primaryColor,
textDirection: DirectionUtils.getDirectionByLanguage(context), textDirection: DirectionUtils.getDirectionByLanguage(context),
onSubmitted: (keyword) => _invokeSearchEmailAction(context, keyword.trim()), onSubmitted: (keyword) => _invokeSearchEmailAction(keyword.trim()),
decoration: InputDecoration( decoration: InputDecoration(
border: InputBorder.none, border: InputBorder.none,
focusedBorder: InputBorder.none, focusedBorder: InputBorder.none,
@@ -209,7 +208,7 @@ class SearchInputFormWidget extends StatelessWidget with AppLoaderMixin {
minSize: 40, minSize: 40,
iconPadding: EdgeInsets.zero, iconPadding: EdgeInsets.zero,
icon: SvgPicture.asset(_imagePaths.icSearchBar, fit: BoxFit.fill), icon: SvgPicture.asset(_imagePaths.icSearchBar, fit: BoxFit.fill),
onTap: () => _invokeSearchEmailAction(context, _searchController.searchInputController.text.trim()) onTap: () => _invokeSearchEmailAction(_searchController.searchInputController.text.trim())
) )
), ),
clearTextButton: buildIconWeb( clearTextButton: buildIconWeb(
@@ -246,10 +245,10 @@ class SearchInputFormWidget extends StatelessWidget with AppLoaderMixin {
}); });
} }
void _invokeSelectContactSuggestion(BuildContext context, EmailAddress emailAddress) { void _invokeSelectContactSuggestion(EmailAddress emailAddress) {
_searchController.searchInputController.clear(); _searchController.searchInputController.clear();
_searchController.searchFocus.unfocus(); _searchController.searchFocus.unfocus();
_searchController.enableSearch(); _searchController.enableSearch();
_dashBoardController.searchEmailByFromFields(context, emailAddress); _dashBoardController.searchEmailByFromFields(emailAddress);
} }
} }
@@ -813,7 +813,7 @@ class SearchEmailController extends BaseController
markAsStarEmail(selectedEmail, MarkStarAction.unMarkStar); markAsStarEmail(selectedEmail, MarkStarAction.unMarkStar);
break; break;
case EmailActionType.moveToMailbox: case EmailActionType.moveToMailbox:
moveToMailbox(context, selectedEmail, mailboxContain: mailboxContain); moveToMailbox(selectedEmail, mailboxContain: mailboxContain);
break; break;
case EmailActionType.moveToTrash: case EmailActionType.moveToTrash:
moveToTrash(selectedEmail, mailboxContain: mailboxContain); moveToTrash(selectedEmail, mailboxContain: mailboxContain);
@@ -856,7 +856,6 @@ class SearchEmailController extends BaseController
} }
void handleSelectionEmailAction( void handleSelectionEmailAction(
BuildContext context,
EmailActionType actionType, EmailActionType actionType,
List<PresentationEmail> listEmails List<PresentationEmail> listEmails
) { ) {
@@ -882,7 +881,7 @@ class SearchEmailController extends BaseController
cancelSelectionMode(); cancelSelectionMode();
final mailboxContainCurrent = listEmails.getCurrentMailboxContain(mailboxDashBoardController.mapMailboxById); final mailboxContainCurrent = listEmails.getCurrentMailboxContain(mailboxDashBoardController.mapMailboxById);
if (mailboxContainCurrent != null) { if (mailboxContainCurrent != null) {
moveSelectedMultipleEmailToMailbox(context, listEmails, mailboxContainCurrent); moveSelectedMultipleEmailToMailbox(listEmails, mailboxContainCurrent);
} }
break; break;
case EmailActionType.moveToTrash: case EmailActionType.moveToTrash:
@@ -894,9 +893,9 @@ class SearchEmailController extends BaseController
break; break;
case EmailActionType.deletePermanently: case EmailActionType.deletePermanently:
final mailboxContainCurrent = listEmails.getCurrentMailboxContain(mailboxDashBoardController.mapMailboxById); final mailboxContainCurrent = listEmails.getCurrentMailboxContain(mailboxDashBoardController.mapMailboxById);
if (mailboxContainCurrent != null) { if (mailboxContainCurrent != null && currentContext != null) {
deleteSelectionEmailsPermanently( deleteSelectionEmailsPermanently(
context, currentContext!,
DeleteActionType.multiple, DeleteActionType.multiple,
listEmails: listEmails, listEmails: listEmails,
mailboxCurrent: mailboxContainCurrent, mailboxCurrent: mailboxContainCurrent,
@@ -66,8 +66,7 @@ class SearchEmailView extends GetWidget<SearchEmailController>
controller.listResultSearch.listEmailSelected, controller.listResultSearch.listEmailSelected,
controller.mailboxDashBoardController.mapMailboxById, controller.mailboxDashBoardController.mapMailboxById,
onCancelSelection: controller.cancelSelectionMode, onCancelSelection: controller.cancelSelectionMode,
onHandleEmailAction: (actionType, listEmails) => onHandleEmailAction: controller.handleSelectionEmailAction);
controller.handleSelectionEmailAction(context, actionType, listEmails));
} else { } else {
return _buildSearchInputForm(context); return _buildSearchInputForm(context);
} }
@@ -111,7 +111,6 @@ mixin EmailActionController {
} }
void moveToMailbox( void moveToMailbox(
BuildContext context,
PresentationEmail email, PresentationEmail email,
{PresentationMailbox? mailboxContain} {PresentationMailbox? mailboxContain}
) async { ) async {
@@ -130,12 +129,10 @@ mixin EmailActionController {
: await push(AppRoutes.destinationPicker, arguments: arguments); : await push(AppRoutes.destinationPicker, arguments: arguments);
if (destinationMailbox != null && if (destinationMailbox != null &&
context.mounted &&
destinationMailbox is PresentationMailbox && destinationMailbox is PresentationMailbox &&
mailboxDashBoardController.sessionCurrent != null mailboxDashBoardController.sessionCurrent != null
) { ) {
_dispatchMoveToAction( _dispatchMoveToAction(
context,
accountId, accountId,
mailboxDashBoardController.sessionCurrent!, mailboxDashBoardController.sessionCurrent!,
email, email,
@@ -146,7 +143,6 @@ mixin EmailActionController {
} }
void _dispatchMoveToAction( void _dispatchMoveToAction(
BuildContext context,
AccountId accountId, AccountId accountId,
Session session, Session session,
PresentationEmail emailSelected, PresentationEmail emailSelected,
@@ -245,12 +241,10 @@ mixin EmailActionController {
} }
void moveSelectedMultipleEmailToMailbox( void moveSelectedMultipleEmailToMailbox(
BuildContext context,
List<PresentationEmail> listEmails, List<PresentationEmail> listEmails,
PresentationMailbox mailboxCurrent PresentationMailbox mailboxCurrent
) { ) {
mailboxDashBoardController.moveSelectedMultipleEmailToMailbox( mailboxDashBoardController.moveSelectedMultipleEmailToMailbox(
context,
listEmails, listEmails,
mailboxCurrent); mailboxCurrent);
} }
@@ -284,7 +278,7 @@ mixin EmailActionController {
onCancelSelectionEmail: onCancelSelectionEmail); onCancelSelectionEmail: onCancelSelectionEmail);
} }
void openEmailInNewTabAction(BuildContext context, PresentationEmail email) { void openEmailInNewTabAction(PresentationEmail email) {
AppUtils.launchLink(email.routeWebAsString); AppUtils.launchLink(email.routeWebAsString);
} }
@@ -287,10 +287,10 @@ class ThreadController extends BaseController with EmailActionController {
cancelSelectEmail(); cancelSelectEmail();
mailboxDashBoardController.clearDashBoardAction(); mailboxDashBoardController.clearDashBoardAction();
} else if (action is FilterMessageAction) { } else if (action is FilterMessageAction) {
filterMessagesAction(action.context, action.option); filterMessagesAction(action.option);
mailboxDashBoardController.clearDashBoardAction(); mailboxDashBoardController.clearDashBoardAction();
} else if (action is HandleEmailActionTypeAction) { } else if (action is HandleEmailActionTypeAction) {
pressEmailSelectionAction(action.context, action.emailAction, action.listEmailSelected); pressEmailSelectionAction(action.emailAction, action.listEmailSelected);
mailboxDashBoardController.clearDashBoardAction(); mailboxDashBoardController.clearDashBoardAction();
} else if (action is OpenEmailDetailedFromSuggestionQuickSearchAction) { } else if (action is OpenEmailDetailedFromSuggestionQuickSearchAction) {
final mailboxContain = action.presentationEmail.findMailboxContain(mailboxDashBoardController.mapMailboxById); final mailboxContain = action.presentationEmail.findMailboxContain(mailboxDashBoardController.mapMailboxById);
@@ -299,7 +299,6 @@ class ThreadController extends BaseController with EmailActionController {
EmailActionType.preview, EmailActionType.preview,
newEmail, newEmail,
mailboxContain: mailboxContain, mailboxContain: mailboxContain,
context: action.context,
); );
mailboxDashBoardController.clearDashBoardAction(); mailboxDashBoardController.clearDashBoardAction();
} else if (action is StartSearchEmailAction) { } else if (action is StartSearchEmailAction) {
@@ -307,8 +306,8 @@ class ThreadController extends BaseController with EmailActionController {
_replaceBrowserHistory(); _replaceBrowserHistory();
_searchEmail(); _searchEmail();
mailboxDashBoardController.clearDashBoardAction(); mailboxDashBoardController.clearDashBoardAction();
} else if (action is EmptyTrashAction) { } else if (action is EmptyTrashAction && currentContext != null) {
deleteSelectionEmailsPermanently(action.context, DeleteActionType.all); deleteSelectionEmailsPermanently(currentContext!, DeleteActionType.all);
mailboxDashBoardController.clearDashBoardAction(); mailboxDashBoardController.clearDashBoardAction();
} else if (action is OpenEmailInsideMailboxFromLocationBar) { } else if (action is OpenEmailInsideMailboxFromLocationBar) {
_getEmailByIdFromLocationBar( _getEmailByIdFromLocationBar(
@@ -720,7 +719,7 @@ class ThreadController extends BaseController with EmailActionController {
} }
} }
void selectEmail(BuildContext context, PresentationEmail presentationEmailSelected) { void selectEmail(PresentationEmail presentationEmailSelected) {
final emailsInCurrentMailbox = mailboxDashBoardController.emailsInCurrentMailbox; final emailsInCurrentMailbox = mailboxDashBoardController.emailsInCurrentMailbox;
if (_rangeSelectionMode && latestEmailSelectedOrUnselected.value != null && latestEmailSelectedOrUnselected.value?.id != presentationEmailSelected.id) { if (_rangeSelectionMode && latestEmailSelectedOrUnselected.value != null && latestEmailSelectedOrUnselected.value?.id != presentationEmailSelected.id) {
@@ -780,7 +779,7 @@ class ThreadController extends BaseController with EmailActionController {
popBack(); popBack();
} }
void filterMessagesAction(BuildContext context, FilterMessageOption filterOption) { void filterMessagesAction(FilterMessageOption filterOption) {
popBack(); popBack();
final newFilterOption = mailboxDashBoardController.filterMessageOption.value == filterOption final newFilterOption = mailboxDashBoardController.filterMessageOption.value == filterOption
@@ -789,11 +788,12 @@ class ThreadController extends BaseController with EmailActionController {
mailboxDashBoardController.filterMessageOption.value = newFilterOption; mailboxDashBoardController.filterMessageOption.value = newFilterOption;
appToast.showToastMessage( if (currentContext != null && currentOverlayContext != null) {
context, appToast.showToastMessage(
newFilterOption.getMessageToast(context), currentOverlayContext!,
leadingSVGIcon: newFilterOption.getIconToast(imagePaths), newFilterOption.getMessageToast(currentContext!),
); leadingSVGIcon: newFilterOption.getIconToast(imagePaths));
}
if (searchController.isSearchEmailRunning) { if (searchController.isSearchEmailRunning) {
_searchEmail(); _searchEmail();
@@ -947,7 +947,10 @@ class ThreadController extends BaseController with EmailActionController {
} }
} }
void pressEmailSelectionAction(BuildContext context, EmailActionType actionType, List<PresentationEmail> selectionEmail) { void pressEmailSelectionAction(
EmailActionType actionType,
List<PresentationEmail> selectionEmail
) {
switch(actionType) { switch(actionType) {
case EmailActionType.markAsRead: case EmailActionType.markAsRead:
cancelSelectEmail(); cancelSelectEmail();
@@ -971,7 +974,7 @@ class ThreadController extends BaseController with EmailActionController {
? selectionEmail.getCurrentMailboxContain(mailboxDashBoardController.mapMailboxById) ? selectionEmail.getCurrentMailboxContain(mailboxDashBoardController.mapMailboxById)
: selectedMailbox; : selectedMailbox;
if (mailboxContainCurrent != null) { if (mailboxContainCurrent != null) {
moveSelectedMultipleEmailToMailbox(context, selectionEmail, mailboxContainCurrent); moveSelectedMultipleEmailToMailbox(selectionEmail, mailboxContainCurrent);
} }
break; break;
case EmailActionType.moveToTrash: case EmailActionType.moveToTrash:
@@ -987,9 +990,9 @@ class ThreadController extends BaseController with EmailActionController {
final mailboxContainCurrent = searchController.isSearchEmailRunning final mailboxContainCurrent = searchController.isSearchEmailRunning
? selectionEmail.getCurrentMailboxContain(mailboxDashBoardController.mapMailboxById) ? selectionEmail.getCurrentMailboxContain(mailboxDashBoardController.mapMailboxById)
: selectedMailbox; : selectedMailbox;
if (mailboxContainCurrent != null) { if (mailboxContainCurrent != null && currentContext != null) {
deleteSelectionEmailsPermanently( deleteSelectionEmailsPermanently(
context, currentContext!,
DeleteActionType.multiple, DeleteActionType.multiple,
listEmails: selectionEmail, listEmails: selectionEmail,
mailboxCurrent: mailboxContainCurrent, mailboxCurrent: mailboxContainCurrent,
@@ -1019,7 +1022,6 @@ class ThreadController extends BaseController with EmailActionController {
PresentationEmail selectedEmail, PresentationEmail selectedEmail,
{ {
PresentationMailbox? mailboxContain, PresentationMailbox? mailboxContain,
BuildContext? context,
} }
) { ) {
switch(actionType) { switch(actionType) {
@@ -1031,7 +1033,7 @@ class ThreadController extends BaseController with EmailActionController {
} }
break; break;
case EmailActionType.selection: case EmailActionType.selection:
selectEmail(context!, selectedEmail); selectEmail(selectedEmail);
break; break;
case EmailActionType.markAsRead: case EmailActionType.markAsRead:
markAsEmailRead(selectedEmail, ReadActions.markAsRead, MarkReadAction.tap); markAsEmailRead(selectedEmail, ReadActions.markAsRead, MarkReadAction.tap);
@@ -1046,13 +1048,15 @@ class ThreadController extends BaseController with EmailActionController {
markAsStarEmail(selectedEmail, MarkStarAction.unMarkStar); markAsStarEmail(selectedEmail, MarkStarAction.unMarkStar);
break; break;
case EmailActionType.moveToMailbox: case EmailActionType.moveToMailbox:
moveToMailbox(context!, selectedEmail, mailboxContain: mailboxContain); moveToMailbox(selectedEmail, mailboxContain: mailboxContain);
break; break;
case EmailActionType.moveToTrash: case EmailActionType.moveToTrash:
moveToTrash(selectedEmail, mailboxContain: mailboxContain); moveToTrash(selectedEmail, mailboxContain: mailboxContain);
break; break;
case EmailActionType.deletePermanently: case EmailActionType.deletePermanently:
deleteEmailPermanently(context!, selectedEmail); if (currentContext != null) {
deleteEmailPermanently(currentContext!, selectedEmail);
}
break; break;
case EmailActionType.moveToSpam: case EmailActionType.moveToSpam:
popBack(); popBack();
@@ -1063,7 +1067,7 @@ class ThreadController extends BaseController with EmailActionController {
unSpam(selectedEmail); unSpam(selectedEmail);
break; break;
case EmailActionType.openInNewTab: case EmailActionType.openInNewTab:
openEmailInNewTabAction(context!, selectedEmail); openEmailInNewTabAction(selectedEmail);
break; break;
default: default:
break; break;
@@ -74,13 +74,7 @@ class ThreadView extends GetWidget<ThreadController>
filterOption: controller.mailboxDashBoardController.filterMessageOption.value, filterOption: controller.mailboxDashBoardController.filterMessageOption.value,
openMailboxAction: controller.openMailboxLeftMenu, openMailboxAction: controller.openMailboxLeftMenu,
cancelEditThreadAction: controller.cancelSelectEmail, cancelEditThreadAction: controller.cancelSelectEmail,
emailSelectionAction: (actionType, selectionEmail) { emailSelectionAction: controller.pressEmailSelectionAction,
return controller.pressEmailSelectionAction(
context,
actionType,
selectionEmail
);
},
onContextMenuFilterEmailAction: controller.responsiveUtils.isScreenWithShortestSide(context) onContextMenuFilterEmailAction: controller.responsiveUtils.isScreenWithShortestSide(context)
? (filterOption) => controller.openContextMenuAction( ? (filterOption) => controller.openContextMenuAction(
context, context,
@@ -94,7 +88,7 @@ class ThreadView extends GetWidget<ThreadController>
popupMenuFilterEmailActionTile( popupMenuFilterEmailActionTile(
context, context,
filterOption, filterOption,
(option) => controller.filterMessagesAction(context, option) controller.filterMessagesAction
) )
) )
: null : null
@@ -245,12 +239,7 @@ class ThreadView extends GetWidget<ThreadController>
controller.responsiveUtils, controller.responsiveUtils,
listEmailSelected, listEmailSelected,
controller.mailboxDashBoardController.selectedMailbox.value, controller.mailboxDashBoardController.selectedMailbox.value,
onPressEmailSelectionActionClick: (actionType, selectionEmail) => onPressEmailSelectionActionClick: controller.pressEmailSelectionAction
controller.pressEmailSelectionAction(
context,
actionType,
selectionEmail
)
); );
} else { } else {
return const SizedBox.shrink(); return const SizedBox.shrink();
@@ -341,7 +330,7 @@ class ThreadView extends GetWidget<ThreadController>
width: 20, width: 20,
height: 20, height: 20,
fit: BoxFit.fill)) fit: BoxFit.fill))
..onActionClick((option) => controller.filterMessagesAction(context, option))) ..onActionClick(controller.filterMessagesAction))
.build()).toList(); .build()).toList();
} }
@@ -598,22 +587,20 @@ class ThreadView extends GetWidget<ThreadController>
searchQuery: controller.searchQuery, searchQuery: controller.searchQuery,
mailboxContain: presentationEmail.mailboxContain, mailboxContain: presentationEmail.mailboxContain,
isSearchEmailRunning: controller.searchController.isSearchEmailRunning, isSearchEmailRunning: controller.searchController.isSearchEmailRunning,
emailActionClick: (action, email) => _handleEmailActionClicked(context, email, action), emailActionClick: _handleEmailActionClicked,
onMoreActionClick: (email, position) => _handleEmailContextMenuAction(context, email, position), onMoreActionClick: (email, position) => _handleEmailContextMenuAction(context, email, position),
), ),
); );
} }
void _handleEmailActionClicked( void _handleEmailActionClicked(
BuildContext context, EmailActionType actionType,
PresentationEmail presentationEmail, PresentationEmail presentationEmail
EmailActionType actionType
) { ) {
controller.handleEmailActionType( controller.handleEmailActionType(
actionType, actionType,
presentationEmail, presentationEmail,
mailboxContain: presentationEmail.mailboxContain, mailboxContain: presentationEmail.mailboxContain,
context: context
); );
} }
@@ -736,7 +723,6 @@ class ThreadView extends GetWidget<ThreadController>
mailboxContain?.isSpam == true ? EmailActionType.unSpam : EmailActionType.moveToSpam, mailboxContain?.isSpam == true ? EmailActionType.unSpam : EmailActionType.moveToSpam,
email, email,
mailboxContain: mailboxContain, mailboxContain: mailboxContain,
context: context,
)) ))
).build(); ).build();
} }
@@ -760,7 +746,7 @@ class ThreadView extends GetWidget<ThreadController>
: EdgeInsets.zero) : EdgeInsets.zero)
..onActionClick((email) { ..onActionClick((email) {
popBack(); popBack();
controller.openEmailInNewTabAction(context, email); controller.openEmailInNewTabAction(email);
}) })
).build(); ).build();
} }
@@ -823,7 +809,6 @@ class ThreadView extends GetWidget<ThreadController>
mailboxContain?.isSpam == true ? EmailActionType.unSpam : EmailActionType.moveToSpam, mailboxContain?.isSpam == true ? EmailActionType.unSpam : EmailActionType.moveToSpam,
email, email,
mailboxContain: mailboxContain, mailboxContain: mailboxContain,
context: context
) )
) )
); );
@@ -847,7 +832,7 @@ class ThreadView extends GetWidget<ThreadController>
), ),
onCallbackAction: () { onCallbackAction: () {
popBack(); popBack();
controller.openEmailInNewTabAction(context, email); controller.openEmailInNewTabAction(email);
} }
) )
); );
@@ -394,7 +394,7 @@ void main() {
when(context.owner).thenReturn(BuildOwner(focusManager: FocusManager())); when(context.owner).thenReturn(BuildOwner(focusManager: FocusManager()));
// expect query in search controller update as expected // expect query in search controller update as expected
mailboxDashboardController.searchEmail(context, queryString: queryString); mailboxDashboardController.searchEmail(queryString: queryString);
expect(searchController.searchEmailFilter.value.text, SearchQuery(queryString)); expect(searchController.searchEmailFilter.value.text, SearchQuery(queryString));
// expect sort in search controller update as expected // expect sort in search controller update as expected
@@ -455,7 +455,7 @@ void main() {
// mailbox: impossible? due to private field // mailbox: impossible? due to private field
advancedFilterController.updateReceiveDateSearchFilter(context, EmailReceiveTimeType.last30Days); advancedFilterController.updateReceiveDateSearchFilter(context, EmailReceiveTimeType.last30Days);
advancedFilterController.updateSortOrder(EmailSortOrderType.relevance); advancedFilterController.updateSortOrder(EmailSortOrderType.relevance);
advancedFilterController.applyAdvancedSearchFilter(context); advancedFilterController.applyAdvancedSearchFilter();
expect(searchController.searchEmailFilter.value, SearchEmailFilter( expect(searchController.searchEmailFilter.value, SearchEmailFilter(
from: {fromEmailAddress.email!}, from: {fromEmailAddress.email!},
to: {toEmailAddress.email!}, to: {toEmailAddress.email!},