TF-3953 Close several modals when click outside
This commit is contained in:
@@ -1,8 +1,6 @@
|
||||
|
||||
import 'package:core/presentation/extensions/color_extension.dart';
|
||||
import 'package:core/presentation/state/failure.dart';
|
||||
import 'package:core/presentation/state/success.dart';
|
||||
import 'package:core/presentation/views/dialog/confirmation_dialog_builder.dart';
|
||||
import 'package:core/utils/app_logger.dart';
|
||||
import 'package:core/utils/platform_info.dart';
|
||||
import 'package:dartz/dartz.dart';
|
||||
@@ -16,6 +14,7 @@ import 'package:model/extensions/identity_request_dto_extension.dart';
|
||||
import 'package:model/extensions/session_extension.dart';
|
||||
import 'package:tmail_ui_user/features/base/before_reconnect_handler.dart';
|
||||
import 'package:tmail_ui_user/features/base/before_reconnect_manager.dart';
|
||||
import 'package:tmail_ui_user/features/base/mixin/message_dialog_action_manager.dart';
|
||||
import 'package:tmail_ui_user/features/base/reloadable/reloadable_controller.dart';
|
||||
import 'package:tmail_ui_user/features/identity_creator/domain/model/identity_cache.dart';
|
||||
import 'package:tmail_ui_user/features/identity_creator/domain/state/get_identity_cache_on_web_state.dart';
|
||||
@@ -43,7 +42,6 @@ import 'package:tmail_ui_user/features/manage_account/domain/usecases/transform_
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/extensions/identity_extension.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/extensions/update_own_email_address_extension.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/extensions/list_identity_extension.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/identities/widgets/delete_identity_dialog_builder.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/manage_account_dashboard_controller.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/model/identity_action_type.dart';
|
||||
import 'package:tmail_ui_user/features/public_asset/domain/extensions/string_to_public_asset_extension.dart';
|
||||
@@ -291,13 +289,19 @@ class IdentitiesController extends ReloadableController implements BeforeReconne
|
||||
}
|
||||
|
||||
void openConfirmationDialogDeleteIdentityAction(BuildContext context, Identity identity) {
|
||||
Get.dialog(
|
||||
DeleteIdentityDialogBuilder(
|
||||
responsiveUtils: responsiveUtils,
|
||||
imagePaths: imagePaths,
|
||||
onDeleteIdentityAction: () => _dereferencePublicAssets(identity),
|
||||
),
|
||||
barrierColor: AppColor.colorDefaultCupertinoActionSheet,
|
||||
final appLocalizations = AppLocalizations.of(context);
|
||||
MessageDialogActionManager().showConfirmDialogAction(
|
||||
context,
|
||||
appLocalizations.message_confirmation_dialog_delete_identity,
|
||||
appLocalizations.delete,
|
||||
key: const Key('confirm_dialog_delete_identity'),
|
||||
showAsBottomSheet: responsiveUtils.isMobile(context),
|
||||
outsideDialogPadding: EdgeInsets.only(bottom: PlatformInfo.isWeb ? 42 : 16),
|
||||
title: appLocalizations.delete_identity,
|
||||
cancelTitle: appLocalizations.cancel,
|
||||
onCancelAction: popBack,
|
||||
onCloseButtonAction: popBack,
|
||||
onConfirmAction: () => _dereferencePublicAssets(identity),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -358,16 +362,14 @@ class IdentitiesController extends ReloadableController implements BeforeReconne
|
||||
|
||||
void _deleteIdentityFailure(DeleteIdentityFailure failure) {
|
||||
if (currentContext != null) {
|
||||
Get.dialog(
|
||||
ConfirmationDialogBuilder(
|
||||
key: const Key('dialog_message_delete_identity_failed'),
|
||||
imagePath: imagePaths,
|
||||
title: AppLocalizations.of(currentContext!).delete_failed,
|
||||
confirmText: '${AppLocalizations.of(currentContext!).got_it}!',
|
||||
onConfirmButtonAction: popBack,
|
||||
onCloseButtonAction: popBack,
|
||||
),
|
||||
barrierColor: AppColor.colorDefaultCupertinoActionSheet,
|
||||
MessageDialogActionManager().showConfirmDialogAction(
|
||||
key: const Key('dialog_message_delete_identity_failed'),
|
||||
currentContext!,
|
||||
title: AppLocalizations.of(currentContext!).delete_failed,
|
||||
'',
|
||||
'${AppLocalizations.of(currentContext!).got_it}!',
|
||||
onConfirmAction: popBack,
|
||||
onCloseButtonAction: popBack,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
-67
@@ -1,67 +0,0 @@
|
||||
import 'package:core/presentation/resources/image_paths.dart';
|
||||
import 'package:core/presentation/utils/responsive_utils.dart';
|
||||
import 'package:core/presentation/views/dialog/confirmation_dialog_builder.dart';
|
||||
import 'package:core/presentation/views/responsive/responsive_widget.dart';
|
||||
import 'package:core/utils/platform_info.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:pointer_interceptor/pointer_interceptor.dart';
|
||||
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
||||
import 'package:tmail_ui_user/main/routes/route_navigation.dart';
|
||||
|
||||
typedef OnDeleteIdentityAction = void Function();
|
||||
|
||||
class DeleteIdentityDialogBuilder extends StatelessWidget {
|
||||
|
||||
final ResponsiveUtils responsiveUtils;
|
||||
final ImagePaths imagePaths;
|
||||
final OnDeleteIdentityAction onDeleteIdentityAction;
|
||||
|
||||
const DeleteIdentityDialogBuilder({
|
||||
Key? key,
|
||||
required this.responsiveUtils,
|
||||
required this.imagePaths,
|
||||
required this.onDeleteIdentityAction
|
||||
}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final appLocalizations = AppLocalizations.of(context);
|
||||
final deleteDialogBuilder = ResponsiveWidget(
|
||||
responsiveUtils: responsiveUtils,
|
||||
mobile: _buildDeleteDialog(
|
||||
appLocalizations: appLocalizations,
|
||||
alignment: Alignment.bottomCenter,
|
||||
outsideDialogPadding: EdgeInsets.only(bottom: PlatformInfo.isWeb ? 42 : 16),
|
||||
),
|
||||
landscapeMobile: _buildDeleteDialog(appLocalizations: appLocalizations),
|
||||
tablet: _buildDeleteDialog(appLocalizations: appLocalizations),
|
||||
tabletLarge: _buildDeleteDialog(appLocalizations: appLocalizations),
|
||||
landscapeTablet: _buildDeleteDialog(appLocalizations: appLocalizations),
|
||||
desktop: _buildDeleteDialog(appLocalizations: appLocalizations),
|
||||
);
|
||||
|
||||
return PlatformInfo.isWeb
|
||||
? PointerInterceptor(child: deleteDialogBuilder)
|
||||
: deleteDialogBuilder;
|
||||
}
|
||||
|
||||
ConfirmationDialogBuilder _buildDeleteDialog({
|
||||
required AppLocalizations appLocalizations,
|
||||
Alignment? alignment,
|
||||
EdgeInsets? outsideDialogPadding,
|
||||
}) {
|
||||
return ConfirmationDialogBuilder(
|
||||
key: const Key('confirm_dialog_delete_identity'),
|
||||
imagePath: imagePaths,
|
||||
title: appLocalizations.delete_identity,
|
||||
textContent: appLocalizations.message_confirmation_dialog_delete_identity,
|
||||
confirmText: appLocalizations.delete,
|
||||
cancelText: appLocalizations.cancel,
|
||||
alignment: alignment,
|
||||
outsideDialogPadding: outsideDialogPadding,
|
||||
onConfirmButtonAction: onDeleteIdentityAction,
|
||||
onCancelButtonAction: popBack,
|
||||
onCloseButtonAction: popBack,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,10 @@ import 'package:core/presentation/views/html_viewer/html_content_viewer_on_web_w
|
||||
import 'package:core/presentation/views/html_viewer/html_content_viewer_widget.dart';
|
||||
import 'package:core/utils/platform_info.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/state_manager.dart';
|
||||
import 'package:pointer_interceptor/pointer_interceptor.dart';
|
||||
import 'package:tmail_ui_user/features/base/mixin/message_dialog_action_manager.dart';
|
||||
import 'package:tmail_ui_user/main/routes/dialog_router.dart';
|
||||
import 'package:tmail_ui_user/main/utils/app_utils.dart';
|
||||
|
||||
class SignatureBuilder extends StatelessWidget {
|
||||
@@ -22,7 +26,20 @@ class SignatureBuilder extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
if (PlatformInfo.isWeb) {
|
||||
return HtmlContentViewerOnWeb(
|
||||
final iframeOverlay = Obx(() {
|
||||
if (MessageDialogActionManager().isDialogOpened ||
|
||||
DialogRouter.isDialogOpened) {
|
||||
return Positioned.fill(
|
||||
child: PointerInterceptor(
|
||||
child: const SizedBox.expand(),
|
||||
),
|
||||
);
|
||||
} else {
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
});
|
||||
|
||||
final htmlView = HtmlContentViewerOnWeb(
|
||||
contentHtml: value,
|
||||
widthContent: width,
|
||||
heightContent: height,
|
||||
@@ -38,6 +55,13 @@ class SignatureBuilder extends StatelessWidget {
|
||||
disableScrolling: true,
|
||||
autoAdjustHeight: true,
|
||||
);
|
||||
|
||||
return Stack(
|
||||
children: [
|
||||
htmlView,
|
||||
iframeOverlay,
|
||||
],
|
||||
);
|
||||
} else {
|
||||
return HtmlContentViewer(
|
||||
contentHtml: value,
|
||||
|
||||
Reference in New Issue
Block a user