Hot fix update new UI for confirm dialog

Signed-off-by: dab246 <tdvu@linagora.com>

core/lib/presentation/views/bottom_popup/confirmation_dialog_action_sheet_builder.dart

@@ -99,7 +99,7 @@ class ConfirmationDialogActionSheetBuilder {
                   child: Text(
                       _confirmText ?? '',
                       style: _styleConfirmButton ?? Theme.of(context).textTheme.bodyLarge?.copyWith(
-                        color: AppColor.steelGray600,
+                        color: AppColor.colorActionDeleteConfirmDialog,
                       )),
                   onPressed: () => _onConfirmActionClick?.call(),
                 ),
@@ -112,7 +112,7 @@ class ConfirmationDialogActionSheetBuilder {
             child: Text(
                 _cancelText ?? '',
                 style: _styleCancelButton ??  Theme.of(context).textTheme.bodyLarge?.copyWith(
-                  color: Colors.white,
+                  color: AppColor.blue700,
                 )),
             onPressed: () => _onCancelActionClick?.call(),
           ),

core/lib/presentation/views/dialog/confirmation_dialog_builder.dart

@@ -17,8 +17,10 @@ class ConfirmationDialogBuilder extends StatelessWidget {
   final String cancelText;
   final Widget? iconWidget;
   final Widget? additionalWidgetContent;
-  final Color? colorCancelButton;
+  final Color? cancelBackgroundButtonColor;
-  final Color? colorConfirmButton;
+  final Color? confirmBackgroundButtonColor;
+  final Color? cancelLabelButtonColor;
+  final Color? confirmLabelButtonColor;
   final TextStyle? styleTextCancelButton;
   final TextStyle? styleTextConfirmButton;
   final TextStyle? styleTitle;
@@ -53,8 +55,10 @@ class ConfirmationDialogBuilder extends StatelessWidget {
     this.cancelText = '',
     this.iconWidget,
     this.additionalWidgetContent,
-    this.colorCancelButton,
+    this.cancelBackgroundButtonColor,
-    this.colorConfirmButton,
+    this.confirmBackgroundButtonColor,
+    this.cancelLabelButtonColor,
+    this.confirmLabelButtonColor,
     this.styleTextCancelButton,
     this.styleTextConfirmButton,
     this.styleTitle,
@@ -92,8 +96,10 @@ class ConfirmationDialogBuilder extends StatelessWidget {
             cancelText: cancelText,
             iconWidget: iconWidget,
             additionalWidgetContent: additionalWidgetContent,
-            colorCancelButton: colorCancelButton,
+            cancelBackgroundButtonColor: cancelBackgroundButtonColor,
-            colorConfirmButton: colorConfirmButton,
+            confirmBackgroundButtonColor: confirmBackgroundButtonColor,
+            cancelLabelButtonColor: cancelLabelButtonColor,
+            confirmLabelButtonColor: confirmLabelButtonColor,
             styleTextCancelButton: styleTextCancelButton,
             styleTextConfirmButton: styleTextConfirmButton,
             styleTitle: styleTitle,
@@ -129,8 +135,10 @@ class ConfirmationDialogBuilder extends StatelessWidget {
               cancelText: cancelText,
               iconWidget: iconWidget,
               additionalWidgetContent: additionalWidgetContent,
-              colorCancelButton: colorCancelButton,
+              cancelBackgroundButtonColor: cancelBackgroundButtonColor,
-              colorConfirmButton: colorConfirmButton,
+              confirmBackgroundButtonColor: confirmBackgroundButtonColor,
+              cancelLabelButtonColor: cancelLabelButtonColor,
+              confirmLabelButtonColor: confirmLabelButtonColor,
               styleTextCancelButton: styleTextCancelButton,
               styleTextConfirmButton: styleTextConfirmButton,
               styleTitle: styleTitle,
@@ -164,8 +172,10 @@ class _BodyContent extends StatelessWidget {
   final String cancelText;
   final Widget? iconWidget;
   final Widget? additionalWidgetContent;
-  final Color? colorCancelButton;
+  final Color? cancelBackgroundButtonColor;
-  final Color? colorConfirmButton;
+  final Color? confirmBackgroundButtonColor;
+  final Color? cancelLabelButtonColor;
+  final Color? confirmLabelButtonColor;
   final TextStyle? styleTextCancelButton;
   final TextStyle? styleTextConfirmButton;
   final TextStyle? styleTitle;
@@ -195,8 +205,10 @@ class _BodyContent extends StatelessWidget {
     required this.cancelText,
     this.iconWidget,
     this.additionalWidgetContent,
-    this.colorCancelButton,
+    this.cancelBackgroundButtonColor,
-    this.colorConfirmButton,
+    this.confirmBackgroundButtonColor,
+    this.cancelLabelButtonColor,
+    this.confirmLabelButtonColor,
     this.styleTextCancelButton,
     this.styleTextConfirmButton,
     this.styleTitle,
@@ -366,7 +378,8 @@ class _BodyContent extends StatelessWidget {
                   context,
                   cancelText,
                   onCancelButtonAction,
-                  colorCancelButton,
+                  cancelBackgroundButtonColor,
+                  cancelLabelButtonColor,
                   styleTextCancelButton,
                 ),
               ),
@@ -377,7 +390,8 @@ class _BodyContent extends StatelessWidget {
                   context,
                   confirmText,
                   onConfirmButtonAction,
-                  colorConfirmButton,
+                  confirmBackgroundButtonColor,
+                  confirmLabelButtonColor,
                   styleTextConfirmButton,
                 ),
               ),
@@ -396,7 +410,8 @@ class _BodyContent extends StatelessWidget {
                   context,
                   cancelText,
                   onCancelButtonAction,
-                  colorCancelButton,
+                  cancelBackgroundButtonColor,
+                  cancelLabelButtonColor,
                   styleTextCancelButton,
                 ),
               ),
@@ -408,7 +423,8 @@ class _BodyContent extends StatelessWidget {
                   context,
                   confirmText,
                   onConfirmButtonAction,
-                  colorConfirmButton,
+                  confirmBackgroundButtonColor,
+                  confirmLabelButtonColor,
                   styleTextConfirmButton,
                 ),
               ),
@@ -423,20 +439,22 @@ class _BodyContent extends StatelessWidget {
     String label,
     VoidCallback? onTapAction,
     Color? bgColor,
+    Color? textColor,
     TextStyle? textStyle,
   ) {
     return ConfirmDialogButton(
       label: label,
       backgroundColor: bgColor ??
           (onTapAction == onConfirmButtonAction
-              ? AppColor.grayBackgroundColor
+              ? AppColor.blue700
-              : AppColor.blue700),
+              : AppColor.grayBackgroundColor),
       borderRadius: radiusButton,
       textStyle: textStyle,
       padding: paddingButton,
-      textColor: onTapAction == onConfirmButtonAction
+      textColor: textColor ??
-          ? AppColor.steelGray600
+        (onTapAction == onConfirmButtonAction
-          : Colors.white,
+          ? Colors.white
+          : AppColor.steelGray600),
       maxLines: titleActionButtonMaxLines,
       onTapAction: onTapAction,
     );

lib/features/base/base_mailbox_controller.dart

@@ -444,6 +444,10 @@ abstract class BaseMailboxController extends BaseController {
             textContent: AppLocalizations.of(context).message_confirmation_dialog_delete_folder(presentationMailbox.getDisplayName(context)),
             confirmText: AppLocalizations.of(context).delete,
             cancelText: AppLocalizations.of(context).cancel,
+            cancelBackgroundButtonColor: AppColor.blue700,
+            cancelLabelButtonColor: Colors.white,
+            confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
+            confirmLabelButtonColor: AppColor.steelGray600,
             onConfirmButtonAction: () => onDeleteMailboxAction(presentationMailbox),
             onCancelButtonAction: popBack,
             onCloseButtonAction: popBack,

lib/features/base/mixin/mailbox_action_handler_mixin.dart

@@ -86,6 +86,10 @@ mixin MailboxActionHandlerMixin {
             confirmText: AppLocalizations.of(context).delete,
             cancelText: AppLocalizations.of(context).cancel,
             useIconAsBasicLogo: true,
+            cancelBackgroundButtonColor: AppColor.blue700,
+            cancelLabelButtonColor: Colors.white,
+            confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
+            confirmLabelButtonColor: AppColor.steelGray600,
             onCloseButtonAction: popBack,
             onConfirmButtonAction: () {
               popBack();
@@ -149,6 +153,10 @@ mixin MailboxActionHandlerMixin {
             confirmText: AppLocalizations.of(context).delete_all,
             cancelText: AppLocalizations.of(context).cancel,
             useIconAsBasicLogo: true,
+            cancelBackgroundButtonColor: AppColor.blue700,
+            cancelLabelButtonColor: Colors.white,
+            confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
+            confirmLabelButtonColor: AppColor.steelGray600,
             onCloseButtonAction: popBack,
             onConfirmButtonAction: () {
               popBack();

lib/features/base/mixin/message_dialog_action_mixin.dart

@@ -38,6 +38,8 @@ mixin MessageDialogActionMixin {
         TextStyle? cancelStyle,
         Color? actionButtonColor,
         Color? cancelButtonColor,
+        Color? cancelLabelButtonColor,
+        Color? confirmLabelButtonColor,
         EdgeInsetsGeometry? marginIcon,
         EdgeInsetsGeometry? paddingButton,
         PopInvokedWithResultCallback? onPopInvoked,
@@ -63,8 +65,10 @@ mixin MessageDialogActionMixin {
           confirmText: actionName,
           cancelText: hasCancelButton ? cancelTitle ?? AppLocalizations.of(context).cancel : '',
           iconWidget: icon,
-          colorCancelButton: cancelButtonColor,
+          cancelBackgroundButtonColor: cancelButtonColor,
-          colorConfirmButton: actionButtonColor,
+          confirmBackgroundButtonColor: actionButtonColor,
+          cancelLabelButtonColor: cancelLabelButtonColor,
+          confirmLabelButtonColor: confirmLabelButtonColor,
           styleTextCancelButton: cancelStyle,
           styleTextConfirmButton: actionStyle,
           styleTitle: titleStyle,
@@ -108,8 +112,10 @@ mixin MessageDialogActionMixin {
             title: title ?? '',
             iconWidget: icon,
             widthDialog: responsiveUtils.getSizeScreenWidth(context),
-            colorConfirmButton: actionButtonColor,
+            confirmBackgroundButtonColor: actionButtonColor,
-            colorCancelButton: cancelButtonColor,
+            cancelBackgroundButtonColor: cancelButtonColor,
+            cancelLabelButtonColor: cancelLabelButtonColor,
+            confirmLabelButtonColor: confirmLabelButtonColor,
             styleContent: messageStyle,
             styleTitle: titleStyle,
             styleTextCancelButton: cancelStyle,
@@ -179,8 +185,10 @@ mixin MessageDialogActionMixin {
             title: title ?? '',
             textContent: message,
             iconWidget: icon,
-            colorConfirmButton: actionButtonColor,
+            confirmBackgroundButtonColor: actionButtonColor,
-            colorCancelButton: cancelButtonColor,
+            cancelBackgroundButtonColor: cancelButtonColor,
+            cancelLabelButtonColor: cancelLabelButtonColor,
+            confirmLabelButtonColor: confirmLabelButtonColor,
             styleContent: messageStyle,
             styleTitle: titleStyle,
             styleTextCancelButton: cancelStyle,

lib/features/composer/presentation/composer_controller.dart

@@ -1007,6 +1007,10 @@ class ComposerController extends BaseController
         onCancelAction: popBack,
         autoPerformPopBack: false,
         title: AppLocalizations.of(context).empty_subject,
+        cancelButtonColor: AppColor.blue700,
+        cancelLabelButtonColor: Colors.white,
+        actionButtonColor: AppColor.grayBackgroundColor,
+        confirmLabelButtonColor: AppColor.steelGray600,
         showAsBottomSheet: true,
         icon: SvgPicture.asset(imagePaths.icEmpty, fit: BoxFit.fill),
       ).whenComplete(() => _sendButtonState = ButtonState.enabled);

lib/features/email/presentation/controller/single_email_controller.dart

@@ -1500,6 +1500,10 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
           textContent: DeleteActionType.single.getContentDialog(context),
           confirmText: DeleteActionType.single.getConfirmActionName(context),
           cancelText: AppLocalizations.of(context).cancel,
+          cancelBackgroundButtonColor: AppColor.blue700,
+          cancelLabelButtonColor: Colors.white,
+          confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
+          confirmLabelButtonColor: AppColor.steelGray600,
           onConfirmButtonAction: () => _deleteEmailPermanentlyAction(context, email),
           onCancelButtonAction: popBack,
           onCloseButtonAction: popBack,

lib/features/mailbox/presentation/mailbox_controller.dart

@@ -1074,6 +1074,10 @@ class MailboxController extends BaseMailboxController
           imagePath: imagePaths,
           useIconAsBasicLogo: true,
           title: AppLocalizations.of(context).deleteFolders,
+          cancelBackgroundButtonColor: AppColor.blue700,
+          cancelLabelButtonColor: Colors.white,
+          confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
+          confirmLabelButtonColor: AppColor.steelGray600,
           textContent: AppLocalizations.of(context).messageConfirmationDialogDeleteMultipleFolder(selectedMailboxList.length),
           onConfirmButtonAction: () => _deleteMultipleMailboxAction(selectedMailboxList),
           onCancelButtonAction: popBack,

lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart

@@ -1564,6 +1564,10 @@ class MailboxDashBoardController extends ReloadableController
           ),
           confirmText: actionType.getConfirmActionName(context),
           cancelText: AppLocalizations.of(context).cancel,
+          cancelBackgroundButtonColor: AppColor.blue700,
+          cancelLabelButtonColor: Colors.white,
+          confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
+          confirmLabelButtonColor: AppColor.steelGray600,
           onConfirmButtonAction: () => _deleteSelectionEmailsPermanentlyAction(
             actionType,
             listEmails: listEmails,
@@ -2704,6 +2708,10 @@ class MailboxDashBoardController extends ReloadableController
           textContent: AppLocalizations.of(context).emptySpamMessageDialog,
           confirmText: AppLocalizations.of(context).delete_all,
           cancelText: AppLocalizations.of(context).cancel,
+          cancelBackgroundButtonColor: AppColor.blue700,
+          cancelLabelButtonColor: Colors.white,
+          confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
+          confirmLabelButtonColor: AppColor.steelGray600,
           onConfirmButtonAction: () {
             popBack();
             if (spamMailbox.countTotalEmails > 0) {

lib/features/manage_account/presentation/email_rules/email_rules_controller.dart

@@ -175,6 +175,10 @@ class EmailRulesController extends BaseController {
             textContent: AppLocalizations.of(context).messageConfirmationDialogDeleteEmailRule(emailRule.name),
             confirmText: AppLocalizations.of(context).delete,
             cancelText: AppLocalizations.of(context).cancel,
+            cancelBackgroundButtonColor: AppColor.blue700,
+            cancelLabelButtonColor: Colors.white,
+            confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
+            confirmLabelButtonColor: AppColor.steelGray600,
             onConfirmButtonAction: () => _handleDeleteEmailRuleAction(emailRule),
             onCancelButtonAction: popBack,
             onCloseButtonAction: popBack,

lib/features/manage_account/presentation/forward/forward_controller.dart

@@ -1,3 +1,4 @@
+import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:core/presentation/utils/keyboard_utils.dart';
@@ -122,6 +123,10 @@ class ForwardController extends BaseController {
       onConfirmAction: () => _handleDeleteRecipientAction({emailAddress}),
       showAsBottomSheet: true,
       useIconAsBasicLogo: true,
+      cancelButtonColor: AppColor.blue700,
+      cancelLabelButtonColor: Colors.white,
+      actionButtonColor: AppColor.grayBackgroundColor,
+      confirmLabelButtonColor: AppColor.steelGray600,
     );
   }
 
@@ -204,6 +209,10 @@ class ForwardController extends BaseController {
       onConfirmAction: () => _handleDeleteRecipientAction(listEmailAddress),
       showAsBottomSheet: true,
       useIconAsBasicLogo: true,
+      cancelButtonColor: AppColor.blue700,
+      cancelLabelButtonColor: Colors.white,
+      actionButtonColor: AppColor.grayBackgroundColor,
+      confirmLabelButtonColor: AppColor.steelGray600,
     );
   }
 

lib/features/manage_account/presentation/forward/widgets/autocomplete_contact_text_field_with_tags.dart

@@ -449,6 +449,10 @@ class _AutocompleteContactTextFieldWithTagsState extends State<AutocompleteConta
       alignCenter: true,
       onConfirmAction: confirmAction,
       onCancelAction: cancelAction,
+      cancelButtonColor: AppColor.blue700,
+      cancelLabelButtonColor: Colors.white,
+      actionButtonColor: AppColor.grayBackgroundColor,
+      confirmLabelButtonColor: AppColor.steelGray600,
       icon: SvgPicture.asset(
         _imagePaths.icQuotasWarning,
         width: 40,

lib/features/manage_account/presentation/profiles/identities/widgets/delete_identity_dialog_builder.dart

@@ -1,3 +1,4 @@
+import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:core/presentation/resources/image_paths.dart';
 import 'package:core/presentation/utils/responsive_utils.dart';
 import 'package:core/presentation/views/dialog/confirmation_dialog_builder.dart';
@@ -63,6 +64,10 @@ class DeleteIdentityDialogBuilder extends StatelessWidget {
       alignment: alignment,
       outsideDialogPadding: outsideDialogPadding,
       widthDialog: widthDialog,
+      cancelBackgroundButtonColor: AppColor.blue700,
+      cancelLabelButtonColor: Colors.white,
+      confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
+      confirmLabelButtonColor: AppColor.steelGray600,
       onConfirmButtonAction: onDeleteIdentityAction,
       onCancelButtonAction: popBack,
       onCloseButtonAction: popBack,

lib/features/thread/presentation/mixin/email_action_controller.dart

@@ -245,6 +245,10 @@ mixin EmailActionController {
           textContent: DeleteActionType.single.getContentDialog(context),
           confirmText: DeleteActionType.single.getConfirmActionName(context),
           cancelText: AppLocalizations.of(context).cancel,
+          cancelBackgroundButtonColor: AppColor.blue700,
+          cancelLabelButtonColor: Colors.white,
+          confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
+          confirmLabelButtonColor: AppColor.steelGray600,
           onConfirmButtonAction: () => _deleteEmailPermanentlyAction(context, email),
           onCancelButtonAction: popBack,
           onCloseButtonAction: popBack,

lib/features/upload/presentation/controller/upload_controller.dart

@@ -388,6 +388,10 @@ class UploadController extends BaseController {
       AppLocalizations.of(context).warningMessageWhenExceedGenerallySizeInComposer,
       AppLocalizations.of(context).continueAction,
       cancelTitle: AppLocalizations.of(context).cancel,
+      cancelButtonColor: AppColor.blue700,
+      cancelLabelButtonColor: Colors.white,
+      actionButtonColor: AppColor.grayBackgroundColor,
+      confirmLabelButtonColor: AppColor.steelGray600,
       alignCenter: true,
       onConfirmAction: confirmAction,
       icon: SvgPicture.asset(