Fix validate email sending dialog position

(cherry picked from commit 8d873b53843a971d3e8e5eb0f80f97f6c5587454)
This commit is contained in:
dab246
2023-12-05 18:55:21 +07:00
committed by Dat H. Pham
parent d97457d42c
commit affc1a4ee7
5 changed files with 96 additions and 82 deletions
@@ -77,8 +77,7 @@ mixin MessageDialogActionMixin {
..title(title ?? '')
..content(message)
..addIcon(icon)
..margin(const EdgeInsets.symmetric(vertical: 42, horizontal: 16))
..marginIcon(icon != null ? const EdgeInsets.only(top: 24) : null)
..margin(const EdgeInsets.only(bottom: 42))
..widthDialog(responsiveUtils.getSizeScreenWidth(context))
..colorConfirmButton(actionButtonColor ?? AppColor.colorTextButton)
..colorCancelButton(cancelButtonColor ?? AppColor.colorCancelButton)
@@ -108,6 +107,11 @@ mixin MessageDialogActionMixin {
barrierColor: AppColor.colorDefaultCupertinoActionSheet,
backgroundColor: Colors.transparent,
enableDrag: true,
constraints: BoxConstraints(
maxWidth: responsiveUtils.getSizeScreenShortestSide(context) - 16
),
useSafeArea: true,
shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(18))),
);
} else {
return (ConfirmationDialogActionSheetBuilder(context, listTextSpan: listTextSpan)
@@ -815,7 +815,7 @@ class ComposerController extends BaseController {
return 'Team-Mail/${mailboxDashBoardController.appInformation.value?.version} $userAgent';
}
void sendEmailAction(BuildContext context) async {
void validateInformationBeforeSending(BuildContext context) async {
if (isSendEmailLoading.isTrue) {
return;
}
@@ -838,7 +838,8 @@ class ComposerController extends BaseController {
onConfirmAction: () => isSendEmailLoading.value = false,
title: AppLocalizations.of(context).sending_failed,
icon: SvgPicture.asset(imagePaths.icSendToastError, fit: BoxFit.fill),
hasCancelButton: false
hasCancelButton: false,
showAsBottomSheet: true,
).whenComplete(() => isSendEmailLoading.value = false);
return;
}
@@ -857,6 +858,7 @@ class ComposerController extends BaseController {
bccAddressExpandMode.value = ExpandMode.EXPAND;
isSendEmailLoading.value = false;
},
showAsBottomSheet: true,
title: AppLocalizations.of(context).sending_failed,
icon: SvgPicture.asset(imagePaths.icSendToastError, fit: BoxFit.fill),
hasCancelButton: false
@@ -871,6 +873,7 @@ class ComposerController extends BaseController {
onConfirmAction: () => _handleSendMessages(context),
onCancelAction: () => isSendEmailLoading.value = false,
title: AppLocalizations.of(context).empty_subject,
showAsBottomSheet: true,
icon: SvgPicture.asset(imagePaths.icEmpty, fit: BoxFit.fill),
).whenComplete(() => isSendEmailLoading.value = false);
return;
@@ -883,6 +886,7 @@ class ComposerController extends BaseController {
AppLocalizations.of(context).got_it,
onConfirmAction: () => isSendEmailLoading.value = false,
title: AppLocalizations.of(context).sending_failed,
showAsBottomSheet: true,
icon: SvgPicture.asset(imagePaths.icSendToastError, fit: BoxFit.fill),
hasCancelButton: false
).whenComplete(() => isSendEmailLoading.value = false);
@@ -60,7 +60,7 @@ class ComposerView extends GetWidget<ComposerController> {
Obx(() => LandscapeAppBarComposerWidget(
isSendButtonEnabled: controller.isEnableEmailSendButton.value,
onCloseViewAction: () => controller.saveToDraftAndClose(context),
sendMessageAction: () => controller.sendEmailAction(context),
sendMessageAction: () => controller.validateInformationBeforeSending(context),
openContextMenuAction: (position) {
controller.openPopupMenuAction(
context,
@@ -74,7 +74,7 @@ class ComposerView extends GetWidget<ComposerController> {
Obx(() => AppBarComposerWidget(
isSendButtonEnabled: controller.isEnableEmailSendButton.value,
onCloseViewAction: () => controller.saveToDraftAndClose(context),
sendMessageAction: () => controller.sendEmailAction(context),
sendMessageAction: () => controller.validateInformationBeforeSending(context),
openContextMenuAction: (position) {
controller.openPopupMenuAction(
context,
@@ -362,7 +362,7 @@ class ComposerView extends GetWidget<ComposerController> {
TabletBottomBarComposerWidget(
deleteComposerAction: () => controller.closeComposer(context),
saveToDraftAction: () => controller.saveToDraftAction(context),
sendMessageAction: () => controller.sendEmailAction(context),
sendMessageAction: () => controller.validateInformationBeforeSending(context),
requestReadReceiptAction: (position) {
controller.openPopupMenuAction(
context,
@@ -47,7 +47,7 @@ class ComposerView extends GetWidget<ComposerController> {
onCloseViewAction: () => controller.saveToDraftAndClose(context),
attachFileAction: () => controller.openFilePickerByType(context, FileType.any),
insertImageAction: () => controller.insertImage(context, constraints.maxWidth),
sendMessageAction: () => controller.sendEmailAction(context),
sendMessageAction: () => controller.validateInformationBeforeSending(context),
openContextMenuAction: (position) {
controller.openPopupMenuAction(
context,
@@ -441,7 +441,7 @@ class ComposerView extends GetWidget<ComposerController> {
showCodeViewAction: controller.richTextWebController.toggleCodeView,
deleteComposerAction: () => controller.closeComposer(context),
saveToDraftAction: () => controller.saveToDraftAction(context),
sendMessageAction: () => controller.sendEmailAction(context),
sendMessageAction: () => controller.validateInformationBeforeSending(context),
requestReadReceiptAction: (position) {
controller.openPopupMenuAction(
context,
@@ -657,7 +657,7 @@ class ComposerView extends GetWidget<ComposerController> {
showCodeViewAction: controller.richTextWebController.toggleCodeView,
deleteComposerAction: () => controller.closeComposer(context),
saveToDraftAction: () => controller.saveToDraftAction(context),
sendMessageAction: () => controller.sendEmailAction(context),
sendMessageAction: () => controller.validateInformationBeforeSending(context),
requestReadReceiptAction: (position) {
controller.openPopupMenuAction(
context,