From 49eea0cd0def70039a25cecd3198a9bd939df1ae Mon Sep 17 00:00:00 2001 From: dab246 Date: Mon, 30 Jun 2025 15:50:33 +0700 Subject: [PATCH] Update modal as new design in Twake Mail Signed-off-by: dab246 --- lib/features/base/base_mailbox_controller.dart | 8 ++++---- .../base/mixin/mailbox_action_handler_mixin.dart | 16 ++++++++-------- .../controller/single_email_controller.dart | 8 ++++---- .../mailbox/presentation/mailbox_controller.dart | 8 ++++---- .../controller/mailbox_dashboard_controller.dart | 16 ++++++++-------- .../email_rules/email_rules_controller.dart | 8 ++++---- .../widgets/delete_identity_dialog_builder.dart | 8 ++++---- .../mixin/email_action_controller.dart | 8 ++++---- 8 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lib/features/base/base_mailbox_controller.dart b/lib/features/base/base_mailbox_controller.dart index 9b6e109d3..8c99219c1 100644 --- a/lib/features/base/base_mailbox_controller.dart +++ b/lib/features/base/base_mailbox_controller.dart @@ -456,10 +456,10 @@ abstract class BaseMailboxController extends BaseController { imagePath: imagePaths, title: AppLocalizations.of(context).deleteFolders, textContent: AppLocalizations.of(context).message_confirmation_dialog_delete_folder(presentationMailbox.getDisplayName(context)), - confirmText: AppLocalizations.of(context).cancel, - cancelText: AppLocalizations.of(context).delete, - onCancelButtonAction: () => onDeleteMailboxAction(presentationMailbox), - onConfirmButtonAction: popBack, + confirmText: AppLocalizations.of(context).delete, + cancelText: AppLocalizations.of(context).cancel, + onConfirmButtonAction: () => onDeleteMailboxAction(presentationMailbox), + onCancelButtonAction: 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 5ad55fbeb..babaed8f0 100644 --- a/lib/features/base/mixin/mailbox_action_handler_mixin.dart +++ b/lib/features/base/mixin/mailbox_action_handler_mixin.dart @@ -83,10 +83,10 @@ mixin MailboxActionHandlerMixin { imagePath: imagePaths, title: AppLocalizations.of(context).emptyTrash, textContent: AppLocalizations.of(context).empty_trash_dialog_message, - confirmText: AppLocalizations.of(context).cancel, - cancelText: AppLocalizations.of(context).delete, + cancelText: AppLocalizations.of(context).cancel, + confirmText: AppLocalizations.of(context).delete, onCloseButtonAction: popBack, - onCancelButtonAction: () { + onConfirmButtonAction: () { popBack(); if (mailbox.countTotalEmails > 0) { dashboardController.emptyTrashFolderAction( @@ -100,7 +100,7 @@ mixin MailboxActionHandlerMixin { ); } }, - onConfirmButtonAction: popBack, + onCancelButtonAction: popBack, ), ), barrierColor: AppColor.colorDefaultCupertinoActionSheet, @@ -145,10 +145,10 @@ mixin MailboxActionHandlerMixin { imagePath: imagePaths, title: AppLocalizations.of(context).emptySpamFolder, textContent: AppLocalizations.of(context).emptySpamMessageDialog, - confirmText: AppLocalizations.of(context).cancel, - cancelText: AppLocalizations.of(context).delete_all, + cancelText: AppLocalizations.of(context).cancel, + confirmText: AppLocalizations.of(context).delete_all, onCloseButtonAction: popBack, - onCancelButtonAction: () { + onConfirmButtonAction: () { popBack(); if (mailbox.countTotalEmails > 0) { dashboardController.emptySpamFolderAction(spamFolderId: mailbox.id, totalEmails: mailbox.countTotalEmails); @@ -159,7 +159,7 @@ mixin MailboxActionHandlerMixin { ); } }, - onConfirmButtonAction: popBack, + onCancelButtonAction: popBack, ), ), barrierColor: AppColor.colorDefaultCupertinoActionSheet, diff --git a/lib/features/email/presentation/controller/single_email_controller.dart b/lib/features/email/presentation/controller/single_email_controller.dart index 693985258..4a720079f 100644 --- a/lib/features/email/presentation/controller/single_email_controller.dart +++ b/lib/features/email/presentation/controller/single_email_controller.dart @@ -1579,10 +1579,10 @@ class SingleEmailController extends BaseController with AppLoaderMixin { imagePath: imagePaths, title: DeleteActionType.single.getTitleDialog(context), textContent: DeleteActionType.single.getContentDialog(context), - cancelText: DeleteActionType.single.getConfirmActionName(context), - confirmText: AppLocalizations.of(context).cancel, - onCancelButtonAction: () => _deleteEmailPermanentlyAction(context, email), - onConfirmButtonAction: popBack, + confirmText: DeleteActionType.single.getConfirmActionName(context), + cancelText: AppLocalizations.of(context).cancel, + onConfirmButtonAction: () => _deleteEmailPermanentlyAction(context, email), + onCancelButtonAction: popBack, onCloseButtonAction: popBack, )), barrierColor: AppColor.colorDefaultCupertinoActionSheet, diff --git a/lib/features/mailbox/presentation/mailbox_controller.dart b/lib/features/mailbox/presentation/mailbox_controller.dart index 9ae2ddd8e..24e9e1b66 100644 --- a/lib/features/mailbox/presentation/mailbox_controller.dart +++ b/lib/features/mailbox/presentation/mailbox_controller.dart @@ -1062,10 +1062,10 @@ class MailboxController extends BaseMailboxController imagePath: imagePaths, title: AppLocalizations.of(context).deleteFolders, textContent: AppLocalizations.of(context).messageConfirmationDialogDeleteMultipleFolder(selectedMailboxList.length), - confirmText: AppLocalizations.of(context).cancel, - cancelText: AppLocalizations.of(context).delete, - onCancelButtonAction: () => _deleteMultipleMailboxAction(selectedMailboxList), - onConfirmButtonAction: popBack, + cancelText: AppLocalizations.of(context).cancel, + confirmText: AppLocalizations.of(context).delete, + onConfirmButtonAction: () => _deleteMultipleMailboxAction(selectedMailboxList), + onCancelButtonAction: popBack, onCloseButtonAction: popBack, )), barrierColor: AppColor.colorDefaultCupertinoActionSheet, 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 95b37489e..aec938a4a 100644 --- a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart +++ b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart @@ -1580,14 +1580,14 @@ class MailboxDashBoardController extends ReloadableController count: listEmails?.length, mailboxName: mailboxCurrent?.getDisplayName(context), ), - cancelText: actionType.getConfirmActionName(context), - confirmText: AppLocalizations.of(context).cancel, - onCancelButtonAction: () => _deleteSelectionEmailsPermanentlyAction( + confirmText: actionType.getConfirmActionName(context), + cancelText: AppLocalizations.of(context).cancel, + onConfirmButtonAction: () => _deleteSelectionEmailsPermanentlyAction( actionType, listEmails: listEmails, onCancelSelectionEmail: onCancelSelectionEmail, ), - onConfirmButtonAction: popBack, + onCancelButtonAction: popBack, onCloseButtonAction: popBack, )), barrierColor: AppColor.colorDefaultCupertinoActionSheet, @@ -2626,9 +2626,9 @@ class MailboxDashBoardController extends ReloadableController imagePath: imagePaths, title: AppLocalizations.of(context).emptySpamFolder, textContent: AppLocalizations.of(context).emptySpamMessageDialog, - cancelText: AppLocalizations.of(context).delete_all, - confirmText: AppLocalizations.of(context).cancel, - onCancelButtonAction: () { + confirmText: AppLocalizations.of(context).delete_all, + cancelText: AppLocalizations.of(context).cancel, + onConfirmButtonAction: () { popBack(); if (spamMailbox.countTotalEmails > 0) { emptySpamFolderAction( @@ -2642,7 +2642,7 @@ class MailboxDashBoardController extends ReloadableController ); } }, - onConfirmButtonAction: popBack, + onCancelButtonAction: popBack, onCloseButtonAction: popBack, )), barrierColor: AppColor.colorDefaultCupertinoActionSheet, diff --git a/lib/features/manage_account/presentation/email_rules/email_rules_controller.dart b/lib/features/manage_account/presentation/email_rules/email_rules_controller.dart index fbc993f16..a03bbaf6b 100644 --- a/lib/features/manage_account/presentation/email_rules/email_rules_controller.dart +++ b/lib/features/manage_account/presentation/email_rules/email_rules_controller.dart @@ -172,10 +172,10 @@ class EmailRulesController extends BaseController { imagePath: imagePaths, title: AppLocalizations.of(context).deleteEmailRule, textContent: AppLocalizations.of(context).messageConfirmationDialogDeleteEmailRule(emailRule.name), - cancelText: AppLocalizations.of(context).delete, - confirmText: AppLocalizations.of(context).cancel, - onCancelButtonAction: () => _handleDeleteEmailRuleAction(emailRule), - onConfirmButtonAction: popBack, + confirmText: AppLocalizations.of(context).delete, + cancelText: AppLocalizations.of(context).cancel, + onConfirmButtonAction: () => _handleDeleteEmailRuleAction(emailRule), + onCancelButtonAction: popBack, onCloseButtonAction: popBack, ), ), diff --git a/lib/features/manage_account/presentation/profiles/identities/widgets/delete_identity_dialog_builder.dart b/lib/features/manage_account/presentation/profiles/identities/widgets/delete_identity_dialog_builder.dart index fcaeb1150..652f4f32f 100644 --- a/lib/features/manage_account/presentation/profiles/identities/widgets/delete_identity_dialog_builder.dart +++ b/lib/features/manage_account/presentation/profiles/identities/widgets/delete_identity_dialog_builder.dart @@ -55,12 +55,12 @@ class DeleteIdentityDialogBuilder extends StatelessWidget { imagePath: imagePaths, title: appLocalizations.delete_identity, textContent: appLocalizations.message_confirmation_dialog_delete_identity, - cancelText: appLocalizations.delete, - confirmText: appLocalizations.cancel, + confirmText: appLocalizations.delete, + cancelText: appLocalizations.cancel, alignment: alignment, outsideDialogPadding: outsideDialogPadding, - onCancelButtonAction: onDeleteIdentityAction, - onConfirmButtonAction: popBack, + onConfirmButtonAction: onDeleteIdentityAction, + onCancelButtonAction: popBack, onCloseButtonAction: popBack, ); } diff --git a/lib/features/thread/presentation/mixin/email_action_controller.dart b/lib/features/thread/presentation/mixin/email_action_controller.dart index 40ab8e1a0..2cce6a7eb 100644 --- a/lib/features/thread/presentation/mixin/email_action_controller.dart +++ b/lib/features/thread/presentation/mixin/email_action_controller.dart @@ -249,10 +249,10 @@ mixin EmailActionController { imagePath: imagePaths, title: DeleteActionType.single.getTitleDialog(context), textContent: DeleteActionType.single.getContentDialog(context), - cancelText: DeleteActionType.single.getConfirmActionName(context), - confirmText: AppLocalizations.of(context).cancel, - onCancelButtonAction: () => _deleteEmailPermanentlyAction(context, email), - onConfirmButtonAction: popBack, + confirmText: DeleteActionType.single.getConfirmActionName(context), + cancelText: AppLocalizations.of(context).cancel, + onConfirmButtonAction: () => _deleteEmailPermanentlyAction(context, email), + onCancelButtonAction: popBack, onCloseButtonAction: popBack, )), barrierColor: AppColor.colorDefaultCupertinoActionSheet,