Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion core/lib/presentation/resources/assets_paths.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
class AssetsPaths {
static const images = 'assets/images/';
static const icons = 'assets/icons/';
static const configurationImages = 'configurations/icons/';
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

import 'package:flutter_test/flutter_test.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/email_receive_time_type.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_sort_order_type.dart';
import 'package:tmail_ui_user/features/search/email/presentation/search_email_view.dart';
import 'package:tmail_ui_user/features/thread/presentation/widgets/email_tile_builder.dart';
Expand Down
37 changes: 0 additions & 37 deletions lib/features/base/mixin/email_action_handler_mixin.dart

This file was deleted.

43 changes: 0 additions & 43 deletions lib/features/base/mixin/popup_menu_widget_mixin.dart

This file was deleted.

35 changes: 20 additions & 15 deletions lib/features/email/data/network/email_api.dart
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ import 'package:model/extensions/account_id_extensions.dart';
import 'package:model/extensions/email_extension.dart';
import 'package:model/extensions/email_id_extensions.dart';
import 'package:model/extensions/keyword_identifier_extension.dart';
import 'package:model/extensions/list_email_extension.dart';
import 'package:model/extensions/list_email_id_extension.dart';
import 'package:model/extensions/list_id_extension.dart';
import 'package:model/extensions/mailbox_id_extension.dart';
Expand Down Expand Up @@ -546,15 +547,11 @@ class EmailAPI with HandleSetErrorMixin {

final currentEmailIds = emailIds.sublist(start, end);

final moveProperties = isMovingToSpam
? currentEmailIds.generateMapUpdateObjectMoveToSpam(
currentMailboxId,
destinationMailboxId,
)
: currentEmailIds.generateMapUpdateObjectMoveToMailbox(
currentMailboxId,
destinationMailboxId,
);
final moveProperties = currentEmailIds.generateMapUpdateObjectMoveToMailbox(
currentMailboxId,
destinationMailboxId,
isDestinationSpamMailbox: isMovingToSpam,
);

final setEmailMethod = SetEmailMethod(accountId)
..addUpdates(moveProperties);
Expand Down Expand Up @@ -1016,19 +1013,27 @@ class EmailAPI with HandleSetErrorMixin {
Future<(List<EmailId> emailIds, Map<Id, SetError> mapErrors)> moveSelectionAllEmailsToFolder(
Session session,
AccountId accountId,
MailboxId currentMailboxId,
MailboxId destinationMailboxId,
List<EmailId> listEmailId,
{
MailboxId? currentMailboxId,
List<EmailId>? listEmailId,
List<Email>? listEmail,
bool isDestinationSpamMailbox = false
}
) async {
final moveProperties = isDestinationSpamMailbox
? listEmailId.generateMapUpdateObjectMoveToSpam(currentMailboxId, destinationMailboxId)
: listEmailId.generateMapUpdateObjectMoveToMailbox(currentMailboxId, destinationMailboxId);
final moveProperties = currentMailboxId != null
? listEmailId?.generateMapUpdateObjectMoveToMailbox(
currentMailboxId,
destinationMailboxId,
isDestinationSpamMailbox: isDestinationSpamMailbox,
)
: listEmail?.generateMapUpdateObjectMoveToMailbox(
destinationMailboxId,
isDestinationSpamMailbox: isDestinationSpamMailbox,
);

final setEmailMethod = SetEmailMethod(accountId)
..addUpdates(moveProperties);
..addUpdates(moveProperties ?? {});

final requestBuilder = JmapRequestBuilder(_httpClient, ProcessingInvocation());
final setEmailInvocation = requestBuilder.invocation(setEmailMethod);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,31 @@ import 'package:tmail_ui_user/main/routes/route_utils.dart';
extension PresentationMailboxExtension on PresentationMailbox {

String getDisplayName(BuildContext context) {
return getDisplayNameByAppLocalizations(AppLocalizations.of(context));
}

String getDisplayNameByAppLocalizations(AppLocalizations appLocalizations) {
if (isDefault) {
switch(role!.value.toLowerCase()) {
case PresentationMailbox.inboxRole:
return AppLocalizations.of(context).inboxMailboxDisplayName;
return appLocalizations.inboxMailboxDisplayName;
case PresentationMailbox.archiveRole:
return AppLocalizations.of(context).archiveMailboxDisplayName;
return appLocalizations.archiveMailboxDisplayName;
case PresentationMailbox.draftsRole:
return AppLocalizations.of(context).draftsMailboxDisplayName;
return appLocalizations.draftsMailboxDisplayName;
case PresentationMailbox.sentRole:
return AppLocalizations.of(context).sentMailboxDisplayName;
return appLocalizations.sentMailboxDisplayName;
case PresentationMailbox.outboxRole:
return AppLocalizations.of(context).outboxMailboxDisplayName;
return appLocalizations.outboxMailboxDisplayName;
case PresentationMailbox.trashRole:
return AppLocalizations.of(context).trashMailboxDisplayName;
return appLocalizations.trashMailboxDisplayName;
case PresentationMailbox.spamRole:
case PresentationMailbox.junkRole:
return AppLocalizations.of(context).spamMailboxDisplayName;
return appLocalizations.spamMailboxDisplayName;
case PresentationMailbox.templatesRole:
return AppLocalizations.of(context).templatesMailboxDisplayName;
return appLocalizations.templatesMailboxDisplayName;
case PresentationMailbox.recoveredRole:
return AppLocalizations.of(context).recoveredMailboxDisplayName;
return appLocalizations.recoveredMailboxDisplayName;
}
}
return name?.name ?? '';
Expand Down
49 changes: 36 additions & 13 deletions lib/features/mailbox/presentation/mailbox_view_web.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ import 'package:tmail_ui_user/features/mailbox/presentation/widgets/app_grid_vie
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_item_widget.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_loading_bar_widget.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/user_information_widget.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_action_for_select_all_emails_extension.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_email_action_type_when_select_all_active_and_mailbox_opened_extension.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_email_action_type_when_select_all_active_and_search_active_extension.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_email_action_type_when_selection_active_extension.dart';
import 'package:tmail_ui_user/features/quotas/presentation/quotas_view.dart';
import 'package:tmail_ui_user/features/quotas/presentation/styles/quotas_view_styles.dart';
import 'package:tmail_ui_user/features/thread/presentation/model/draggable_email_data.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';

class MailboxView extends BaseMailboxView {
Expand Down Expand Up @@ -366,7 +367,12 @@ class MailboxView extends BaseMailboxView {
onOpenMailboxFolderClick: (mailboxNode) => controller.openMailbox(context, mailboxNode.item),
onExpandFolderActionClick: (mailboxNode) => controller.toggleMailboxFolder(mailboxNode, controller.mailboxListScrollController),
onSelectMailboxFolderClick: controller.selectMailboxNode,
onDragItemAccepted: _handleDragItemAccepted,
onDragItemAccepted: (draggableEmailData, destinationMailbox) =>
_handleDragItemAccepted(
AppLocalizations.of(context),
draggableEmailData,
destinationMailbox,
),
onMenuActionClick: (position, mailboxNode) {
openMailboxMenuActionOnWeb(
context,
Expand All @@ -387,7 +393,12 @@ class MailboxView extends BaseMailboxView {
mailboxNodeSelected: controller.mailboxDashBoardController.selectedMailbox.value,
onOpenMailboxFolderClick: (mailboxNode) => controller.openMailbox(context, mailboxNode.item),
onSelectMailboxFolderClick: controller.selectMailboxNode,
onDragItemAccepted: _handleDragItemAccepted,
onDragItemAccepted: (draggableEmailData, destinationMailbox) =>
_handleDragItemAccepted(
AppLocalizations.of(context),
draggableEmailData,
destinationMailbox,
),
onMenuActionClick: (position, mailboxNode) {
openMailboxMenuActionOnWeb(
context,
Expand All @@ -405,27 +416,39 @@ class MailboxView extends BaseMailboxView {
}

void _handleDragItemAccepted(
DraggableEmailData draggableEmailData,
PresentationMailbox presentationMailbox,
AppLocalizations appLocalizations,
List<PresentationEmail> listEmails,
PresentationMailbox destinationMailbox,
) {
final mailboxPath = controller.findNodePath(presentationMailbox.id)
?? presentationMailbox.name?.name;
final mailboxPath = controller.findNodePath(destinationMailbox.id)
?? destinationMailbox.name?.name;
log('MailboxView::_handleDragItemAccepted(): mailboxPath: $mailboxPath');
if (mailboxPath != null) {
presentationMailbox = presentationMailbox
destinationMailbox = destinationMailbox
.toPresentationMailboxWithMailboxPath(mailboxPath);
}

if (draggableEmailData.isSelectAllEmailsEnabled) {
if (controller.mailboxDashBoardController.isSelectAllActiveAndMailboxOpened) {
controller
.mailboxDashBoardController
.dragEmailsToMailboxWhenSelectAllActiveAndMailboxOpened(
appLocalizations: appLocalizations,
selectedMailbox: controller.mailboxDashBoardController.selectedMailbox.value!,
destinationMailbox: destinationMailbox,
);
} else if (controller.mailboxDashBoardController.isSelectAllActiveAndMailboxOpened) {
controller
.mailboxDashBoardController
.dragAllSelectedEmailToMailboxAction(presentationMailbox);
.dragEmailsToMailboxWhenSelectAllActiveAndSearchActive(
appLocalizations: appLocalizations,
destinationMailbox: destinationMailbox,
);
} else {
controller
.mailboxDashBoardController
.dragSelectedMultipleEmailToMailboxAction(
draggableEmailData.listEmails!,
presentationMailbox,
listEmails,
destinationMailbox,
);
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@

import 'package:flutter/material.dart';
import 'package:model/email/presentation_email.dart';
import 'package:model/mailbox/presentation_mailbox.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart';
import 'package:tmail_ui_user/features/thread/presentation/model/draggable_email_data.dart';

typedef OnClickOpenMailboxAction = void Function(PresentationMailbox);
typedef OnClickOpenMenuMailboxAction = void Function(RelativeRect, PresentationMailbox);
typedef OnSelectMailboxAction = void Function(PresentationMailbox);
typedef OnDragEmailToMailboxAccepted = void Function(DraggableEmailData, PresentationMailbox);
typedef OnDragEmailToMailboxAccepted = void Function(List<PresentationEmail>, PresentationMailbox);
typedef OnLongPressMailboxAction = void Function(PresentationMailbox);

typedef OnClickExpandMailboxNodeAction = void Function(MailboxNode);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart';
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
import 'package:model/email/presentation_email.dart';
import 'package:model/mailbox/presentation_mailbox.dart';
import 'package:model/mailbox/select_mode.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_actions.dart';
Expand All @@ -15,7 +16,6 @@ import 'package:tmail_ui_user/features/mailbox/presentation/styles/mailbox_item_
import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_method_action_define.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/label_mailbox_item_widget.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/leading_mailbox_item_widget.dart';
import 'package:tmail_ui_user/features/thread/presentation/model/draggable_email_data.dart';

class MailboxItemWidget extends StatefulWidget {

Expand Down Expand Up @@ -65,7 +65,7 @@ class _MailboxItemWidgetState extends State<MailboxItemWidget> {
@override
Widget build(BuildContext context) {
if (_responsiveUtils.isWebDesktop(context) && widget.mailboxDisplayed == MailboxDisplayed.mailbox) {
return DragTarget<DraggableEmailData>(
return DragTarget<List<PresentationEmail>>(
builder: (context, _, __) {
return InkWell(
onTap: () => widget.onOpenMailboxFolderClick?.call(widget.mailboxNode),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@

import 'package:flutter/material.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
import 'package:model/email/email_action_type.dart';
import 'package:model/email/presentation_email.dart';
import 'package:model/mailbox/presentation_mailbox.dart';
import 'package:tmail_ui_user/features/base/action/ui_action.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/email_receive_time_type.dart';
import 'package:tmail_ui_user/features/thread/domain/model/filter_message_option.dart';
import 'package:tmail_ui_user/features/thread/domain/model/search_query.dart';

Expand All @@ -33,17 +31,6 @@ class FilterMessageAction extends DashBoardAction {
List<Object?> get props => [option];
}

class HandleEmailActionTypeAction extends DashBoardAction {

final EmailActionType emailAction;
final List<PresentationEmail> listEmailSelected;

HandleEmailActionTypeAction(this.listEmailSelected, this.emailAction);

@override
List<Object> get props => [listEmailSelected, emailAction];
}

class OpenEmailDetailedFromSuggestionQuickSearchAction extends DashBoardAction {

final PresentationEmail presentationEmail;
Expand Down Expand Up @@ -148,15 +135,4 @@ class OpenAdvancedSearchViewAction extends DashBoardAction {}

class ClearSearchFilterAppliedAction extends DashBoardAction {}

class ClearAdvancedSearchFilterEmailAction extends DashBoardAction {}

class MoreSelectedEmailAction extends DashBoardAction {

final BuildContext context;
final RelativeRect position;

MoreSelectedEmailAction(this.context, this.position);

@override
List<Object> get props => [context, position];
}
class ClearAdvancedSearchFilterEmailAction extends DashBoardAction {}
Loading
Loading