TF-78 Update state email in threads and count unread of current mailbox when back from EmailView
This commit is contained in:
@@ -8,20 +8,27 @@ import 'package:jmap_dart_client/jmap/mail/email/email.dart';
|
|||||||
import 'package:model/model.dart';
|
import 'package:model/model.dart';
|
||||||
import 'package:tmail_ui_user/features/base/base_controller.dart';
|
import 'package:tmail_ui_user/features/base/base_controller.dart';
|
||||||
import 'package:tmail_ui_user/features/email/domain/state/get_email_content_state.dart';
|
import 'package:tmail_ui_user/features/email/domain/state/get_email_content_state.dart';
|
||||||
|
import 'package:tmail_ui_user/features/email/domain/state/mark_as_email_read_state.dart';
|
||||||
import 'package:tmail_ui_user/features/email/domain/usecases/get_email_content_interactor.dart';
|
import 'package:tmail_ui_user/features/email/domain/usecases/get_email_content_interactor.dart';
|
||||||
import 'package:tmail_ui_user/features/email/domain/usecases/mark_as_email_read_interactor.dart';
|
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/email/presentation/model/composer_arguments.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/mailbox_dashboard_controller.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/app_routes.dart';
|
||||||
|
import 'package:tmail_ui_user/main/routes/route_navigation.dart';
|
||||||
|
|
||||||
class EmailController extends BaseController {
|
class EmailController extends BaseController {
|
||||||
|
|
||||||
final mailboxDashBoardController = Get.find<MailboxDashBoardController>();
|
final mailboxDashBoardController = Get.find<MailboxDashBoardController>();
|
||||||
|
final responsiveUtils = Get.find<ResponsiveUtils>();
|
||||||
|
|
||||||
final GetEmailContentInteractor _getEmailContentInteractor;
|
final GetEmailContentInteractor _getEmailContentInteractor;
|
||||||
final MarkAsEmailReadInteractor _markAsEmailReadInteractor;
|
final MarkAsEmailReadInteractor _markAsEmailReadInteractor;
|
||||||
|
|
||||||
final emailAddressExpandMode = ExpandMode.COLLAPSE.obs;
|
final emailAddressExpandMode = ExpandMode.COLLAPSE.obs;
|
||||||
EmailContent? emailContent;
|
EmailContent? emailContent;
|
||||||
|
AppAction? emailActionCurrent;
|
||||||
|
|
||||||
EmailController(this._getEmailContentInteractor, this._markAsEmailReadInteractor);
|
EmailController(this._getEmailContentInteractor, this._markAsEmailReadInteractor);
|
||||||
|
|
||||||
@@ -30,10 +37,13 @@ class EmailController extends BaseController {
|
|||||||
super.onReady();
|
super.onReady();
|
||||||
mailboxDashBoardController.selectedEmail.listen((presentationEmail) {
|
mailboxDashBoardController.selectedEmail.listen((presentationEmail) {
|
||||||
toggleDisplayEmailAddressAction(expandMode: ExpandMode.COLLAPSE);
|
toggleDisplayEmailAddressAction(expandMode: ExpandMode.COLLAPSE);
|
||||||
|
emailActionCurrent = null;
|
||||||
final accountId = mailboxDashBoardController.accountId.value;
|
final accountId = mailboxDashBoardController.accountId.value;
|
||||||
if (accountId != null && presentationEmail != null) {
|
if (accountId != null && presentationEmail != null) {
|
||||||
_getEmailContentAction(accountId, presentationEmail.id);
|
_getEmailContentAction(accountId, presentationEmail.id);
|
||||||
markAsEmailRead(unread: false);
|
if (presentationEmail.isUnReadEmail()) {
|
||||||
|
markAsEmailRead(unread: false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -73,8 +83,23 @@ class EmailController extends BaseController {
|
|||||||
void markAsEmailRead({required bool unread}) async {
|
void markAsEmailRead({required bool unread}) async {
|
||||||
final accountId = mailboxDashBoardController.accountId.value;
|
final accountId = mailboxDashBoardController.accountId.value;
|
||||||
final presentationEmail = mailboxDashBoardController.selectedEmail.value;
|
final presentationEmail = mailboxDashBoardController.selectedEmail.value;
|
||||||
if (accountId != null && presentationEmail != null) {
|
final mailboxCurrent = mailboxDashBoardController.selectedMailbox.value;
|
||||||
_markAsEmailReadInteractor.execute(accountId, presentationEmail.id, unread);
|
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);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _updateMailboxDashBoardActionForDesktop(AppAction? appAction) {
|
||||||
|
if (Get.context != null && responsiveUtils.isDesktop(Get.context!)) {
|
||||||
|
mailboxDashBoardController.setMailboxDashBoardAction(appAction);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -84,7 +109,7 @@ class EmailController extends BaseController {
|
|||||||
&& mailboxDashBoardController.selectedEmail.value != null;
|
&& mailboxDashBoardController.selectedEmail.value != null;
|
||||||
|
|
||||||
void goToThreadView(BuildContext context) {
|
void goToThreadView(BuildContext context) {
|
||||||
Get.back();
|
popBack(result: emailActionCurrent);
|
||||||
}
|
}
|
||||||
|
|
||||||
void pressEmailAction(EmailActionType emailActionType) {
|
void pressEmailAction(EmailActionType emailActionType) {
|
||||||
|
|||||||
@@ -22,25 +22,29 @@ class EmailView extends GetWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Scaffold(
|
return WillPopScope(
|
||||||
resizeToAvoidBottomInset: false,
|
child: Scaffold(
|
||||||
backgroundColor: AppColor.primaryLightColor,
|
resizeToAvoidBottomInset: false,
|
||||||
body: SafeArea(
|
backgroundColor: AppColor.primaryLightColor,
|
||||||
right: false,
|
body: SafeArea(
|
||||||
left: false,
|
right: false,
|
||||||
child: Container(
|
left: false,
|
||||||
alignment: Alignment.center,
|
child: Container(
|
||||||
child: Column(
|
alignment: Alignment.center,
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.center,
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
children: [
|
crossAxisAlignment: CrossAxisAlignment.center,
|
||||||
_buildAppBar(context),
|
children: [
|
||||||
Expanded(child: _buildEmailContent(context)),
|
_buildAppBar(context),
|
||||||
_buildBottomBar(context),
|
Expanded(child: _buildEmailContent(context)),
|
||||||
])
|
_buildBottomBar(context),
|
||||||
)
|
])
|
||||||
),
|
)
|
||||||
);
|
)),
|
||||||
|
onWillPop: () async {
|
||||||
|
emailController.goToThreadView(context);
|
||||||
|
return true;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget _buildAppBar(BuildContext context) {
|
Widget _buildAppBar(BuildContext context) {
|
||||||
|
|||||||
@@ -1,22 +1,20 @@
|
|||||||
import 'package:core/presentation/state/failure.dart';
|
import 'package:core/core.dart';
|
||||||
import 'package:core/presentation/state/success.dart';
|
|
||||||
import 'package:core/presentation/utils/responsive_utils.dart';
|
|
||||||
import 'package:dartz/dartz.dart';
|
import 'package:dartz/dartz.dart';
|
||||||
import 'package:flutter/cupertino.dart';
|
import 'package:flutter/cupertino.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||||
import 'package:model/mailbox/presentation_mailbox.dart';
|
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||||
import 'package:model/mailbox/select_mode.dart';
|
import 'package:model/model.dart';
|
||||||
import 'package:tmail_ui_user/features/base/base_controller.dart';
|
import 'package:tmail_ui_user/features/base/base_controller.dart';
|
||||||
import 'package:tmail_ui_user/features/login/domain/usecases/delete_credential_interactor.dart';
|
import 'package:tmail_ui_user/features/login/domain/usecases/delete_credential_interactor.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox/domain/constants/mailbox_constants.dart';
|
|
||||||
import 'package:tmail_ui_user/features/mailbox/domain/state/get_all_mailboxes_state.dart';
|
import 'package:tmail_ui_user/features/mailbox/domain/state/get_all_mailboxes_state.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox/domain/usecases/get_all_mailbox_interactor.dart';
|
import 'package:tmail_ui_user/features/mailbox/domain/usecases/get_all_mailbox_interactor.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart';
|
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_tree.dart';
|
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_tree.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_tree_builder.dart';
|
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_tree_builder.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/mailbox_dashboard_controller.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/mailbox_dashboard_controller.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/app_routes.dart';
|
||||||
|
|
||||||
class MailboxController extends BaseController {
|
class MailboxController extends BaseController {
|
||||||
@@ -28,6 +26,7 @@ class MailboxController extends BaseController {
|
|||||||
final ResponsiveUtils responsiveUtils;
|
final ResponsiveUtils responsiveUtils;
|
||||||
|
|
||||||
final folderMailboxTree = MailboxTree(MailboxNode.root()).obs;
|
final folderMailboxTree = MailboxTree(MailboxNode.root()).obs;
|
||||||
|
final defaultMailboxList = <PresentationMailbox>[].obs;
|
||||||
|
|
||||||
MailboxController(
|
MailboxController(
|
||||||
this._getAllMailboxInteractor,
|
this._getAllMailboxInteractor,
|
||||||
@@ -44,12 +43,20 @@ class MailboxController extends BaseController {
|
|||||||
getAllMailboxAction(accountId);
|
getAllMailboxAction(accountId);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
mailboxDashBoardController.mailboxDashBoardAction.listen((action) {
|
||||||
|
if (action is MarkAsEmailReadAction) {
|
||||||
|
_updateCountUnReadAllMailbox(action.presentationMailbox);
|
||||||
|
mailboxDashBoardController.clearMailboxDashBoardAction();
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
super.dispose();
|
super.dispose();
|
||||||
mailboxDashBoardController.accountId.close();
|
mailboxDashBoardController.accountId.close();
|
||||||
|
mailboxDashBoardController.mailboxDashBoardAction.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
void refreshGetAllMailboxAction() {
|
void refreshGetAllMailboxAction() {
|
||||||
@@ -77,6 +84,7 @@ class MailboxController extends BaseController {
|
|||||||
void onDone() {
|
void onDone() {
|
||||||
viewState.value.map((success) {
|
viewState.value.map((success) {
|
||||||
if (success is GetAllMailboxSuccess) {
|
if (success is GetAllMailboxSuccess) {
|
||||||
|
defaultMailboxList.value = success.defaultMailboxList;
|
||||||
_setUpMapMailboxIdDefault(success.defaultMailboxList);
|
_setUpMapMailboxIdDefault(success.defaultMailboxList);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -90,12 +98,21 @@ class MailboxController extends BaseController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void _setUpMapMailboxIdDefault(List<PresentationMailbox> defaultMailboxList) {
|
void _setUpMapMailboxIdDefault(List<PresentationMailbox> defaultMailboxList) {
|
||||||
|
var mailboxCurrent = mailboxDashBoardController.selectedMailbox.value;
|
||||||
|
|
||||||
defaultMailboxList.forEach((presentationMailbox) {
|
defaultMailboxList.forEach((presentationMailbox) {
|
||||||
if (presentationMailbox.role == PresentationMailbox.roleInbox) {
|
if (mailboxCurrent == null && presentationMailbox.role == PresentationMailbox.roleInbox) {
|
||||||
mailboxDashBoardController.setSelectedMailbox(presentationMailbox);
|
mailboxCurrent = presentationMailbox;
|
||||||
|
} else if (mailboxCurrent?.role == presentationMailbox.role) {
|
||||||
|
mailboxCurrent = presentationMailbox;
|
||||||
}
|
}
|
||||||
|
|
||||||
mailboxDashBoardController.addMailboxIdToMap(presentationMailbox.role!, presentationMailbox.id);
|
mailboxDashBoardController.addMailboxIdToMap(presentationMailbox.role!, presentationMailbox.id);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (mailboxCurrent != null) {
|
||||||
|
mailboxDashBoardController.setNewFirstSelectedMailbox(mailboxCurrent);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SelectMode getSelectMode(PresentationMailbox presentationMailbox, PresentationMailbox? selectedMailbox) {
|
SelectMode getSelectMode(PresentationMailbox presentationMailbox, PresentationMailbox? selectedMailbox) {
|
||||||
@@ -109,12 +126,29 @@ class MailboxController extends BaseController {
|
|||||||
PresentationMailbox presentationMailboxSelected
|
PresentationMailbox presentationMailboxSelected
|
||||||
) {
|
) {
|
||||||
mailboxDashBoardController.setSelectedMailbox(presentationMailboxSelected);
|
mailboxDashBoardController.setSelectedMailbox(presentationMailboxSelected);
|
||||||
|
mailboxDashBoardController.clearSelectedEmail();
|
||||||
|
|
||||||
if (responsiveUtils.isMobile(context)) {
|
if (responsiveUtils.isMobile(context)) {
|
||||||
mailboxDashBoardController.closeDrawer();
|
mailboxDashBoardController.closeDrawer();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _updateCountUnReadAllMailbox(PresentationMailbox presentationMailbox) {
|
||||||
|
if (presentationMailbox.hasRole()) {
|
||||||
|
final newCountUnRead = presentationMailbox.unreadEmails != null
|
||||||
|
? presentationMailbox.unreadEmails!.value.value - 1
|
||||||
|
: 0;
|
||||||
|
final newMailbox = presentationMailbox.toPresentationMailbox(countUnRead: UnsignedInt(newCountUnRead));
|
||||||
|
final newDefaultMailboxList = defaultMailboxList
|
||||||
|
.map((mailbox) => mailbox.id == presentationMailbox.id
|
||||||
|
? mailbox.toPresentationMailbox(countUnRead: UnsignedInt(newCountUnRead))
|
||||||
|
: mailbox)
|
||||||
|
.toList();
|
||||||
|
defaultMailboxList.value = newDefaultMailboxList;
|
||||||
|
mailboxDashBoardController.setNewFirstSelectedMailbox(newMailbox);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void _deleteCredential() async {
|
void _deleteCredential() async {
|
||||||
await _deleteCredentialInteractor.execute();
|
await _deleteCredentialInteractor.execute();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:flutter_svg/flutter_svg.dart';
|
import 'package:flutter_svg/flutter_svg.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:model/model.dart';
|
import 'package:model/model.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox/domain/state/get_all_mailboxes_state.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/model/mailbox_node.dart';
|
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_button_new_folder_builder.dart';
|
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_button_new_folder_builder.dart';
|
||||||
@@ -127,12 +126,9 @@ class MailboxView extends GetWidget<MailboxController> {
|
|||||||
primary: false,
|
primary: false,
|
||||||
shrinkWrap: true,
|
shrinkWrap: true,
|
||||||
children: [
|
children: [
|
||||||
Obx(() => controller.viewState.value.fold(
|
Obx(() => controller.defaultMailboxList.isNotEmpty
|
||||||
(failure) => SizedBox.shrink(),
|
? _buildDefaultMailbox(context, controller.defaultMailboxList)
|
||||||
(success) => success is GetAllMailboxSuccess
|
: SizedBox.shrink()),
|
||||||
? _buildDefaultMailbox(context, success.defaultMailboxList)
|
|
||||||
: SizedBox.shrink())
|
|
||||||
),
|
|
||||||
Padding(
|
Padding(
|
||||||
padding: EdgeInsets.only(
|
padding: EdgeInsets.only(
|
||||||
left: responsiveUtils.isMobile(context) ? 40 : 32,
|
left: responsiveUtils.isMobile(context) ? 40 : 32,
|
||||||
@@ -202,7 +198,8 @@ class MailboxView extends GetWidget<MailboxController> {
|
|||||||
imagePaths,
|
imagePaths,
|
||||||
responsiveUtils,
|
responsiveUtils,
|
||||||
mailboxNode,
|
mailboxNode,
|
||||||
controller.getSelectMode(mailboxNode.item, controller.mailboxDashBoardController.selectedMailbox.value))
|
controller.getSelectMode(mailboxNode.item,
|
||||||
|
controller.mailboxDashBoardController.selectedMailbox.value))
|
||||||
.build(context)),
|
.build(context)),
|
||||||
children: _buildListChildTileWidget(context, mailboxNode.childrenItems!)))
|
children: _buildListChildTileWidget(context, mailboxNode.childrenItems!)))
|
||||||
: Padding(
|
: Padding(
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import 'package:tmail_ui_user/features/base/base_controller.dart';
|
|||||||
import 'package:tmail_ui_user/features/email/presentation/email_controller.dart';
|
import 'package:tmail_ui_user/features/email/presentation/email_controller.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/get_user_profile_state.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/get_user_profile_state.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/get_user_profile_interactor.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/get_user_profile_interactor.dart';
|
||||||
|
import 'package:tmail_ui_user/main/actions/app_action.dart';
|
||||||
|
|
||||||
class MailboxDashBoardController extends BaseController {
|
class MailboxDashBoardController extends BaseController {
|
||||||
|
|
||||||
@@ -19,6 +20,7 @@ class MailboxDashBoardController extends BaseController {
|
|||||||
final selectedEmail = Rxn<PresentationEmail>();
|
final selectedEmail = Rxn<PresentationEmail>();
|
||||||
final accountId = Rxn<AccountId>();
|
final accountId = Rxn<AccountId>();
|
||||||
final userProfile = Rxn<UserProfile>();
|
final userProfile = Rxn<UserProfile>();
|
||||||
|
final mailboxDashBoardAction = Rxn<AppAction>();
|
||||||
|
|
||||||
Session? sessionCurrent;
|
Session? sessionCurrent;
|
||||||
Map<Role, MailboxId> mapMailboxId = Map();
|
Map<Role, MailboxId> mapMailboxId = Map();
|
||||||
@@ -67,10 +69,27 @@ class MailboxDashBoardController extends BaseController {
|
|||||||
selectedMailbox.value = newPresentationMailbox;
|
selectedMailbox.value = newPresentationMailbox;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void setNewFirstSelectedMailbox(PresentationMailbox? newPresentationMailbox) {
|
||||||
|
selectedMailbox.firstRebuild = true;
|
||||||
|
selectedMailbox.value = newPresentationMailbox;
|
||||||
|
}
|
||||||
|
|
||||||
void setSelectedEmail(PresentationEmail? newPresentationEmail) {
|
void setSelectedEmail(PresentationEmail? newPresentationEmail) {
|
||||||
selectedEmail.value = newPresentationEmail;
|
selectedEmail.value = newPresentationEmail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void setMailboxDashBoardAction(AppAction? newAction) {
|
||||||
|
mailboxDashBoardAction.value = newAction;
|
||||||
|
}
|
||||||
|
|
||||||
|
void clearMailboxDashBoardAction() {
|
||||||
|
mailboxDashBoardAction.value = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
void clearSelectedEmail() {
|
||||||
|
selectedEmail.value = null;
|
||||||
|
}
|
||||||
|
|
||||||
void openDrawer() {
|
void openDrawer() {
|
||||||
scaffoldKey.currentState?.openDrawer();
|
scaffoldKey.currentState?.openDrawer();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,9 +8,11 @@ import 'package:jmap_dart_client/jmap/core/filter/filter.dart';
|
|||||||
import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
|
import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/sort/comparator.dart';
|
import 'package:jmap_dart_client/jmap/core/sort/comparator.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/email/email_comparator.dart';
|
import 'package:jmap_dart_client/jmap/mail/email/email_comparator.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/email/email_comparator_property.dart';
|
import 'package:jmap_dart_client/jmap/mail/email/email_comparator_property.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/email/email_filter_condition.dart';
|
import 'package:jmap_dart_client/jmap/mail/email/email_filter_condition.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||||
import 'package:model/model.dart';
|
import 'package:model/model.dart';
|
||||||
import 'package:tmail_ui_user/features/base/base_controller.dart';
|
import 'package:tmail_ui_user/features/base/base_controller.dart';
|
||||||
import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.dart';
|
import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.dart';
|
||||||
@@ -19,7 +21,9 @@ import 'package:tmail_ui_user/features/thread/domain/constants/thread_constants.
|
|||||||
import 'package:tmail_ui_user/features/thread/domain/state/get_all_email_state.dart';
|
import 'package:tmail_ui_user/features/thread/domain/state/get_all_email_state.dart';
|
||||||
import 'package:tmail_ui_user/features/thread/domain/usecases/get_emails_in_mailbox_interactor.dart';
|
import 'package:tmail_ui_user/features/thread/domain/usecases/get_emails_in_mailbox_interactor.dart';
|
||||||
import 'package:tmail_ui_user/features/thread/presentation/model/load_more_state.dart';
|
import 'package:tmail_ui_user/features/thread/presentation/model/load_more_state.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/app_routes.dart';
|
||||||
|
import 'package:tmail_ui_user/main/routes/route_navigation.dart';
|
||||||
|
|
||||||
class ThreadController extends BaseController {
|
class ThreadController extends BaseController {
|
||||||
|
|
||||||
@@ -37,6 +41,7 @@ class ThreadController extends BaseController {
|
|||||||
|
|
||||||
int positionCurrent = 0;
|
int positionCurrent = 0;
|
||||||
int lastGetTotal = 0;
|
int lastGetTotal = 0;
|
||||||
|
MailboxId? _currentMailboxId;
|
||||||
|
|
||||||
ThreadController(
|
ThreadController(
|
||||||
this.responsiveUtils,
|
this.responsiveUtils,
|
||||||
@@ -47,8 +52,15 @@ class ThreadController extends BaseController {
|
|||||||
void onReady() {
|
void onReady() {
|
||||||
super.onReady();
|
super.onReady();
|
||||||
mailboxDashBoardController.selectedMailbox.listen((selectedMailbox) {
|
mailboxDashBoardController.selectedMailbox.listen((selectedMailbox) {
|
||||||
mailboxDashBoardController.setSelectedEmail(null);
|
if (_currentMailboxId != selectedMailbox?.id) {
|
||||||
refreshGetAllEmailAction();
|
_currentMailboxId = selectedMailbox?.id;
|
||||||
|
refreshGetAllEmailAction();
|
||||||
|
} else {
|
||||||
|
final emailCurrent = mailboxDashBoardController.selectedEmail.value;
|
||||||
|
if (Get.context != null && responsiveUtils.isDesktop(Get.context!) && emailCurrent != null) {
|
||||||
|
_updateStateUnReadEmail(emailCurrent.id, unRead: false);
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -170,6 +182,13 @@ class ThreadController extends BaseController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _updateStateUnReadEmail(EmailId emailId, {required bool unRead}) {
|
||||||
|
final newEmailList = emailList
|
||||||
|
.map((email) => email.id == emailId ? email.markAsReadPresentationEmail(unRead: unRead) : email)
|
||||||
|
.toList();
|
||||||
|
emailList.value = newEmailList;
|
||||||
|
}
|
||||||
|
|
||||||
bool canComposeEmail() => mailboxDashBoardController.sessionCurrent != null
|
bool canComposeEmail() => mailboxDashBoardController.sessionCurrent != null
|
||||||
&& mailboxDashBoardController.userProfile.value != null
|
&& mailboxDashBoardController.userProfile.value != null
|
||||||
&& mailboxDashBoardController.mapMailboxId.containsKey(PresentationMailbox.roleOutbox);
|
&& mailboxDashBoardController.mapMailboxId.containsKey(PresentationMailbox.roleOutbox);
|
||||||
@@ -178,8 +197,13 @@ class ThreadController extends BaseController {
|
|||||||
mailboxDashBoardController.openDrawer();
|
mailboxDashBoardController.openDrawer();
|
||||||
}
|
}
|
||||||
|
|
||||||
void goToEmail(BuildContext context) {
|
void goToEmail(BuildContext context) async {
|
||||||
Get.toNamed(AppRoutes.EMAIL);
|
final action = await push(AppRoutes.EMAIL);
|
||||||
|
if (action is MarkAsEmailReadAction) {
|
||||||
|
_updateStateUnReadEmail(action.emailId, unRead: false);
|
||||||
|
mailboxDashBoardController.setMailboxDashBoardAction(action);
|
||||||
|
}
|
||||||
|
mailboxDashBoardController.clearSelectedEmail();
|
||||||
}
|
}
|
||||||
|
|
||||||
void composeEmailAction() {
|
void composeEmailAction() {
|
||||||
|
|||||||
@@ -30,11 +30,7 @@ class ThreadView extends GetWidget<ThreadController> {
|
|||||||
mainAxisAlignment: MainAxisAlignment.start,
|
mainAxisAlignment: MainAxisAlignment.start,
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Obx(() => _buildAppBarMailboxListMail(
|
_buildAppBarMailboxListMail(context),
|
||||||
context,
|
|
||||||
controller.mailboxDashBoardController.selectedMailbox.value,
|
|
||||||
controller.mailboxDashBoardController.userProfile.value,
|
|
||||||
)),
|
|
||||||
_buildLoadingView(),
|
_buildLoadingView(),
|
||||||
Expanded(child: _buildListEmail(context)),
|
Expanded(child: _buildListEmail(context)),
|
||||||
_buildLoadingViewLoadMore()
|
_buildLoadingViewLoadMore()
|
||||||
@@ -51,17 +47,17 @@ class ThreadView extends GetWidget<ThreadController> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget _buildAppBarMailboxListMail(BuildContext context, PresentationMailbox? presentationMailbox, UserProfile? userProfile) {
|
Widget _buildAppBarMailboxListMail(BuildContext context) {
|
||||||
return Padding(
|
return Obx(() => Padding(
|
||||||
padding: EdgeInsets.only(left: 15, right: 12),
|
padding: EdgeInsets.only(left: 15, right: 12),
|
||||||
child: AppBarThreadWidgetBuilder(
|
child: AppBarThreadWidgetBuilder(
|
||||||
context,
|
context,
|
||||||
imagePaths,
|
imagePaths,
|
||||||
responsiveUtils,
|
responsiveUtils,
|
||||||
presentationMailbox,
|
controller.mailboxDashBoardController.selectedMailbox.value,
|
||||||
userProfile)
|
controller.mailboxDashBoardController.userProfile.value)
|
||||||
.onOpenListMailboxActionClick(() => controller.openMailboxLeftMenu())
|
.onOpenListMailboxActionClick(() => controller.openMailboxLeftMenu())
|
||||||
.build());
|
.build()));
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget _buildLoadingView() {
|
Widget _buildLoadingView() {
|
||||||
@@ -96,13 +92,12 @@ class ThreadView extends GetWidget<ThreadController> {
|
|||||||
alignment: Alignment.center,
|
alignment: Alignment.center,
|
||||||
padding: EdgeInsets.zero,
|
padding: EdgeInsets.zero,
|
||||||
color: responsiveUtils.isMobile(context) ? AppColor.bgMailboxListMail : Colors.white,
|
color: responsiveUtils.isMobile(context) ? AppColor.bgMailboxListMail : Colors.white,
|
||||||
child: Obx(() => RefreshIndicator(
|
child: RefreshIndicator(
|
||||||
color: AppColor.primaryColor,
|
color: AppColor.primaryColor,
|
||||||
onRefresh: () async => controller.refreshGetAllEmailAction(),
|
onRefresh: () async => controller.refreshGetAllEmailAction(),
|
||||||
child: controller.emailList.isNotEmpty
|
child: Obx(() => controller.emailList.isNotEmpty
|
||||||
? _buildListEmailBody(context, controller.emailList)
|
? _buildListEmailBody(context, controller.emailList)
|
||||||
: _buildEmptyEmail(context)))
|
: _buildEmptyEmail(context))));
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget _buildListEmailBody(BuildContext context, List<PresentationEmail> listPresentationEmail) {
|
Widget _buildListEmailBody(BuildContext context, List<PresentationEmail> listPresentationEmail) {
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
|
||||||
|
import 'package:equatable/equatable.dart';
|
||||||
|
|
||||||
|
abstract class AppAction with EquatableMixin {}
|
||||||
|
|
||||||
|
abstract class ActionOnline extends AppAction {}
|
||||||
|
|
||||||
|
abstract class ActionOffline extends AppAction {}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
|
||||||
|
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
|
||||||
|
import 'package:model/mailbox/presentation_mailbox.dart';
|
||||||
|
import 'package:tmail_ui_user/main/actions/app_action.dart';
|
||||||
|
|
||||||
|
class MarkAsEmailReadAction extends ActionOnline {
|
||||||
|
final EmailId emailId;
|
||||||
|
final PresentationMailbox presentationMailbox;
|
||||||
|
|
||||||
|
MarkAsEmailReadAction(this.emailId, this.presentationMailbox);
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object?> get props => [emailId, presentationMailbox];
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
|
||||||
|
import 'package:get/get.dart';
|
||||||
|
|
||||||
|
Future<dynamic> push(String routeName, {dynamic arguments}) async {
|
||||||
|
return Get.toNamed(routeName, arguments: arguments);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<dynamic> pushAndPop(String routeName, {dynamic arguments}) async {
|
||||||
|
return Get.offNamed(routeName, arguments: arguments);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<dynamic> pushAndPopAll(String routeName, {dynamic arguments}) async {
|
||||||
|
return Get.offAllNamed(routeName, arguments: arguments);
|
||||||
|
}
|
||||||
|
|
||||||
|
void popBack({dynamic result}) {
|
||||||
|
Get.back(result: result);
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import 'package:core/core.dart';
|
import 'package:core/core.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
|
||||||
import 'package:model/model.dart';
|
import 'package:model/model.dart';
|
||||||
|
|
||||||
extension PresentationEmailExtension on PresentationEmail {
|
extension PresentationEmailExtension on PresentationEmail {
|
||||||
@@ -12,4 +13,37 @@ extension PresentationEmailExtension on PresentationEmail {
|
|||||||
}
|
}
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
PresentationEmail markAsReadPresentationEmail({required bool unRead}) {
|
||||||
|
var newKeyWord = keywords;
|
||||||
|
|
||||||
|
if (unRead) {
|
||||||
|
newKeyWord?.removeWhere((key, value) => key == KeyWordIdentifier.emailSeen);
|
||||||
|
} else {
|
||||||
|
if (newKeyWord == null) {
|
||||||
|
newKeyWord = {
|
||||||
|
KeyWordIdentifier.emailSeen: true
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
newKeyWord[KeyWordIdentifier.emailSeen] = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return PresentationEmail(
|
||||||
|
id,
|
||||||
|
keywords: newKeyWord,
|
||||||
|
size: size,
|
||||||
|
receivedAt: receivedAt,
|
||||||
|
hasAttachment: hasAttachment,
|
||||||
|
preview: preview,
|
||||||
|
subject: subject,
|
||||||
|
sentAt: sentAt,
|
||||||
|
from: from,
|
||||||
|
to: to,
|
||||||
|
cc: cc,
|
||||||
|
bcc: bcc,
|
||||||
|
replyTo: replyTo,
|
||||||
|
selectMode: selectMode
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||||
|
import 'package:model/model.dart';
|
||||||
|
|
||||||
|
extension PresentationMailboxExtension on PresentationMailbox {
|
||||||
|
|
||||||
|
PresentationMailbox toPresentationMailbox({required UnsignedInt countUnRead}) {
|
||||||
|
return PresentationMailbox(
|
||||||
|
id,
|
||||||
|
name: name,
|
||||||
|
parentId: parentId,
|
||||||
|
role: role,
|
||||||
|
sortOrder: sortOrder,
|
||||||
|
totalEmails: totalEmails,
|
||||||
|
unreadEmails: UnreadEmails(countUnRead),
|
||||||
|
totalThreads: totalThreads,
|
||||||
|
unreadThreads: unreadThreads,
|
||||||
|
myRights: myRights,
|
||||||
|
isSubscribed: isSubscribed,
|
||||||
|
selectMode: selectMode
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -38,6 +38,7 @@ export 'extensions/presentation_account_extension.dart';
|
|||||||
export 'extensions/user_profile_extension.dart';
|
export 'extensions/user_profile_extension.dart';
|
||||||
export 'extensions/presentation_email_extension.dart';
|
export 'extensions/presentation_email_extension.dart';
|
||||||
export 'extensions/keyword_identifier_extension.dart';
|
export 'extensions/keyword_identifier_extension.dart';
|
||||||
|
export 'extensions/presentation_mailbox_extension.dart';
|
||||||
|
|
||||||
// Converter
|
// Converter
|
||||||
export 'converter/avatar_id_converter.dart';
|
export 'converter/avatar_id_converter.dart';
|
||||||
|
|||||||
Reference in New Issue
Block a user