TF-2078 Display original email content when can not parse calendar event
(cherry picked from commit 295c3caa684bf5c4279e3219a961b96498c01373)
This commit is contained in:
@@ -0,0 +1,126 @@
|
||||
import 'package:core/presentation/extensions/color_extension.dart';
|
||||
import 'package:core/presentation/resources/image_paths.dart';
|
||||
import 'package:core/presentation/views/button/tmail_button_widget.dart';
|
||||
import 'package:filesize/filesize.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/flutter_svg.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:model/email/attachment.dart';
|
||||
import 'package:model/extensions/list_attachment_extension.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/custom_scroll_behavior.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/styles/email_attachments_styles.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/widgets/attachment_file_tile_builder.dart';
|
||||
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
||||
|
||||
typedef OnDownloadAttachmentActionCallback = Function(BuildContext context, Attachment attachment);
|
||||
|
||||
class EmailAttachmentsWidget extends StatefulWidget {
|
||||
|
||||
final List<Attachment> attachments;
|
||||
final OnDownloadAttachmentActionCallback? onDownloadAttachmentActionCallback;
|
||||
|
||||
const EmailAttachmentsWidget({
|
||||
super.key,
|
||||
required this.attachments,
|
||||
this.onDownloadAttachmentActionCallback
|
||||
});
|
||||
|
||||
@override
|
||||
State<EmailAttachmentsWidget> createState() => _EmailAttachmentsWidgetState();
|
||||
}
|
||||
|
||||
class _EmailAttachmentsWidgetState extends State<EmailAttachmentsWidget> {
|
||||
|
||||
final _imagePaths = Get.find<ImagePaths>();
|
||||
|
||||
bool _isDisplayAll = false;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Padding(
|
||||
padding: EmailAttachmentsStyles.padding,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: Row(
|
||||
children: [
|
||||
const SizedBox(width: EmailAttachmentsStyles.headerSpace),
|
||||
SvgPicture.asset(
|
||||
_imagePaths.icAttachment,
|
||||
width: EmailAttachmentsStyles.headerIconSize,
|
||||
height: EmailAttachmentsStyles.headerIconSize,
|
||||
colorFilter: EmailAttachmentsStyles.headerIconColor.asFilter(),
|
||||
fit: BoxFit.fill
|
||||
),
|
||||
const SizedBox(width: EmailAttachmentsStyles.headerSpace),
|
||||
Expanded(
|
||||
child: Text(
|
||||
AppLocalizations.of(context).titleHeaderAttachment(
|
||||
widget.attachments.length,
|
||||
filesize(widget.attachments.totalSize(), 1)
|
||||
),
|
||||
style: const TextStyle(
|
||||
fontSize: EmailAttachmentsStyles.headerTextSize,
|
||||
fontWeight: EmailAttachmentsStyles.headerFontWeight,
|
||||
color: EmailAttachmentsStyles.headerTextColor
|
||||
)
|
||||
)
|
||||
),
|
||||
const SizedBox(width: EmailAttachmentsStyles.headerSpace),
|
||||
]
|
||||
)
|
||||
),
|
||||
if (widget.attachments.length > 2)
|
||||
TMailButtonWidget(
|
||||
text: _isDisplayAll
|
||||
? AppLocalizations.of(context).hide
|
||||
: AppLocalizations.of(context).showAll,
|
||||
backgroundColor: Colors.transparent,
|
||||
borderRadius: EmailAttachmentsStyles.buttonBorderRadius,
|
||||
padding: EmailAttachmentsStyles.buttonPadding,
|
||||
textStyle: const TextStyle(
|
||||
fontSize: EmailAttachmentsStyles.buttonTextSize,
|
||||
color: EmailAttachmentsStyles.buttonTextColor,
|
||||
fontWeight: EmailAttachmentsStyles.buttonFontWeight
|
||||
),
|
||||
onTapActionCallback: () => setState(() => _isDisplayAll = !_isDisplayAll),
|
||||
)
|
||||
],
|
||||
),
|
||||
const SizedBox(height: EmailAttachmentsStyles.marginHeader),
|
||||
if (_isDisplayAll)
|
||||
Wrap(
|
||||
runSpacing: EmailAttachmentsStyles.listSpace,
|
||||
children: widget.attachments
|
||||
.map((attachment) => AttachmentFileTileBuilder(
|
||||
attachment,
|
||||
onDownloadAttachmentFileActionClick: (attachment) => widget.onDownloadAttachmentActionCallback?.call(context, attachment)
|
||||
))
|
||||
.toList()
|
||||
)
|
||||
else
|
||||
SizedBox(
|
||||
height: EmailAttachmentsStyles.listHeight,
|
||||
child: ScrollConfiguration(
|
||||
behavior: CustomScrollBehavior(),
|
||||
child: ListView.builder(
|
||||
shrinkWrap: true,
|
||||
scrollDirection: Axis.horizontal,
|
||||
itemCount: widget.attachments.length,
|
||||
itemBuilder: (context, index) {
|
||||
return AttachmentFileTileBuilder(
|
||||
widget.attachments[index],
|
||||
onDownloadAttachmentFileActionClick: (attachment) => widget.onDownloadAttachmentActionCallback?.call(context, attachment)
|
||||
);
|
||||
}
|
||||
),
|
||||
)
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
+50
-46
@@ -15,46 +15,54 @@ import 'package:model/extensions/list_email_address_extension.dart';
|
||||
import 'package:model/extensions/presentation_email_extension.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/material_text_button.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/extensions/prefix_email_address_extension.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/controller/single_email_controller.dart';
|
||||
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
||||
import 'package:tmail_ui_user/main/utils/app_utils.dart';
|
||||
|
||||
class EmailReceiverBuilder extends StatelessWidget {
|
||||
typedef OnPreviewEmailAddressActionCallback = Function(BuildContext context, EmailAddress emailAddress);
|
||||
|
||||
static const double _maxSizeFullDisplayEmailAddressArrowDownButton = 30.0;
|
||||
class EmailReceiverWidget extends StatefulWidget {
|
||||
|
||||
final PresentationEmail emailSelected;
|
||||
final SingleEmailController controller;
|
||||
final ResponsiveUtils responsiveUtils;
|
||||
final ImagePaths imagePaths;
|
||||
final double maxWidth;
|
||||
final OnPreviewEmailAddressActionCallback? onPreviewEmailAddressActionCallback;
|
||||
|
||||
const EmailReceiverBuilder({
|
||||
const EmailReceiverWidget({
|
||||
Key? key,
|
||||
required this.emailSelected,
|
||||
required this.controller,
|
||||
required this.responsiveUtils,
|
||||
required this.imagePaths,
|
||||
this.maxWidth = 200,
|
||||
this.onPreviewEmailAddressActionCallback,
|
||||
}) : super(key: key);
|
||||
|
||||
@override
|
||||
State<EmailReceiverWidget> createState() => _EmailReceiverWidgetState();
|
||||
}
|
||||
|
||||
class _EmailReceiverWidgetState extends State<EmailReceiverWidget> {
|
||||
|
||||
static const double _maxSizeFullDisplayEmailAddressArrowDownButton = 30.0;
|
||||
|
||||
final _imagePaths = Get.find<ImagePaths>();
|
||||
final _responsiveUtils = Get.find<ResponsiveUtils>();
|
||||
|
||||
bool _isDisplayAll = false;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Obx(() => Row(
|
||||
return Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Expanded(child: Padding(
|
||||
padding: EdgeInsets.only(top: controller.isDisplayFullEmailAddress
|
||||
padding: EdgeInsets.only(top: _isDisplayAll
|
||||
? DirectionUtils.isDirectionRTLByLanguage(context) ? 3 : 5.5
|
||||
: 0),
|
||||
child: _buildEmailAddressOfReceiver(
|
||||
context,
|
||||
emailSelected,
|
||||
controller.isDisplayFullEmailAddress,
|
||||
maxWidth
|
||||
widget.emailSelected,
|
||||
_isDisplayAll,
|
||||
widget.maxWidth
|
||||
),
|
||||
)),
|
||||
if (controller.isDisplayFullEmailAddress)
|
||||
if (_isDisplayAll)
|
||||
Padding(
|
||||
padding: EdgeInsets.symmetric(
|
||||
vertical: DirectionUtils.isDirectionRTLByLanguage(context) ? 0 : 6),
|
||||
@@ -62,12 +70,12 @@ class EmailReceiverBuilder extends StatelessWidget {
|
||||
padding: DirectionUtils.isDirectionRTLByLanguage(context)
|
||||
? const EdgeInsets.symmetric(horizontal: 8, vertical: 4)
|
||||
: null,
|
||||
onTap: controller.collapseEmailAddress,
|
||||
onTap: () => setState(() => _isDisplayAll = false),
|
||||
label: AppLocalizations.of(context).hide,
|
||||
)
|
||||
)
|
||||
]
|
||||
));
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildEmailAddressOfReceiver(
|
||||
@@ -113,7 +121,27 @@ class EmailReceiverBuilder extends StatelessWidget {
|
||||
]
|
||||
),
|
||||
),
|
||||
_buildArrowDownButton()
|
||||
Material(
|
||||
color: Colors.transparent,
|
||||
child: InkWell(
|
||||
onTap: () => setState(() => _isDisplayAll = true),
|
||||
customBorder: const CircleBorder(),
|
||||
child: Container(
|
||||
padding: const EdgeInsets.all(5),
|
||||
color: Colors.transparent,
|
||||
constraints: const BoxConstraints(
|
||||
maxHeight: _maxSizeFullDisplayEmailAddressArrowDownButton,
|
||||
maxWidth: _maxSizeFullDisplayEmailAddressArrowDownButton
|
||||
),
|
||||
child: SvgPicture.asset(
|
||||
_imagePaths.icChevronDown,
|
||||
width: 16,
|
||||
height: 16,
|
||||
fit: BoxFit.fill
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
]
|
||||
);
|
||||
} else {
|
||||
@@ -190,7 +218,7 @@ class EmailReceiverBuilder extends StatelessWidget {
|
||||
label: lastEmailAddress == emailAddress
|
||||
? emailAddress.asString()
|
||||
: '${emailAddress.asString()},',
|
||||
onTap: () => controller.openEmailAddressDialog(context, emailAddress),
|
||||
onTap: () => widget.onPreviewEmailAddressActionCallback?.call(context, emailAddress),
|
||||
onLongPress: () {
|
||||
AppUtils.copyEmailAddressToClipboard(context, emailAddress.emailAddress);
|
||||
},
|
||||
@@ -218,36 +246,12 @@ class EmailReceiverBuilder extends StatelessWidget {
|
||||
}
|
||||
|
||||
double _getMaxWidthEmailAddressDisplayed(BuildContext context, double maxWidth) {
|
||||
if (responsiveUtils.isPortraitMobile(context)) {
|
||||
if (_responsiveUtils.isPortraitMobile(context)) {
|
||||
return maxWidth - _maxSizeFullDisplayEmailAddressArrowDownButton;
|
||||
} else if (responsiveUtils.isWebDesktop(context)) {
|
||||
} else if (_responsiveUtils.isWebDesktop(context)) {
|
||||
return maxWidth / 2;
|
||||
} else {
|
||||
return maxWidth * 3/4;
|
||||
}
|
||||
}
|
||||
|
||||
Widget _buildArrowDownButton() {
|
||||
return Material(
|
||||
color: Colors.transparent,
|
||||
child: InkWell(
|
||||
onTap: controller.expandEmailAddress,
|
||||
customBorder: const CircleBorder(),
|
||||
child: Container(
|
||||
padding: const EdgeInsets.all(5),
|
||||
color: Colors.transparent,
|
||||
constraints: const BoxConstraints(
|
||||
maxHeight: _maxSizeFullDisplayEmailAddressArrowDownButton,
|
||||
maxWidth: _maxSizeFullDisplayEmailAddressArrowDownButton
|
||||
),
|
||||
child: SvgPicture.asset(
|
||||
imagePaths.icChevronDown,
|
||||
width: 16,
|
||||
height: 16,
|
||||
fit: BoxFit.fill
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:model/email/presentation_email.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/styles/email_subject_styles.dart';
|
||||
|
||||
class EmailSubjectWidget extends StatelessWidget {
|
||||
|
||||
final PresentationEmail presentationEmail;
|
||||
|
||||
const EmailSubjectWidget({super.key, required this.presentationEmail});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Padding(
|
||||
padding: EmailSubjectStyles.padding,
|
||||
child: SelectableText(
|
||||
presentationEmail.getEmailTitle(),
|
||||
maxLines: EmailSubjectStyles.maxLines,
|
||||
minLines: EmailSubjectStyles.minLines,
|
||||
cursorColor: EmailSubjectStyles.cursorColor,
|
||||
style: const TextStyle(
|
||||
fontSize: EmailSubjectStyles.textSize,
|
||||
color: EmailSubjectStyles.textColor,
|
||||
fontWeight: EmailSubjectStyles.fontWeight
|
||||
)
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/styles/email_view_empty_styles.dart';
|
||||
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
||||
|
||||
class EmailViewEmptyWidget extends StatelessWidget {
|
||||
|
||||
const EmailViewEmptyWidget({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Center(
|
||||
child: Text(
|
||||
AppLocalizations.of(context).no_mail_selected,
|
||||
textAlign: TextAlign.center,
|
||||
style: const TextStyle(
|
||||
fontSize: EmailViewEmptyStyles.textSize,
|
||||
color: EmailViewEmptyStyles.textColor,
|
||||
fontWeight: EmailViewEmptyStyles.fontWeight
|
||||
)
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -23,7 +23,7 @@ class EmailViewLoadingBarWidget extends StatelessWidget {
|
||||
return viewState.fold(
|
||||
(failure) => const SizedBox.shrink(),
|
||||
(success) {
|
||||
if (success is GetEmailContentLoading || (success is ParseCalendarEventLoading && selectedEmail.hasCalendarEvent)) {
|
||||
if (success is GetEmailContentLoading || success is ParseCalendarEventLoading) {
|
||||
return const CupertinoLoadingWidget();
|
||||
} else {
|
||||
return const SizedBox.shrink();
|
||||
|
||||
+3
-5
@@ -6,7 +6,7 @@ import 'package:model/email/presentation_email.dart';
|
||||
import 'package:model/extensions/presentation_email_extension.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/email_avatar_builder.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/controller/single_email_controller.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/widgets/email_receiver_builder.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/widgets/email_receiver_widget.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/widgets/email_sender_builder.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/widgets/received_time_builder.dart';
|
||||
|
||||
@@ -56,12 +56,10 @@ class InformationSenderAndReceiverBuilder extends StatelessWidget {
|
||||
ReceivedTimeBuilder(emailSelected),
|
||||
]),
|
||||
if (emailSelected.numberOfAllEmailAddress() > 0)
|
||||
EmailReceiverBuilder(
|
||||
controller: controller,
|
||||
EmailReceiverWidget(
|
||||
emailSelected: emailSelected,
|
||||
responsiveUtils: responsiveUtils,
|
||||
imagePaths: imagePaths,
|
||||
maxWidth: constraints.maxWidth,
|
||||
onPreviewEmailAddressActionCallback: controller.openEmailAddressDialog,
|
||||
)
|
||||
]
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user