eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

TF-1973 Fix selection mode still displayed when dragging or moving email

Browse Source 
Signed-off-by: dab246 <tdvu@linagora.com>
(cherry picked from commit b02fc22a1c7761bc08b6668d97c36487f05f9874)
This commit is contained in:
dab246
2023-11-20 14:53:47 +07:00
committed by Dat Vu
parent 2ffda63517
commit caa981e509
6 changed files with 585 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/search/email/presentation/search_email_view.dart
+31 -15
View File
@@ -414,22 +414,38 @@ class SearchEmailView extends GetWidget<SearchEmailController>
itemCount: listPresentationEmail.length, itemCount: listPresentationEmail.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
final currentPresentationEmail = listPresentationEmail[index]; final currentPresentationEmail = listPresentationEmail[index];
return Obx(() => (EmailTileBuilder( return Obx(() => EmailTileBuilder(
presentationEmail: currentPresentationEmail,
selectAllMode: controller.selectionMode.value,
searchQuery: controller.searchQuery,
isShowingEmailContent: controller.mailboxDashBoardController.selectedEmail.value?.id == currentPresentationEmail.id,
isSearchEmailRunning: true,
padding: SearchEmailUtils.getPaddingSearchResultList(context, controller.responsiveUtils),
paddingDivider: SearchEmailUtils.getPaddingDividerSearchResultList(context, controller.responsiveUtils),
mailboxContain: currentPresentationEmail.mailboxContain,
emailActionClick: (action, email) {
controller.pressEmailAction(
context, context,
currentPresentationEmail, action,
controller.selectionMode.value, email,
controller.searchQuery, mailboxContain: currentPresentationEmail.mailboxContain
controller.mailboxDashBoardController.selectedEmail.value?.id == currentPresentationEmail.id, );
isSearchEmailRunning: true, },
padding: SearchEmailUtils.getPaddingSearchResultList(context, controller.responsiveUtils), onMoreActionClick: (email, position) {
paddingDivider: SearchEmailUtils.getPaddingDividerSearchResultList(context, controller.responsiveUtils), if (controller.responsiveUtils.isScreenWithShortestSide(context)) {
mailboxContain: currentPresentationEmail.mailboxContain) controller.openContextMenuAction(
..addOnPressEmailActionClick((action, email) => context,
controller.pressEmailAction(context, action, email, mailboxContain: currentPresentationEmail.mailboxContain)) _contextMenuActionTile(context, email)
..addOnMoreActionClick((email, position) => controller.responsiveUtils.isScreenWithShortestSide(context) );
? controller.openContextMenuAction(context, _contextMenuActionTile(context, email)) } else {
: controller.openPopupMenuAction(context, position, _popupMenuActionTile(context, email))) controller.openPopupMenuAction(
).build()); context,
position,
_popupMenuActionTile(context, email)
);
}
},
));
}) })
); );
} }
lib/features/thread/presentation/mixin/base_email_item_tile.dart
+2 -3
View File
@@ -16,7 +16,6 @@ import 'package:model/email/presentation_email.dart';
import 'package:model/extensions/presentation_email_extension.dart'; import 'package:model/extensions/presentation_email_extension.dart';
import 'package:model/extensions/presentation_mailbox_extension.dart'; import 'package:model/extensions/presentation_mailbox_extension.dart';
import 'package:model/mailbox/presentation_mailbox.dart'; import 'package:model/mailbox/presentation_mailbox.dart';
import 'package:model/mailbox/select_mode.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/extensions/presentation_mailbox_extension.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/extensions/presentation_mailbox_extension.dart';
import 'package:tmail_ui_user/features/thread/domain/model/search_query.dart'; import 'package:tmail_ui_user/features/thread/domain/model/search_query.dart';
import 'package:tmail_ui_user/features/thread/presentation/styles/item_email_tile_styles.dart'; import 'package:tmail_ui_user/features/thread/presentation/styles/item_email_tile_styles.dart';
@@ -263,7 +262,7 @@ mixin BaseEmailItemTile {
? const EdgeInsetsDirectional.symmetric(horizontal: 4) ? const EdgeInsetsDirectional.symmetric(horizontal: 4)
: const EdgeInsetsDirectional.all(12), : const EdgeInsetsDirectional.all(12),
child: SvgPicture.asset( child: SvgPicture.asset(
email.selectMode == SelectMode.ACTIVE email.isSelected
? imagePaths.icSelected ? imagePaths.icSelected
: imagePaths.icUnSelected, : imagePaths.icUnSelected,
fit: BoxFit.fill), fit: BoxFit.fill),
@@ -273,7 +272,7 @@ mixin BaseEmailItemTile {
alignment: Alignment.center, alignment: Alignment.center,
color: Colors.transparent, color: Colors.transparent,
child: SvgPicture.asset( child: SvgPicture.asset(
email.selectMode == SelectMode.ACTIVE email.isSelected
? imagePaths.icSelected ? imagePaths.icSelected
: imagePaths.icUnSelected, : imagePaths.icUnSelected,
width: 24, height: 24)); width: 24, height: 24));
lib/features/thread/presentation/thread_view.dart
+17 -21
View File
@@ -1,5 +1,4 @@
import 'package:core/core.dart'; import 'package:core/core.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_portal/flutter_portal.dart'; import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
@@ -352,8 +351,8 @@ class ThreadView extends GetWidget<ThreadController>
}, },
child: Focus( child: Focus(
focusNode: controller.focusNodeKeyBoard, focusNode: controller.focusNodeKeyBoard,
autofocus: kIsWeb, autofocus: PlatformInfo.isWeb,
onKey: kIsWeb ? controller.handleKeyEvent : null, onKey: PlatformInfo.isWeb ? controller.handleKeyEvent : null,
child: ListView.builder( child: ListView.builder(
controller: controller.listEmailController, controller: controller.listEmailController,
physics: const AlwaysScrollableScrollPhysics(), physics: const AlwaysScrollableScrollPhysics(),
@@ -400,16 +399,15 @@ class ThreadView extends GetWidget<ThreadController>
final isShowingEmailContent = controller.mailboxDashBoardController.selectedEmail.value?.id == presentationEmail.id; final isShowingEmailContent = controller.mailboxDashBoardController.selectedEmail.value?.id == presentationEmail.id;
final selectModeAll = controller.mailboxDashBoardController.currentSelectMode.value; final selectModeAll = controller.mailboxDashBoardController.currentSelectMode.value;
return (EmailTileBuilder( return EmailTileBuilder(
context, presentationEmail: presentationEmail,
presentationEmail, selectAllMode: selectModeAll,
selectModeAll, isShowingEmailContent: isShowingEmailContent,
controller.searchQuery, searchQuery: controller.searchQuery,
isShowingEmailContent,
mailboxContain: presentationEmail.mailboxContain, mailboxContain: presentationEmail.mailboxContain,
isSearchEmailRunning: controller.searchController.isSearchEmailRunning, isSearchEmailRunning: controller.searchController.isSearchEmailRunning,
isDrag: true isDrag: true
)).build(); );
} }
Widget _buildEmailItemNotDraggable(BuildContext context, PresentationEmail presentationEmail) { Widget _buildEmailItemNotDraggable(BuildContext context, PresentationEmail presentationEmail) {
@@ -457,18 +455,16 @@ class ThreadView extends GetWidget<ThreadController>
), ),
), ),
confirmDismiss: (direction) => controller.swipeEmailAction(context, presentationEmail, direction), confirmDismiss: (direction) => controller.swipeEmailAction(context, presentationEmail, direction),
child: (EmailTileBuilder( child: EmailTileBuilder(
context, presentationEmail: presentationEmail,
presentationEmail, selectAllMode: selectModeAll,
selectModeAll, isShowingEmailContent: isShowingEmailContent,
controller.searchQuery, searchQuery: controller.searchQuery,
isShowingEmailContent,
mailboxContain: presentationEmail.mailboxContain, mailboxContain: presentationEmail.mailboxContain,
isSearchEmailRunning: controller.searchController.isSearchEmailRunning isSearchEmailRunning: controller.searchController.isSearchEmailRunning,
) emailActionClick: (action, email) => _handleEmailActionClicked(context, email, action),
..addOnPressEmailActionClick((action, email) => _handleEmailActionClicked(context, email, action)) onMoreActionClick: (email, position) => _handleEmailContextMenuAction(context, email, position),
..addOnMoreActionClick((email, position) => _handleEmailContextMenuAction(context, email, position)) ),
).build(),
); );
} }
lib/features/thread/presentation/widgets/email_tile_builder.dart
+53 -64
View File
@@ -8,72 +8,69 @@ import 'package:model/mailbox/select_mode.dart';
import 'package:tmail_ui_user/features/thread/domain/model/search_query.dart'; import 'package:tmail_ui_user/features/thread/domain/model/search_query.dart';
import 'package:tmail_ui_user/features/thread/presentation/mixin/base_email_item_tile.dart'; import 'package:tmail_ui_user/features/thread/presentation/mixin/base_email_item_tile.dart';
class EmailTileBuilder with BaseEmailItemTile { class EmailTileBuilder extends StatelessWidget with BaseEmailItemTile {
final PresentationEmail _presentationEmail; final PresentationEmail presentationEmail;
final BuildContext _context; final SelectMode selectAllMode;
final SelectMode _selectModeAll;
final PresentationMailbox? mailboxContain; final PresentationMailbox? mailboxContain;
final SearchQuery? _searchQuery; final SearchQuery? searchQuery;
final bool isSearchEmailRunning; final bool isSearchEmailRunning;
final EdgeInsetsGeometry? padding; final EdgeInsetsGeometry? padding;
final EdgeInsetsGeometry? paddingDivider; final EdgeInsetsGeometry? paddingDivider;
final bool isDrag; final bool isDrag;
final bool _isShowingEmailContent; final bool isShowingEmailContent;
final OnPressEmailActionClick? emailActionClick;
final OnMoreActionClick? onMoreActionClick;
OnPressEmailActionClick? _emailActionClick; EmailTileBuilder({
super.key,
required this.presentationEmail,
required this.selectAllMode,
required this.isShowingEmailContent,
this.searchQuery,
this.isSearchEmailRunning = false,
this.mailboxContain,
this.padding,
this.paddingDivider,
this.isDrag = false,
this.emailActionClick,
this.onMoreActionClick,
});
EmailTileBuilder( @override
this._context, Widget build(BuildContext context) {
this._presentationEmail,
this._selectModeAll,
this._searchQuery,
this._isShowingEmailContent,
{
this.isSearchEmailRunning = false,
this.mailboxContain,
this.padding,
this.paddingDivider,
this.isDrag = false,
}
);
void addOnPressEmailActionClick(OnPressEmailActionClick actionClick) {
_emailActionClick = actionClick;
}
void addOnMoreActionClick(OnMoreActionClick onMoreActionClick) {}
Widget build() {
return Material( return Material(
color: Colors.transparent, color: Colors.transparent,
child: Column( child: Column(
children: [ children: [
ListTile( ListTile(
tileColor: _isShowingEmailContent ? AppColor.colorItemEmailSelectedDesktop : null, tileColor: isShowingEmailContent ? AppColor.colorItemEmailSelectedDesktop : null,
contentPadding: padding ?? const EdgeInsetsDirectional.symmetric(horizontal: 16, vertical: 5), contentPadding: padding ?? const EdgeInsetsDirectional.symmetric(horizontal: 16, vertical: 5),
onTap: () => _emailActionClick?.call( onTap: () => emailActionClick?.call(
EmailActionType.preview, EmailActionType.preview,
_presentationEmail), presentationEmail),
onLongPress: () => _emailActionClick?.call( onLongPress: () => emailActionClick?.call(
EmailActionType.selection, EmailActionType.selection,
_presentationEmail), presentationEmail),
leading: GestureDetector( leading: GestureDetector(
onTap: () => _emailActionClick?.call( onTap: () => emailActionClick?.call(
_selectModeAll == SelectMode.ACTIVE selectAllMode == SelectMode.ACTIVE
? EmailActionType.selection ? EmailActionType.selection
: EmailActionType.preview, : EmailActionType.preview,
_presentationEmail), presentationEmail),
child: Container( child: Container(
width: 56, width: 56,
height: 56, height: 56,
color: Colors.transparent, color: Colors.transparent,
alignment: Alignment.center, alignment: Alignment.center,
child: _buildAvatarIcon()), child: selectAllMode == SelectMode.ACTIVE
? buildIconAvatarSelection(context, presentationEmail)
: buildIconAvatarText(presentationEmail)
)
), ),
title: Row( title: Row(
children: [ children: [
if (!_presentationEmail.hasRead) if (!presentationEmail.hasRead)
Padding( Padding(
padding: const EdgeInsetsDirectional.only(end: 5), padding: const EdgeInsetsDirectional.only(end: 5),
child: SvgPicture.asset( child: SvgPicture.asset(
@@ -82,19 +79,19 @@ class EmailTileBuilder with BaseEmailItemTile {
height: 9, height: 9,
fit: BoxFit.fill)), fit: BoxFit.fill)),
Expanded(child: buildInformationSender( Expanded(child: buildInformationSender(
_context, context,
_presentationEmail, presentationEmail,
mailboxContain, mailboxContain,
isSearchEmailRunning, isSearchEmailRunning,
_searchQuery)), searchQuery)),
buildIconAnsweredOrForwarded(width: 16, height: 16, presentationEmail: _presentationEmail), buildIconAnsweredOrForwarded(width: 16, height: 16, presentationEmail: presentationEmail),
if (_presentationEmail.hasAttachment == true) if (presentationEmail.hasAttachment == true)
Padding( Padding(
padding: const EdgeInsetsDirectional.only(start: 8), padding: const EdgeInsetsDirectional.only(start: 8),
child: buildIconAttachment()), child: buildIconAttachment()),
Padding( Padding(
padding: const EdgeInsetsDirectional.only(end: 4, start: 8), padding: const EdgeInsetsDirectional.only(end: 4, start: 8),
child: buildDateTime(_context, _presentationEmail)), child: buildDateTime(context, presentationEmail)),
buildIconChevron(), buildIconChevron(),
], ],
), ),
@@ -107,18 +104,18 @@ class EmailTileBuilder with BaseEmailItemTile {
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
if (_presentationEmail.hasCalendarEvent) if (presentationEmail.hasCalendarEvent)
buildCalendarEventIcon(context: _context, presentationEmail: _presentationEmail), buildCalendarEventIcon(context: context, presentationEmail: presentationEmail),
Expanded(child: buildEmailTitle( Expanded(child: buildEmailTitle(
_context, context,
_presentationEmail, presentationEmail,
isSearchEmailRunning, isSearchEmailRunning,
_searchQuery)), searchQuery)),
buildMailboxContain( buildMailboxContain(
_context, context,
isSearchEmailRunning, isSearchEmailRunning,
_presentationEmail), presentationEmail),
if (_presentationEmail.hasStarred) if (presentationEmail.hasStarred)
Padding( Padding(
padding: const EdgeInsetsDirectional.only(start: 8), padding: const EdgeInsetsDirectional.only(start: 8),
child: buildIconStar(), child: buildIconStar(),
@@ -129,10 +126,10 @@ class EmailTileBuilder with BaseEmailItemTile {
padding: const EdgeInsetsDirectional.only(top: 6), padding: const EdgeInsetsDirectional.only(top: 6),
child: Row(children: [ child: Row(children: [
Expanded(child: buildEmailPartialContent( Expanded(child: buildEmailPartialContent(
_context, context,
_presentationEmail, presentationEmail,
isSearchEmailRunning, isSearchEmailRunning,
_searchQuery)), searchQuery)),
]) ])
), ),
], ],
@@ -145,12 +142,4 @@ class EmailTileBuilder with BaseEmailItemTile {
), ),
); );
} }
Widget _buildAvatarIcon() {
if (_selectModeAll == SelectMode.ACTIVE) {
return buildIconAvatarSelection(_context, _presentationEmail);
} else {
return buildIconAvatarText(_presentationEmail);
}
}
} }
lib/features/thread/presentation/widgets/email_tile_web_builder.dart
+480 -413
View File
File diff suppressed because it is too large Load Diff
model/lib/email/presentation_email.dart
+2
View File
@@ -114,6 +114,8 @@ class PresentationEmail with EquatableMixin {
bool get withAttachments => hasAttachment == true; bool get withAttachments => hasAttachment == true;
bool get isSelected => selectMode == SelectMode.ACTIVE;
String get routeWebAsString => routeWeb.toString(); String get routeWebAsString => routeWeb.toString();
bool get pushNotificationActivated => !isDraft && !hasRead; bool get pushNotificationActivated => !isDraft && !hasRead;