From 50635049ab81691d175a5260edab84e6c8bfb75c Mon Sep 17 00:00:00 2001 From: dab246 Date: Fri, 9 Jun 2023 09:57:34 +0700 Subject: [PATCH] TF-1915 Add `await` for all show dialog (cherry picked from commit f710f75f3ffb29a4e2fabfc33054eaa4554a944c) --- .../confirmation_dialog_action_sheet_builder.dart | 4 ++-- core/lib/presentation/views/toast/tmail_toast.dart | 2 +- lib/features/base/mixin/message_dialog_action_mixin.dart | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/lib/presentation/views/bottom_popup/confirmation_dialog_action_sheet_builder.dart b/core/lib/presentation/views/bottom_popup/confirmation_dialog_action_sheet_builder.dart index 5b2c1f376..1f09dd148 100644 --- a/core/lib/presentation/views/bottom_popup/confirmation_dialog_action_sheet_builder.dart +++ b/core/lib/presentation/views/bottom_popup/confirmation_dialog_action_sheet_builder.dart @@ -49,8 +49,8 @@ class ConfirmationDialogActionSheetBuilder { _styleCancelButton = style; } - void show() { - showCupertinoModalPopup( + void show() async { + await showCupertinoModalPopup( context: _context, barrierColor: AppColor.colorDefaultCupertinoActionSheet, builder: (context) => PointerInterceptor(child: CupertinoActionSheet( diff --git a/core/lib/presentation/views/toast/tmail_toast.dart b/core/lib/presentation/views/toast/tmail_toast.dart index f4c69003b..2ca0a1a8f 100644 --- a/core/lib/presentation/views/toast/tmail_toast.dart +++ b/core/lib/presentation/views/toast/tmail_toast.dart @@ -163,7 +163,7 @@ class ToastView { required double currentMaxWidth, Widget? leading }) { - return leading == null ? currentMaxWidth : currentMaxWidth - 90; + return leading == null ? currentMaxWidth : currentMaxWidth - 100; } static Positioned _showWidgetBasedOnPosition( diff --git a/lib/features/base/mixin/message_dialog_action_mixin.dart b/lib/features/base/mixin/message_dialog_action_mixin.dart index 5be432552..e993b1dff 100644 --- a/lib/features/base/mixin/message_dialog_action_mixin.dart +++ b/lib/features/base/mixin/message_dialog_action_mixin.dart @@ -28,12 +28,12 @@ mixin MessageDialogActionMixin { Color? actionButtonColor, Color? cancelButtonColor, } - ) { + ) async { final responsiveUtils = Get.find(); final imagePaths = Get.find(); if (alignCenter) { - showDialog( + await showDialog( context: context, barrierColor: AppColor.colorDefaultCupertinoActionSheet, builder: (BuildContext context) => PointerInterceptor( @@ -63,7 +63,7 @@ mixin MessageDialogActionMixin { } else { if (responsiveUtils.isMobile(context)) { if (showAsBottomSheet) { - showModalBottomSheet( + await showModalBottomSheet( context: context, isScrollControlled: true, barrierColor: AppColor.colorDefaultCupertinoActionSheet, @@ -107,7 +107,7 @@ mixin MessageDialogActionMixin { })).show(); } } else { - showDialog( + await showDialog( context: context, barrierColor: AppColor.colorDefaultCupertinoActionSheet, builder: (BuildContext context) => PointerInterceptor(