tf-1946 add swipe to thread

tf-1946 add swipe to thread

tf-1946 fix duplicate import and change MarkReadAction

(cherry picked from commit 3fa17e200b972c3dd81ae297f19fd7b736f3845a)
This commit is contained in:
hieubt
2023-08-28 10:21:56 +07:00
committed by Dat Vu
parent 20c95caf0e
commit 852599856d
11 changed files with 160 additions and 27 deletions
@@ -0,0 +1,5 @@
enum MarkReadAction {
tap,
swipeOnThread,
undo
}
@@ -4,14 +4,17 @@ import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:model/email/read_actions.dart';
import 'package:model/model.dart';
import 'package:tmail_ui_user/features/base/state/ui_action_state.dart';
import 'package:tmail_ui_user/features/email/domain/model/mark_read_action.dart';
class MarkAsEmailReadSuccess extends UIActionState {
final Email updatedEmail;
final ReadActions readActions;
final MarkReadAction markReadAction;
MarkAsEmailReadSuccess(
this.updatedEmail,
this.readActions,
this.markReadAction,
{
jmap.State? currentEmailState,
jmap.State? currentMailboxState,
@@ -19,7 +22,7 @@ class MarkAsEmailReadSuccess extends UIActionState {
) : super(currentEmailState, currentMailboxState);
@override
List<Object?> get props => [updatedEmail, readActions, ...super.props];
List<Object?> get props => [updatedEmail, readActions, markReadAction, ...super.props];
}
class MarkAsEmailReadFailure extends FeatureFailure {
@@ -4,6 +4,7 @@ import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/session/session.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:model/model.dart';
import 'package:tmail_ui_user/features/email/domain/model/mark_read_action.dart';
import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
import 'package:tmail_ui_user/features/email/domain/state/mark_as_email_read_state.dart';
import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
@@ -14,7 +15,7 @@ class MarkAsEmailReadInteractor {
MarkAsEmailReadInteractor(this._emailRepository, this._mailboxRepository);
Stream<Either<Failure, Success>> execute(Session session, AccountId accountId, Email email, ReadActions readAction) async* {
Stream<Either<Failure, Success>> execute(Session session, AccountId accountId, Email email, ReadActions readAction, MarkReadAction markReadAction) async* {
try {
final listState = await Future.wait([
_mailboxRepository.getMailboxState( session,accountId),
@@ -30,6 +31,7 @@ class MarkAsEmailReadInteractor {
yield Right(MarkAsEmailReadSuccess(
updatedEmail,
readAction,
markReadAction,
currentEmailState: currentEmailState,
currentMailboxState: currentMailboxState));
} else {
@@ -30,6 +30,7 @@ import 'package:tmail_ui_user/features/destination_picker/presentation/model/des
import 'package:tmail_ui_user/features/email/domain/extensions/list_attachments_extension.dart';
import 'package:tmail_ui_user/features/email/domain/model/detailed_email.dart';
import 'package:tmail_ui_user/features/email/domain/model/event_action.dart';
import 'package:tmail_ui_user/features/email/domain/model/mark_read_action.dart';
import 'package:tmail_ui_user/features/email/domain/state/parse_calendar_event_state.dart';
import 'package:tmail_ui_user/features/email/domain/usecases/parse_calendar_event_interactor.dart';
import 'package:tmail_ui_user/features/email/domain/usecases/store_opened_email_interactor.dart';
@@ -237,7 +238,7 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
}
if (!selectedEmail.hasRead) {
markAsEmailRead(selectedEmail, ReadActions.markAsRead);
markAsEmailRead(selectedEmail, ReadActions.markAsRead, MarkReadAction.tap);
}
if (_identitySelected == null) {
@@ -508,11 +509,11 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
}
}
void markAsEmailRead(PresentationEmail presentationEmail, ReadActions readActions) async {
void markAsEmailRead(PresentationEmail presentationEmail, ReadActions readActions, MarkReadAction markReadAction) async {
final accountId = mailboxDashBoardController.accountId.value;
final session = mailboxDashBoardController.sessionCurrent;
if (accountId != null && session != null) {
consumeState(_markAsEmailReadInteractor.execute(session, accountId, presentationEmail.toEmail(), readActions));
consumeState(_markAsEmailReadInteractor.execute(session, accountId, presentationEmail.toEmail(), readActions, markReadAction));
}
}
@@ -925,7 +926,7 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
switch(actionType) {
case EmailActionType.markAsUnread:
popBack();
markAsEmailRead(presentationEmail, ReadActions.markAsUnread);
markAsEmailRead(presentationEmail, ReadActions.markAsUnread, MarkReadAction.tap);
break;
case EmailActionType.markAsStarred:
markAsStarEmail(presentationEmail, MarkStarAction.markStar);