From fbc5ea67964308cfa1f9f824fef2baad707c81b6 Mon Sep 17 00:00:00 2001 From: dab246 Date: Mon, 28 Mar 2022 16:42:12 +0700 Subject: [PATCH] TF-335 Add focus widget view above email detail view in browser --- .../presentation/destination_picker_view.dart | 13 +++---- .../presentation/mailbox_controller.dart | 37 ++++++++++--------- .../presentation/mailbox_creator_view.dart | 5 ++- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/lib/features/destination_picker/presentation/destination_picker_view.dart b/lib/features/destination_picker/presentation/destination_picker_view.dart index b9d9d41a6..7da22c44e 100644 --- a/lib/features/destination_picker/presentation/destination_picker_view.dart +++ b/lib/features/destination_picker/presentation/destination_picker_view.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; import 'package:model/model.dart'; +import 'package:pointer_interceptor/pointer_interceptor.dart'; import 'package:tmail_ui_user/features/destination_picker/presentation/destination_picker_controller.dart'; import 'package:tmail_ui_user/features/destination_picker/presentation/model/destination_picker_arguments.dart'; import 'package:tmail_ui_user/features/destination_picker/presentation/widgets/app_bar_destination_picker_builder.dart'; @@ -26,7 +27,7 @@ class DestinationPickerView extends GetWidget { } if (actions == MailboxActions.create) { - return Card( + return PointerInterceptor(child: Card( margin: EdgeInsets.zero, borderOnForeground: false, color: Colors.transparent, @@ -35,10 +36,8 @@ class DestinationPickerView extends GetWidget { child: ResponsiveWidget( responsiveUtils: _responsiveUtils, mobile: _responsiveUtils.isPortrait(context) - ? Container( - child: _buildBodyMailboxLocation(context, actions), - width: _responsiveUtils.getSizeScreenWidth(context)) - : _buildBodyMailboxDestination(context, actions), + ? Container(child: _buildBodyMailboxLocation(context, actions), width: _responsiveUtils.getSizeScreenWidth(context)) + : _buildBodyMailboxDestination(context, actions), tablet: Container( child: Row( children: [ @@ -65,9 +64,9 @@ class DestinationPickerView extends GetWidget { ) ), ) - ); + )); } else { - return _buildBodyMailboxDestination(context, actions); + return PointerInterceptor(child: _buildBodyMailboxDestination(context, actions)); } } diff --git a/lib/features/mailbox/presentation/mailbox_controller.dart b/lib/features/mailbox/presentation/mailbox_controller.dart index 87a978481..dbc9efe87 100644 --- a/lib/features/mailbox/presentation/mailbox_controller.dart +++ b/lib/features/mailbox/presentation/mailbox_controller.dart @@ -459,7 +459,7 @@ class MailboxController extends BaseMailboxController { } void _openConfirmationDialogDeleteMailboxAction(BuildContext context, PresentationMailbox presentationMailbox) { - if (_responsiveUtils.isMobile(context) || _responsiveUtils.isMobileDevice(context)) { + if (_responsiveUtils.isMobile(context)) { (ConfirmationDialogActionSheetBuilder(context) ..messageText(AppLocalizations.of(context).message_confirmation_dialog_delete_mailbox(presentationMailbox.name?.name ?? '')) ..onCancelAction(AppLocalizations.of(context).cancel, () => popBack()) @@ -536,7 +536,7 @@ class MailboxController extends BaseMailboxController { } void _openDialogRenameMailboxAction(BuildContext context, PresentationMailbox presentationMailbox) { - if (_responsiveUtils.isMobile(context) || _responsiveUtils.isMobileDevice(context)) { + if (_responsiveUtils.isMobile(context)) { (EditTextModalSheetBuilder() ..key(Key('rename_mailbox_modal_sheet')) ..title(AppLocalizations.of(context).rename_mailbox) @@ -560,22 +560,23 @@ class MailboxController extends BaseMailboxController { showDialog( context: context, barrierColor: AppColor.colorDefaultCupertinoActionSheet, - builder: (BuildContext context) => (EditTextDialogBuilder() - ..key(Key('rename_mailbox_dialog')) - ..title(AppLocalizations.of(context).rename_mailbox) - ..cancelText(AppLocalizations.of(context).cancel) - ..setErrorString((value) => getErrorInputNameStringRenameMailbox(context, value)) - ..setTextController(TextEditingController.fromValue( - TextEditingValue( - text: presentationMailbox.name?.name ?? '', - selection: TextSelection( - baseOffset: 0, - extentOffset: presentationMailbox.name?.name.length ?? 0 - ) - ))) - ..onConfirmButtonAction(AppLocalizations.of(context).rename, - (value) => _renameMailboxAction(presentationMailbox, value))) - .build()); + builder: (BuildContext context) => + PointerInterceptor(child: (EditTextDialogBuilder() + ..key(Key('rename_mailbox_dialog')) + ..title(AppLocalizations.of(context).rename_mailbox) + ..cancelText(AppLocalizations.of(context).cancel) + ..setErrorString((value) => getErrorInputNameStringRenameMailbox(context, value)) + ..setTextController(TextEditingController.fromValue( + TextEditingValue( + text: presentationMailbox.name?.name ?? '', + selection: TextSelection( + baseOffset: 0, + extentOffset: presentationMailbox.name?.name.length ?? 0 + ) + ))) + ..onConfirmButtonAction(AppLocalizations.of(context).rename, + (value) => _renameMailboxAction(presentationMailbox, value))) + .build())); } } diff --git a/lib/features/mailbox_creator/presentation/mailbox_creator_view.dart b/lib/features/mailbox_creator/presentation/mailbox_creator_view.dart index 66e3fba0a..d12da066d 100644 --- a/lib/features/mailbox_creator/presentation/mailbox_creator_view.dart +++ b/lib/features/mailbox_creator/presentation/mailbox_creator_view.dart @@ -2,6 +2,7 @@ import 'package:core/core.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; +import 'package:pointer_interceptor/pointer_interceptor.dart'; import 'package:tmail_ui_user/features/mailbox_creator/presentation/mailbox_creator_controller.dart'; import 'package:tmail_ui_user/features/mailbox_creator/presentation/widgets/app_bar_mailbox_creator_builder.dart'; import 'package:tmail_ui_user/features/mailbox_creator/presentation/widgets/create_mailbox_name_input_decoration_builder.dart'; @@ -14,7 +15,7 @@ class MailboxCreatorView extends GetWidget { @override Widget build(BuildContext context) { - return Card( + return PointerInterceptor(child: Card( margin: EdgeInsets.zero, borderOnForeground: false, color: Colors.transparent, @@ -51,7 +52,7 @@ class MailboxCreatorView extends GetWidget { ) ), ) - ); + )); } Widget _buildBody(BuildContext context) {