TF-78 Implement mark as unread when touch the "eye slash" icon on the top of screen EmailView
This commit is contained in:
@@ -1,7 +1,5 @@
|
||||
import 'package:core/core.dart';
|
||||
import 'package:dartz/dartz.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
|
||||
@@ -13,8 +11,6 @@ import 'package:tmail_ui_user/features/email/domain/usecases/get_email_content_i
|
||||
import 'package:tmail_ui_user/features/email/domain/usecases/mark_as_email_read_interactor.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/mailbox_dashboard_controller.dart';
|
||||
import 'package:tmail_ui_user/main/actions/app_action.dart';
|
||||
import 'package:tmail_ui_user/main/actions/email_action.dart';
|
||||
import 'package:tmail_ui_user/main/routes/app_routes.dart';
|
||||
import 'package:tmail_ui_user/main/routes/route_navigation.dart';
|
||||
|
||||
@@ -28,7 +24,6 @@ class EmailController extends BaseController {
|
||||
|
||||
final emailAddressExpandMode = ExpandMode.COLLAPSE.obs;
|
||||
EmailContent? emailContent;
|
||||
AppAction? emailActionCurrent;
|
||||
|
||||
EmailController(this._getEmailContentInteractor, this._markAsEmailReadInteractor);
|
||||
|
||||
@@ -37,12 +32,11 @@ class EmailController extends BaseController {
|
||||
super.onReady();
|
||||
mailboxDashBoardController.selectedEmail.listen((presentationEmail) {
|
||||
toggleDisplayEmailAddressAction(expandMode: ExpandMode.COLLAPSE);
|
||||
emailActionCurrent = null;
|
||||
final accountId = mailboxDashBoardController.accountId.value;
|
||||
if (accountId != null && presentationEmail != null) {
|
||||
_getEmailContentAction(accountId, presentationEmail.id);
|
||||
if (presentationEmail.isUnReadEmail()) {
|
||||
markAsEmailRead(unread: false);
|
||||
markAsEmailRead(presentationEmail, ReadActions.markAsRead);
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -65,11 +59,19 @@ class EmailController extends BaseController {
|
||||
|
||||
@override
|
||||
void onDone() {
|
||||
viewState.value.map((success) {
|
||||
if (success is GetEmailContentSuccess) {
|
||||
emailContent = success.emailContent;
|
||||
}
|
||||
});
|
||||
viewState.value.fold(
|
||||
(failure) {
|
||||
if (failure is MarkAsEmailReadFailure) {
|
||||
_markAsEmailReadFailure(failure);
|
||||
}
|
||||
},
|
||||
(success) {
|
||||
if (success is GetEmailContentSuccess) {
|
||||
emailContent = success.emailContent;
|
||||
} else if (success is MarkAsEmailReadSuccess) {
|
||||
_markAsEmailReadSuccess(success);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -80,36 +82,33 @@ class EmailController extends BaseController {
|
||||
emailAddressExpandMode.value = expandMode;
|
||||
}
|
||||
|
||||
void markAsEmailRead({required bool unread}) async {
|
||||
void markAsEmailRead(PresentationEmail presentationEmail, ReadActions readActions) async {
|
||||
final accountId = mailboxDashBoardController.accountId.value;
|
||||
final presentationEmail = mailboxDashBoardController.selectedEmail.value;
|
||||
final mailboxCurrent = mailboxDashBoardController.selectedMailbox.value;
|
||||
if (accountId != null && presentationEmail != null && mailboxCurrent != null) {
|
||||
_markAsEmailReadInteractor.execute(accountId, presentationEmail.id, unread)
|
||||
.then((result) => result
|
||||
.map((success) {
|
||||
if (success is MarkAsEmailReadSuccess) {
|
||||
emailActionCurrent = MarkAsEmailReadAction(presentationEmail.id, mailboxCurrent);
|
||||
_updateMailboxDashBoardActionForDesktop(emailActionCurrent);
|
||||
}
|
||||
})
|
||||
);
|
||||
if (accountId != null && mailboxCurrent != null) {
|
||||
consumeState(_markAsEmailReadInteractor.execute(accountId, presentationEmail.id, readActions));
|
||||
}
|
||||
}
|
||||
|
||||
void _updateMailboxDashBoardActionForDesktop(AppAction? appAction) {
|
||||
if (Get.context != null && responsiveUtils.isDesktop(Get.context!)) {
|
||||
mailboxDashBoardController.setMailboxDashBoardAction(appAction);
|
||||
void _markAsEmailReadSuccess(Success success) {
|
||||
mailboxDashBoardController.dispatchState(Right(success));
|
||||
|
||||
if (success is MarkAsEmailReadSuccess && success.readActions == ReadActions.markAsUnread) {
|
||||
backToThreadView();
|
||||
}
|
||||
}
|
||||
|
||||
void _markAsEmailReadFailure(Failure failure) {
|
||||
backToThreadView();
|
||||
}
|
||||
|
||||
bool canComposeEmail() => mailboxDashBoardController.sessionCurrent != null
|
||||
&& mailboxDashBoardController.userProfile.value != null
|
||||
&& mailboxDashBoardController.mapMailboxId.containsKey(PresentationMailbox.roleOutbox)
|
||||
&& mailboxDashBoardController.selectedEmail.value != null;
|
||||
|
||||
void goToThreadView(BuildContext context) {
|
||||
popBack(result: emailActionCurrent);
|
||||
void backToThreadView() {
|
||||
popBack();
|
||||
}
|
||||
|
||||
void pressEmailAction(EmailActionType emailActionType) {
|
||||
|
||||
@@ -22,40 +22,37 @@ class EmailView extends GetWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return WillPopScope(
|
||||
child: Scaffold(
|
||||
resizeToAvoidBottomInset: false,
|
||||
backgroundColor: AppColor.primaryLightColor,
|
||||
body: SafeArea(
|
||||
right: false,
|
||||
left: false,
|
||||
child: Container(
|
||||
alignment: Alignment.center,
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
_buildAppBar(context),
|
||||
Expanded(child: _buildEmailContent(context)),
|
||||
_buildBottomBar(context),
|
||||
])
|
||||
)
|
||||
)),
|
||||
onWillPop: () async {
|
||||
emailController.goToThreadView(context);
|
||||
return true;
|
||||
});
|
||||
return Scaffold(
|
||||
resizeToAvoidBottomInset: false,
|
||||
backgroundColor: AppColor.primaryLightColor,
|
||||
body: SafeArea(
|
||||
right: false,
|
||||
left: false,
|
||||
child: Container(
|
||||
alignment: Alignment.center,
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
_buildAppBar(context),
|
||||
Expanded(child: _buildEmailContent(context)),
|
||||
_buildBottomBar(context),
|
||||
])
|
||||
)
|
||||
));
|
||||
}
|
||||
|
||||
Widget _buildAppBar(BuildContext context) {
|
||||
return Obx(() => Padding(
|
||||
padding: EdgeInsets.only(left: 6, top: 6, right: 6, bottom: 6),
|
||||
child: AppBarMailWidgetBuilder(
|
||||
context,
|
||||
imagePaths,
|
||||
responsiveUtils,
|
||||
emailController.mailboxDashBoardController.selectedEmail.value)
|
||||
.onBackActionClick(() => emailController.goToThreadView(context))
|
||||
child: (AppBarMailWidgetBuilder(
|
||||
context,
|
||||
imagePaths,
|
||||
responsiveUtils,
|
||||
emailController.mailboxDashBoardController.selectedEmail.value)
|
||||
..onBackActionClick(() => emailController.backToThreadView())
|
||||
..onUnreadEmailActionClick((presentationEmail) =>
|
||||
emailController.markAsEmailRead(presentationEmail, ReadActions.markAsUnread)))
|
||||
.build()));
|
||||
}
|
||||
|
||||
|
||||
@@ -7,9 +7,11 @@ import 'package:model/model.dart';
|
||||
import 'package:tmail_ui_user/main/routes/app_routes.dart';
|
||||
|
||||
typedef OnBackActionClick = void Function();
|
||||
typedef OnUnreadEmailActionClick = void Function(PresentationEmail presentationEmail);
|
||||
|
||||
class AppBarMailWidgetBuilder {
|
||||
OnBackActionClick? _onBackActionClick;
|
||||
OnUnreadEmailActionClick? _onUnreadEmailActionClick;
|
||||
|
||||
final BuildContext _context;
|
||||
final ImagePaths _imagePaths;
|
||||
@@ -23,10 +25,12 @@ class AppBarMailWidgetBuilder {
|
||||
this._presentationEmail,
|
||||
);
|
||||
|
||||
AppBarMailWidgetBuilder onBackActionClick(
|
||||
OnBackActionClick onBackActionClick) {
|
||||
void onBackActionClick(OnBackActionClick onBackActionClick) {
|
||||
_onBackActionClick = onBackActionClick;
|
||||
return this;
|
||||
}
|
||||
|
||||
void onUnreadEmailActionClick(OnUnreadEmailActionClick onUnreadEmailActionClick) {
|
||||
_onUnreadEmailActionClick = onUnreadEmailActionClick;
|
||||
}
|
||||
|
||||
Widget build() {
|
||||
@@ -68,17 +72,23 @@ class AppBarMailWidgetBuilder {
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
ButtonBuilder(_imagePaths.icTrash).key(Key('button_delete_message')).build(),
|
||||
ButtonBuilder(_imagePaths.icTrash).key(Key('button_move_to_trash_email')).build(),
|
||||
SizedBox(width: 10),
|
||||
ButtonBuilder(_imagePaths.icEyeDisable).key(Key('button_hide_message')).build(),
|
||||
ButtonBuilder(_imagePaths.icEyeDisable)
|
||||
.key(Key('button_mark_as_unread_email'))
|
||||
.onPressActionClick(() {
|
||||
if (_onUnreadEmailActionClick != null && _presentationEmail != null && _presentationEmail!.isReadEmail()) {
|
||||
_onUnreadEmailActionClick!(_presentationEmail!);
|
||||
}})
|
||||
.build(),
|
||||
SizedBox(width: 10),
|
||||
ButtonBuilder((_presentationEmail != null && _presentationEmail!.isFlaggedEmail())
|
||||
? _imagePaths.icFlagged
|
||||
: _imagePaths.icFlag)
|
||||
.key(Key('button_favorite_message'))
|
||||
.key(Key('button_mark_as_flag_email'))
|
||||
.build(),
|
||||
SizedBox(width: 10),
|
||||
ButtonBuilder(_imagePaths.icFolder).key(Key('button_add_folder_message')).build(),
|
||||
ButtonBuilder(_imagePaths.icFolder).key(Key('button_move_to_mailbox_email')).build(),
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user