TF-3952 Change modal style in Forwarding
Signed-off-by: dab246 <tdvu@linagora.com>
This commit is contained in:
@@ -42,6 +42,7 @@ mixin MessageDialogActionMixin {
|
||||
bool useIconAsBasicLogo = false,
|
||||
bool isScrollContentEnabled = false,
|
||||
EdgeInsetsGeometry? dialogMargin,
|
||||
EdgeInsets? outsideDialogPadding,
|
||||
}
|
||||
) async {
|
||||
final responsiveUtils = Get.find<ResponsiveUtils>();
|
||||
@@ -61,6 +62,10 @@ mixin MessageDialogActionMixin {
|
||||
confirmText: actionName,
|
||||
cancelText: hasCancelButton ? cancelTitle ?? AppLocalizations.of(context).cancel : '',
|
||||
iconWidget: icon,
|
||||
outsideDialogPadding: outsideDialogPadding ??
|
||||
(responsiveUtils.isScreenWithShortestSide(context)
|
||||
? const EdgeInsets.all(16)
|
||||
: null),
|
||||
cancelBackgroundButtonColor: cancelButtonColor,
|
||||
confirmBackgroundButtonColor: actionButtonColor,
|
||||
cancelLabelButtonColor: cancelLabelButtonColor,
|
||||
|
||||
@@ -123,10 +123,11 @@ class ForwardController extends BaseController {
|
||||
context,
|
||||
title: AppLocalizations.of(context).deleteRecipient,
|
||||
AppLocalizations.of(context).messageConfirmationDialogDeleteRecipientForward(emailAddress),
|
||||
AppLocalizations.of(context).cancel,
|
||||
cancelTitle: AppLocalizations.of(context).remove,
|
||||
onCancelAction: () => _handleDeleteRecipientAction({emailAddress}),
|
||||
showAsBottomSheet: true,
|
||||
AppLocalizations.of(context).remove,
|
||||
cancelTitle: AppLocalizations.of(context).cancel,
|
||||
onCloseButtonAction: popBack,
|
||||
onConfirmAction: () => _handleDeleteRecipientAction({emailAddress}),
|
||||
alignCenter: true,
|
||||
dialogMargin: MediaQuery.paddingOf(context).add(const EdgeInsets.only(bottom: 12)),
|
||||
);
|
||||
}
|
||||
@@ -207,10 +208,11 @@ class ForwardController extends BaseController {
|
||||
context,
|
||||
title: AppLocalizations.of(context).deleteRecipient,
|
||||
AppLocalizations.of(context).messageConfirmationDialogDeleteAllRecipientForward,
|
||||
AppLocalizations.of(context).cancel,
|
||||
cancelTitle: AppLocalizations.of(context).remove,
|
||||
onCancelAction: () => _handleDeleteRecipientAction(listEmailAddress),
|
||||
showAsBottomSheet: true,
|
||||
AppLocalizations.of(context).remove,
|
||||
cancelTitle: AppLocalizations.of(context).cancel,
|
||||
onConfirmAction: () => _handleDeleteRecipientAction(listEmailAddress),
|
||||
onCloseButtonAction: popBack,
|
||||
alignCenter: true,
|
||||
dialogMargin: MediaQuery.paddingOf(context).add(const EdgeInsets.only(bottom: 12)),
|
||||
);
|
||||
}
|
||||
|
||||
+19
-6
@@ -23,6 +23,7 @@ import 'package:tmail_ui_user/features/contact/presentation/widgets/contact_sugg
|
||||
import 'package:tmail_ui_user/features/email/presentation/utils/email_utils.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/domain/exceptions/forward_exception.dart';
|
||||
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
||||
import 'package:tmail_ui_user/main/routes/route_navigation.dart';
|
||||
import 'package:tmail_ui_user/main/utils/app_config.dart';
|
||||
import 'package:tmail_ui_user/main/utils/app_utils.dart';
|
||||
|
||||
@@ -452,15 +453,27 @@ class _AutocompleteContactTextFieldWithTagsState extends State<AutocompleteConta
|
||||
VoidCallback? confirmAction,
|
||||
VoidCallback? cancelAction
|
||||
}) async {
|
||||
final appLocalizations = AppLocalizations.of(context);
|
||||
final forwardWarningMessage = AppConfig.forwardWarningMessage;
|
||||
final title = forwardWarningMessage != null
|
||||
? null
|
||||
: appLocalizations.dialogWarningTitleForForwardsToOtherDomains;
|
||||
final message = forwardWarningMessage
|
||||
?? appLocalizations.dialogWarningMessageForForwardsToOtherDomains;
|
||||
|
||||
await showConfirmDialogAction(
|
||||
context,
|
||||
AppLocalizations.of(context).doYouWantToProceed,
|
||||
AppLocalizations.of(context).no,
|
||||
title: AppConfig.getForwardWarningMessage(context),
|
||||
cancelTitle: AppLocalizations.of(context).yes,
|
||||
message,
|
||||
AppLocalizations.of(context).yes,
|
||||
title: title,
|
||||
cancelTitle: AppLocalizations.of(context).no,
|
||||
alignCenter: true,
|
||||
onConfirmAction: cancelAction,
|
||||
onCancelAction: confirmAction,
|
||||
onConfirmAction: confirmAction,
|
||||
onCancelAction: cancelAction,
|
||||
onCloseButtonAction: () {
|
||||
popBack();
|
||||
cancelAction?.call();
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
+6
-2
@@ -4,6 +4,7 @@ import 'package:core/presentation/utils/responsive_utils.dart';
|
||||
import 'package:core/presentation/utils/theme_utils.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/flutter_svg.dart';
|
||||
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
||||
import 'package:tmail_ui_user/main/utils/app_config.dart';
|
||||
|
||||
class ForwardWarningBanner extends StatelessWidget {
|
||||
@@ -28,7 +29,9 @@ class ForwardWarningBanner extends StatelessWidget {
|
||||
color: AppColor.lightGrayEAEDF2,
|
||||
),
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
crossAxisAlignment: responsiveUtils.isWebDesktop(context)
|
||||
? CrossAxisAlignment.center
|
||||
: CrossAxisAlignment.start,
|
||||
children: [
|
||||
SvgPicture.asset(
|
||||
imagePaths.icInfoCircleOutline,
|
||||
@@ -40,7 +43,8 @@ class ForwardWarningBanner extends StatelessWidget {
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
AppConfig.getForwardWarningMessage(context),
|
||||
AppConfig.forwardWarningMessage ??
|
||||
AppLocalizations.of(context).messageWarningDialogForForwardsToOtherDomains,
|
||||
style: ThemeUtils.textStyleInter400.copyWith(
|
||||
letterSpacing: 0.0,
|
||||
color: AppColor.steelGray400,
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ class KeepCopyInInboxWidget extends StatelessWidget {
|
||||
}
|
||||
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(top: 8),
|
||||
padding: const EdgeInsets.only(top: 8, bottom: 16),
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ class NumberOfRecipientWidget extends StatelessWidget {
|
||||
Widget build(BuildContext context) {
|
||||
final appLocalizations = AppLocalizations.of(context);
|
||||
return Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 36),
|
||||
padding: const EdgeInsets.only(top: 20, bottom: 36),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
|
||||
Reference in New Issue
Block a user