TF-46 Compose email for Reply, Forward from EmailView
This commit is contained in:
@@ -1,22 +1,10 @@
|
|||||||
import 'package:intl/intl.dart';
|
|
||||||
import 'package:model/model.dart';
|
import 'package:model/model.dart';
|
||||||
import 'package:core/core.dart';
|
import 'package:core/core.dart';
|
||||||
|
|
||||||
extension PresentationEmailExtension on PresentationEmail {
|
extension PresentationEmailExtension on PresentationEmail {
|
||||||
|
|
||||||
String getTimeSentEmail(String locale) {
|
String getTimeSentEmail(String newLocale) {
|
||||||
if (sentAt != null) {
|
final dateTime = sentAt?.value;
|
||||||
if (sentAt!.value.isToday()) {
|
return sentAt.formatDate(pattern: dateTime.toPattern(), locale: newLocale);
|
||||||
return DateFormat('h:mm a', locale).format(sentAt!.value);
|
|
||||||
} else if (sentAt!.value.isYesterday()) {
|
|
||||||
return DateFormat('EEE', locale).format(sentAt!.value);
|
|
||||||
} else if (sentAt!.value.isThisYear()) {
|
|
||||||
return DateFormat('MMMd', locale).format(sentAt!.value);
|
|
||||||
} else {
|
|
||||||
return DateFormat('yMMMd', locale).format(sentAt!.value);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -7,8 +7,11 @@ import 'package:jmap_dart_client/jmap/account_id.dart';
|
|||||||
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
|
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/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/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/routes/app_routes.dart';
|
||||||
|
|
||||||
class EmailController extends BaseController {
|
class EmailController extends BaseController {
|
||||||
|
|
||||||
@@ -16,6 +19,7 @@ class EmailController extends BaseController {
|
|||||||
final GetEmailContentInteractor _getEmailContentInteractor;
|
final GetEmailContentInteractor _getEmailContentInteractor;
|
||||||
|
|
||||||
final emailAddressExpandMode = ExpandMode.COLLAPSE.obs;
|
final emailAddressExpandMode = ExpandMode.COLLAPSE.obs;
|
||||||
|
EmailContent? emailContent;
|
||||||
|
|
||||||
EmailController(this._getEmailContentInteractor);
|
EmailController(this._getEmailContentInteractor);
|
||||||
|
|
||||||
@@ -48,6 +52,11 @@ class EmailController extends BaseController {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
void onDone() {
|
void onDone() {
|
||||||
|
viewState.value.map((success) {
|
||||||
|
if (success is GetEmailContentSuccess) {
|
||||||
|
emailContent = success.emailContent;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -61,4 +70,19 @@ class EmailController extends BaseController {
|
|||||||
void goToThreadView(BuildContext context) {
|
void goToThreadView(BuildContext context) {
|
||||||
Get.back();
|
Get.back();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void pressEmailAction(EmailActionType emailActionType) {
|
||||||
|
if (mailboxDashBoardController.selectedEmail.value != null
|
||||||
|
&& mailboxDashBoardController.sessionCurrent != null
|
||||||
|
&& mailboxDashBoardController.userProfile.value != null) {
|
||||||
|
Get.toNamed(
|
||||||
|
AppRoutes.COMPOSER,
|
||||||
|
arguments: ComposerArguments(
|
||||||
|
emailActionType: emailActionType,
|
||||||
|
presentationEmail: mailboxDashBoardController.selectedEmail.value!,
|
||||||
|
emailContent: emailContent,
|
||||||
|
session: mailboxDashBoardController.sessionCurrent!,
|
||||||
|
userProfile: mailboxDashBoardController.userProfile.value!));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -58,8 +58,9 @@ class EmailView extends GetWidget {
|
|||||||
Widget _buildBottomBar(BuildContext context) {
|
Widget _buildBottomBar(BuildContext context) {
|
||||||
return Padding(
|
return Padding(
|
||||||
padding: EdgeInsets.only(left: 6, top: 6, right: 6, bottom: 6),
|
padding: EdgeInsets.only(left: 6, top: 6, right: 6, bottom: 6),
|
||||||
child: BottomBarMailWidgetBuilder(context, imagePaths, responsiveUtils)
|
child: (BottomBarMailWidgetBuilder(context, imagePaths, responsiveUtils)
|
||||||
.build());
|
..addOnPressEmailAction((emailActionType) => emailController.pressEmailAction(emailActionType)))
|
||||||
|
.build());
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget _buildEmailContent(BuildContext context) {
|
Widget _buildEmailContent(BuildContext context) {
|
||||||
@@ -193,11 +194,11 @@ class EmailView extends GetWidget {
|
|||||||
itemCount: messageContents.length,
|
itemCount: messageContents.length,
|
||||||
itemBuilder: (context, index) =>
|
itemBuilder: (context, index) =>
|
||||||
MessageContentTileBuilder(
|
MessageContentTileBuilder(
|
||||||
htmlMessagePurifier,
|
htmlMessagePurifier: htmlMessagePurifier,
|
||||||
messageContents[index],
|
messageContent: messageContents[index],
|
||||||
attachmentsInline,
|
attachmentInlines: attachmentsInline,
|
||||||
emailController.mailboxDashBoardController.sessionCurrent,
|
session: emailController.mailboxDashBoardController.sessionCurrent,
|
||||||
emailController.mailboxDashBoardController.accountId.value)
|
accountId: emailController.mailboxDashBoardController.accountId.value)
|
||||||
.build())
|
.build())
|
||||||
: SizedBox.shrink();
|
: SizedBox.shrink();
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
import 'package:intl/intl.dart';
|
|
||||||
import 'package:model/model.dart';
|
import 'package:model/model.dart';
|
||||||
|
|
||||||
extension PresentationEmailExtension on PresentationEmail {
|
extension PresentationEmailExtension on PresentationEmail {
|
||||||
|
|
||||||
int numberOfAllEmailAddress() => to.numberEmailAddress() + cc.numberEmailAddress() + bcc.numberEmailAddress();
|
int numberOfAllEmailAddress() => to.numberEmailAddress() + cc.numberEmailAddress() + bcc.numberEmailAddress();
|
||||||
|
|
||||||
String getSentTime() => sentAt != null ? DateFormat('dd/MM/yyyy h:mm a', 'en_US').format(sentAt!.value) : '';
|
String getSentTime(String locale) => sentAt.formatDate(pattern: 'dd/MM/yyyy h:mm a', locale: locale);
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
|
||||||
|
import 'package:equatable/equatable.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||||
|
import 'package:model/model.dart';
|
||||||
|
|
||||||
|
class ComposerArguments with EquatableMixin {
|
||||||
|
final EmailActionType emailActionType;
|
||||||
|
final PresentationEmail? presentationEmail;
|
||||||
|
final EmailContent? emailContent;
|
||||||
|
final Session session;
|
||||||
|
final UserProfile userProfile;
|
||||||
|
|
||||||
|
ComposerArguments({
|
||||||
|
this.emailActionType = EmailActionType.compose,
|
||||||
|
this.presentationEmail,
|
||||||
|
this.emailContent,
|
||||||
|
required this.session,
|
||||||
|
required this.userProfile
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object?> get props => [emailActionType, presentationEmail, emailContent, session, userProfile];
|
||||||
|
}
|
||||||
@@ -56,7 +56,7 @@ class AppBarMailWidgetBuilder {
|
|||||||
Widget _buildBackButton() {
|
Widget _buildBackButton() {
|
||||||
return ButtonBuilder(_imagePaths.icBack)
|
return ButtonBuilder(_imagePaths.icBack)
|
||||||
.size(20)
|
.size(20)
|
||||||
.onBackActionClick(() {
|
.onPressActionClick(() {
|
||||||
if (_onBackActionClick != null) {
|
if (_onBackActionClick != null) {
|
||||||
_onBackActionClick!();
|
_onBackActionClick!();
|
||||||
}})
|
}})
|
||||||
|
|||||||
@@ -1,20 +1,29 @@
|
|||||||
import 'package:core/core.dart';
|
import 'package:core/core.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/widgets.dart';
|
import 'package:flutter/widgets.dart';
|
||||||
|
import 'package:model/model.dart';
|
||||||
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
||||||
|
|
||||||
|
typedef OnPressEmailActionClick = void Function(EmailActionType emailActionType);
|
||||||
|
|
||||||
class BottomBarMailWidgetBuilder {
|
class BottomBarMailWidgetBuilder {
|
||||||
|
|
||||||
final BuildContext _context;
|
final BuildContext _context;
|
||||||
final ImagePaths _imagePaths;
|
final ImagePaths _imagePaths;
|
||||||
final ResponsiveUtils _responsiveUtils;
|
final ResponsiveUtils _responsiveUtils;
|
||||||
|
|
||||||
|
OnPressEmailActionClick? _onPressEmailActionClick;
|
||||||
|
|
||||||
BottomBarMailWidgetBuilder(
|
BottomBarMailWidgetBuilder(
|
||||||
this._context,
|
this._context,
|
||||||
this._imagePaths,
|
this._imagePaths,
|
||||||
this._responsiveUtils,
|
this._responsiveUtils,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
void addOnPressEmailAction(OnPressEmailActionClick onPressEmailActionClick) {
|
||||||
|
_onPressEmailActionClick = onPressEmailActionClick;
|
||||||
|
}
|
||||||
|
|
||||||
Widget build() {
|
Widget build() {
|
||||||
return Container(
|
return Container(
|
||||||
key: Key('bottom_bar_messenger_widget'),
|
key: Key('bottom_bar_messenger_widget'),
|
||||||
@@ -34,14 +43,26 @@ class BottomBarMailWidgetBuilder {
|
|||||||
children: [
|
children: [
|
||||||
ButtonBuilder(_imagePaths.icReplyAll)
|
ButtonBuilder(_imagePaths.icReplyAll)
|
||||||
.key(Key('button_reply_all_message'))
|
.key(Key('button_reply_all_message'))
|
||||||
|
.onPressActionClick(() {
|
||||||
|
if (_onPressEmailActionClick != null) {
|
||||||
|
_onPressEmailActionClick!(EmailActionType.replyAll);
|
||||||
|
}})
|
||||||
.text(AppLocalizations.of(_context).reply_all, isVertical: _responsiveUtils.isMobile(_context))
|
.text(AppLocalizations.of(_context).reply_all, isVertical: _responsiveUtils.isMobile(_context))
|
||||||
.build(),
|
.build(),
|
||||||
ButtonBuilder(_imagePaths.icReply)
|
ButtonBuilder(_imagePaths.icReply)
|
||||||
.key(Key('button_reply_message'))
|
.key(Key('button_reply_message'))
|
||||||
|
.onPressActionClick(() {
|
||||||
|
if (_onPressEmailActionClick != null) {
|
||||||
|
_onPressEmailActionClick!(EmailActionType.reply);
|
||||||
|
}})
|
||||||
.text(AppLocalizations.of(_context).reply, isVertical: _responsiveUtils.isMobile(_context))
|
.text(AppLocalizations.of(_context).reply, isVertical: _responsiveUtils.isMobile(_context))
|
||||||
.build(),
|
.build(),
|
||||||
ButtonBuilder(_imagePaths.icForward)
|
ButtonBuilder(_imagePaths.icForward)
|
||||||
.key(Key('button_forward_message'))
|
.key(Key('button_forward_message'))
|
||||||
|
.onPressActionClick(() {
|
||||||
|
if (_onPressEmailActionClick != null) {
|
||||||
|
_onPressEmailActionClick!(EmailActionType.forward);
|
||||||
|
}})
|
||||||
.text(AppLocalizations.of(_context).forward, isVertical: _responsiveUtils.isMobile(_context))
|
.text(AppLocalizations.of(_context).forward, isVertical: _responsiveUtils.isMobile(_context))
|
||||||
.build()
|
.build()
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -11,19 +11,19 @@ import 'package:tmail_ui_user/features/email/presentation/model/text_format.dart
|
|||||||
|
|
||||||
class MessageContentTileBuilder {
|
class MessageContentTileBuilder {
|
||||||
|
|
||||||
final MessageContent _messageContent;
|
final MessageContent messageContent;
|
||||||
final List<AttachmentFile> _attachmentInlines;
|
final List<AttachmentFile> attachmentInlines;
|
||||||
final Session? _session;
|
final Session? session;
|
||||||
final AccountId? _accountId;
|
final AccountId? accountId;
|
||||||
final HtmlMessagePurifier _htmlMessagePurifier;
|
final HtmlMessagePurifier htmlMessagePurifier;
|
||||||
|
|
||||||
MessageContentTileBuilder(
|
MessageContentTileBuilder({
|
||||||
this._htmlMessagePurifier,
|
required this.htmlMessagePurifier,
|
||||||
this._messageContent,
|
required this.messageContent,
|
||||||
this._attachmentInlines,
|
required this.attachmentInlines,
|
||||||
this._session,
|
required this.session,
|
||||||
this._accountId,
|
required this.accountId,
|
||||||
);
|
});
|
||||||
|
|
||||||
Widget build() {
|
Widget build() {
|
||||||
return Theme(
|
return Theme(
|
||||||
@@ -33,8 +33,8 @@ class MessageContentTileBuilder {
|
|||||||
child: MediaQuery(
|
child: MediaQuery(
|
||||||
data: MediaQueryData(padding: EdgeInsets.zero),
|
data: MediaQueryData(padding: EdgeInsets.zero),
|
||||||
child: Center(
|
child: Center(
|
||||||
child: _messageContent.textFormat == TextFormat.PLAIN
|
child: messageContent.textFormat == TextFormat.PLAIN
|
||||||
? Text('${_messageContent.content}', style: TextStyle(fontSize: 12, color: AppColor.mailboxTextColor))
|
? Text('${messageContent.content}', style: TextStyle(fontSize: 12, color: AppColor.mailboxTextColor))
|
||||||
: HtmlWidget(
|
: HtmlWidget(
|
||||||
getHtmlMessageText(),
|
getHtmlMessageText(),
|
||||||
textStyle: TextStyle(fontSize: 12, color: AppColor.mailboxTextColor),
|
textStyle: TextStyle(fontSize: 12, color: AppColor.mailboxTextColor),
|
||||||
@@ -50,11 +50,11 @@ class MessageContentTileBuilder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
String getHtmlMessageText() {
|
String getHtmlMessageText() {
|
||||||
final message = (_attachmentInlines.isNotEmpty && _session != null && _accountId != null && _messageContent.hasImageInlineWithCid())
|
final message = (attachmentInlines.isNotEmpty && session != null && accountId != null && messageContent.hasImageInlineWithCid())
|
||||||
? '${_messageContent.getContentHasInlineAttachment(_session!, _accountId!, _attachmentInlines)}'
|
? '${messageContent.getContentHasInlineAttachment(session!, accountId!, attachmentInlines)}'
|
||||||
: '${_messageContent.content}';
|
: '${messageContent.content}';
|
||||||
|
|
||||||
final trustAsHtml = _htmlMessagePurifier.purifyHtmlMessage(
|
final trustAsHtml = htmlMessagePurifier.purifyHtmlMessage(
|
||||||
message,
|
message,
|
||||||
allowAttributes: {'style', 'input', 'form'});
|
allowAttributes: {'style', 'input', 'form'});
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -69,7 +69,7 @@ class SenderAndReceiverInformationTileBuilder {
|
|||||||
Padding(
|
Padding(
|
||||||
padding: EdgeInsets.only(top: 6),
|
padding: EdgeInsets.only(top: 6),
|
||||||
child: Text(
|
child: Text(
|
||||||
'${_presentationEmail!.getSentTime()}',
|
'${_presentationEmail!.getSentTime(Localizations.localeOf(_context).toLanguageTag())}',
|
||||||
style: TextStyle(fontSize: 12, color: AppColor.baseTextColor),
|
style: TextStyle(fontSize: 12, color: AppColor.baseTextColor),
|
||||||
))
|
))
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -6,4 +6,5 @@ abstract class AppRoutes {
|
|||||||
static const THREAD = '$MAILBOX_DASHBOARD/thread';
|
static const THREAD = '$MAILBOX_DASHBOARD/thread';
|
||||||
static const EMAIL = '$THREAD/email';
|
static const EMAIL = '$THREAD/email';
|
||||||
static const SESSION = '/session';
|
static const SESSION = '/session';
|
||||||
|
static const COMPOSER = '/composer';
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user