From d8dd5ea31bf8323c4e8c74f438d2f47539522c6c Mon Sep 17 00:00:00 2001 From: Dat PHAM HOANG Date: Thu, 14 Oct 2021 17:03:25 +0700 Subject: [PATCH] TF-174 Order the ThreadView base on ReceivedAt to uniform with load more --- .../widgets/sender_and_receiver_information_tile_builder.dart | 2 +- lib/features/thread/presentation/thread_controller.dart | 2 +- .../thread/presentation/widgets/email_tile_builder.dart | 2 +- model/lib/extensions/presentation_email_extension.dart | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/features/email/presentation/widgets/sender_and_receiver_information_tile_builder.dart b/lib/features/email/presentation/widgets/sender_and_receiver_information_tile_builder.dart index d13191932..29fbe866a 100644 --- a/lib/features/email/presentation/widgets/sender_and_receiver_information_tile_builder.dart +++ b/lib/features/email/presentation/widgets/sender_and_receiver_information_tile_builder.dart @@ -68,7 +68,7 @@ class SenderAndReceiverInformationTileBuilder { Padding( padding: EdgeInsets.only(top: 6), child: Text( - '${_presentationEmail!.getEmailDateTime(Localizations.localeOf(_context).toLanguageTag(), pattern: 'dd/MM/yyyy h:mm a')}', + '${_presentationEmail!.getReceivedAt(Localizations.localeOf(_context).toLanguageTag(), pattern: 'dd/MM/yyyy h:mm a')}', style: TextStyle(fontSize: 12, color: AppColor.baseTextColor), )) ], diff --git a/lib/features/thread/presentation/thread_controller.dart b/lib/features/thread/presentation/thread_controller.dart index ae60b2850..6e672c0fe 100644 --- a/lib/features/thread/presentation/thread_controller.dart +++ b/lib/features/thread/presentation/thread_controller.dart @@ -62,7 +62,7 @@ class ThreadController extends BaseController { inMailbox: mailboxDashBoardController.selectedMailbox.value?.id); Set? get _sortOrder => Set() - ..add(EmailComparator(EmailComparatorProperty.sentAt) + ..add(EmailComparator(EmailComparatorProperty.receivedAt) ..setIsAscending(false)); AccountId? get _accountId => mailboxDashBoardController.accountId.value; diff --git a/lib/features/thread/presentation/widgets/email_tile_builder.dart b/lib/features/thread/presentation/widgets/email_tile_builder.dart index fc99291fb..66143f4c8 100644 --- a/lib/features/thread/presentation/widgets/email_tile_builder.dart +++ b/lib/features/thread/presentation/widgets/email_tile_builder.dart @@ -99,7 +99,7 @@ class EmailTileBuilder { Padding( padding: EdgeInsets.only(right: 4), child: Text( - '${_presentationEmail.getEmailDateTime(Localizations.localeOf(_context).toLanguageTag())}', + '${_presentationEmail.getReceivedAt(Localizations.localeOf(_context).toLanguageTag())}', maxLines: 1, overflow:TextOverflow.ellipsis, style: TextStyle( diff --git a/model/lib/extensions/presentation_email_extension.dart b/model/lib/extensions/presentation_email_extension.dart index e59db896c..4e1130ecb 100644 --- a/model/lib/extensions/presentation_email_extension.dart +++ b/model/lib/extensions/presentation_email_extension.dart @@ -9,8 +9,8 @@ extension PresentationEmailExtension on PresentationEmail { int numberOfAllEmailAddress() => to.numberEmailAddress() + cc.numberEmailAddress() + bcc.numberEmailAddress(); - String getEmailDateTime(String newLocale, {String? pattern}) { - final emailTime = sentAt ?? receivedAt; + String getReceivedAt(String newLocale, {String? pattern}) { + final emailTime = receivedAt; if (emailTime != null) { return emailTime.formatDate( pattern: pattern ?? emailTime.value.toLocal().toPattern(),