TF-3766 Change context menu style for mailbox on mobile
Signed-off-by: dab246 <tdvu@linagora.com>
This commit is contained in:
@@ -1,12 +1,20 @@
|
||||
|
||||
import 'package:core/core.dart';
|
||||
import 'package:core/presentation/resources/image_paths.dart';
|
||||
import 'package:core/presentation/utils/responsive_utils.dart';
|
||||
import 'package:core/utils/platform_info.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/flutter_svg.dart';
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||
import 'package:model/mailbox/mailbox_constants.dart';
|
||||
import 'package:model/model.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/popup_item_widget.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/presentation/mailbox_controller.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/presentation/model/context_item_mailbox_action.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_actions.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_bottom_sheet_action_tile_builder.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_utils.dart';
|
||||
import 'package:tmail_ui_user/main/error/capability_validator.dart';
|
||||
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
||||
|
||||
mixin MailboxWidgetMixin {
|
||||
|
||||
@@ -100,54 +108,43 @@ mixin MailboxWidgetMixin {
|
||||
}
|
||||
}
|
||||
|
||||
List<Widget> contextMenuMailboxActionTiles(
|
||||
void openMailboxMenuActionOnMobile(
|
||||
BuildContext context,
|
||||
ImagePaths imagePaths,
|
||||
PresentationMailbox mailbox,
|
||||
List<ContextMenuItemMailboxAction> contextMenuActions,
|
||||
{
|
||||
required Function(BuildContext, MailboxActions, PresentationMailbox) handleMailboxAction
|
||||
}
|
||||
MailboxController controller
|
||||
) {
|
||||
return contextMenuActions
|
||||
.map((action) => _buildContextMenuActionTile(
|
||||
context,
|
||||
imagePaths,
|
||||
action,
|
||||
mailbox,
|
||||
handleMailboxAction: handleMailboxAction
|
||||
))
|
||||
.toList();
|
||||
}
|
||||
final bool deletedMessageVaultSupported = MailboxUtils.isDeletedMessageVaultSupported(
|
||||
controller.mailboxDashBoardController.sessionCurrent,
|
||||
controller.mailboxDashBoardController.accountId.value);
|
||||
|
||||
Widget _buildContextMenuActionTile(
|
||||
BuildContext context,
|
||||
ImagePaths imagePaths,
|
||||
ContextMenuItemMailboxAction contextMenuItem,
|
||||
PresentationMailbox mailbox,
|
||||
{
|
||||
required Function(BuildContext, MailboxActions, PresentationMailbox) handleMailboxAction
|
||||
final bool subaddressingSupported = isSubaddressingSupported(
|
||||
controller.mailboxDashBoardController.sessionCurrent,
|
||||
controller.mailboxDashBoardController.accountId.value);
|
||||
|
||||
final contextMenuActions = listContextMenuItemAction(
|
||||
mailbox,
|
||||
controller.mailboxDashBoardController.enableSpamReport,
|
||||
deletedMessageVaultSupported,
|
||||
subaddressingSupported,
|
||||
imagePaths,
|
||||
AppLocalizations.of(context),
|
||||
);
|
||||
|
||||
if (contextMenuActions.isEmpty) {
|
||||
return;
|
||||
}
|
||||
) {
|
||||
return (MailboxBottomSheetActionTileBuilder(
|
||||
Key('${contextMenuItem.action.name}_action'),
|
||||
SvgPicture.asset(
|
||||
contextMenuItem.action.getContextMenuIcon(imagePaths),
|
||||
colorFilter: contextMenuItem.action.getColorContextMenuIcon().asFilter(),
|
||||
width: 24,
|
||||
height: 24
|
||||
),
|
||||
contextMenuItem.action.getTitleContextMenu(context),
|
||||
mailbox,
|
||||
absorbing: !contextMenuItem.isActivated,
|
||||
opacity: !contextMenuItem.isActivated)
|
||||
..actionTextStyle(textStyle: TextStyle(
|
||||
fontSize: 16,
|
||||
color: contextMenuItem.action.getColorContextMenuTitle(),
|
||||
fontWeight: FontWeight.w500
|
||||
))
|
||||
..onActionClick((mailbox) => handleMailboxAction(context, contextMenuItem.action, mailbox))
|
||||
).build();
|
||||
|
||||
controller.openContextMenuAction(
|
||||
context,
|
||||
[],
|
||||
itemActions: contextMenuActions,
|
||||
onContextMenuActionClick: (menuAction) => controller.handleMailboxAction(
|
||||
context,
|
||||
menuAction.action,
|
||||
mailbox,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
List<ContextMenuItemMailboxAction> listContextMenuItemAction(
|
||||
@@ -155,16 +152,77 @@ mixin MailboxWidgetMixin {
|
||||
bool spamReportEnabled,
|
||||
bool deletedMessageVaultSupported,
|
||||
bool subaddressingSupported,
|
||||
ImagePaths imagePaths,
|
||||
AppLocalizations appLocalizations,
|
||||
) {
|
||||
final mailboxActionsSupported = _listActionForAllMailboxType(mailbox, spamReportEnabled, deletedMessageVaultSupported, subaddressingSupported);
|
||||
|
||||
final listContextMenuItemAction = mailboxActionsSupported
|
||||
.map((action) => ContextMenuItemMailboxAction(action, action.getContextMenuItemState(mailbox)))
|
||||
.map((action) => ContextMenuItemMailboxAction(
|
||||
action,
|
||||
appLocalizations,
|
||||
imagePaths
|
||||
))
|
||||
.toList();
|
||||
|
||||
return listContextMenuItemAction;
|
||||
}
|
||||
|
||||
void openMailboxMenuActionOnWeb(
|
||||
BuildContext context,
|
||||
ImagePaths imagePaths,
|
||||
ResponsiveUtils responsiveUtils,
|
||||
RelativeRect position,
|
||||
PresentationMailbox mailbox,
|
||||
MailboxController controller
|
||||
) {
|
||||
final bool deletedMessageVaultSupported = MailboxUtils.isDeletedMessageVaultSupported(
|
||||
controller.mailboxDashBoardController.sessionCurrent,
|
||||
controller.mailboxDashBoardController.accountId.value);
|
||||
|
||||
final bool subaddressingSupported = isSubaddressingSupported(
|
||||
controller.mailboxDashBoardController.sessionCurrent,
|
||||
controller.mailboxDashBoardController.accountId.value);
|
||||
|
||||
final contextMenuActions = listContextMenuItemAction(
|
||||
mailbox,
|
||||
controller.mailboxDashBoardController.enableSpamReport,
|
||||
deletedMessageVaultSupported,
|
||||
subaddressingSupported,
|
||||
imagePaths,
|
||||
AppLocalizations.of(context),
|
||||
);
|
||||
|
||||
if (contextMenuActions.isEmpty) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (responsiveUtils.isScreenWithShortestSide(context)) {
|
||||
controller.openContextMenuAction(
|
||||
context,
|
||||
[],
|
||||
itemActions: contextMenuActions,
|
||||
onContextMenuActionClick: (menuAction) => controller.handleMailboxAction(
|
||||
context,
|
||||
menuAction.action,
|
||||
mailbox,
|
||||
),
|
||||
);
|
||||
} else {
|
||||
controller.openPopupMenuAction(
|
||||
context,
|
||||
position,
|
||||
popupMenuMailboxActionTiles(
|
||||
context,
|
||||
imagePaths,
|
||||
mailbox,
|
||||
contextMenuActions,
|
||||
handleMailboxAction: controller.handleMailboxAction
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
List<PopupMenuEntry> popupMenuMailboxActionTiles(
|
||||
BuildContext context,
|
||||
ImagePaths imagePaths,
|
||||
@@ -185,6 +243,20 @@ mixin MailboxWidgetMixin {
|
||||
.toList();
|
||||
}
|
||||
|
||||
static bool isSubaddressingSupported(Session? session, AccountId? accountId) {
|
||||
if (session == null || accountId == null) {
|
||||
return false;
|
||||
}
|
||||
if (!CapabilityIdentifier.jmapTeamMailboxes.isSupported(session, accountId)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return (session.getCapabilityProperties(accountId, CapabilityIdentifier.jmapTeamMailboxes)
|
||||
?.props[0] as Map<String, dynamic>?)
|
||||
?[subaddressingSupported]
|
||||
?? false;
|
||||
}
|
||||
|
||||
PopupMenuItem _buildPopupMenuItem(
|
||||
BuildContext context,
|
||||
ImagePaths imagePaths,
|
||||
@@ -196,21 +268,15 @@ mixin MailboxWidgetMixin {
|
||||
) {
|
||||
return PopupMenuItem(
|
||||
padding: EdgeInsets.zero,
|
||||
child: AbsorbPointer(
|
||||
absorbing: !contextMenuItem.isActivated,
|
||||
child: Opacity(
|
||||
opacity: contextMenuItem.isActivated ? 1.0 : 0.3,
|
||||
child: PopupItemWidget(
|
||||
iconAction: contextMenuItem.action.getContextMenuIcon(imagePaths),
|
||||
nameAction: contextMenuItem.action.getTitleContextMenu(context),
|
||||
colorIcon: contextMenuItem.action.getColorContextMenuIcon(),
|
||||
padding: const EdgeInsetsDirectional.symmetric(horizontal: 12),
|
||||
styleName: ThemeUtils.textStyleBodyBody3(
|
||||
color: contextMenuItem.action.getColorContextMenuTitle()
|
||||
),
|
||||
onCallbackAction: () => handleMailboxAction(context, contextMenuItem.action, mailbox)
|
||||
),
|
||||
child: PopupItemWidget(
|
||||
iconAction: contextMenuItem.action.getContextMenuIcon(imagePaths),
|
||||
nameAction: contextMenuItem.action.getTitleContextMenu(AppLocalizations.of(context)),
|
||||
colorIcon: contextMenuItem.action.getPopupMenuIconColor(),
|
||||
padding: const EdgeInsetsDirectional.symmetric(horizontal: 12),
|
||||
styleName: ThemeUtils.textStyleBodyBody3(
|
||||
color: contextMenuItem.action.getPopupMenuTitleColor()
|
||||
),
|
||||
onCallbackAction: () => handleMailboxAction(context, contextMenuItem.action, mailbox)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,29 @@
|
||||
|
||||
import 'package:tmail_ui_user/features/base/widget/context_menu_item_action.dart';
|
||||
import 'package:core/presentation/resources/image_paths.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/context_menu/context_menu_item_action.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_actions.dart';
|
||||
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
||||
|
||||
class ContextMenuItemMailboxAction extends ContextMenuItemAction<MailboxActions> {
|
||||
ContextMenuItemMailboxAction(super.action, super.state);
|
||||
}
|
||||
class ContextMenuItemMailboxAction
|
||||
extends ContextMenuItemAction<MailboxActions> {
|
||||
final AppLocalizations appLocalizations;
|
||||
final ImagePaths imagePaths;
|
||||
|
||||
ContextMenuItemMailboxAction(
|
||||
super.action,
|
||||
this.appLocalizations,
|
||||
this.imagePaths,
|
||||
);
|
||||
|
||||
@override
|
||||
String get actionIcon => action.getContextMenuIcon(imagePaths);
|
||||
|
||||
@override
|
||||
String get actionName => action.getTitleContextMenu(appLocalizations);
|
||||
|
||||
@override
|
||||
Color get actionIconColor => action.getContextMenuIconColor();
|
||||
|
||||
@override
|
||||
Color get actionNameColor => action.getContextMenuIconColor();
|
||||
}
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
|
||||
import 'package:core/core.dart';
|
||||
import 'package:core/presentation/extensions/color_extension.dart';
|
||||
import 'package:core/presentation/resources/image_paths.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:model/extensions/presentation_mailbox_extension.dart';
|
||||
import 'package:model/mailbox/presentation_mailbox.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/context_menu_item_action.dart';
|
||||
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
||||
|
||||
enum MailboxActions {
|
||||
@@ -48,44 +45,44 @@ extension MailboxActionsExtension on MailboxActions {
|
||||
}
|
||||
}
|
||||
|
||||
String getTitleContextMenu(BuildContext context) {
|
||||
String getTitleContextMenu(AppLocalizations appLocalizations) {
|
||||
switch(this) {
|
||||
case MailboxActions.openInNewTab:
|
||||
return AppLocalizations.of(context).openInNewTab;
|
||||
return appLocalizations.openInNewTab;
|
||||
case MailboxActions.copySubaddress:
|
||||
return AppLocalizations.of(context).copySubaddress;
|
||||
return appLocalizations.copySubaddress;
|
||||
case MailboxActions.newSubfolder:
|
||||
return AppLocalizations.of(context).newSubfolder;
|
||||
return appLocalizations.newSubfolder;
|
||||
case MailboxActions.createFilter:
|
||||
return AppLocalizations.of(context).createFilter;
|
||||
return appLocalizations.createFilter;
|
||||
case MailboxActions.disableSpamReport:
|
||||
return AppLocalizations.of(context).disableSpamReport;
|
||||
return appLocalizations.disableSpamReport;
|
||||
case MailboxActions.enableSpamReport:
|
||||
return AppLocalizations.of(context).enableSpamReport;
|
||||
return appLocalizations.enableSpamReport;
|
||||
case MailboxActions.markAsRead:
|
||||
return AppLocalizations.of(context).mark_as_read;
|
||||
return appLocalizations.mark_as_read;
|
||||
case MailboxActions.move:
|
||||
return AppLocalizations.of(context).moveFolder;
|
||||
return appLocalizations.moveFolder;
|
||||
case MailboxActions.rename:
|
||||
return AppLocalizations.of(context).renameFolder;
|
||||
return appLocalizations.renameFolder;
|
||||
case MailboxActions.delete:
|
||||
return AppLocalizations.of(context).deleteFolder;
|
||||
return appLocalizations.deleteFolder;
|
||||
case MailboxActions.disableMailbox:
|
||||
return AppLocalizations.of(context).hideFolder;
|
||||
return appLocalizations.hideFolder;
|
||||
case MailboxActions.enableMailbox:
|
||||
return AppLocalizations.of(context).showFolder;
|
||||
return appLocalizations.showFolder;
|
||||
case MailboxActions.emptyTrash:
|
||||
return AppLocalizations.of(context).emptyTrash;
|
||||
return appLocalizations.emptyTrash;
|
||||
case MailboxActions.emptySpam:
|
||||
return AppLocalizations.of(context).deleteAllSpamEmails;
|
||||
return appLocalizations.deleteAllSpamEmails;
|
||||
case MailboxActions.confirmMailSpam:
|
||||
return AppLocalizations.of(context).confirmAllEmailHereAreSpam;
|
||||
return appLocalizations.confirmAllEmailHereAreSpam;
|
||||
case MailboxActions.recoverDeletedMessages:
|
||||
return AppLocalizations.of(context).recoverDeletedMessages;
|
||||
return appLocalizations.recoverDeletedMessages;
|
||||
case MailboxActions.allowSubaddressing:
|
||||
return AppLocalizations.of(context).allowSubaddressing;
|
||||
return appLocalizations.allowSubaddressing;
|
||||
case MailboxActions.disallowSubaddressing:
|
||||
return AppLocalizations.of(context).disallowSubaddressing;
|
||||
return appLocalizations.disallowSubaddressing;
|
||||
default:
|
||||
return '';
|
||||
}
|
||||
@@ -134,7 +131,7 @@ extension MailboxActionsExtension on MailboxActions {
|
||||
}
|
||||
}
|
||||
|
||||
Color getColorContextMenuTitle() {
|
||||
Color getPopupMenuTitleColor() {
|
||||
switch(this) {
|
||||
case MailboxActions.delete:
|
||||
return AppColor.redFF3347;
|
||||
@@ -143,7 +140,7 @@ extension MailboxActionsExtension on MailboxActions {
|
||||
}
|
||||
}
|
||||
|
||||
Color getColorContextMenuIcon() {
|
||||
Color getPopupMenuIconColor() {
|
||||
switch(this) {
|
||||
case MailboxActions.delete:
|
||||
return AppColor.redFF3347;
|
||||
@@ -152,6 +149,24 @@ extension MailboxActionsExtension on MailboxActions {
|
||||
}
|
||||
}
|
||||
|
||||
Color getContextMenuIconColor() {
|
||||
switch (this) {
|
||||
case MailboxActions.delete:
|
||||
return AppColor.redFF3347;
|
||||
default:
|
||||
return AppColor.gray424244.withOpacity(0.72);
|
||||
}
|
||||
}
|
||||
|
||||
Color getContextMenuTitleColor() {
|
||||
switch (this) {
|
||||
case MailboxActions.delete:
|
||||
return AppColor.redFF3347;
|
||||
default:
|
||||
return AppColor.gray424244.withOpacity(0.9);
|
||||
}
|
||||
}
|
||||
|
||||
bool canSearch() {
|
||||
switch(this) {
|
||||
case MailboxActions.create:
|
||||
@@ -187,33 +202,4 @@ extension MailboxActionsExtension on MailboxActions {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
ContextMenuItemState getContextMenuItemState(PresentationMailbox mailbox) {
|
||||
switch(this) {
|
||||
case MailboxActions.openInNewTab:
|
||||
case MailboxActions.copySubaddress:
|
||||
case MailboxActions.newSubfolder:
|
||||
case MailboxActions.createFilter:
|
||||
case MailboxActions.disableSpamReport:
|
||||
case MailboxActions.enableSpamReport:
|
||||
case MailboxActions.enableMailbox:
|
||||
case MailboxActions.disableMailbox:
|
||||
case MailboxActions.move:
|
||||
case MailboxActions.rename:
|
||||
case MailboxActions.delete:
|
||||
case MailboxActions.emptyTrash:
|
||||
case MailboxActions.emptySpam:
|
||||
case MailboxActions.confirmMailSpam:
|
||||
case MailboxActions.recoverDeletedMessages:
|
||||
case MailboxActions.allowSubaddressing:
|
||||
case MailboxActions.disallowSubaddressing:
|
||||
return ContextMenuItemState.activated;
|
||||
case MailboxActions.markAsRead:
|
||||
return mailbox.countUnReadEmailsAsString.isNotEmpty
|
||||
? ContextMenuItemState.activated
|
||||
: ContextMenuItemState.deactivated;
|
||||
default:
|
||||
return ContextMenuItemState.deactivated;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:model/mailbox/presentation_mailbox.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_actions.dart';
|
||||
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
||||
|
||||
typedef OnMailboxActionsClick = void Function(MailboxActions, List<PresentationMailbox>);
|
||||
|
||||
@@ -44,12 +45,12 @@ class BottomBarSelectionMailboxWidget extends StatelessWidget {
|
||||
key: Key('${action.name}_button'),
|
||||
text: responsiveUtils.isLandscapeMobile(context)
|
||||
? ''
|
||||
: action.getTitleContextMenu(context),
|
||||
: action.getTitleContextMenu(AppLocalizations.of(context)),
|
||||
icon: action.getContextMenuIcon(imagePaths),
|
||||
borderRadius: 0,
|
||||
backgroundColor: Colors.transparent,
|
||||
flexibleText: true,
|
||||
tooltipMessage: action.getTitleContextMenu(context),
|
||||
tooltipMessage: action.getTitleContextMenu(AppLocalizations.of(context)),
|
||||
textStyle: const TextStyle(fontSize: 12, color: AppColor.colorTextButton),
|
||||
onTapActionCallback: () => onMailboxActionsClick.call(action, _listSelectionMailbox),
|
||||
));
|
||||
|
||||
Reference in New Issue
Block a user