TF-3759 Update style popup context menu for mailbox view
Signed-off-by: dab246 <tdvu@linagora.com>
This commit is contained in:
@@ -46,7 +46,9 @@ class PopupMenuItemActionWidget extends StatelessWidget {
|
|||||||
Expanded(
|
Expanded(
|
||||||
child: Text(
|
child: Text(
|
||||||
menuAction.getActionNameWithLimitation(),
|
menuAction.getActionNameWithLimitation(),
|
||||||
style: ThemeUtils.textStyleBodyBody3(color: Colors.black),
|
style: ThemeUtils.textStyleBodyBody3(
|
||||||
|
color: menuAction.actionNameColor,
|
||||||
|
),
|
||||||
maxLines: 1,
|
maxLines: 1,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
|
|
||||||
|
import 'package:core/presentation/extensions/color_extension.dart';
|
||||||
import 'package:core/presentation/extensions/html_extension.dart';
|
import 'package:core/presentation/extensions/html_extension.dart';
|
||||||
import 'package:core/presentation/resources/image_paths.dart';
|
import 'package:core/presentation/resources/image_paths.dart';
|
||||||
import 'package:flutter/cupertino.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:model/email/email_action_type.dart';
|
import 'package:model/email/email_action_type.dart';
|
||||||
import 'package:model/email/presentation_email.dart';
|
import 'package:model/email/presentation_email.dart';
|
||||||
import 'package:model/extensions/list_email_address_extension.dart';
|
import 'package:model/extensions/list_email_address_extension.dart';
|
||||||
@@ -181,4 +182,22 @@ extension EmailActionTypeExtension on EmailActionType {
|
|||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Color getPopupMenuIconColor() {
|
||||||
|
switch(this) {
|
||||||
|
case EmailActionType.deletePermanently:
|
||||||
|
return AppColor.redFF3347;
|
||||||
|
default:
|
||||||
|
return AppColor.steelGrayA540;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Color getPopupMenuTitleColor() {
|
||||||
|
switch(this) {
|
||||||
|
case EmailActionType.deletePermanently:
|
||||||
|
return AppColor.redFF3347;
|
||||||
|
default:
|
||||||
|
return Colors.black;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -574,7 +574,7 @@ class EmailView extends GetWidget<SingleEmailController> {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
final popupMenuActions = emailActions.map((actionType) {
|
final popupMenuItems = emailActions.map((actionType) {
|
||||||
return PopupMenuItem(
|
return PopupMenuItem(
|
||||||
padding: EdgeInsets.zero,
|
padding: EdgeInsets.zero,
|
||||||
child: PopupMenuItemActionWidget(
|
child: PopupMenuItemActionWidget(
|
||||||
@@ -595,11 +595,7 @@ class EmailView extends GetWidget<SingleEmailController> {
|
|||||||
);
|
);
|
||||||
}).toList();
|
}).toList();
|
||||||
|
|
||||||
controller.openPopupMenuAction(
|
controller.openPopupMenuAction(context, position, popupMenuItems);
|
||||||
context,
|
|
||||||
position,
|
|
||||||
popupMenuActions,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import 'package:core/presentation/resources/image_paths.dart';
|
import 'package:core/presentation/resources/image_paths.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
import 'package:model/email/email_action_type.dart';
|
import 'package:model/email/email_action_type.dart';
|
||||||
import 'package:tmail_ui_user/features/base/model/popup_menu_item_action.dart';
|
import 'package:tmail_ui_user/features/base/model/popup_menu_item_action.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/presentation/extensions/email_action_type_extension.dart';
|
import 'package:tmail_ui_user/features/composer/presentation/extensions/email_action_type_extension.dart';
|
||||||
@@ -20,4 +21,10 @@ class PopupMenuItemEmailAction
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
String get actionName => action.getTitle(appLocalizations);
|
String get actionName => action.getTitle(appLocalizations);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Color get actionIconColor => action.getPopupMenuIconColor();
|
||||||
|
|
||||||
|
@override
|
||||||
|
Color get actionNameColor => action.getPopupMenuTitleColor();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:model/email/presentation_email.dart';
|
import 'package:model/email/presentation_email.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:tmail_ui_user/features/base/widget/popup_menu/popup_menu_item_action_widget.dart';
|
||||||
import 'package:tmail_ui_user/features/home/domain/extensions/session_extensions.dart';
|
import 'package:tmail_ui_user/features/home/domain/extensions/session_extensions.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox/presentation/mailbox_controller.dart';
|
import 'package:tmail_ui_user/features/mailbox/presentation/mailbox_controller.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_utils.dart';
|
import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_utils.dart';
|
||||||
@@ -73,20 +74,18 @@ extension HandleMailboxActionExtension on MailboxController {
|
|||||||
final isSubAddressingSupported =
|
final isSubAddressingSupported =
|
||||||
session?.isSubAddressingSupported(accountId) ?? false;
|
session?.isSubAddressingSupported(accountId) ?? false;
|
||||||
|
|
||||||
final contextMenuActions = listContextMenuItemAction(
|
|
||||||
mailbox,
|
|
||||||
mailboxDashBoardController.enableSpamReport,
|
|
||||||
deletedMessageVaultSupported,
|
|
||||||
isSubAddressingSupported,
|
|
||||||
imagePaths,
|
|
||||||
AppLocalizations.of(context),
|
|
||||||
);
|
|
||||||
|
|
||||||
if (contextMenuActions.isEmpty) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (responsiveUtils.isScreenWithShortestSide(context)) {
|
if (responsiveUtils.isScreenWithShortestSide(context)) {
|
||||||
|
final contextMenuActions = listContextMenuItemAction(
|
||||||
|
mailbox,
|
||||||
|
mailboxDashBoardController.enableSpamReport,
|
||||||
|
deletedMessageVaultSupported,
|
||||||
|
isSubAddressingSupported,
|
||||||
|
imagePaths,
|
||||||
|
AppLocalizations.of(context),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (contextMenuActions.isEmpty) return;
|
||||||
|
|
||||||
openBottomSheetContextMenuAction(
|
openBottomSheetContextMenuAction(
|
||||||
context: context,
|
context: context,
|
||||||
itemActions: contextMenuActions,
|
itemActions: contextMenuActions,
|
||||||
@@ -97,17 +96,30 @@ extension HandleMailboxActionExtension on MailboxController {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
openPopupMenuAction(
|
final popupMenuActions = getListPopupMenuItemAction(
|
||||||
context,
|
AppLocalizations.of(context),
|
||||||
position,
|
imagePaths,
|
||||||
popupMenuMailboxActionTiles(
|
mailbox,
|
||||||
context,
|
mailboxDashBoardController.enableSpamReport,
|
||||||
imagePaths,
|
deletedMessageVaultSupported,
|
||||||
mailbox,
|
isSubAddressingSupported,
|
||||||
contextMenuActions,
|
|
||||||
handleMailboxAction: handleMailboxAction,
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (popupMenuActions.isEmpty) return;
|
||||||
|
|
||||||
|
final popupMenuItems = popupMenuActions.map((menuAction) {
|
||||||
|
return PopupMenuItem(
|
||||||
|
padding: EdgeInsets.zero,
|
||||||
|
child: PopupMenuItemActionWidget(
|
||||||
|
menuAction: menuAction,
|
||||||
|
menuActionClick: (menuAction) {
|
||||||
|
handleMailboxAction(context, menuAction.action, mailbox);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}).toList();
|
||||||
|
|
||||||
|
openPopupMenuAction(context, position, popupMenuItems);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2,12 +2,13 @@ import 'package:core/presentation/resources/image_paths.dart';
|
|||||||
import 'package:core/presentation/utils/theme_utils.dart';
|
import 'package:core/presentation/utils/theme_utils.dart';
|
||||||
import 'package:core/utils/platform_info.dart';
|
import 'package:core/utils/platform_info.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:model/extensions/presentation_mailbox_extension.dart';
|
import 'package:model/model.dart';
|
||||||
import 'package:model/mailbox/presentation_mailbox.dart';
|
import 'package:tmail_ui_user/features/base/model/popup_menu_item_action.dart';
|
||||||
import 'package:tmail_ui_user/features/base/widget/popup_item_widget.dart';
|
import 'package:tmail_ui_user/features/base/widget/popup_item_widget.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox/presentation/model/context_item_mailbox_action.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/model/mailbox_actions.dart';
|
||||||
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
||||||
|
import 'package:tmail_ui_user/features/mailbox/presentation/model/popup_menu_item_mailbox_action.dart';
|
||||||
|
|
||||||
mixin MailboxWidgetMixin {
|
mixin MailboxWidgetMixin {
|
||||||
|
|
||||||
@@ -131,6 +132,32 @@ mixin MailboxWidgetMixin {
|
|||||||
return listContextMenuItemAction;
|
return listContextMenuItemAction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
List<PopupMenuItemAction> getListPopupMenuItemAction(
|
||||||
|
AppLocalizations appLocalizations,
|
||||||
|
ImagePaths imagePaths,
|
||||||
|
PresentationMailbox presentationMailbox,
|
||||||
|
bool spamReportEnabled,
|
||||||
|
bool deletedMessageVaultSupported,
|
||||||
|
bool isSubAddressingSupported,
|
||||||
|
) {
|
||||||
|
final mailboxActionsSupported = _listActionForAllMailboxType(
|
||||||
|
presentationMailbox,
|
||||||
|
spamReportEnabled,
|
||||||
|
deletedMessageVaultSupported,
|
||||||
|
isSubAddressingSupported,
|
||||||
|
);
|
||||||
|
|
||||||
|
final popupMenuActions = mailboxActionsSupported
|
||||||
|
.map((action) => PopupMenuItemMailboxAction(
|
||||||
|
action,
|
||||||
|
appLocalizations,
|
||||||
|
imagePaths,
|
||||||
|
))
|
||||||
|
.toList();
|
||||||
|
|
||||||
|
return popupMenuActions;
|
||||||
|
}
|
||||||
|
|
||||||
List<PopupMenuEntry> popupMenuMailboxActionTiles(
|
List<PopupMenuEntry> popupMenuMailboxActionTiles(
|
||||||
BuildContext context,
|
BuildContext context,
|
||||||
ImagePaths imagePaths,
|
ImagePaths imagePaths,
|
||||||
@@ -164,7 +191,7 @@ mixin MailboxWidgetMixin {
|
|||||||
padding: EdgeInsets.zero,
|
padding: EdgeInsets.zero,
|
||||||
child: PopupItemWidget(
|
child: PopupItemWidget(
|
||||||
iconAction: contextMenuItem.action.getContextMenuIcon(imagePaths),
|
iconAction: contextMenuItem.action.getContextMenuIcon(imagePaths),
|
||||||
nameAction: contextMenuItem.action.getTitleContextMenu(AppLocalizations.of(context)),
|
nameAction: contextMenuItem.action.getContextMenuTitle(AppLocalizations.of(context)),
|
||||||
colorIcon: contextMenuItem.action.getPopupMenuIconColor(),
|
colorIcon: contextMenuItem.action.getPopupMenuIconColor(),
|
||||||
padding: const EdgeInsetsDirectional.symmetric(horizontal: 12),
|
padding: const EdgeInsetsDirectional.symmetric(horizontal: 12),
|
||||||
styleName: ThemeUtils.textStyleBodyBody3(
|
styleName: ThemeUtils.textStyleBodyBody3(
|
||||||
|
|||||||
@@ -19,11 +19,11 @@ class ContextMenuItemMailboxAction
|
|||||||
String get actionIcon => action.getContextMenuIcon(imagePaths);
|
String get actionIcon => action.getContextMenuIcon(imagePaths);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get actionName => action.getTitleContextMenu(appLocalizations);
|
String get actionName => action.getContextMenuTitle(appLocalizations);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Color get actionIconColor => action.getContextMenuIconColor();
|
Color get actionIconColor => action.getContextMenuIconColor();
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Color get actionNameColor => action.getContextMenuIconColor();
|
Color get actionNameColor => action.getContextMenuTitleColor();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ extension MailboxActionsExtension on MailboxActions {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
String getTitleContextMenu(AppLocalizations appLocalizations) {
|
String getContextMenuTitle(AppLocalizations appLocalizations) {
|
||||||
switch(this) {
|
switch(this) {
|
||||||
case MailboxActions.openInNewTab:
|
case MailboxActions.openInNewTab:
|
||||||
return appLocalizations.openInNewTab;
|
return appLocalizations.openInNewTab;
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import 'package:core/presentation/resources/image_paths.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:tmail_ui_user/features/base/model/popup_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 PopupMenuItemMailboxAction
|
||||||
|
extends PopupMenuItemActionRequiredIcon<MailboxActions> {
|
||||||
|
final AppLocalizations appLocalizations;
|
||||||
|
final ImagePaths imagePaths;
|
||||||
|
|
||||||
|
PopupMenuItemMailboxAction(
|
||||||
|
super.action,
|
||||||
|
this.appLocalizations,
|
||||||
|
this.imagePaths,
|
||||||
|
);
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get actionIcon => action.getContextMenuIcon(imagePaths);
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get actionName => action.getContextMenuTitle(appLocalizations);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Color get actionIconColor => action.getPopupMenuIconColor();
|
||||||
|
|
||||||
|
@override
|
||||||
|
Color get actionNameColor => action.getPopupMenuTitleColor();
|
||||||
|
}
|
||||||
@@ -45,12 +45,12 @@ class BottomBarSelectionMailboxWidget extends StatelessWidget {
|
|||||||
key: Key('${action.name}_button'),
|
key: Key('${action.name}_button'),
|
||||||
text: responsiveUtils.isLandscapeMobile(context)
|
text: responsiveUtils.isLandscapeMobile(context)
|
||||||
? ''
|
? ''
|
||||||
: action.getTitleContextMenu(AppLocalizations.of(context)),
|
: action.getContextMenuTitle(AppLocalizations.of(context)),
|
||||||
icon: action.getContextMenuIcon(imagePaths),
|
icon: action.getContextMenuIcon(imagePaths),
|
||||||
borderRadius: 0,
|
borderRadius: 0,
|
||||||
backgroundColor: Colors.transparent,
|
backgroundColor: Colors.transparent,
|
||||||
flexibleText: true,
|
flexibleText: true,
|
||||||
tooltipMessage: action.getTitleContextMenu(AppLocalizations.of(context)),
|
tooltipMessage: action.getContextMenuTitle(AppLocalizations.of(context)),
|
||||||
textStyle: const TextStyle(fontSize: 12, color: AppColor.colorTextButton),
|
textStyle: const TextStyle(fontSize: 12, color: AppColor.colorTextButton),
|
||||||
onTapActionCallback: () => onMailboxActionsClick.call(action, _listSelectionMailbox),
|
onTapActionCallback: () => onMailboxActionsClick.call(action, _listSelectionMailbox),
|
||||||
));
|
));
|
||||||
|
|||||||
@@ -243,7 +243,7 @@ class SearchMailboxView extends GetWidget<SearchMailboxController>
|
|||||||
),
|
),
|
||||||
const SizedBox(width: 12),
|
const SizedBox(width: 12),
|
||||||
Expanded(child: Text(
|
Expanded(child: Text(
|
||||||
contextMenuItem.action.getTitleContextMenu(AppLocalizations.of(context)),
|
contextMenuItem.action.getContextMenuTitle(AppLocalizations.of(context)),
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontWeight: FontWeight.w500,
|
fontWeight: FontWeight.w500,
|
||||||
fontSize: 16,
|
fontSize: 16,
|
||||||
|
|||||||
@@ -661,7 +661,7 @@ class ThreadView extends GetWidget<ThreadController>
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
final popupMenuActions = listEmailActions.map((actionType) {
|
final popupMenuItems = listEmailActions.map((actionType) {
|
||||||
return PopupMenuItem(
|
return PopupMenuItem(
|
||||||
padding: EdgeInsets.zero,
|
padding: EdgeInsets.zero,
|
||||||
child: PopupMenuItemActionWidget(
|
child: PopupMenuItemActionWidget(
|
||||||
@@ -682,11 +682,7 @@ class ThreadView extends GetWidget<ThreadController>
|
|||||||
);
|
);
|
||||||
}).toList();
|
}).toList();
|
||||||
|
|
||||||
controller.openPopupMenuAction(
|
controller.openPopupMenuAction(context, position, popupMenuItems);
|
||||||
context,
|
|
||||||
position,
|
|
||||||
popupMenuActions,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user