Skip to content

Commit ae0c847

Browse files
dab246hoangdat
dab246
authored and
hoangdat
committed
Hot fix update new UI for confirm dialog
Signed-off-by: dab246 <tdvu@linagora.com>
1 parent 86fa566 commit ae0c847

File tree

15 files changed

+117
-29
lines changed

15 files changed

+117
-29
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class ConfirmationDialogActionSheetBuilder {
9999
child: Text(
100100
_confirmText ?? '',
101101
style: _styleConfirmButton ?? Theme.of(context).textTheme.bodyLarge?.copyWith(
102-
color: AppColor.steelGray600,
102+
color: AppColor.colorActionDeleteConfirmDialog,
103103
)),
104104
onPressed: () => _onConfirmActionClick?.call(),
105105
),
@@ -112,7 +112,7 @@ class ConfirmationDialogActionSheetBuilder {
112112
child: Text(
113113
_cancelText ?? '',
114114
style: _styleCancelButton ?? Theme.of(context).textTheme.bodyLarge?.copyWith(
115-
color: Colors.white,
115+
color: AppColor.blue700,
116116
)),
117117
onPressed: () => _onCancelActionClick?.call(),
118118
),

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

Lines changed: 39 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ class ConfirmationDialogBuilder extends StatelessWidget {
1717
final String cancelText;
1818
final Widget? iconWidget;
1919
final Widget? additionalWidgetContent;
20-
final Color? colorCancelButton;
21-
final Color? colorConfirmButton;
20+
final Color? cancelBackgroundButtonColor;
21+
final Color? confirmBackgroundButtonColor;
22+
final Color? cancelLabelButtonColor;
23+
final Color? confirmLabelButtonColor;
2224
final TextStyle? styleTextCancelButton;
2325
final TextStyle? styleTextConfirmButton;
2426
final TextStyle? styleTitle;
@@ -53,8 +55,10 @@ class ConfirmationDialogBuilder extends StatelessWidget {
5355
this.cancelText = '',
5456
this.iconWidget,
5557
this.additionalWidgetContent,
56-
this.colorCancelButton,
57-
this.colorConfirmButton,
58+
this.cancelBackgroundButtonColor,
59+
this.confirmBackgroundButtonColor,
60+
this.cancelLabelButtonColor,
61+
this.confirmLabelButtonColor,
5862
this.styleTextCancelButton,
5963
this.styleTextConfirmButton,
6064
this.styleTitle,
@@ -92,8 +96,10 @@ class ConfirmationDialogBuilder extends StatelessWidget {
9296
cancelText: cancelText,
9397
iconWidget: iconWidget,
9498
additionalWidgetContent: additionalWidgetContent,
95-
colorCancelButton: colorCancelButton,
96-
colorConfirmButton: colorConfirmButton,
99+
cancelBackgroundButtonColor: cancelBackgroundButtonColor,
100+
confirmBackgroundButtonColor: confirmBackgroundButtonColor,
101+
cancelLabelButtonColor: cancelLabelButtonColor,
102+
confirmLabelButtonColor: confirmLabelButtonColor,
97103
styleTextCancelButton: styleTextCancelButton,
98104
styleTextConfirmButton: styleTextConfirmButton,
99105
styleTitle: styleTitle,
@@ -129,8 +135,10 @@ class ConfirmationDialogBuilder extends StatelessWidget {
129135
cancelText: cancelText,
130136
iconWidget: iconWidget,
131137
additionalWidgetContent: additionalWidgetContent,
132-
colorCancelButton: colorCancelButton,
133-
colorConfirmButton: colorConfirmButton,
138+
cancelBackgroundButtonColor: cancelBackgroundButtonColor,
139+
confirmBackgroundButtonColor: confirmBackgroundButtonColor,
140+
cancelLabelButtonColor: cancelLabelButtonColor,
141+
confirmLabelButtonColor: confirmLabelButtonColor,
134142
styleTextCancelButton: styleTextCancelButton,
135143
styleTextConfirmButton: styleTextConfirmButton,
136144
styleTitle: styleTitle,
@@ -164,8 +172,10 @@ class _BodyContent extends StatelessWidget {
164172
final String cancelText;
165173
final Widget? iconWidget;
166174
final Widget? additionalWidgetContent;
167-
final Color? colorCancelButton;
168-
final Color? colorConfirmButton;
175+
final Color? cancelBackgroundButtonColor;
176+
final Color? confirmBackgroundButtonColor;
177+
final Color? cancelLabelButtonColor;
178+
final Color? confirmLabelButtonColor;
169179
final TextStyle? styleTextCancelButton;
170180
final TextStyle? styleTextConfirmButton;
171181
final TextStyle? styleTitle;
@@ -195,8 +205,10 @@ class _BodyContent extends StatelessWidget {
195205
required this.cancelText,
196206
this.iconWidget,
197207
this.additionalWidgetContent,
198-
this.colorCancelButton,
199-
this.colorConfirmButton,
208+
this.cancelBackgroundButtonColor,
209+
this.confirmBackgroundButtonColor,
210+
this.cancelLabelButtonColor,
211+
this.confirmLabelButtonColor,
200212
this.styleTextCancelButton,
201213
this.styleTextConfirmButton,
202214
this.styleTitle,
@@ -366,7 +378,8 @@ class _BodyContent extends StatelessWidget {
366378
context,
367379
cancelText,
368380
onCancelButtonAction,
369-
colorCancelButton,
381+
cancelBackgroundButtonColor,
382+
cancelLabelButtonColor,
370383
styleTextCancelButton,
371384
),
372385
),
@@ -377,7 +390,8 @@ class _BodyContent extends StatelessWidget {
377390
context,
378391
confirmText,
379392
onConfirmButtonAction,
380-
colorConfirmButton,
393+
confirmBackgroundButtonColor,
394+
confirmLabelButtonColor,
381395
styleTextConfirmButton,
382396
),
383397
),
@@ -396,7 +410,8 @@ class _BodyContent extends StatelessWidget {
396410
context,
397411
cancelText,
398412
onCancelButtonAction,
399-
colorCancelButton,
413+
cancelBackgroundButtonColor,
414+
cancelLabelButtonColor,
400415
styleTextCancelButton,
401416
),
402417
),
@@ -408,7 +423,8 @@ class _BodyContent extends StatelessWidget {
408423
context,
409424
confirmText,
410425
onConfirmButtonAction,
411-
colorConfirmButton,
426+
confirmBackgroundButtonColor,
427+
confirmLabelButtonColor,
412428
styleTextConfirmButton,
413429
),
414430
),
@@ -423,20 +439,22 @@ class _BodyContent extends StatelessWidget {
423439
String label,
424440
VoidCallback? onTapAction,
425441
Color? bgColor,
442+
Color? textColor,
426443
TextStyle? textStyle,
427444
) {
428445
return ConfirmDialogButton(
429446
label: label,
430447
backgroundColor: bgColor ??
431448
(onTapAction == onConfirmButtonAction
432-
? AppColor.grayBackgroundColor
433-
: AppColor.blue700),
449+
? AppColor.blue700
450+
: AppColor.grayBackgroundColor),
434451
borderRadius: radiusButton,
435452
textStyle: textStyle,
436453
padding: paddingButton,
437-
textColor: onTapAction == onConfirmButtonAction
438-
? AppColor.steelGray600
439-
: Colors.white,
454+
textColor: textColor ??
455+
(onTapAction == onConfirmButtonAction
456+
? Colors.white
457+
: AppColor.steelGray600),
440458
maxLines: titleActionButtonMaxLines,
441459
onTapAction: onTapAction,
442460
);

‎lib/features/base/base_mailbox_controller.dart‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,10 @@ abstract class BaseMailboxController extends BaseController {
444444
textContent: AppLocalizations.of(context).message_confirmation_dialog_delete_folder(presentationMailbox.getDisplayName(context)),
445445
confirmText: AppLocalizations.of(context).delete,
446446
cancelText: AppLocalizations.of(context).cancel,
447+
cancelBackgroundButtonColor: AppColor.blue700,
448+
cancelLabelButtonColor: Colors.white,
449+
confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
450+
confirmLabelButtonColor: AppColor.steelGray600,
447451
onConfirmButtonAction: () => onDeleteMailboxAction(presentationMailbox),
448452
onCancelButtonAction: popBack,
449453
onCloseButtonAction: popBack,

‎lib/features/base/mixin/mailbox_action_handler_mixin.dart‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ mixin MailboxActionHandlerMixin {
8686
confirmText: AppLocalizations.of(context).delete,
8787
cancelText: AppLocalizations.of(context).cancel,
8888
useIconAsBasicLogo: true,
89+
cancelBackgroundButtonColor: AppColor.blue700,
90+
cancelLabelButtonColor: Colors.white,
91+
confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
92+
confirmLabelButtonColor: AppColor.steelGray600,
8993
onCloseButtonAction: popBack,
9094
onConfirmButtonAction: () {
9195
popBack();
@@ -149,6 +153,10 @@ mixin MailboxActionHandlerMixin {
149153
confirmText: AppLocalizations.of(context).delete_all,
150154
cancelText: AppLocalizations.of(context).cancel,
151155
useIconAsBasicLogo: true,
156+
cancelBackgroundButtonColor: AppColor.blue700,
157+
cancelLabelButtonColor: Colors.white,
158+
confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
159+
confirmLabelButtonColor: AppColor.steelGray600,
152160
onCloseButtonAction: popBack,
153161
onConfirmButtonAction: () {
154162
popBack();

‎lib/features/base/mixin/message_dialog_action_mixin.dart‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ mixin MessageDialogActionMixin {
3838
TextStyle? cancelStyle,
3939
Color? actionButtonColor,
4040
Color? cancelButtonColor,
41+
Color? cancelLabelButtonColor,
42+
Color? confirmLabelButtonColor,
4143
EdgeInsetsGeometry? marginIcon,
4244
EdgeInsetsGeometry? paddingButton,
4345
PopInvokedWithResultCallback? onPopInvoked,
@@ -63,8 +65,10 @@ mixin MessageDialogActionMixin {
6365
confirmText: actionName,
6466
cancelText: hasCancelButton ? cancelTitle ?? AppLocalizations.of(context).cancel : '',
6567
iconWidget: icon,
66-
colorCancelButton: cancelButtonColor,
67-
colorConfirmButton: actionButtonColor,
68+
cancelBackgroundButtonColor: cancelButtonColor,
69+
confirmBackgroundButtonColor: actionButtonColor,
70+
cancelLabelButtonColor: cancelLabelButtonColor,
71+
confirmLabelButtonColor: confirmLabelButtonColor,
6872
styleTextCancelButton: cancelStyle,
6973
styleTextConfirmButton: actionStyle,
7074
styleTitle: titleStyle,
@@ -108,8 +112,10 @@ mixin MessageDialogActionMixin {
108112
title: title ?? '',
109113
iconWidget: icon,
110114
widthDialog: responsiveUtils.getSizeScreenWidth(context),
111-
colorConfirmButton: actionButtonColor,
112-
colorCancelButton: cancelButtonColor,
115+
confirmBackgroundButtonColor: actionButtonColor,
116+
cancelBackgroundButtonColor: cancelButtonColor,
117+
cancelLabelButtonColor: cancelLabelButtonColor,
118+
confirmLabelButtonColor: confirmLabelButtonColor,
113119
styleContent: messageStyle,
114120
styleTitle: titleStyle,
115121
styleTextCancelButton: cancelStyle,
@@ -179,8 +185,10 @@ mixin MessageDialogActionMixin {
179185
title: title ?? '',
180186
textContent: message,
181187
iconWidget: icon,
182-
colorConfirmButton: actionButtonColor,
183-
colorCancelButton: cancelButtonColor,
188+
confirmBackgroundButtonColor: actionButtonColor,
189+
cancelBackgroundButtonColor: cancelButtonColor,
190+
cancelLabelButtonColor: cancelLabelButtonColor,
191+
confirmLabelButtonColor: confirmLabelButtonColor,
184192
styleContent: messageStyle,
185193
styleTitle: titleStyle,
186194
styleTextCancelButton: cancelStyle,

‎lib/features/composer/presentation/composer_controller.dart‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,6 +1007,10 @@ class ComposerController extends BaseController
10071007
onCancelAction: popBack,
10081008
autoPerformPopBack: false,
10091009
title: AppLocalizations.of(context).empty_subject,
1010+
cancelButtonColor: AppColor.blue700,
1011+
cancelLabelButtonColor: Colors.white,
1012+
actionButtonColor: AppColor.grayBackgroundColor,
1013+
confirmLabelButtonColor: AppColor.steelGray600,
10101014
showAsBottomSheet: true,
10111015
icon: SvgPicture.asset(imagePaths.icEmpty, fit: BoxFit.fill),
10121016
).whenComplete(() => _sendButtonState = ButtonState.enabled);

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1500,6 +1500,10 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
15001500
textContent: DeleteActionType.single.getContentDialog(context),
15011501
confirmText: DeleteActionType.single.getConfirmActionName(context),
15021502
cancelText: AppLocalizations.of(context).cancel,
1503+
cancelBackgroundButtonColor: AppColor.blue700,
1504+
cancelLabelButtonColor: Colors.white,
1505+
confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
1506+
confirmLabelButtonColor: AppColor.steelGray600,
15031507
onConfirmButtonAction: () => _deleteEmailPermanentlyAction(context, email),
15041508
onCancelButtonAction: popBack,
15051509
onCloseButtonAction: popBack,

‎lib/features/mailbox/presentation/mailbox_controller.dart‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,6 +1074,10 @@ class MailboxController extends BaseMailboxController
10741074
imagePath: imagePaths,
10751075
useIconAsBasicLogo: true,
10761076
title: AppLocalizations.of(context).deleteFolders,
1077+
cancelBackgroundButtonColor: AppColor.blue700,
1078+
cancelLabelButtonColor: Colors.white,
1079+
confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
1080+
confirmLabelButtonColor: AppColor.steelGray600,
10771081
textContent: AppLocalizations.of(context).messageConfirmationDialogDeleteMultipleFolder(selectedMailboxList.length),
10781082
onConfirmButtonAction: () => _deleteMultipleMailboxAction(selectedMailboxList),
10791083
onCancelButtonAction: popBack,

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1564,6 +1564,10 @@ class MailboxDashBoardController extends ReloadableController
15641564
),
15651565
confirmText: actionType.getConfirmActionName(context),
15661566
cancelText: AppLocalizations.of(context).cancel,
1567+
cancelBackgroundButtonColor: AppColor.blue700,
1568+
cancelLabelButtonColor: Colors.white,
1569+
confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
1570+
confirmLabelButtonColor: AppColor.steelGray600,
15671571
onConfirmButtonAction: () => _deleteSelectionEmailsPermanentlyAction(
15681572
actionType,
15691573
listEmails: listEmails,
@@ -2704,6 +2708,10 @@ class MailboxDashBoardController extends ReloadableController
27042708
textContent: AppLocalizations.of(context).emptySpamMessageDialog,
27052709
confirmText: AppLocalizations.of(context).delete_all,
27062710
cancelText: AppLocalizations.of(context).cancel,
2711+
cancelBackgroundButtonColor: AppColor.blue700,
2712+
cancelLabelButtonColor: Colors.white,
2713+
confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
2714+
confirmLabelButtonColor: AppColor.steelGray600,
27072715
onConfirmButtonAction: () {
27082716
popBack();
27092717
if (spamMailbox.countTotalEmails > 0) {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,10 @@ class EmailRulesController extends BaseController {
175175
textContent: AppLocalizations.of(context).messageConfirmationDialogDeleteEmailRule(emailRule.name),
176176
confirmText: AppLocalizations.of(context).delete,
177177
cancelText: AppLocalizations.of(context).cancel,
178+
cancelBackgroundButtonColor: AppColor.blue700,
179+
cancelLabelButtonColor: Colors.white,
180+
confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
181+
confirmLabelButtonColor: AppColor.steelGray600,
178182
onConfirmButtonAction: () => _handleDeleteEmailRuleAction(emailRule),
179183
onCancelButtonAction: popBack,
180184
onCloseButtonAction: popBack,

0 commit comments

Comments
 (0)