diff --git a/lib/features/base/base_mailbox_controller.dart b/lib/features/base/base_mailbox_controller.dart index 6146d1e9b..ced48e80f 100644 --- a/lib/features/base/base_mailbox_controller.dart +++ b/lib/features/base/base_mailbox_controller.dart @@ -456,7 +456,6 @@ abstract class BaseMailboxController extends BaseController { title: AppLocalizations.of(context).deleteFolders, cancelTitle: AppLocalizations.of(context).cancel, onConfirmAction: () => onDeleteMailboxAction(presentationMailbox), - onCancelAction: popBack, onCloseButtonAction: popBack, ); } diff --git a/lib/features/base/extensions/handle_mailbox_action_type_extension.dart b/lib/features/base/extensions/handle_mailbox_action_type_extension.dart index 22552d588..22a8f1a22 100644 --- a/lib/features/base/extensions/handle_mailbox_action_type_extension.dart +++ b/lib/features/base/extensions/handle_mailbox_action_type_extension.dart @@ -85,7 +85,6 @@ extension HandleMailboxActionTypeExtension on BaseMailboxController { currentRights, MailboxActions.allowSubaddressing, ), - onCancelAction: popBack, onCloseButtonAction: popBack, ); } diff --git a/lib/features/base/mixin/mailbox_action_handler_mixin.dart b/lib/features/base/mixin/mailbox_action_handler_mixin.dart index 141d5135f..ea394c01c 100644 --- a/lib/features/base/mixin/mailbox_action_handler_mixin.dart +++ b/lib/features/base/mixin/mailbox_action_handler_mixin.dart @@ -94,7 +94,6 @@ mixin MailboxActionHandlerMixin { ); } }, - onCancelAction: popBack, ); } } @@ -147,7 +146,6 @@ mixin MailboxActionHandlerMixin { ); } }, - onCancelAction: popBack ); } } diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart index 9171ef812..983822d83 100644 --- a/lib/features/composer/presentation/composer_controller.dart +++ b/lib/features/composer/presentation/composer_controller.dart @@ -781,11 +781,13 @@ class ComposerController extends BaseController autoCreateEmailTag(); } + final appLocalizations = AppLocalizations.of(context); + if (!isEnableEmailSendButton.value) { MessageDialogActionManager().showConfirmDialogAction(context, - AppLocalizations.of(context).message_dialog_send_email_without_recipient, - AppLocalizations.of(context).add_recipients, - title: AppLocalizations.of(context).sending_failed, + appLocalizations.message_dialog_send_email_without_recipient, + appLocalizations.add_recipients, + title: appLocalizations.sending_failed, hasCancelButton: false, showAsBottomSheet: true, dialogMargin: MediaQuery.paddingOf(context).add(const EdgeInsets.only(bottom: 12)), @@ -799,8 +801,8 @@ class ComposerController extends BaseController .toList(); if (listEmailAddressInvalid.isNotEmpty) { MessageDialogActionManager().showConfirmDialogAction(context, - AppLocalizations.of(context).message_dialog_send_email_with_email_address_invalid, - AppLocalizations.of(context).fix_email_addresses, + appLocalizations.message_dialog_send_email_with_email_address_invalid, + appLocalizations.fix_email_addresses, onConfirmAction: () { toAddressExpandMode.value = ExpandMode.EXPAND; ccAddressExpandMode.value = ExpandMode.EXPAND; @@ -808,7 +810,7 @@ class ComposerController extends BaseController replyToAddressExpandMode.value = ExpandMode.EXPAND; }, showAsBottomSheet: true, - title: AppLocalizations.of(context).sending_failed, + title: appLocalizations.sending_failed, hasCancelButton: false, dialogMargin: MediaQuery.paddingOf(context).add(const EdgeInsets.only(bottom: 12)), ).whenComplete(() => _sendButtonState = ButtonState.enabled); @@ -817,13 +819,13 @@ class ComposerController extends BaseController if (subjectEmail.value == null || subjectEmail.isEmpty == true) { MessageDialogActionManager().showConfirmDialogAction(context, - AppLocalizations.of(context).message_dialog_send_email_without_a_subject, - AppLocalizations.of(context).cancel, - cancelTitle: AppLocalizations.of(context).send_anyway, - onCancelAction: () => _handleSendMessages(context), - onConfirmAction: popBack, + appLocalizations.message_dialog_send_email_without_a_subject, + appLocalizations.send_anyway, + cancelTitle: appLocalizations.cancel, + onConfirmAction: () => _handleSendMessages(context), + onCancelAction: popBack, autoPerformPopBack: false, - title: AppLocalizations.of(context).empty_subject, + title: appLocalizations.empty_subject, showAsBottomSheet: true, dialogMargin: MediaQuery.paddingOf(context).add(const EdgeInsets.only(bottom: 12)), ).whenComplete(() => _sendButtonState = ButtonState.enabled); @@ -833,9 +835,9 @@ class ComposerController extends BaseController if (!uploadController.allUploadAttachmentsCompleted) { MessageDialogActionManager().showConfirmDialogAction( context, - AppLocalizations.of(context).messageDialogSendEmailUploadingAttachment, - AppLocalizations.of(context).got_it, - title: AppLocalizations.of(context).sending_failed, + appLocalizations.messageDialogSendEmailUploadingAttachment, + appLocalizations.got_it, + title: appLocalizations.sending_failed, showAsBottomSheet: true, hasCancelButton: false, dialogMargin: MediaQuery.paddingOf(context).add(const EdgeInsets.only(bottom: 12)), @@ -846,10 +848,11 @@ class ComposerController extends BaseController if (uploadController.isExceededMaxSizeAttachmentsPerEmail()) { MessageDialogActionManager().showConfirmDialogAction( context, - AppLocalizations.of(context).message_dialog_send_email_exceeds_maximum_size( - filesize(mailboxDashBoardController.maxSizeAttachmentsPerEmail?.value ?? 0, 0)), - AppLocalizations.of(context).got_it, - title: AppLocalizations.of(context).sending_failed, + appLocalizations.message_dialog_send_email_exceeds_maximum_size( + filesize(mailboxDashBoardController.maxSizeAttachmentsPerEmail?.value ?? 0, 0), + ), + appLocalizations.got_it, + title: appLocalizations.sending_failed, hasCancelButton: false ).whenComplete(() => _sendButtonState = ButtonState.enabled); return; diff --git a/lib/features/email/presentation/utils/email_action_reactor/email_action_reactor.dart b/lib/features/email/presentation/utils/email_action_reactor/email_action_reactor.dart index 94f488475..10c9cd31b 100644 --- a/lib/features/email/presentation/utils/email_action_reactor/email_action_reactor.dart +++ b/lib/features/email/presentation/utils/email_action_reactor/email_action_reactor.dart @@ -216,10 +216,9 @@ class EmailActionReactor { currentContext!, title: DeleteActionType.single.getTitleDialog(currentContext!), DeleteActionType.single.getContentDialog(currentContext!), - cancelTitle: DeleteActionType.single.getConfirmActionName(currentContext!), - AppLocalizations.of(currentContext!).cancel, - onCancelAction: () => onDeleteEmailRequest.call(presentationEmail), - onConfirmAction: popBack, + DeleteActionType.single.getConfirmActionName(currentContext!), + cancelTitle: AppLocalizations.of(currentContext!).cancel, + onConfirmAction: () => onDeleteEmailRequest.call(presentationEmail), onCloseButtonAction: popBack, ); } diff --git a/lib/features/mailbox/presentation/mailbox_controller.dart b/lib/features/mailbox/presentation/mailbox_controller.dart index ddf1bae6e..47fde5ffb 100644 --- a/lib/features/mailbox/presentation/mailbox_controller.dart +++ b/lib/features/mailbox/presentation/mailbox_controller.dart @@ -1063,7 +1063,6 @@ class MailboxController extends BaseMailboxController AppLocalizations.of(context).messageConfirmationDialogDeleteMultipleFolder(selectedMailboxList.length), cancelTitle: AppLocalizations.of(context).cancel, AppLocalizations.of(context).delete, - onCancelAction: popBack, onConfirmAction: () => _deleteMultipleMailboxAction(selectedMailboxList), onCloseButtonAction: popBack, ); diff --git a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart index bd0e99f70..2390ee63f 100644 --- a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart +++ b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart @@ -1681,14 +1681,13 @@ class MailboxDashBoardController extends ReloadableController actionType.getConfirmActionName(context), cancelTitle: AppLocalizations.of(context).cancel, onConfirmAction: () { - onConfirm?.call(); - _deleteSelectionEmailsPermanentlyAction( + onConfirm?.call(); + _deleteSelectionEmailsPermanentlyAction( actionType, listEmails: listEmails, onCancelSelectionEmail: onCancelSelectionEmail, ); - }, - onCancelAction: popBack, + }, onCloseButtonAction: popBack, ); } @@ -2745,7 +2744,6 @@ class MailboxDashBoardController extends ReloadableController ); } }, - onCancelAction: popBack, onCloseButtonAction: popBack, ); } diff --git a/lib/features/sending_queue/presentation/sending_queue_controller.dart b/lib/features/sending_queue/presentation/sending_queue_controller.dart index dc96629b3..cf1942cd9 100644 --- a/lib/features/sending_queue/presentation/sending_queue_controller.dart +++ b/lib/features/sending_queue/presentation/sending_queue_controller.dart @@ -191,14 +191,15 @@ class SendingQueueController extends BaseController { } void _deleteListSendingEmailAction(BuildContext context, List listSendingEmails) { + final appLocalizations = AppLocalizations.of(context); MessageDialogActionManager().showConfirmDialogAction( context, - AppLocalizations.of(context).messageDialogDeleteSendingEmail, - AppLocalizations.of(context).cancel, - title: AppLocalizations.of(context).deleteOfflineEmail, + appLocalizations.messageDialogDeleteSendingEmail, + appLocalizations.delete, + title: appLocalizations.deleteOfflineEmail, alignCenter: true, - cancelTitle: AppLocalizations.of(context).delete, - onCancelAction: () => _handleDeleteListSendingEmail(listSendingEmails), + cancelTitle: appLocalizations.cancel, + onConfirmAction: () => _handleDeleteListSendingEmail(listSendingEmails), ); } diff --git a/lib/features/thread/presentation/mixin/email_action_controller.dart b/lib/features/thread/presentation/mixin/email_action_controller.dart index 3c6a1c663..20b6119cd 100644 --- a/lib/features/thread/presentation/mixin/email_action_controller.dart +++ b/lib/features/thread/presentation/mixin/email_action_controller.dart @@ -250,7 +250,6 @@ mixin EmailActionController { DeleteActionType.single.getConfirmActionName(context), cancelTitle: AppLocalizations.of(context).cancel, onConfirmAction: () => _deleteEmailPermanentlyAction(context, email), - onCancelAction: popBack, onCloseButtonAction: popBack, ); } diff --git a/lib/features/upload/presentation/controller/upload_controller.dart b/lib/features/upload/presentation/controller/upload_controller.dart index c8cc09fb6..906c91f4f 100644 --- a/lib/features/upload/presentation/controller/upload_controller.dart +++ b/lib/features/upload/presentation/controller/upload_controller.dart @@ -382,14 +382,15 @@ class UploadController extends BaseController { required BuildContext context, VoidCallback? confirmAction, }) { + final appLocalizations = AppLocalizations.of(context); MessageDialogActionManager().showConfirmDialogAction( context, title: '', - AppLocalizations.of(context).warningMessageWhenExceedGenerallySizeInComposer, - AppLocalizations.of(context).cancel, - cancelTitle: AppLocalizations.of(context).continueAction, + appLocalizations.warningMessageWhenExceedGenerallySizeInComposer, + appLocalizations.continueAction, + cancelTitle: appLocalizations.cancel, alignCenter: true, - onCancelAction: confirmAction, + onConfirmAction: confirmAction, ); }