Upgrade Twake Mail Flutter to v3.24.5
Revert "fixup! Upgrade Twake Mail Flutter to v3.24.5" This reverts commit 0a597753a92b658ec17b0578ed488584d7c514d4.
This commit is contained in:
@@ -34,7 +34,7 @@ mixin MessageDialogActionMixin {
|
||||
Color? cancelButtonColor,
|
||||
EdgeInsetsGeometry? marginIcon,
|
||||
EdgeInsetsGeometry? paddingButton,
|
||||
PopInvokedCallback? onPopInvoked,
|
||||
PopInvokedWithResultCallback? onPopInvoked,
|
||||
bool isArrangeActionButtonsVertical = false,
|
||||
int? titleActionButtonMaxLines,
|
||||
EdgeInsetsGeometry? titlePadding,
|
||||
@@ -92,7 +92,7 @@ mixin MessageDialogActionMixin {
|
||||
);
|
||||
return await Get.dialog(
|
||||
usePopScope && PlatformInfo.isMobile
|
||||
? PopScope(onPopInvoked: onPopInvoked, canPop: false, child: childWidget)
|
||||
? PopScope(onPopInvokedWithResult: onPopInvoked, canPop: false, child: childWidget)
|
||||
: childWidget,
|
||||
barrierColor: AppColor.colorDefaultCupertinoActionSheet,
|
||||
barrierDismissible: outsideDismissible
|
||||
@@ -146,7 +146,7 @@ mixin MessageDialogActionMixin {
|
||||
if (showAsBottomSheet) {
|
||||
return await Get.bottomSheet(
|
||||
usePopScope && PlatformInfo.isMobile
|
||||
? PopScope(onPopInvoked: onPopInvoked, canPop: false, child: childWidget)
|
||||
? PopScope(onPopInvokedWithResult: onPopInvoked, canPop: false, child: childWidget)
|
||||
: childWidget,
|
||||
isScrollControlled: true,
|
||||
barrierColor: AppColor.colorDefaultCupertinoActionSheet,
|
||||
@@ -222,7 +222,7 @@ mixin MessageDialogActionMixin {
|
||||
);
|
||||
return await Get.dialog(
|
||||
usePopScope && PlatformInfo.isMobile
|
||||
? PopScope(onPopInvoked: onPopInvoked, canPop: false, child: childWidget)
|
||||
? PopScope(onPopInvokedWithResult: onPopInvoked, canPop: false, child: childWidget)
|
||||
: childWidget,
|
||||
barrierColor: AppColor.colorDefaultCupertinoActionSheet,
|
||||
barrierDismissible: outsideDismissible
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import 'package:core/core.dart';
|
||||
import 'package:core/utils/application_manager.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:tmail_ui_user/features/base/base_bindings.dart';
|
||||
import 'package:tmail_ui_user/features/caching/utils/local_storage_manager.dart';
|
||||
|
||||
@@ -2199,7 +2199,7 @@ class ComposerController extends BaseController
|
||||
popBack();
|
||||
_autoFocusFieldWhenLauncher();
|
||||
},
|
||||
onPopInvoked: (didPop) {
|
||||
onPopInvoked: (didPop, _) {
|
||||
log('ComposerController::_showConfirmDialogSaveMessage: didPop = $didPop');
|
||||
if (!didPop) {
|
||||
_closeComposerButtonState = ButtonState.enabled;
|
||||
|
||||
@@ -20,7 +20,7 @@ class MobileContainerView extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return PopScope(
|
||||
onPopInvoked: (didPop) {
|
||||
onPopInvokedWithResult: (didPop, _) {
|
||||
log('MobileContainerView::build:onPopInvoked: didPop = $didPop');
|
||||
if (!didPop) {
|
||||
onCloseViewAction.call();
|
||||
|
||||
@@ -34,7 +34,7 @@ class TabletContainerView extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return PopScope(
|
||||
onPopInvoked: (didPop) {
|
||||
onPopInvokedWithResult: (didPop, _) {
|
||||
log('TabletContainerView::build:onPopInvoked: didPop = $didPop');
|
||||
if (!didPop) {
|
||||
onCloseViewAction.call();
|
||||
|
||||
@@ -154,7 +154,7 @@ class _WebEditorState extends State<WebEditorWidget> {
|
||||
}
|
||||
},
|
||||
onFocus: widget.onFocus,
|
||||
onUnFocus: widget.onUnFocus,
|
||||
onBlur: widget.onUnFocus,
|
||||
onMouseDown:widget.onMouseDown,
|
||||
onChangeSelection: widget.onEditorSettings,
|
||||
onChangeCodeview: widget.onChangeContent,
|
||||
|
||||
@@ -886,9 +886,7 @@ class IdentityCreatorController extends BaseController with DragDropFileMixin im
|
||||
clearFocusEditor(context);
|
||||
|
||||
final listFileInfo = await onDragDone(context: context, details: details);
|
||||
|
||||
if (!context.mounted) return;
|
||||
|
||||
await _uploadMultipleFilesToPublicAsset(
|
||||
context,
|
||||
listFileInfo,
|
||||
@@ -934,12 +932,15 @@ class IdentityCreatorController extends BaseController with DragDropFileMixin im
|
||||
|
||||
await Future.forEach(
|
||||
listCompressedImages,
|
||||
(platformFile) => _insertInlineImage(
|
||||
context,
|
||||
platformFile,
|
||||
maxWidth.toInt(),
|
||||
compressedFile: platformFile
|
||||
)
|
||||
(platformFile) {
|
||||
if (!context.mounted) return null;
|
||||
return _insertInlineImage(
|
||||
context,
|
||||
platformFile,
|
||||
maxWidth.toInt(),
|
||||
compressedFile: platformFile
|
||||
);
|
||||
}
|
||||
);
|
||||
} catch (e) {
|
||||
logError("IdentityCreatorController::_uploadMultipleFilesToPublicAsset: error: $e");
|
||||
|
||||
@@ -28,7 +28,7 @@ class LoginView extends BaseLoginView {
|
||||
|
||||
return PopScope(
|
||||
canPop: false,
|
||||
onPopInvoked: (didPop) => !didPop
|
||||
onPopInvokedWithResult: (didPop, _) => !didPop
|
||||
? controller.handleBackButtonAction(context)
|
||||
: null,
|
||||
child: Scaffold(
|
||||
|
||||
@@ -153,6 +153,7 @@ class MailboxController extends BaseMailboxController
|
||||
@override
|
||||
void onReady() {
|
||||
_openMailboxEventController.stream.debounceTime(const Duration(milliseconds: 500)).listen((event) {
|
||||
if (!event.buildContext.mounted) return;
|
||||
_handleOpenMailbox(event.buildContext, event.presentationMailbox);
|
||||
});
|
||||
_initCollapseMailboxCategories();
|
||||
|
||||
Reference in New Issue
Block a user