eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

TF-495 Implement linter for thread view

Browse Source
This commit is contained in:
dab246
2022-04-22 09:29:37 +07:00
committed by Dat H. Pham
parent 3b81962c3b
commit d8f236a89c
25 changed files with 419 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/thread/data/extensions/list_email_cache_extension.dart
+1 -4
View File
@@ -3,9 +3,6 @@ import 'package:tmail_ui_user/features/thread/data/model/email_cache.dart';
extension ListEmailCacheExtension on List<EmailCache> { extension ListEmailCacheExtension on List<EmailCache> {
Map<String, EmailCache> toMap() { Map<String, EmailCache> toMap() {
return Map<String, EmailCache>.fromIterable( return { for (var emailCache in this) emailCache.id : emailCache };
this,
key: (emailCache) => emailCache.id,
value: (emailCache) => emailCache);
} }
} }
lib/features/thread/data/local/email_cache_manager.dart
+2 -2
View File
@@ -30,9 +30,9 @@ class EmailCacheManager {
.where((email) => filterOption.filterEmail(email)) .where((email) => filterOption.filterEmail(email))
.toList(); .toList();
if (sort != null) { if (sort != null) {
sort.forEach((comparator) { for (var comparator in sort) {
emailList.sortBy(comparator); emailList.sortBy(comparator);
}); }
} }
return emailList; return emailList;
} }
lib/features/thread/data/network/thread_api.dart
+10 -10
View File
@@ -39,19 +39,19 @@ class ThreadAPI {
final queryEmailMethod = QueryEmailMethod(accountId); final queryEmailMethod = QueryEmailMethod(accountId);
if (limit != null) queryEmailMethod..addLimit(limit); if (limit != null) queryEmailMethod.addLimit(limit);
if (sort != null) queryEmailMethod..addSorts(sort); if (sort != null) queryEmailMethod.addSorts(sort);
if (filter != null) queryEmailMethod..addFilters(filter); if (filter != null) queryEmailMethod.addFilters(filter);
final queryEmailInvocation = jmapRequestBuilder.invocation(queryEmailMethod); final queryEmailInvocation = jmapRequestBuilder.invocation(queryEmailMethod);
final getEmailMethod = GetEmailMethod(accountId); final getEmailMethod = GetEmailMethod(accountId);
if (properties != null) getEmailMethod..addProperties(properties); if (properties != null) getEmailMethod.addProperties(properties);
getEmailMethod..addReferenceIds(processingInvocation.createResultReference( getEmailMethod.addReferenceIds(processingInvocation.createResultReference(
queryEmailInvocation.methodCallId, queryEmailInvocation.methodCallId,
ReferencePath.idsPath)); ReferencePath.idsPath));
@@ -66,9 +66,9 @@ class ThreadAPI {
getEmailInvocation.methodCallId, GetEmailResponse.deserialize); getEmailInvocation.methodCallId, GetEmailResponse.deserialize);
if (sort != null && resultList != null) { if (sort != null && resultList != null) {
sort.forEach((comparator) { for (var comparator in sort) {
resultList..sortEmails(comparator); resultList.sortEmails(comparator);
}); }
} }
return EmailsResponse(emailList: resultList?.list, state: resultList?.state); return EmailsResponse(emailList: resultList?.list, state: resultList?.state);
@@ -96,7 +96,7 @@ class ThreadAPI {
ReferencePath.updatedPath)); ReferencePath.updatedPath));
if (propertiesUpdated != null) { if (propertiesUpdated != null) {
getMailboxUpdated..addProperties(propertiesUpdated); getMailboxUpdated.addProperties(propertiesUpdated);
} }
final getEmailCreated = GetEmailMethod(accountId) final getEmailCreated = GetEmailMethod(accountId)
@@ -105,7 +105,7 @@ class ThreadAPI {
ReferencePath.createdPath)); ReferencePath.createdPath));
if (propertiesCreated != null) { if (propertiesCreated != null) {
getEmailCreated..addProperties(propertiesCreated); getEmailCreated.addProperties(propertiesCreated);
} }
final getEmailUpdatedInvocation = jmapRequestBuilder.invocation(getMailboxUpdated); final getEmailUpdatedInvocation = jmapRequestBuilder.invocation(getMailboxUpdated);
lib/features/thread/data/repository/thread_repository_impl.dart
+3 -3
View File
@@ -242,9 +242,9 @@ class ThreadRepositoryImpl extends ThreadRepository {
} }
@override @override
Stream<EmailsResponse> loadMoreEmails(GetEmailRequest getEmailRequest) async* { Stream<EmailsResponse> loadMoreEmails(GetEmailRequest emailRequest) async* {
bench.start('loadMoreEmails in computed'); bench.start('loadMoreEmails in computed');
final response = await compute(_getAllEmailsWithoutLastEmailId, getEmailRequest); final response = await compute(_getAllEmailsWithoutLastEmailId, emailRequest);
bench.end('loadMoreEmails in computed'); bench.end('loadMoreEmails in computed');
await _updateEmailCache(newCreated: response.emailList); await _updateEmailCache(newCreated: response.emailList);
yield response; yield response;
@@ -335,7 +335,7 @@ class ThreadRepositoryImpl extends ThreadRepository {
final emailsResponse = await mapDataSource[DataSourceType.network]!.getAllEmail( final emailsResponse = await mapDataSource[DataSourceType.network]!.getAllEmail(
accountId, accountId,
sort: Set() sort: <Comparator>{}
..add(EmailComparator(EmailComparatorProperty.receivedAt) ..add(EmailComparator(EmailComparatorProperty.receivedAt)
..setIsAscending(false)), ..setIsAscending(false)),
filter: EmailFilterCondition(inMailbox: trashMailboxId, before: lastEmail?.receivedAt), filter: EmailFilterCondition(inMailbox: trashMailboxId, before: lastEmail?.receivedAt),
lib/features/thread/domain/state/empty_trash_folder_state.dart
+1 -1
View File
@@ -9,7 +9,7 @@ class EmptyTrashFolderSuccess extends UIState {
} }
class EmptyTrashFolderFailure extends FeatureFailure { class EmptyTrashFolderFailure extends FeatureFailure {
final exception; final dynamic exception;
EmptyTrashFolderFailure(this.exception); EmptyTrashFolderFailure(this.exception);
lib/features/thread/domain/state/get_all_email_state.dart
+1 -1
View File
@@ -13,7 +13,7 @@ class GetAllEmailSuccess extends UIState {
} }
class GetAllEmailFailure extends FeatureFailure { class GetAllEmailFailure extends FeatureFailure {
final exception; final dynamic exception;
GetAllEmailFailure(this.exception); GetAllEmailFailure(this.exception);
lib/features/thread/domain/state/load_more_emails_state.dart
+1 -1
View File
@@ -11,7 +11,7 @@ class LoadMoreEmailsSuccess extends UIState {
} }
class LoadMoreEmailsFailure extends FeatureFailure { class LoadMoreEmailsFailure extends FeatureFailure {
final exception; final dynamic exception;
LoadMoreEmailsFailure(this.exception); LoadMoreEmailsFailure(this.exception);
lib/features/thread/domain/state/mark_as_multiple_email_read_state.dart
+1 -1
View File
@@ -31,7 +31,7 @@ class MarkAsMultipleEmailReadHasSomeEmailFailure extends UIState {
} }
class MarkAsMultipleEmailReadFailure extends FeatureFailure { class MarkAsMultipleEmailReadFailure extends FeatureFailure {
final exception; final dynamic exception;
final ReadActions readActions; final ReadActions readActions;
MarkAsMultipleEmailReadFailure(this.exception, this.readActions); MarkAsMultipleEmailReadFailure(this.exception, this.readActions);
lib/features/thread/domain/state/mark_as_star_multiple_email_state.dart
+1 -1
View File
@@ -31,7 +31,7 @@ class MarkAsStarMultipleEmailHasSomeEmailFailure extends UIState {
} }
class MarkAsStarMultipleEmailFailure extends FeatureFailure { class MarkAsStarMultipleEmailFailure extends FeatureFailure {
final exception; final dynamic exception;
final MarkStarAction markStarAction; final MarkStarAction markStarAction;
MarkAsStarMultipleEmailFailure(this.exception, this.markStarAction); MarkAsStarMultipleEmailFailure(this.exception, this.markStarAction);
lib/features/thread/domain/state/move_multiple_email_to_mailbox_state.dart
+1 -1
View File
@@ -71,7 +71,7 @@ class MoveMultipleEmailToMailboxHasSomeEmailFailure extends UIState {
} }
class MoveMultipleEmailToMailboxFailure extends FeatureFailure { class MoveMultipleEmailToMailboxFailure extends FeatureFailure {
final exception; final dynamic exception;
final MoveAction moveAction; final MoveAction moveAction;
final EmailActionType emailActionType; final EmailActionType emailActionType;
lib/features/thread/domain/state/refresh_changes_all_email_state.dart
+1 -1
View File
@@ -13,7 +13,7 @@ class RefreshChangesAllEmailSuccess extends UIState {
} }
class RefreshChangesAllEmailFailure extends FeatureFailure { class RefreshChangesAllEmailFailure extends FeatureFailure {
final exception; final dynamic exception;
RefreshChangesAllEmailFailure(this.exception); RefreshChangesAllEmailFailure(this.exception);
lib/features/thread/domain/state/search_email_state.dart
+1 -1
View File
@@ -30,7 +30,7 @@ class SearchEmailSuccess extends UIState {
} }
class SearchEmailFailure extends FeatureFailure { class SearchEmailFailure extends FeatureFailure {
final exception; final dynamic exception;
SearchEmailFailure(this.exception); SearchEmailFailure(this.exception);
lib/features/thread/domain/state/search_more_email_state.dart
+1 -1
View File
@@ -21,7 +21,7 @@ class SearchMoreEmailSuccess extends UIState {
} }
class SearchMoreEmailFailure extends FeatureFailure { class SearchMoreEmailFailure extends FeatureFailure {
final exception; final dynamic exception;
SearchMoreEmailFailure(this.exception); SearchMoreEmailFailure(this.exception);
lib/features/thread/presentation/thread_bindings.dart
-5
View File
@@ -37,11 +37,6 @@ import 'package:tmail_ui_user/features/thread/presentation/thread_controller.dar
class ThreadBindings extends BaseBindings { class ThreadBindings extends BaseBindings {
@override
void dependencies() {
super.dependencies();
}
@override @override
void bindingsController() { void bindingsController() {
Get.put(ThreadController( Get.put(ThreadController(
lib/features/thread/presentation/thread_controller.dart
+8 -8
View File
@@ -104,7 +104,7 @@ class ThreadController extends BaseController {
SearchQuery? get searchQuery => mailboxDashBoardController.searchQuery; SearchQuery? get searchQuery => mailboxDashBoardController.searchQuery;
Set<Comparator>? get _sortOrder => Set() Set<Comparator>? get _sortOrder => <Comparator>{}
..add(EmailComparator(EmailComparatorProperty.receivedAt) ..add(EmailComparator(EmailComparatorProperty.receivedAt)
..setIsAscending(false)); ..setIsAscending(false));
@@ -277,7 +277,7 @@ class ThreadController extends BaseController {
_currentEmailState = success.currentEmailState; _currentEmailState = success.currentEmailState;
emailList.value = success.emailList; emailList.value = success.emailList;
if (listEmailController.hasClients) { if (listEmailController.hasClients) {
listEmailController.animateTo(0, duration: Duration(milliseconds: 500), curve: Curves.fastOutSlowIn); listEmailController.animateTo(0, duration: const Duration(milliseconds: 500), curve: Curves.fastOutSlowIn);
} }
} }
@@ -361,7 +361,7 @@ class ThreadController extends BaseController {
void _refreshEmailChanges() { void _refreshEmailChanges() {
if (isSearchActive()) { if (isSearchActive()) {
if (_accountId != null && searchQuery != null) { if (_accountId != null && searchQuery != null) {
final limit = emailListSearch.length > 0 ? UnsignedInt(emailListSearch.length) : ThreadConstants.defaultLimit; final limit = emailListSearch.isNotEmpty ? UnsignedInt(emailListSearch.length) : ThreadConstants.defaultLimit;
consumeState(_searchEmailInteractor.execute( consumeState(_searchEmailInteractor.execute(
_accountId!, _accountId!,
limit: limit, limit: limit,
@@ -535,7 +535,7 @@ class ThreadController extends BaseController {
void openFilterMessagesForTablet(BuildContext context, RelativeRect? position, List<PopupMenuEntry> popupMenuItems) async { void openFilterMessagesForTablet(BuildContext context, RelativeRect? position, List<PopupMenuEntry> popupMenuItems) async {
await showMenu( await showMenu(
context: context, context: context,
position: position ?? RelativeRect.fromLTRB(16, 40, 16, 16), position: position ?? const RelativeRect.fromLTRB(16, 40, 16, 16),
color: Colors.white, color: Colors.white,
elevation: 5, elevation: 5,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14)), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14)),
@@ -1054,12 +1054,12 @@ class ThreadController extends BaseController {
context: context, context: context,
barrierColor: AppColor.colorDefaultCupertinoActionSheet, barrierColor: AppColor.colorDefaultCupertinoActionSheet,
builder: (BuildContext context) => PointerInterceptor(child: (ConfirmDialogBuilder(_imagePaths) builder: (BuildContext context) => PointerInterceptor(child: (ConfirmDialogBuilder(_imagePaths)
..key(Key('confirm_dialog_delete_email_permanently')) ..key(const Key('confirm_dialog_delete_email_permanently'))
..title(DeleteActionType.single.getTitleDialog(context)) ..title(DeleteActionType.single.getTitleDialog(context))
..content(DeleteActionType.single.getContentDialog(context)) ..content(DeleteActionType.single.getContentDialog(context))
..addIcon(SvgPicture.asset(_imagePaths.icRemoveDialog, fit: BoxFit.fill)) ..addIcon(SvgPicture.asset(_imagePaths.icRemoveDialog, fit: BoxFit.fill))
..colorConfirmButton(AppColor.colorConfirmActionDialog) ..colorConfirmButton(AppColor.colorConfirmActionDialog)
..styleTextConfirmButton(TextStyle(fontSize: 17, fontWeight: FontWeight.w500, color: AppColor.colorActionDeleteConfirmDialog)) ..styleTextConfirmButton(const TextStyle(fontSize: 17, fontWeight: FontWeight.w500, color: AppColor.colorActionDeleteConfirmDialog))
..onCloseButtonAction(() => popBack()) ..onCloseButtonAction(() => popBack())
..onConfirmButtonAction(DeleteActionType.single.getConfirmActionName(context), () => _deleteEmailPermanentlyAction(context, email)) ..onConfirmButtonAction(DeleteActionType.single.getConfirmActionName(context), () => _deleteEmailPermanentlyAction(context, email))
..onCancelButtonAction(AppLocalizations.of(context).cancel, () => popBack())) ..onCancelButtonAction(AppLocalizations.of(context).cancel, () => popBack()))
@@ -1086,12 +1086,12 @@ class ThreadController extends BaseController {
context: context, context: context,
barrierColor: AppColor.colorDefaultCupertinoActionSheet, barrierColor: AppColor.colorDefaultCupertinoActionSheet,
builder: (BuildContext context) => PointerInterceptor(child: (ConfirmDialogBuilder(_imagePaths) builder: (BuildContext context) => PointerInterceptor(child: (ConfirmDialogBuilder(_imagePaths)
..key(Key('confirm_dialog_delete_emails_permanently')) ..key(const Key('confirm_dialog_delete_emails_permanently'))
..title(actionType.getTitleDialog(context)) ..title(actionType.getTitleDialog(context))
..content(actionType.getContentDialog(context, count: selectedEmails?.length)) ..content(actionType.getContentDialog(context, count: selectedEmails?.length))
..addIcon(SvgPicture.asset(_imagePaths.icRemoveDialog, fit: BoxFit.fill)) ..addIcon(SvgPicture.asset(_imagePaths.icRemoveDialog, fit: BoxFit.fill))
..colorConfirmButton(AppColor.colorConfirmActionDialog) ..colorConfirmButton(AppColor.colorConfirmActionDialog)
..styleTextConfirmButton(TextStyle(fontSize: 17, fontWeight: FontWeight.w500, color: AppColor.colorActionDeleteConfirmDialog)) ..styleTextConfirmButton(const TextStyle(fontSize: 17, fontWeight: FontWeight.w500, color: AppColor.colorActionDeleteConfirmDialog))
..onCloseButtonAction(() => popBack()) ..onCloseButtonAction(() => popBack())
..onConfirmButtonAction(actionType.getConfirmActionName(context), () => _deleteSelectionEmailsPermanentlyAction(actionType)) ..onConfirmButtonAction(actionType.getConfirmActionName(context), () => _deleteSelectionEmailsPermanentlyAction(actionType))
..onCancelButtonAction(AppLocalizations.of(context).cancel, () => popBack())) ..onCancelButtonAction(AppLocalizations.of(context).cancel, () => popBack()))
lib/features/thread/presentation/thread_view.dart
+103 -101
View File
@@ -26,6 +26,8 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
final _responsiveUtils = Get.find<ResponsiveUtils>(); final _responsiveUtils = Get.find<ResponsiveUtils>();
final _imagePaths = Get.find<ImagePaths>(); final _imagePaths = Get.find<ImagePaths>();
ThreadView({Key? key}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return GestureDetector( return GestureDetector(
@@ -35,7 +37,7 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
backgroundColor: _responsiveUtils.isDesktop(context) ? AppColor.colorBgDesktop : Colors.white, backgroundColor: _responsiveUtils.isDesktop(context) ? AppColor.colorBgDesktop : Colors.white,
body: Row(children: [ body: Row(children: [
if ((!kIsWeb && !_responsiveUtils.isMobile(context)) || (kIsWeb && _responsiveUtils.isTabletLarge(context))) if ((!kIsWeb && !_responsiveUtils.isMobile(context)) || (kIsWeb && _responsiveUtils.isTabletLarge(context)))
VerticalDivider(color: AppColor.lineItemListColor, width: 1, thickness: 0.2), const VerticalDivider(color: AppColor.lineItemListColor, width: 1, thickness: 0.2),
Expanded(child: SafeArea( Expanded(child: SafeArea(
right: _responsiveUtils.isLandscapeMobile(context), right: _responsiveUtils.isLandscapeMobile(context),
left: _responsiveUtils.isLandscapeMobile(context), left: _responsiveUtils.isLandscapeMobile(context),
@@ -45,11 +47,11 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
if (_responsiveUtils.isDesktop(context)) if (_responsiveUtils.isDesktop(context))
Container( Container(
color: Colors.white, color: Colors.white,
padding: EdgeInsets.only(right: 10, top: 16, bottom: 10, left: 32), padding: const EdgeInsets.only(right: 10, top: 16, bottom: 10, left: 32),
child: _buildHeader(context)), child: _buildHeader(context)),
Obx(() => !controller.isSearchActive() && !_responsiveUtils.isDesktop(context) Obx(() => !controller.isSearchActive() && !_responsiveUtils.isDesktop(context)
? _buildAppBarNormal(context) ? _buildAppBarNormal(context)
: SizedBox.shrink()), : const SizedBox.shrink()),
_buildSearchInputFormForMobile(context), _buildSearchInputFormForMobile(context),
Container( Container(
color: kIsWeb ? AppColor.colorBgDesktop : Colors.white, color: kIsWeb ? AppColor.colorBgDesktop : Colors.white,
@@ -57,10 +59,10 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
child: _buildSearchButtonViewForMobile(context)), child: _buildSearchButtonViewForMobile(context)),
Obx(() => controller.isMailboxTrash && controller.emailList.isNotEmpty && !controller.isSearchActive() Obx(() => controller.isMailboxTrash && controller.emailList.isNotEmpty && !controller.isSearchActive()
? _buildEmptyTrashButton(context) ? _buildEmptyTrashButton(context)
: SizedBox.shrink()), : const SizedBox.shrink()),
Expanded(child: Container( Expanded(child: Container(
color: kIsWeb ? AppColor.colorBgDesktop : Colors.white, color: kIsWeb ? AppColor.colorBgDesktop : Colors.white,
padding: _responsiveUtils.isDesktop(context) ? EdgeInsets.only(left: 32, right: 24, top: 16, bottom: 24) : EdgeInsets.zero, padding: _responsiveUtils.isDesktop(context) ? const EdgeInsets.only(left: 32, right: 24, top: 16, bottom: 24) : EdgeInsets.zero,
child: Stack(children: [ child: Stack(children: [
Container( Container(
alignment: Alignment.center, alignment: Alignment.center,
@@ -92,14 +94,14 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
Widget _buildHeader(BuildContext context) { Widget _buildHeader(BuildContext context) {
return Row(children: [ return Row(children: [
Obx(() => !controller.isSelectionEnabled() ? _buildListButtonTopBar(context) : SizedBox.shrink()), Obx(() => !controller.isSelectionEnabled() ? _buildListButtonTopBar(context) : const SizedBox.shrink()),
Obx(() => controller.isSelectionEnabled() ? _buildListButtonSelectionForDesktop(context) : SizedBox.shrink()), Obx(() => controller.isSelectionEnabled() ? _buildListButtonSelectionForDesktop(context) : const SizedBox.shrink()),
SizedBox(width: 16), const SizedBox(width: 16),
Obx(() => !controller.isSearchActive() ? Spacer() : SizedBox.shrink()), Obx(() => !controller.isSearchActive() ? const Spacer() : const SizedBox.shrink()),
Expanded(child: _buildSearchInputFormForDesktop(context)), Expanded(child: _buildSearchInputFormForDesktop(context)),
_buildSearchButtonViewForDesktop(context), _buildSearchButtonViewForDesktop(context),
Padding( Padding(
padding: EdgeInsets.only(right: 16), padding: const EdgeInsets.only(right: 16),
child: (AvatarBuilder() child: (AvatarBuilder()
..text(controller.mailboxDashBoardController.userProfile.value?.getAvatarText() ?? '') ..text(controller.mailboxDashBoardController.userProfile.value?.getAvatarText() ?? '')
..backgroundColor(Colors.white) ..backgroundColor(Colors.white)
@@ -109,7 +111,7 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
context, context,
position, position,
popupMenuUserSettingActionTile(context, () => controller.mailboxDashBoardController.logoutAction()))) popupMenuUserSettingActionTile(context, () => controller.mailboxDashBoardController.logoutAction())))
..addBoxShadows([BoxShadow( ..addBoxShadows([const BoxShadow(
color: AppColor.colorShadowBgContentEmail, color: AppColor.colorShadowBgContentEmail,
spreadRadius: 1, blurRadius: 1, offset: Offset(0, 0.5))]) spreadRadius: 1, blurRadius: 1, offset: Offset(0, 0.5))])
..size(48)) ..size(48))
@@ -121,35 +123,35 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
return Row(children: [ return Row(children: [
if (!controller.isSearchActive()) if (!controller.isSearchActive())
(ButtonBuilder(_imagePaths.icRefresh) (ButtonBuilder(_imagePaths.icRefresh)
..key(Key('button_reload_thread')) ..key(const Key('button_reload_thread'))
..decoration(BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.colorButtonHeaderThread)) ..decoration(BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.colorButtonHeaderThread))
..paddingIcon(EdgeInsets.zero) ..paddingIcon(EdgeInsets.zero)
..size(16) ..size(16)
..radiusSplash(10) ..radiusSplash(10)
..padding(EdgeInsets.symmetric(horizontal: 8, vertical: 8)) ..padding(const EdgeInsets.symmetric(horizontal: 8, vertical: 8))
..onPressActionClick(() => controller.refreshAllEmail())) ..onPressActionClick(() => controller.refreshAllEmail()))
.build(), .build(),
if (!controller.isSearchActive()) SizedBox(width: 16), if (!controller.isSearchActive()) const SizedBox(width: 16),
(ButtonBuilder(_imagePaths.icSelectAll) (ButtonBuilder(_imagePaths.icSelectAll)
..key(Key('button_select_all')) ..key(const Key('button_select_all'))
..decoration(BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.colorButtonHeaderThread)) ..decoration(BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.colorButtonHeaderThread))
..paddingIcon(EdgeInsets.only(right: 8)) ..paddingIcon(const EdgeInsets.only(right: 8))
..size(16) ..size(16)
..radiusSplash(10) ..radiusSplash(10)
..padding(EdgeInsets.symmetric(horizontal: 12, vertical: 8)) ..padding(const EdgeInsets.symmetric(horizontal: 12, vertical: 8))
..textStyle(TextStyle(fontSize: 12, color: AppColor.colorTextButtonHeaderThread)) ..textStyle(const TextStyle(fontSize: 12, color: AppColor.colorTextButtonHeaderThread))
..onPressActionClick(() => controller.setSelectAllEmailAction()) ..onPressActionClick(() => controller.setSelectAllEmailAction())
..text(AppLocalizations.of(context).select_all, isVertical: false)) ..text(AppLocalizations.of(context).select_all, isVertical: false))
.build(), .build(),
SizedBox(width: 16), const SizedBox(width: 16),
(ButtonBuilder(_imagePaths.icMarkAllAsRead) (ButtonBuilder(_imagePaths.icMarkAllAsRead)
..key(Key('button_mark_all_as_read')) ..key(const Key('button_mark_all_as_read'))
..decoration(BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.colorButtonHeaderThread)) ..decoration(BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.colorButtonHeaderThread))
..paddingIcon(EdgeInsets.only(right: 8)) ..paddingIcon(const EdgeInsets.only(right: 8))
..size(16) ..size(16)
..padding(EdgeInsets.symmetric(horizontal: 12, vertical: 8)) ..padding(const EdgeInsets.symmetric(horizontal: 12, vertical: 8))
..radiusSplash(10) ..radiusSplash(10)
..textStyle(TextStyle(fontSize: 12, color: AppColor.colorTextButtonHeaderThread)) ..textStyle(const TextStyle(fontSize: 12, color: AppColor.colorTextButtonHeaderThread))
..onPressActionClick(() { ..onPressActionClick(() {
final listEmail = controller.isSearchActive() final listEmail = controller.isSearchActive()
? controller.emailListSearch.allEmailUnread ? controller.emailListSearch.allEmailUnread
@@ -161,22 +163,22 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
}) })
..text(AppLocalizations.of(context).mark_all_as_read, isVertical: false)) ..text(AppLocalizations.of(context).mark_all_as_read, isVertical: false))
.build(), .build(),
if (!controller.isSearchActive()) SizedBox(width: 16), if (!controller.isSearchActive()) const SizedBox(width: 16),
if (!controller.isSearchActive()) if (!controller.isSearchActive())
(ButtonBuilder(_imagePaths.icFilterWeb) (ButtonBuilder(_imagePaths.icFilterWeb)
..key(Key('button_filter_messages')) ..key(const Key('button_filter_messages'))
..context(context) ..context(context)
..decoration(BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.colorButtonHeaderThread)) ..decoration(BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.colorButtonHeaderThread))
..paddingIcon(EdgeInsets.only(right: 8)) ..paddingIcon(const EdgeInsets.only(right: 8))
..size(16) ..size(16)
..padding(EdgeInsets.symmetric(horizontal: 12, vertical: 8)) ..padding(const EdgeInsets.symmetric(horizontal: 12, vertical: 8))
..radiusSplash(10) ..radiusSplash(10)
..textStyle(TextStyle( ..textStyle(TextStyle(
fontSize: 12, fontSize: 12,
color: controller.filterMessageOption.value == FilterMessageOption.all ? AppColor.colorTextButtonHeaderThread : AppColor.colorNameEmail, color: controller.filterMessageOption.value == FilterMessageOption.all ? AppColor.colorTextButtonHeaderThread : AppColor.colorNameEmail,
fontWeight: controller.filterMessageOption.value == FilterMessageOption.all ? FontWeight.normal : FontWeight.w500)) fontWeight: controller.filterMessageOption.value == FilterMessageOption.all ? FontWeight.normal : FontWeight.w500))
..addIconAction(Padding( ..addIconAction(Padding(
padding: EdgeInsets.only(left: 8), padding: const EdgeInsets.only(left: 8),
child: SvgPicture.asset(_imagePaths.icArrowDown, fit: BoxFit.fill))) child: SvgPicture.asset(_imagePaths.icArrowDown, fit: BoxFit.fill)))
..addOnPressActionWithPositionClick((position) => ..addOnPressActionWithPositionClick((position) =>
controller.openFilterMessagesForTablet( controller.openFilterMessagesForTablet(
@@ -198,8 +200,8 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
onTap: () => controller.cancelSelectEmail()), onTap: () => controller.cancelSelectEmail()),
Text( Text(
AppLocalizations.of(context).count_email_selected(controller.listEmailSelected.length), AppLocalizations.of(context).count_email_selected(controller.listEmailSelected.length),
style: TextStyle(fontSize: 17, fontWeight: FontWeight.w500, color: AppColor.colorTextButton),), style: const TextStyle(fontSize: 17, fontWeight: FontWeight.w500, color: AppColor.colorTextButton),),
SizedBox(width: 30), const SizedBox(width: 30),
buildIconWeb( buildIconWeb(
icon: SvgPicture.asset(controller.listEmailSelected.isAllEmailRead ? _imagePaths.icUnread : _imagePaths.icRead, fit: BoxFit.fill), icon: SvgPicture.asset(controller.listEmailSelected.isAllEmailRead ? _imagePaths.icUnread : _imagePaths.icRead, fit: BoxFit.fill),
tooltip: controller.listEmailSelected.isAllEmailRead ? AppLocalizations.of(context).mark_as_unread : AppLocalizations.of(context).mark_as_read, tooltip: controller.listEmailSelected.isAllEmailRead ? AppLocalizations.of(context).mark_as_unread : AppLocalizations.of(context).mark_as_read,
@@ -242,9 +244,9 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
return Obx(() { return Obx(() {
if (controller.isSelectionEnabled() && !_responsiveUtils.isDesktop(context) && controller.listEmailSelected.isNotEmpty) { if (controller.isSelectionEnabled() && !_responsiveUtils.isDesktop(context) && controller.listEmailSelected.isNotEmpty) {
return Column(children: [ return Column(children: [
Divider(color: AppColor.lineItemListColor, height: 1, thickness: 0.2), const Divider(color: AppColor.lineItemListColor, height: 1, thickness: 0.2),
Padding( Padding(
padding: EdgeInsets.all(10), padding: const EdgeInsets.all(10),
child: (BottomBarThreadSelectionWidget( child: (BottomBarThreadSelectionWidget(
context, context,
_imagePaths, _imagePaths,
@@ -256,7 +258,7 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
.build()), .build()),
]); ]);
} else { } else {
return SizedBox.shrink(); return const SizedBox.shrink();
} }
}); });
} }
@@ -266,13 +268,13 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
if (!controller.isSearchActive() && !_responsiveUtils.isDesktop(context)) { if (!controller.isSearchActive() && !_responsiveUtils.isDesktop(context)) {
return Container( return Container(
color: Colors.white, color: Colors.white,
padding: EdgeInsets.only(left: 16, right: 16, bottom: 10), padding: const EdgeInsets.only(left: 16, right: 16, bottom: 10),
child: (SearchBarView(_imagePaths) child: (SearchBarView(_imagePaths)
..hintTextSearch(kIsWeb ? AppLocalizations.of(context).search_emails : AppLocalizations.of(context).hint_search_emails) ..hintTextSearch(kIsWeb ? AppLocalizations.of(context).search_emails : AppLocalizations.of(context).hint_search_emails)
..addOnOpenSearchViewAction(() => controller.enableSearch(context))) ..addOnOpenSearchViewAction(() => controller.enableSearch(context)))
.build()); .build());
} else { } else {
return SizedBox.shrink(); return const SizedBox.shrink();
} }
}); });
} }
@@ -282,10 +284,10 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
if (controller.isSearchActive() && !_responsiveUtils.isDesktop(context)) { if (controller.isSearchActive() && !_responsiveUtils.isDesktop(context)) {
return Column(children: [ return Column(children: [
_buildSearchForm(context), _buildSearchForm(context),
Divider(color: AppColor.lineItemListColor, height: 1, thickness: 0.2), const Divider(color: AppColor.lineItemListColor, height: 1, thickness: 0.2),
]); ]);
} else { } else {
return SizedBox.shrink(); return const SizedBox.shrink();
} }
}); });
} }
@@ -294,14 +296,14 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
return Obx(() { return Obx(() {
if (!controller.isSearchActive() && _responsiveUtils.isDesktop(context)) { if (!controller.isSearchActive() && _responsiveUtils.isDesktop(context)) {
return Padding( return Padding(
padding: EdgeInsets.only(right: 16), padding: const EdgeInsets.only(right: 16),
child: (SearchBarView(_imagePaths) child: (SearchBarView(_imagePaths)
..hintTextSearch(AppLocalizations.of(context).search_emails) ..hintTextSearch(AppLocalizations.of(context).search_emails)
..maxSizeWidth(240) ..maxSizeWidth(240)
..addOnOpenSearchViewAction(() => controller.enableSearch(context))) ..addOnOpenSearchViewAction(() => controller.enableSearch(context)))
.build()); .build());
} else { } else {
return SizedBox.shrink(); return const SizedBox.shrink();
} }
}); });
} }
@@ -311,7 +313,7 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
if (controller.isSearchActive() && _responsiveUtils.isDesktop(context)) { if (controller.isSearchActive() && _responsiveUtils.isDesktop(context)) {
return _buildSearchFormForDesktop(context); return _buildSearchFormForDesktop(context);
} else { } else {
return SizedBox.shrink(); return const SizedBox.shrink();
} }
}); });
} }
@@ -325,10 +327,10 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
controller.mailboxDashBoardController.searchFocus, controller.mailboxDashBoardController.searchFocus,
controller.mailboxDashBoardController.searchInputController, controller.mailboxDashBoardController.searchInputController,
suggestionSearch: controller.mailboxDashBoardController.suggestionSearch,) suggestionSearch: controller.mailboxDashBoardController.suggestionSearch,)
..addDecoration(BoxDecoration( ..addDecoration(const BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(10)), borderRadius: BorderRadius.all(Radius.circular(10)),
color: AppColor.colorBgSearchBar)) color: AppColor.colorBgSearchBar))
..setMargin(EdgeInsets.only(right: 10)) ..setMargin(const EdgeInsets.only(right: 10))
..setHeightSearchBar(45) ..setHeightSearchBar(45)
..setHintText(AppLocalizations.of(context).search_mail) ..setHintText(AppLocalizations.of(context).search_mail)
..addOnCancelSearchPressed(() => controller.disableSearch()) ..addOnCancelSearchPressed(() => controller.disableSearch())
@@ -347,8 +349,8 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
controller.mailboxDashBoardController.searchFocus, controller.mailboxDashBoardController.searchFocus,
controller.mailboxDashBoardController.searchInputController, controller.mailboxDashBoardController.searchInputController,
suggestionSearch: controller.mailboxDashBoardController.suggestionSearch,) suggestionSearch: controller.mailboxDashBoardController.suggestionSearch,)
..addDecoration(BoxDecoration(color: Colors.white)) ..addDecoration(const BoxDecoration(color: Colors.white))
..setMargin(EdgeInsets.only(right: 10)) ..setMargin(const EdgeInsets.only(right: 10))
..setHintText(AppLocalizations.of(context).search_mail) ..setHintText(AppLocalizations.of(context).search_mail)
..addOnCancelSearchPressed(() => controller.disableSearch()) ..addOnCancelSearchPressed(() => controller.disableSearch())
..addOnClearTextSearchAction(() => controller.mailboxDashBoardController.clearSearchText()) ..addOnClearTextSearchAction(() => controller.mailboxDashBoardController.clearSearchText())
@@ -395,9 +397,9 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
alignment: Alignment.bottomRight, alignment: Alignment.bottomRight,
child: ScrollingFloatingButtonAnimated( child: ScrollingFloatingButtonAnimated(
icon: SvgPicture.asset(_imagePaths.icCompose, width: 20, height: 20, fit: BoxFit.fill), icon: SvgPicture.asset(_imagePaths.icCompose, width: 20, height: 20, fit: BoxFit.fill),
text: Padding(padding: EdgeInsets.only(right: 10), text: Padding(padding: const EdgeInsets.only(right: 10),
child: Text(AppLocalizations.of(context).compose, child: Text(AppLocalizations.of(context).compose,
style: TextStyle(color: AppColor.colorTextButton, fontSize: 15.0, fontWeight: FontWeight.w500))), style: const TextStyle(color: AppColor.colorTextButton, fontSize: 15.0, fontWeight: FontWeight.w500))),
onPress: () => controller.composeEmailAction(), onPress: () => controller.composeEmailAction(),
scrollController: controller.listEmailController, scrollController: controller.listEmailController,
color: Colors.white, color: Colors.white,
@@ -408,7 +410,7 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
) )
); );
} else { } else {
return SizedBox.shrink(); return const SizedBox.shrink();
} }
}); });
} }
@@ -425,23 +427,23 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
return CupertinoActionSheetAction( return CupertinoActionSheetAction(
child: Text( child: Text(
AppLocalizations.of(context).cancel, AppLocalizations.of(context).cancel,
style: TextStyle(fontWeight: FontWeight.w500, fontSize: 20, color: AppColor.colorTextButton)), style: const TextStyle(fontWeight: FontWeight.w500, fontSize: 20, color: AppColor.colorTextButton)),
onPressed: () => controller.closeFilterMessageActionSheet(), onPressed: () => controller.closeFilterMessageActionSheet(),
); );
} }
Widget _filterMessageWithAttachmentsAction(BuildContext context, FilterMessageOption optionCurrent) { Widget _filterMessageWithAttachmentsAction(BuildContext context, FilterMessageOption optionCurrent) {
return (FilterMessageCupertinoActionSheetActionBuilder( return (FilterMessageCupertinoActionSheetActionBuilder(
Key('filter_attachment_action'), const Key('filter_attachment_action'),
SvgPicture.asset(_imagePaths.icAttachment, width: 28, height: 28, fit: BoxFit.fill, color: AppColor.colorTextButton), SvgPicture.asset(_imagePaths.icAttachment, width: 28, height: 28, fit: BoxFit.fill, color: AppColor.colorTextButton),
AppLocalizations.of(context).with_attachments, AppLocalizations.of(context).with_attachments,
FilterMessageOption.attachments, FilterMessageOption.attachments,
optionCurrent: optionCurrent, optionCurrent: optionCurrent,
iconLeftPadding: _responsiveUtils.isMobile(context) iconLeftPadding: _responsiveUtils.isMobile(context)
? EdgeInsets.only(left: 12, right: 16) ? const EdgeInsets.only(left: 12, right: 16)
: EdgeInsets.only(right: 12), : const EdgeInsets.only(right: 12),
iconRightPadding: _responsiveUtils.isMobile(context) iconRightPadding: _responsiveUtils.isMobile(context)
? EdgeInsets.only(right: 12) ? const EdgeInsets.only(right: 12)
: EdgeInsets.zero, : EdgeInsets.zero,
actionSelected: SvgPicture.asset(_imagePaths.icFilterSelected, fit: BoxFit.fill)) actionSelected: SvgPicture.asset(_imagePaths.icFilterSelected, fit: BoxFit.fill))
..onActionClick((option) => controller.filterMessagesAction(context, option))) ..onActionClick((option) => controller.filterMessagesAction(context, option)))
@@ -450,16 +452,16 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
Widget _filterMessagesUnreadAction(BuildContext context, FilterMessageOption optionCurrent) { Widget _filterMessagesUnreadAction(BuildContext context, FilterMessageOption optionCurrent) {
return (FilterMessageCupertinoActionSheetActionBuilder( return (FilterMessageCupertinoActionSheetActionBuilder(
Key('filter_unread_action'), const Key('filter_unread_action'),
SvgPicture.asset(_imagePaths.icUnread, width: 28, height: 28, fit: BoxFit.fill), SvgPicture.asset(_imagePaths.icUnread, width: 28, height: 28, fit: BoxFit.fill),
AppLocalizations.of(context).unread, AppLocalizations.of(context).unread,
FilterMessageOption.unread, FilterMessageOption.unread,
optionCurrent: optionCurrent, optionCurrent: optionCurrent,
iconLeftPadding: _responsiveUtils.isMobile(context) iconLeftPadding: _responsiveUtils.isMobile(context)
? EdgeInsets.only(left: 12, right: 16) ? const EdgeInsets.only(left: 12, right: 16)
: EdgeInsets.only(right: 12), : const EdgeInsets.only(right: 12),
iconRightPadding: _responsiveUtils.isMobile(context) iconRightPadding: _responsiveUtils.isMobile(context)
? EdgeInsets.only(right: 12) ? const EdgeInsets.only(right: 12)
: EdgeInsets.zero, : EdgeInsets.zero,
actionSelected: SvgPicture.asset(_imagePaths.icFilterSelected, fit: BoxFit.fill)) actionSelected: SvgPicture.asset(_imagePaths.icFilterSelected, fit: BoxFit.fill))
..onActionClick((option) => controller.filterMessagesAction(context, option))) ..onActionClick((option) => controller.filterMessagesAction(context, option)))
@@ -468,16 +470,16 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
Widget _filterMessageStarredAction(BuildContext context, FilterMessageOption optionCurrent) { Widget _filterMessageStarredAction(BuildContext context, FilterMessageOption optionCurrent) {
return (FilterMessageCupertinoActionSheetActionBuilder( return (FilterMessageCupertinoActionSheetActionBuilder(
Key('filter_starred_action'), const Key('filter_starred_action'),
SvgPicture.asset(_imagePaths.icStar, width: 28, height: 28, fit: BoxFit.fill), SvgPicture.asset(_imagePaths.icStar, width: 28, height: 28, fit: BoxFit.fill),
AppLocalizations.of(context).starred, AppLocalizations.of(context).starred,
FilterMessageOption.starred, FilterMessageOption.starred,
optionCurrent: optionCurrent, optionCurrent: optionCurrent,
iconLeftPadding: _responsiveUtils.isMobile(context) iconLeftPadding: _responsiveUtils.isMobile(context)
? EdgeInsets.only(left: 12, right: 16) ? const EdgeInsets.only(left: 12, right: 16)
: EdgeInsets.only(right: 12), : const EdgeInsets.only(right: 12),
iconRightPadding: _responsiveUtils.isMobile(context) iconRightPadding: _responsiveUtils.isMobile(context)
? EdgeInsets.only(right: 12) ? const EdgeInsets.only(right: 12)
: EdgeInsets.zero, : EdgeInsets.zero,
actionSelected: SvgPicture.asset(_imagePaths.icFilterSelected, fit: BoxFit.fill)) actionSelected: SvgPicture.asset(_imagePaths.icFilterSelected, fit: BoxFit.fill))
..onActionClick((option) => controller.filterMessagesAction(context, option))) ..onActionClick((option) => controller.filterMessagesAction(context, option)))
@@ -486,32 +488,32 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
List<PopupMenuEntry> _popupMenuEmailActionTile(BuildContext context, FilterMessageOption option) { List<PopupMenuEntry> _popupMenuEmailActionTile(BuildContext context, FilterMessageOption option) {
return [ return [
PopupMenuItem(padding: EdgeInsets.symmetric(horizontal: 8), child: _filterMessageWithAttachmentsAction(context, option)), PopupMenuItem(padding: const EdgeInsets.symmetric(horizontal: 8), child: _filterMessageWithAttachmentsAction(context, option)),
PopupMenuDivider(height: 0.5), const PopupMenuDivider(height: 0.5),
PopupMenuItem(padding: EdgeInsets.symmetric(horizontal: 8), child: _filterMessagesUnreadAction(context, option)), PopupMenuItem(padding: const EdgeInsets.symmetric(horizontal: 8), child: _filterMessagesUnreadAction(context, option)),
PopupMenuDivider(height: 0.5), const PopupMenuDivider(height: 0.5),
PopupMenuItem(padding: EdgeInsets.symmetric(horizontal: 8), child: _filterMessageStarredAction(context, option)), PopupMenuItem(padding: const EdgeInsets.symmetric(horizontal: 8), child: _filterMessageStarredAction(context, option)),
]; ];
} }
Widget _buildLoadingView() { Widget _buildLoadingView() {
return Obx(() => controller.viewState.value.fold( return Obx(() => controller.viewState.value.fold(
(failure) => SizedBox.shrink(), (failure) => const SizedBox.shrink(),
(success) { (success) {
if (controller.isSearchActive()) { if (controller.isSearchActive()) {
return success is SearchingState return success is SearchingState
? Padding(padding: EdgeInsets.symmetric(vertical: 16), child: _loadingWidget) ? Padding(padding: const EdgeInsets.symmetric(vertical: 16), child: _loadingWidget)
: SizedBox.shrink(); : const SizedBox.shrink();
} else { } else {
return success is LoadingState return success is LoadingState
? Padding(padding: EdgeInsets.symmetric(vertical: 16), child: _loadingWidget) ? Padding(padding: const EdgeInsets.symmetric(vertical: 16), child: _loadingWidget)
: SizedBox.shrink(); : const SizedBox.shrink();
} }
})); }));
} }
Widget get _loadingWidget { Widget get _loadingWidget {
return Center(child: Padding( return const Center(child: Padding(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
child: SizedBox( child: SizedBox(
width: 24, width: 24,
@@ -521,16 +523,16 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
Widget _buildLoadingViewLoadMore() { Widget _buildLoadingViewLoadMore() {
return Obx(() => controller.viewState.value.fold( return Obx(() => controller.viewState.value.fold(
(failure) => SizedBox.shrink(), (failure) => const SizedBox.shrink(),
(success) { (success) {
if (controller.isSearchActive()) { if (controller.isSearchActive()) {
return success is SearchingMoreState return success is SearchingMoreState
? Padding(padding: EdgeInsets.only(bottom: 16), child: _loadingWidget) ? Padding(padding: const EdgeInsets.only(bottom: 16), child: _loadingWidget)
: SizedBox.shrink(); : const SizedBox.shrink();
} else { } else {
return success is LoadingMoreState return success is LoadingMoreState
? Padding(padding: EdgeInsets.only(bottom: 16), child: _loadingWidget) ? Padding(padding: const EdgeInsets.only(bottom: 16), child: _loadingWidget)
: SizedBox.shrink(); : const SizedBox.shrink();
} }
})); }));
} }
@@ -546,7 +548,7 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
child: Obx(() { child: Obx(() {
if (controller.isSearchActive()) { if (controller.isSearchActive()) {
if (controller.mailboxDashBoardController.suggestionSearch.isNotEmpty) { if (controller.mailboxDashBoardController.suggestionSearch.isNotEmpty) {
return SizedBox.shrink(); return const SizedBox.shrink();
} else { } else {
return _buildResultSearchEmails(context, controller.emailListSearch); return _buildResultSearchEmails(context, controller.emailListSearch);
} }
@@ -598,8 +600,8 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
}, },
child: ListView.builder( child: ListView.builder(
controller: controller.listEmailController, controller: controller.listEmailController,
physics: AlwaysScrollableScrollPhysics(), physics: const AlwaysScrollableScrollPhysics(),
key: PageStorageKey('list_presentation_email_in_threads'), key: const PageStorageKey('list_presentation_email_in_threads'),
itemCount: listPresentationEmail.length, itemCount: listPresentationEmail.length,
padding: EdgeInsets.only(top: kIsWeb && !_responsiveUtils.isDesktop(context) ? 10 : 0), padding: EdgeInsets.only(top: kIsWeb && !_responsiveUtils.isDesktop(context) ? 10 : 0),
itemBuilder: (context, index) => Obx(() => (EmailTileBuilder( itemBuilder: (context, index) => Obx(() => (EmailTileBuilder(
@@ -620,16 +622,16 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
Widget _buildEmptyEmail(BuildContext context) { Widget _buildEmptyEmail(BuildContext context) {
return Obx(() => controller.viewState.value.fold( return Obx(() => controller.viewState.value.fold(
(failure) => SizedBox.shrink(), (failure) => const SizedBox.shrink(),
(success) => !(success is LoadingState) && !(success is SearchingState) (success) => success is! LoadingState && success is! SearchingState
? (BackgroundWidgetBuilder(context) ? (BackgroundWidgetBuilder(context)
..key(Key('empty_email_background')) ..key(const Key('empty_email_background'))
..image(SvgPicture.asset(_imagePaths.icEmptyImageDefault, width: 120, height: 120, fit: BoxFit.fill)) ..image(SvgPicture.asset(_imagePaths.icEmptyImageDefault, width: 120, height: 120, fit: BoxFit.fill))
..text(controller.isSearchActive() ..text(controller.isSearchActive()
? AppLocalizations.of(context).no_emails_matching_your_search ? AppLocalizations.of(context).no_emails_matching_your_search
: AppLocalizations.of(context).no_emails)) : AppLocalizations.of(context).no_emails))
.build() .build()
: SizedBox.shrink()) : const SizedBox.shrink())
); );
} }
@@ -642,29 +644,29 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
..addOnSelectedSuggestion((suggestion) => ..addOnSelectedSuggestion((suggestion) =>
controller.mailboxDashBoardController.searchEmail(context, suggestion))) controller.mailboxDashBoardController.searchEmail(context, suggestion)))
.build() .build()
: SizedBox.shrink() : const SizedBox.shrink()
); );
} }
Widget _buildStatusResultSearch(BuildContext context) { Widget _buildStatusResultSearch(BuildContext context) {
return Obx(() { return Obx(() {
if (controller.isSearchActive()) { if (controller.isSearchActive()) {
return controller.emailListSearch.length > 0 return controller.emailListSearch.isNotEmpty
? Container( ? Container(
width: double.infinity, width: double.infinity,
padding: EdgeInsets.symmetric(vertical: 12, horizontal: 24), padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 24),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: _responsiveUtils.isDesktop(context) borderRadius: _responsiveUtils.isDesktop(context)
? BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20)) ? const BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20))
: null, : null,
color: AppColor.bgStatusResultSearch), color: AppColor.bgStatusResultSearch),
child: Text( child: Text(
AppLocalizations.of(context).results, AppLocalizations.of(context).results,
style: TextStyle(color: AppColor.baseTextColor, fontSize: 14, fontWeight: FontWeight.w500), style: const TextStyle(color: AppColor.baseTextColor, fontSize: 14, fontWeight: FontWeight.w500),
)) ))
: SizedBox.shrink(); : const SizedBox.shrink();
} else { } else {
return SizedBox.shrink(); return const SizedBox.shrink();
} }
}); });
} }
@@ -672,7 +674,7 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
Widget _buildEmptyTrashButton(BuildContext context) { Widget _buildEmptyTrashButton(BuildContext context) {
return Container( return Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(14)), borderRadius: const BorderRadius.all(Radius.circular(14)),
border: Border.all(color: AppColor.colorLineLeftEmailView), border: Border.all(color: AppColor.colorLineLeftEmailView),
color: Colors.white), color: Colors.white),
margin: EdgeInsets.only( margin: EdgeInsets.only(
@@ -680,25 +682,25 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
right: _responsiveUtils.isDesktop(context) ? 20 : 16, right: _responsiveUtils.isDesktop(context) ? 20 : 16,
bottom: _responsiveUtils.isDesktop(context) ? 0 : 16, bottom: _responsiveUtils.isDesktop(context) ? 0 : 16,
top: _responsiveUtils.isDesktop(context) ? 16 : 0), top: _responsiveUtils.isDesktop(context) ? 16 : 0),
padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8), padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
child: Row(children: [ child: Row(children: [
Padding( Padding(
padding: EdgeInsets.only(right: 16), padding: const EdgeInsets.only(right: 16),
child: SvgPicture.asset(_imagePaths.icDeleteTrash, fit: BoxFit.fill)), child: SvgPicture.asset(_imagePaths.icDeleteTrash, fit: BoxFit.fill)),
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Padding( Padding(
padding: EdgeInsets.only(left: 8), padding: const EdgeInsets.only(left: 8),
child: Text( child: Text(
AppLocalizations.of(context).message_delete_all_email_in_trash_button, AppLocalizations.of(context).message_delete_all_email_in_trash_button,
style: TextStyle(color: AppColor.colorContentEmail, fontSize: 13, fontWeight: FontWeight.w500))), style: const TextStyle(color: AppColor.colorContentEmail, fontSize: 13, fontWeight: FontWeight.w500))),
TextButton( TextButton(
onPressed: () => controller.deleteSelectionEmailsPermanently(context, DeleteActionType.all), onPressed: () => controller.deleteSelectionEmailsPermanently(context, DeleteActionType.all),
child: Text( child: Text(
AppLocalizations.of(context).empty_trash_now, AppLocalizations.of(context).empty_trash_now,
style: TextStyle(fontSize: 17, fontWeight: FontWeight.w500, color: AppColor.colorTextButton) style: const TextStyle(fontSize: 17, fontWeight: FontWeight.w500, color: AppColor.colorTextButton)
) )
) )
] ]
@@ -716,7 +718,7 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
Widget _markAsEmailSpamOrUnSpamAction(BuildContext context, PresentationEmail email) { Widget _markAsEmailSpamOrUnSpamAction(BuildContext context, PresentationEmail email) {
return (EmailActionCupertinoActionSheetActionBuilder( return (EmailActionCupertinoActionSheetActionBuilder(
Key('mark_as_spam_or_un_spam_action'), const Key('mark_as_spam_or_un_spam_action'),
SvgPicture.asset( SvgPicture.asset(
controller.currentMailbox?.isSpam == true ? _imagePaths.icNotSpam : _imagePaths.icSpam, controller.currentMailbox?.isSpam == true ? _imagePaths.icNotSpam : _imagePaths.icSpam,
width: 28, height: 28, fit: BoxFit.fill, color: AppColor.colorTextButton), width: 28, height: 28, fit: BoxFit.fill, color: AppColor.colorTextButton),
@@ -725,10 +727,10 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
: AppLocalizations.of(context).mark_as_spam, : AppLocalizations.of(context).mark_as_spam,
email, email,
iconLeftPadding: _responsiveUtils.isMobile(context) iconLeftPadding: _responsiveUtils.isMobile(context)
? EdgeInsets.only(left: 12, right: 16) ? const EdgeInsets.only(left: 12, right: 16)
: EdgeInsets.only(right: 12), : const EdgeInsets.only(right: 12),
iconRightPadding: _responsiveUtils.isMobile(context) iconRightPadding: _responsiveUtils.isMobile(context)
? EdgeInsets.only(right: 12) ? const EdgeInsets.only(right: 12)
: EdgeInsets.zero) : EdgeInsets.zero)
..onActionClick((email) => controller.pressEmailAction(context, ..onActionClick((email) => controller.pressEmailAction(context,
controller.currentMailbox?.isSpam == true controller.currentMailbox?.isSpam == true
@@ -740,7 +742,7 @@ class ThreadView extends GetWidget<ThreadController> with UserSettingPopupMenuMi
List<PopupMenuEntry> _popupMenuActionTile(BuildContext context, PresentationEmail email) { List<PopupMenuEntry> _popupMenuActionTile(BuildContext context, PresentationEmail email) {
return [ return [
PopupMenuItem(padding: EdgeInsets.symmetric(horizontal: 8), child: _markAsEmailSpamOrUnSpamAction(context, email)), PopupMenuItem(padding: const EdgeInsets.symmetric(horizontal: 8), child: _markAsEmailSpamOrUnSpamAction(context, email)),
]; ];
} }
} }
lib/features/thread/presentation/widgets/app_action_sheet_action_builder.dart
+1 -1
View File
@@ -27,7 +27,7 @@ class AppActionSheetActionBuilder extends CupertinoActionSheetActionBuilder {
key: key, key: key,
child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [ child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [
Padding( Padding(
padding: iconLeftPadding ?? EdgeInsets.only(left: 12, right: 16), padding: iconLeftPadding ?? const EdgeInsets.only(left: 12, right: 16),
child: actionIcon), child: actionIcon),
Expanded(child: Text(actionName, textAlign: TextAlign.left, style: actionTextStyle())), Expanded(child: Text(actionName, textAlign: TextAlign.left, style: actionTextStyle())),
]), ]),
lib/features/thread/presentation/widgets/app_bar_thread_widget_builder.dart
+20 -20
View File
@@ -61,13 +61,13 @@ class AppBarThreadWidgetBuilder {
Widget build() { Widget build() {
return Container( return Container(
key: Key('app_bar_thread_widget'), key: const Key('app_bar_thread_widget'),
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
color: Colors.white, color: Colors.white,
margin: EdgeInsets.zero, margin: EdgeInsets.zero,
padding: EdgeInsets.only(left: 8, top: 16, bottom: 8, right: 8), padding: const EdgeInsets.only(left: 8, top: 16, bottom: 8, right: 8),
child: MediaQuery( child: MediaQuery(
data: MediaQueryData(padding: EdgeInsets.zero), data: const MediaQueryData(padding: EdgeInsets.zero),
child: kIsWeb child: kIsWeb
? _selectMode == SelectMode.INACTIVE ? _buildBodyAppBarForWeb() : _buildBodyAppBarForWebSelection() ? _selectMode == SelectMode.INACTIVE ? _buildBodyAppBarForWeb() : _buildBodyAppBarForWebSelection()
: _selectMode == SelectMode.INACTIVE ? _buildBodyAppBarForMobile() : _buildBodyAppBarForMobileSelection() : _selectMode == SelectMode.INACTIVE ? _buildBodyAppBarForMobile() : _buildBodyAppBarForMobileSelection()
@@ -78,12 +78,12 @@ class AppBarThreadWidgetBuilder {
Widget _buildBodyAppBarForWeb() { Widget _buildBodyAppBarForWeb() {
return Row(children: [ return Row(children: [
if (!_responsiveUtils.isTabletLarge(_context)) _buildMenuButton(), if (!_responsiveUtils.isTabletLarge(_context)) _buildMenuButton(),
if (_responsiveUtils.isTabletLarge(_context)) SizedBox(width: 16), if (_responsiveUtils.isTabletLarge(_context)) const SizedBox(width: 16),
Expanded(child: Text( Expanded(child: Text(
'${_currentMailbox?.name?.name.capitalizeFirstEach ?? ''}', _currentMailbox?.name?.name.capitalizeFirstEach ?? '',
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 21, color: Colors.black, fontWeight: FontWeight.bold))), style: const TextStyle(fontSize: 21, color: Colors.black, fontWeight: FontWeight.bold))),
_buildFilterButton(), _buildFilterButton(),
]); ]);
} }
@@ -96,7 +96,7 @@ class AppBarThreadWidgetBuilder {
onTap: () => _onCancelEditThread?.call()), onTap: () => _onCancelEditThread?.call()),
Expanded(child: Text( Expanded(child: Text(
AppLocalizations.of(_context).count_email_selected(_listSelectionEmail.length), AppLocalizations.of(_context).count_email_selected(_listSelectionEmail.length),
style: TextStyle(fontSize: 17, fontWeight: FontWeight.w500, color: AppColor.colorTextButton))), style: const TextStyle(fontSize: 17, fontWeight: FontWeight.w500, color: AppColor.colorTextButton))),
buildIconWeb( buildIconWeb(
icon: SvgPicture.asset(_listSelectionEmail.isAllEmailRead ? _imagePaths.icUnread : _imagePaths.icRead, fit: BoxFit.fill), icon: SvgPicture.asset(_listSelectionEmail.isAllEmailRead ? _imagePaths.icUnread : _imagePaths.icRead, fit: BoxFit.fill),
tooltip: _listSelectionEmail.isAllEmailRead ? AppLocalizations.of(_context).unread : AppLocalizations.of(_context).read, tooltip: _listSelectionEmail.isAllEmailRead ? AppLocalizations.of(_context).unread : AppLocalizations.of(_context).read,
@@ -144,16 +144,16 @@ class AppBarThreadWidgetBuilder {
_filterMessageOption.getTitle(_context).isNotEmpty _filterMessageOption.getTitle(_context).isNotEmpty
? Column(mainAxisAlignment: MainAxisAlignment.center, children: [ ? Column(mainAxisAlignment: MainAxisAlignment.center, children: [
Padding( Padding(
padding: EdgeInsets.only(left: 40, right: 40), padding: const EdgeInsets.only(left: 40, right: 40),
child: _buildContentCenterAppBar()), child: _buildContentCenterAppBar()),
Transform( Transform(
transform: Matrix4.translationValues(_responsiveUtils.isDesktop(_context) ? -2.0 : -16.0, -8.0, 0.0), transform: Matrix4.translationValues(_responsiveUtils.isDesktop(_context) ? -2.0 : -16.0, -8.0, 0.0),
child: Text( child: Text(
_filterMessageOption.getTitle(_context), _filterMessageOption.getTitle(_context),
style: TextStyle(fontSize: 11, color: AppColor.colorContentEmail))) style: const TextStyle(fontSize: 11, color: AppColor.colorContentEmail)))
]) ])
: Padding( : Padding(
padding: EdgeInsets.only(left: 60, right: 40), padding: const EdgeInsets.only(left: 60, right: 40),
child: _buildContentCenterAppBar()), child: _buildContentCenterAppBar()),
] ]
)) ))
@@ -171,16 +171,16 @@ class AppBarThreadWidgetBuilder {
_filterMessageOption.getTitle(_context).isNotEmpty _filterMessageOption.getTitle(_context).isNotEmpty
? Column(mainAxisAlignment: MainAxisAlignment.center, children: [ ? Column(mainAxisAlignment: MainAxisAlignment.center, children: [
Padding( Padding(
padding: EdgeInsets.only(left: 40, right: 40), padding: const EdgeInsets.only(left: 40, right: 40),
child: _buildContentCenterAppBar()), child: _buildContentCenterAppBar()),
Transform( Transform(
transform: Matrix4.translationValues(_responsiveUtils.isDesktop(_context) ? -2.0 : -16.0, -8.0, 0.0), transform: Matrix4.translationValues(_responsiveUtils.isDesktop(_context) ? -2.0 : -16.0, -8.0, 0.0),
child: Text( child: Text(
_filterMessageOption.getTitle(_context), _filterMessageOption.getTitle(_context),
style: TextStyle(fontSize: 11, color: AppColor.colorContentEmail))) style: const TextStyle(fontSize: 11, color: AppColor.colorContentEmail)))
]) ])
: Padding( : Padding(
padding: EdgeInsets.only(left: 60, right: 40), padding: const EdgeInsets.only(left: 60, right: 40),
child: _buildContentCenterAppBar()), child: _buildContentCenterAppBar()),
] ]
)) ))
@@ -192,12 +192,12 @@ class AppBarThreadWidgetBuilder {
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
color: Colors.transparent, color: Colors.transparent,
child: Padding( child: Padding(
padding: EdgeInsets.only(right: 16), padding: const EdgeInsets.only(right: 16),
child: TextButton( child: TextButton(
onPressed: () => _onEditThreadAction?.call(), onPressed: () => _onEditThreadAction?.call(),
child: Text( child: Text(
AppLocalizations.of(_context).edit, AppLocalizations.of(_context).edit,
style: TextStyle(fontSize: 17, color: AppColor.colorTextButton), style: const TextStyle(fontSize: 17, color: AppColor.colorTextButton),
), ),
) )
) )
@@ -209,7 +209,7 @@ class AppBarThreadWidgetBuilder {
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
color: Colors.transparent, color: Colors.transparent,
child: Padding( child: Padding(
padding: EdgeInsets.only(left: 16, right: 16), padding: const EdgeInsets.only(left: 16, right: 16),
child: GestureDetector( child: GestureDetector(
onTap: () { onTap: () {
if (_onFilterEmailAction != null && _responsiveUtils.isMobileDevice(_context)) { if (_onFilterEmailAction != null && _responsiveUtils.isMobileDevice(_context)) {
@@ -258,7 +258,7 @@ class AppBarThreadWidgetBuilder {
'${_listSelectionEmail.length}', '${_listSelectionEmail.length}',
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 17, color: AppColor.colorTextButton))); style: const TextStyle(fontSize: 17, color: AppColor.colorTextButton)));
} }
Widget _buildContentCenterAppBar() { Widget _buildContentCenterAppBar() {
@@ -269,16 +269,16 @@ class AppBarThreadWidgetBuilder {
InkWell( InkWell(
onTap: () => !_responsiveUtils.isTabletLarge(_context) ? _onOpenMailboxMenuActionClick?.call() : null, onTap: () => !_responsiveUtils.isTabletLarge(_context) ? _onOpenMailboxMenuActionClick?.call() : null,
child: Padding( child: Padding(
padding: !_responsiveUtils.isTabletLarge(_context) ? EdgeInsets.zero : EdgeInsets.only(bottom: 8, top: 8), padding: !_responsiveUtils.isTabletLarge(_context) ? EdgeInsets.zero : const EdgeInsets.only(bottom: 8, top: 8),
child: Container( child: Container(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
margin: EdgeInsets.zero, margin: EdgeInsets.zero,
constraints: BoxConstraints(maxWidth: _getMaxWidthAppBarTitle()), constraints: BoxConstraints(maxWidth: _getMaxWidthAppBarTitle()),
child: Text( child: Text(
'${_currentMailbox?.name?.name.capitalizeFirstEach ?? ''}', _currentMailbox?.name?.name.capitalizeFirstEach ?? '',
maxLines: 1, maxLines: 1,
overflow: GetPlatform.isWeb ? TextOverflow.clip : TextOverflow.ellipsis, overflow: GetPlatform.isWeb ? TextOverflow.clip : TextOverflow.ellipsis,
style: TextStyle(fontSize: 21, color: AppColor.colorNameEmail, fontWeight: FontWeight.w700)) style: const TextStyle(fontSize: 21, color: AppColor.colorNameEmail, fontWeight: FontWeight.w700))
))), ))),
if (!_responsiveUtils.isTabletLarge(_context)) if (!_responsiveUtils.isTabletLarge(_context))
Transform( Transform(
lib/features/thread/presentation/widgets/bottom_bar_thread_selection_widget.dart
+17 -17
View File
@@ -29,11 +29,11 @@ class BottomBarThreadSelectionWidget {
Widget build() { Widget build() {
return Container( return Container(
key: Key('bottom_bar_thread_selection_widget'), key: const Key('bottom_bar_thread_selection_widget'),
alignment: Alignment.center, alignment: Alignment.center,
color: Colors.white, color: Colors.white,
child: MediaQuery( child: MediaQuery(
data: MediaQueryData(padding: EdgeInsets.zero), data: const MediaQueryData(padding: EdgeInsets.zero),
child: _buildListOptionButton() child: _buildListOptionButton()
) )
); );
@@ -45,9 +45,9 @@ class BottomBarThreadSelectionWidget {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Expanded(child: (ButtonBuilder(_listSelectionEmail.isAllEmailRead ? _imagePaths.icUnread : _imagePaths.icRead) Expanded(child: (ButtonBuilder(_listSelectionEmail.isAllEmailRead ? _imagePaths.icUnread : _imagePaths.icRead)
..key(Key('button_mark_read_email')) ..key(const Key('button_mark_read_email'))
..paddingIcon(EdgeInsets.all(8)) ..paddingIcon(const EdgeInsets.all(8))
..textStyle(TextStyle(fontSize: 12, color: AppColor.colorTextButton)) ..textStyle(const TextStyle(fontSize: 12, color: AppColor.colorTextButton))
..onPressActionClick(() { ..onPressActionClick(() {
if (_onPressEmailSelectionActionClick != null) { if (_onPressEmailSelectionActionClick != null) {
_onPressEmailSelectionActionClick!( _onPressEmailSelectionActionClick!(
@@ -59,9 +59,9 @@ class BottomBarThreadSelectionWidget {
isVertical: _responsiveUtils.isMobile(_context))) isVertical: _responsiveUtils.isMobile(_context)))
.build()), .build()),
Expanded(child: (ButtonBuilder(_listSelectionEmail.isAllEmailStarred ? _imagePaths.icUnStar : _imagePaths.icStar) Expanded(child: (ButtonBuilder(_listSelectionEmail.isAllEmailStarred ? _imagePaths.icUnStar : _imagePaths.icStar)
..key(Key('button_mark_as_star_email')) ..key(const Key('button_mark_as_star_email'))
..paddingIcon(EdgeInsets.all(8)) ..paddingIcon(const EdgeInsets.all(8))
..textStyle(TextStyle(fontSize: 12, color: AppColor.colorTextButton)) ..textStyle(const TextStyle(fontSize: 12, color: AppColor.colorTextButton))
..onPressActionClick(() { ..onPressActionClick(() {
if (_onPressEmailSelectionActionClick != null) { if (_onPressEmailSelectionActionClick != null) {
_onPressEmailSelectionActionClick!( _onPressEmailSelectionActionClick!(
@@ -73,9 +73,9 @@ class BottomBarThreadSelectionWidget {
.build()), .build()),
if (_currentMailbox?.isDrafts == false) if (_currentMailbox?.isDrafts == false)
Expanded(child: (ButtonBuilder(_imagePaths.icMove) Expanded(child: (ButtonBuilder(_imagePaths.icMove)
..key(Key('button_move_to_mailbox')) ..key(const Key('button_move_to_mailbox'))
..paddingIcon(EdgeInsets.all(8)) ..paddingIcon(const EdgeInsets.all(8))
..textStyle(TextStyle(fontSize: 12, color: AppColor.colorTextButton)) ..textStyle(const TextStyle(fontSize: 12, color: AppColor.colorTextButton))
..onPressActionClick(() { ..onPressActionClick(() {
if (_onPressEmailSelectionActionClick != null) { if (_onPressEmailSelectionActionClick != null) {
_onPressEmailSelectionActionClick!(EmailActionType.moveToMailbox, _listSelectionEmail); _onPressEmailSelectionActionClick!(EmailActionType.moveToMailbox, _listSelectionEmail);
@@ -84,9 +84,9 @@ class BottomBarThreadSelectionWidget {
.build()), .build()),
if (_currentMailbox?.isDrafts == false) if (_currentMailbox?.isDrafts == false)
Expanded(child: (ButtonBuilder(_currentMailbox?.isSpam == true ? _imagePaths.icNotSpam : _imagePaths.icSpam) Expanded(child: (ButtonBuilder(_currentMailbox?.isSpam == true ? _imagePaths.icNotSpam : _imagePaths.icSpam)
..key(Key('button_move_to_spam')) ..key(const Key('button_move_to_spam'))
..paddingIcon(EdgeInsets.all(8)) ..paddingIcon(const EdgeInsets.all(8))
..textStyle(TextStyle(fontSize: 12, color: AppColor.colorTextButton)) ..textStyle(const TextStyle(fontSize: 12, color: AppColor.colorTextButton))
..onPressActionClick(() { ..onPressActionClick(() {
if (_currentMailbox?.isSpam == true) { if (_currentMailbox?.isSpam == true) {
_onPressEmailSelectionActionClick?.call(EmailActionType.unSpam, _listSelectionEmail); _onPressEmailSelectionActionClick?.call(EmailActionType.unSpam, _listSelectionEmail);
@@ -100,9 +100,9 @@ class BottomBarThreadSelectionWidget {
isVertical: _responsiveUtils.isMobile(_context))) isVertical: _responsiveUtils.isMobile(_context)))
.build()), .build()),
Expanded(child: (ButtonBuilder(_imagePaths.icDelete) Expanded(child: (ButtonBuilder(_imagePaths.icDelete)
..key(Key('button_delete_email')) ..key(const Key('button_delete_email'))
..paddingIcon(EdgeInsets.all(8)) ..paddingIcon(const EdgeInsets.all(8))
..textStyle(TextStyle(fontSize: 12, color: AppColor.colorTextButton)) ..textStyle(const TextStyle(fontSize: 12, color: AppColor.colorTextButton))
..onPressActionClick(() { ..onPressActionClick(() {
if (_currentMailbox?.isTrash == true) { if (_currentMailbox?.isTrash == true) {
_onPressEmailSelectionActionClick?.call(EmailActionType.deletePermanently, _listSelectionEmail); _onPressEmailSelectionActionClick?.call(EmailActionType.deletePermanently, _listSelectionEmail);
lib/features/thread/presentation/widgets/email_context_menu_action_builder.dart
+1 -1
View File
@@ -19,7 +19,7 @@ class EmailContextMenuActionBuilder extends ContextMenuActionBuilder<List<Presen
return ListTile( return ListTile(
key: key, key: key,
leading: Padding( leading: Padding(
padding: EdgeInsets.only(left: 12), padding: const EdgeInsets.only(left: 12),
child: actionIcon), child: actionIcon),
title: Text(actionName, style: actionTextStyle()), title: Text(actionName, style: actionTextStyle()),
onTap: () { onTap: () {
lib/features/thread/presentation/widgets/email_tile_builder.dart
+95 -95
View File
@@ -48,14 +48,14 @@ class EmailTileBuilder {
Widget build() { Widget build() {
return Theme( return Theme(
key: Key('thread_tile'), key: const Key('thread_tile'),
data: ThemeData(splashColor: Colors.transparent, highlightColor: Colors.transparent), data: ThemeData(splashColor: Colors.transparent, highlightColor: Colors.transparent),
child: ResponsiveWidget( child: ResponsiveWidget(
responsiveUtils: _responsiveUtils, responsiveUtils: _responsiveUtils,
mobile: _buildListTile(), mobile: _buildListTile(),
desktop: Container( desktop: Container(
margin: _selectModeAll == SelectMode.ACTIVE ? EdgeInsets.only(top: 3, left: 8, right: 8) : EdgeInsets.zero, margin: _selectModeAll == SelectMode.ACTIVE ? const EdgeInsets.only(top: 3, left: 8, right: 8) : EdgeInsets.zero,
padding: _selectModeAll == SelectMode.ACTIVE ? EdgeInsets.symmetric(vertical: 8) : EdgeInsets.zero, padding: _selectModeAll == SelectMode.ACTIVE ? const EdgeInsets.symmetric(vertical: 8) : EdgeInsets.zero,
decoration: _selectModeAll == SelectMode.ACTIVE && _presentationEmail.selectMode == SelectMode.ACTIVE decoration: _selectModeAll == SelectMode.ACTIVE && _presentationEmail.selectMode == SelectMode.ACTIVE
? BoxDecoration( ? BoxDecoration(
borderRadius: BorderRadius.circular(14), borderRadius: BorderRadius.circular(14),
@@ -70,7 +70,7 @@ class EmailTileBuilder {
Widget _buildListTile() { Widget _buildListTile() {
return Container( return Container(
margin: EdgeInsets.zero, margin: EdgeInsets.zero,
padding: EdgeInsets.only(bottom: 10, left: 16, right: 16), padding: const EdgeInsets.only(bottom: 10, left: 16, right: 16),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(0), color: Colors.white), decoration: BoxDecoration(borderRadius: BorderRadius.circular(0), color: Colors.white),
alignment: Alignment.center, alignment: Alignment.center,
child: Column(children: [ child: Column(children: [
@@ -88,39 +88,33 @@ class EmailTileBuilder {
children: [ children: [
if (!_presentationEmail.hasRead) if (!_presentationEmail.hasRead)
Padding( Padding(
padding: EdgeInsets.only(right: 5), padding: const EdgeInsets.only(right: 5),
child: SvgPicture.asset(_imagePaths.icUnreadStatus, width: 9, height: 9, fit: BoxFit.fill)), child: SvgPicture.asset(_imagePaths.icUnreadStatus, width: 9, height: 9, fit: BoxFit.fill)),
Expanded( Expanded(
child: _searchStatus == SearchStatus.ACTIVE && _searchQuery != null && _searchQuery!.value.isNotEmpty child: _searchStatus == SearchStatus.ACTIVE && _searchQuery != null && _searchQuery!.value.isNotEmpty
? RichTextBuilder( ? RichTextBuilder(
_getInformationSender(), _getInformationSender(),
'${_searchQuery!.value}', _searchQuery!.value,
TextStyle(fontSize: 15, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600), const TextStyle(fontSize: 15, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600),
TextStyle(fontSize: 15, color: AppColor.colorNameEmail, backgroundColor: AppColor.bgWordSearch, fontWeight: FontWeight.w600)).build() const TextStyle(fontSize: 15, color: AppColor.colorNameEmail, backgroundColor: AppColor.bgWordSearch, fontWeight: FontWeight.w600)).build()
: Text( : Text(
_getInformationSender(), _getInformationSender(),
maxLines: 1, maxLines: 1,
overflow:TextOverflow.ellipsis, overflow:TextOverflow.ellipsis,
style: TextStyle(fontSize: 15, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600)) style: const TextStyle(fontSize: 15, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600))
), ),
if (_presentationEmail.hasAttachment == true) if (_presentationEmail.hasAttachment == true)
Padding( Padding(
padding: EdgeInsets.only(left: 8), padding: const EdgeInsets.only(left: 8),
child: (ButtonBuilder(_imagePaths.icAttachment) child: SvgPicture.asset(_imagePaths.icAttachment, width: 16, height: 16, fit: BoxFit.fill)),
..paddingIcon(EdgeInsets.zero)
..size(16))
.build()),
Padding( Padding(
padding: EdgeInsets.only(right: 4, left: 8), padding: const EdgeInsets.only(right: 4, left: 8),
child: Text( child: Text(
'${_presentationEmail.getReceivedAt(Localizations.localeOf(_context).toLanguageTag())}', _presentationEmail.getReceivedAt(Localizations.localeOf(_context).toLanguageTag()),
maxLines: 1, maxLines: 1,
overflow:TextOverflow.ellipsis, overflow:TextOverflow.ellipsis,
style: TextStyle(fontSize: 13, color: AppColor.colorContentEmail))), style: const TextStyle(fontSize: 13, color: AppColor.colorContentEmail))),
(ButtonBuilder(_imagePaths.icChevron) SvgPicture.asset(_imagePaths.icChevron, width: 16, height: 16, fit: BoxFit.fill),
..paddingIcon(EdgeInsets.zero)
..size(16))
.build(),
], ],
), ),
subtitle: Transform( subtitle: Transform(
@@ -136,52 +130,49 @@ class EmailTileBuilder {
children: [ children: [
Expanded(child: _searchStatus == SearchStatus.ACTIVE && _searchQuery != null && _searchQuery!.value.isNotEmpty Expanded(child: _searchStatus == SearchStatus.ACTIVE && _searchQuery != null && _searchQuery!.value.isNotEmpty
? RichTextBuilder( ? RichTextBuilder(
'${_presentationEmail.getEmailTitle()}', _presentationEmail.getEmailTitle(),
'${_searchQuery!.value}', _searchQuery!.value,
TextStyle(fontSize: 13, color: AppColor.colorNameEmail), const TextStyle(fontSize: 13, color: AppColor.colorNameEmail),
TextStyle(fontSize: 13, backgroundColor: AppColor.bgWordSearch, color: AppColor.colorNameEmail)).build() const TextStyle(fontSize: 13, backgroundColor: AppColor.bgWordSearch, color: AppColor.colorNameEmail)).build()
: Text( : Text(
'${_presentationEmail.getEmailTitle()}', _presentationEmail.getEmailTitle(),
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 13, color: AppColor.colorNameEmail)) style: const TextStyle(fontSize: 13, color: AppColor.colorNameEmail))
), ),
if (_searchStatus == SearchStatus.ACTIVE && _presentationEmail.mailboxName.isNotEmpty) if (_searchStatus == SearchStatus.ACTIVE && _presentationEmail.mailboxName.isNotEmpty)
Container( Container(
margin: EdgeInsets.only(left: 8), margin: const EdgeInsets.only(left: 8),
padding: EdgeInsets.only(left: 8, right: 8, top: 3, bottom: 3), padding: const EdgeInsets.only(left: 8, right: 8, top: 3, bottom: 3),
constraints: BoxConstraints(maxWidth: 100), constraints: const BoxConstraints(maxWidth: 100),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
color: AppColor.backgroundCounterMailboxColor), color: AppColor.backgroundCounterMailboxColor),
child: Text( child: Text(
'${_presentationEmail.mailboxName}', _presentationEmail.mailboxName,
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 10, color: AppColor.mailboxTextColor, fontWeight: FontWeight.bold), style: const TextStyle(fontSize: 10, color: AppColor.mailboxTextColor, fontWeight: FontWeight.bold),
) )
), ),
if (_presentationEmail.hasStarred) if (_presentationEmail.hasStarred)
(ButtonBuilder(_imagePaths.icStar) SvgPicture.asset(_imagePaths.icStar, width: 15, height: 15, fit: BoxFit.fill)
..paddingIcon(EdgeInsets.zero)
..size(15))
.build(),
], ],
)), )),
Padding( Padding(
padding: EdgeInsets.only(top: 8), padding: const EdgeInsets.only(top: 8),
child: Row(children: [ child: Row(children: [
Expanded(child: _searchStatus == SearchStatus.ACTIVE && _searchQuery != null && _searchQuery!.value.isNotEmpty Expanded(child: _searchStatus == SearchStatus.ACTIVE && _searchQuery != null && _searchQuery!.value.isNotEmpty
? RichTextBuilder( ? RichTextBuilder(
'${_presentationEmail.getPartialContent()}', _presentationEmail.getPartialContent(),
'${_searchQuery!.value}', _searchQuery!.value,
TextStyle(fontSize: 13, color: AppColor.colorContentEmail), const TextStyle(fontSize: 13, color: AppColor.colorContentEmail),
TextStyle(fontSize: 13, color: AppColor.colorContentEmail, backgroundColor: AppColor.bgWordSearch)).build() const TextStyle(fontSize: 13, color: AppColor.colorContentEmail, backgroundColor: AppColor.bgWordSearch)).build()
: Text( : Text(
'${_presentationEmail.getPartialContent()}', _presentationEmail.getPartialContent(),
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 13, color: AppColor.colorContentEmail)) style: const TextStyle(fontSize: 13, color: AppColor.colorContentEmail))
), ),
]) ])
), ),
@@ -189,7 +180,7 @@ class EmailTileBuilder {
) )
), ),
), ),
Padding( const Padding(
padding: EdgeInsets.only(top: 12, right: 12), padding: EdgeInsets.only(top: 12, right: 12),
child: Divider(color: AppColor.lineItemListColor, height: 1, thickness: 0.2)), child: Divider(color: AppColor.lineItemListColor, height: 1, thickness: 0.2)),
]), ]),
@@ -203,11 +194,11 @@ class EmailTileBuilder {
child: Column(children: [ child: Column(children: [
Row(children: [ Row(children: [
Container( Container(
padding: EdgeInsets.only(left: 16, right: 16), padding: const EdgeInsets.only(left: 16, right: 16),
alignment: Alignment.center, alignment: Alignment.center,
child: !_presentationEmail.hasRead child: !_presentationEmail.hasRead
? SvgPicture.asset(_imagePaths.icUnreadStatus, width: 9, height: 9, fit: BoxFit.fill) ? SvgPicture.asset(_imagePaths.icUnreadStatus, width: 9, height: 9, fit: BoxFit.fill)
: SizedBox(width: 9)), : const SizedBox(width: 9)),
buildIconWeb( buildIconWeb(
icon: SvgPicture.asset( icon: SvgPicture.asset(
_presentationEmail.hasStarred ? _imagePaths.icStar : _imagePaths.icUnStar, _presentationEmail.hasStarred ? _imagePaths.icStar : _imagePaths.icUnStar,
@@ -218,61 +209,58 @@ class EmailTileBuilder {
onTap: () => _emailActionClick?.call( onTap: () => _emailActionClick?.call(
_presentationEmail.hasStarred ? EmailActionType.unMarkAsStarred : EmailActionType.markAsStarred, _presentationEmail.hasStarred ? EmailActionType.unMarkAsStarred : EmailActionType.markAsStarred,
_presentationEmail)), _presentationEmail)),
if (_selectModeAll == SelectMode.INACTIVE) SizedBox(width: 8), if (_selectModeAll == SelectMode.INACTIVE) const SizedBox(width: 8),
GestureDetector( GestureDetector(
onTap: () => _emailActionClick?.call( onTap: () => _emailActionClick?.call(
_selectModeAll == SelectMode.ACTIVE ? EmailActionType.selection : EmailActionType.preview, _selectModeAll == SelectMode.ACTIVE ? EmailActionType.selection : EmailActionType.preview,
_presentationEmail), _presentationEmail),
child: _buildAvatarIcon( child: _buildAvatarIcon(
iconSize: 32, iconSize: 32,
textStyle: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Colors.white), textStyle: const TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Colors.white),
paddingIconSelect: EdgeInsets.all(5)), paddingIconSelect: const EdgeInsets.all(5)),
), ),
if (_selectModeAll == SelectMode.INACTIVE) SizedBox(width: 10), if (_selectModeAll == SelectMode.INACTIVE) const SizedBox(width: 10),
Container( SizedBox(
width: 160, width: 160,
child: _isSearchEnabled child: _isSearchEnabled
? RichTextBuilder( ? RichTextBuilder(
_getInformationSender(), _getInformationSender(),
'${_searchQuery!.value}', _searchQuery!.value,
TextStyle(fontSize: 15, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600), const TextStyle(fontSize: 15, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600),
TextStyle(fontSize: 15, color: AppColor.colorNameEmail, backgroundColor: AppColor.bgWordSearch, fontWeight: FontWeight.w600)).build() const TextStyle(fontSize: 15, color: AppColor.colorNameEmail, backgroundColor: AppColor.bgWordSearch, fontWeight: FontWeight.w600)).build()
: Text('${_getInformationSender()}', : Text(_getInformationSender(),
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 15, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600)), style: const TextStyle(fontSize: 15, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600)),
), ),
SizedBox(width: 24), const SizedBox(width: 24),
Expanded(child: _buildSubjectAndContent()), Expanded(child: _buildSubjectAndContent()),
SizedBox(width: 16), const SizedBox(width: 16),
if (_searchStatus == SearchStatus.ACTIVE && _presentationEmail.mailboxName.isNotEmpty) if (_searchStatus == SearchStatus.ACTIVE && _presentationEmail.mailboxName.isNotEmpty)
Container( Container(
margin: EdgeInsets.only(left: 8), margin: const EdgeInsets.only(left: 8),
padding: EdgeInsets.symmetric(horizontal: 8, vertical: 3), padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
constraints: BoxConstraints(maxWidth: 80), constraints: const BoxConstraints(maxWidth: 80),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.backgroundCounterMailboxColor), decoration: BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.backgroundCounterMailboxColor),
child: Text('${_presentationEmail.mailboxName}', child: Text(_presentationEmail.mailboxName,
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 10, color: AppColor.mailboxTextColor, fontWeight: FontWeight.bold), style: const TextStyle(fontSize: 10, color: AppColor.mailboxTextColor, fontWeight: FontWeight.bold),
) )
), ),
if (_presentationEmail.hasAttachment == true) if (_presentationEmail.hasAttachment == true)
Padding(padding: EdgeInsets.only(left: 8), Padding(padding: const EdgeInsets.only(left: 8),
child: (ButtonBuilder(_imagePaths.icAttachment) child: SvgPicture.asset(_imagePaths.icAttachment, width: 16, height: 16, fit: BoxFit.fill)),
..paddingIcon(EdgeInsets.zero)
..size(16))
.build()),
Padding( Padding(
padding: EdgeInsets.only(right: 20, left: 8), padding: const EdgeInsets.only(right: 20, left: 8),
child: Text('${_presentationEmail.getReceivedAt(Localizations.localeOf(_context).toLanguageTag())}', child: Text(_presentationEmail.getReceivedAt(Localizations.localeOf(_context).toLanguageTag()),
maxLines: 1, maxLines: 1,
textAlign: TextAlign.right, textAlign: TextAlign.right,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 13, color: AppColor.colorContentEmail, fontWeight: FontWeight.normal))), style: const TextStyle(fontSize: 13, color: AppColor.colorContentEmail, fontWeight: FontWeight.normal))),
]), ]),
if (_selectModeAll == SelectMode.INACTIVE) if (_selectModeAll == SelectMode.INACTIVE)
Padding( const Padding(
padding: EdgeInsets.only(top: 7.5, bottom: 7.5, left: 70), padding: EdgeInsets.only(top: 7.5, bottom: 7.5, left: 70),
child: Divider(color: AppColor.lineItemListColor, height: 1, thickness: 0.2)), child: Divider(color: AppColor.lineItemListColor, height: 1, thickness: 0.2)),
]), ]),
@@ -286,28 +274,28 @@ class EmailTileBuilder {
constraints: BoxConstraints(maxWidth: constraints.maxWidth / 2), constraints: BoxConstraints(maxWidth: constraints.maxWidth / 2),
child: _isSearchEnabled child: _isSearchEnabled
? RichTextBuilder( ? RichTextBuilder(
'${_presentationEmail.getEmailTitle()}', _presentationEmail.getEmailTitle(),
'${_searchQuery!.value}', _searchQuery!.value,
TextStyle(fontSize: 13, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600), const TextStyle(fontSize: 13, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600),
TextStyle(fontSize: 13, backgroundColor: AppColor.bgWordSearch, color: AppColor.colorNameEmail)).build() const TextStyle(fontSize: 13, backgroundColor: AppColor.bgWordSearch, color: AppColor.colorNameEmail)).build()
: Text('${_presentationEmail.getEmailTitle()}', : Text(_presentationEmail.getEmailTitle(),
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 13, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600)) style: const TextStyle(fontSize: 13, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600))
), ),
if (_presentationEmail.getEmailTitle().isNotEmpty) SizedBox(width: 12), if (_presentationEmail.getEmailTitle().isNotEmpty) const SizedBox(width: 12),
Expanded( Expanded(
child: Container( child: Container(
child: _isSearchEnabled child: _isSearchEnabled
? RichTextBuilder( ? RichTextBuilder(
'${_presentationEmail.getPartialContent()}', _presentationEmail.getPartialContent(),
'${_searchQuery!.value}', _searchQuery!.value,
TextStyle(fontSize: 13, color: AppColor.colorContentEmail, fontWeight: FontWeight.normal), const TextStyle(fontSize: 13, color: AppColor.colorContentEmail, fontWeight: FontWeight.normal),
TextStyle(fontSize: 13, color: AppColor.colorContentEmail, backgroundColor: AppColor.bgWordSearch)).build() const TextStyle(fontSize: 13, color: AppColor.colorContentEmail, backgroundColor: AppColor.bgWordSearch)).build()
: Text('${_presentationEmail.getPartialContent()}', : Text(_presentationEmail.getPartialContent(),
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 13, color: AppColor.colorContentEmail, fontWeight: FontWeight.normal)) style: const TextStyle(fontSize: 13, color: AppColor.colorContentEmail, fontWeight: FontWeight.normal))
) )
), ),
]); ]);
@@ -322,17 +310,29 @@ class EmailTileBuilder {
if (_selectModeAll == SelectMode.ACTIVE) { if (_selectModeAll == SelectMode.ACTIVE) {
return Tooltip( return Tooltip(
child: Padding( child: Padding(
padding: EdgeInsets.all(12), padding: const EdgeInsets.all(12),
child: SvgPicture.asset(_presentationEmail.selectMode == SelectMode.ACTIVE ? _imagePaths.icSelected : _imagePaths.icUnSelected, fit: BoxFit.fill)), child: SvgPicture.asset(_presentationEmail.selectMode == SelectMode.ACTIVE ? _imagePaths.icSelected : _imagePaths.icUnSelected, fit: BoxFit.fill)),
message: AppLocalizations.of(_context).select); message: AppLocalizations.of(_context).select);
} else { } else {
return (AvatarBuilder() return Container(
..text('${_presentationEmail.getAvatarText()}') width: iconSize ?? 56,
..size(iconSize ?? 56) height: iconSize ?? 56,
..textColor(Colors.white) alignment: Alignment.center,
..addTextStyle(textStyle) decoration: BoxDecoration(
..avatarColor(_presentationEmail.avatarColors)) borderRadius: BorderRadius.circular((iconSize ?? 56) * 0.5),
.build(); border: Border.all(color: Colors.transparent),
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
stops: const [0.0, 1.0],
colors: _presentationEmail.avatarColors),
color: AppColor.avatarColor
),
child: Text(
_presentationEmail.getAvatarText(),
style: textStyle ?? const TextStyle(fontSize: 20, color: Colors.white, fontWeight: FontWeight.w500)
)
);
} }
} }
@@ -340,9 +340,9 @@ class EmailTileBuilder {
if (_mailboxRole == PresentationMailbox.roleSent if (_mailboxRole == PresentationMailbox.roleSent
|| _mailboxRole == PresentationMailbox.roleDrafts || _mailboxRole == PresentationMailbox.roleDrafts
|| _mailboxRole == PresentationMailbox.roleOutbox) { || _mailboxRole == PresentationMailbox.roleOutbox) {
return '${_presentationEmail.recipientsName()}'; return _presentationEmail.recipientsName();
} }
return '${_presentationEmail.getSenderName()}'; return _presentationEmail.getSenderName();
} }
bool get _isSearchEnabled => _searchStatus == SearchStatus.ACTIVE bool get _isSearchEnabled => _searchStatus == SearchStatus.ACTIVE
lib/features/thread/presentation/widgets/email_tile_web_builder.dart
+137 -146
View File
@@ -47,17 +47,17 @@ class EmailTileBuilder {
Widget build() { Widget build() {
return Theme( return Theme(
key: Key('thread_tile'), key: const Key('thread_tile'),
data: ThemeData(splashColor: Colors.transparent, highlightColor: Colors.transparent), data: ThemeData(splashColor: Colors.transparent, highlightColor: Colors.transparent),
child: ResponsiveWidget( child: ResponsiveWidget(
responsiveUtils: _responsiveUtils, responsiveUtils: _responsiveUtils,
mobile: Container( mobile: Container(
margin: _selectModeAll == SelectMode.ACTIVE margin: _selectModeAll == SelectMode.ACTIVE
? EdgeInsets.only(top: 3, left: 16, right: 16) ? const EdgeInsets.only(top: 3, left: 16, right: 16)
: EdgeInsets.zero, : EdgeInsets.zero,
padding: _selectModeAll == SelectMode.ACTIVE padding: _selectModeAll == SelectMode.ACTIVE
? EdgeInsets.only(top: 8, bottom: 16, right: 8) ? const EdgeInsets.only(top: 8, bottom: 16, right: 8)
: EdgeInsets.only(bottom: 10, left: 16, right: 16), : const EdgeInsets.only(bottom: 10, left: 16, right: 16),
decoration: _selectModeAll == SelectMode.ACTIVE && _presentationEmail.selectMode == SelectMode.ACTIVE decoration: _selectModeAll == SelectMode.ACTIVE && _presentationEmail.selectMode == SelectMode.ACTIVE
? BoxDecoration(borderRadius: BorderRadius.circular(14), color: AppColor.colorItemEmailSelectedDesktop) ? BoxDecoration(borderRadius: BorderRadius.circular(14), color: AppColor.colorItemEmailSelectedDesktop)
: BoxDecoration(borderRadius: BorderRadius.circular(0), color: Colors.white), : BoxDecoration(borderRadius: BorderRadius.circular(0), color: Colors.white),
@@ -65,11 +65,11 @@ class EmailTileBuilder {
child: _buildListTile()), child: _buildListTile()),
tablet: Container( tablet: Container(
margin: _selectModeAll == SelectMode.ACTIVE margin: _selectModeAll == SelectMode.ACTIVE
? EdgeInsets.only(top: 3, left: 16, right: 16) ? const EdgeInsets.only(top: 3, left: 16, right: 16)
: EdgeInsets.zero, : EdgeInsets.zero,
padding: _selectModeAll == SelectMode.ACTIVE padding: _selectModeAll == SelectMode.ACTIVE
? EdgeInsets.only(top: 8, bottom: 16, right: 8) ? const EdgeInsets.only(top: 8, bottom: 16, right: 8)
: EdgeInsets.only(bottom: 10, left: 16, right: 16), : const EdgeInsets.only(bottom: 10, left: 16, right: 16),
decoration: _selectModeAll == SelectMode.ACTIVE && _presentationEmail.selectMode == SelectMode.ACTIVE decoration: _selectModeAll == SelectMode.ACTIVE && _presentationEmail.selectMode == SelectMode.ACTIVE
? BoxDecoration(borderRadius: BorderRadius.circular(14), color: AppColor.colorItemEmailSelectedDesktop) ? BoxDecoration(borderRadius: BorderRadius.circular(14), color: AppColor.colorItemEmailSelectedDesktop)
: BoxDecoration(borderRadius: BorderRadius.circular(0), color: Colors.white), : BoxDecoration(borderRadius: BorderRadius.circular(0), color: Colors.white),
@@ -77,19 +77,19 @@ class EmailTileBuilder {
child: _buildListTileTabletLarge()), child: _buildListTileTabletLarge()),
tabletLarge: Container( tabletLarge: Container(
margin: _selectModeAll == SelectMode.ACTIVE margin: _selectModeAll == SelectMode.ACTIVE
? EdgeInsets.only(top: 3, left: 16, right: 16) ? const EdgeInsets.only(top: 3, left: 16, right: 16)
: EdgeInsets.zero, : EdgeInsets.zero,
padding: _selectModeAll == SelectMode.ACTIVE padding: _selectModeAll == SelectMode.ACTIVE
? EdgeInsets.only(top: 8, bottom: 16, right: 8) ? const EdgeInsets.only(top: 8, bottom: 16, right: 8)
: EdgeInsets.only(bottom: 10, left: 16, right: 16), : const EdgeInsets.only(bottom: 10, left: 16, right: 16),
decoration: _selectModeAll == SelectMode.ACTIVE && _presentationEmail.selectMode == SelectMode.ACTIVE decoration: _selectModeAll == SelectMode.ACTIVE && _presentationEmail.selectMode == SelectMode.ACTIVE
? BoxDecoration(borderRadius: BorderRadius.circular(14), color: AppColor.colorItemEmailSelectedDesktop) ? BoxDecoration(borderRadius: BorderRadius.circular(14), color: AppColor.colorItemEmailSelectedDesktop)
: BoxDecoration(borderRadius: BorderRadius.circular(0), color: Colors.white), : BoxDecoration(borderRadius: BorderRadius.circular(0), color: Colors.white),
alignment: Alignment.center, alignment: Alignment.center,
child: _buildListTileTabletLarge()), child: _buildListTileTabletLarge()),
desktop: Container( desktop: Container(
margin: _selectModeAll == SelectMode.ACTIVE ? EdgeInsets.only(top: 3, left: 8, right: 8) : EdgeInsets.zero, margin: _selectModeAll == SelectMode.ACTIVE ? const EdgeInsets.only(top: 3, left: 8, right: 8) : EdgeInsets.zero,
padding: _selectModeAll == SelectMode.ACTIVE ? EdgeInsets.symmetric(vertical: 8) : EdgeInsets.zero, padding: _selectModeAll == SelectMode.ACTIVE ? const EdgeInsets.symmetric(vertical: 8) : EdgeInsets.zero,
decoration: _selectModeAll == SelectMode.ACTIVE && _presentationEmail.selectMode == SelectMode.ACTIVE decoration: _selectModeAll == SelectMode.ACTIVE && _presentationEmail.selectMode == SelectMode.ACTIVE
? BoxDecoration( ? BoxDecoration(
borderRadius: BorderRadius.circular(14), borderRadius: BorderRadius.circular(14),
@@ -116,37 +116,31 @@ class EmailTileBuilder {
title: Row(children: [ title: Row(children: [
if (!_presentationEmail.hasRead) if (!_presentationEmail.hasRead)
Padding( Padding(
padding: EdgeInsets.only(right: 5), padding: const EdgeInsets.only(right: 5),
child: SvgPicture.asset(_imagePaths.icUnreadStatus, width: 9, height: 9, fit: BoxFit.fill)), child: SvgPicture.asset(_imagePaths.icUnreadStatus, width: 9, height: 9, fit: BoxFit.fill)),
Expanded( Expanded(
child: _searchStatus == SearchStatus.ACTIVE && _searchQuery != null && _searchQuery!.value.isNotEmpty child: _searchStatus == SearchStatus.ACTIVE && _searchQuery != null && _searchQuery!.value.isNotEmpty
? RichTextBuilder( ? RichTextBuilder(
_getInformationSender(), _getInformationSender(),
'${_searchQuery!.value}', _searchQuery!.value,
TextStyle(fontSize: 15, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600), const TextStyle(fontSize: 15, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600),
TextStyle(fontSize: 15, color: AppColor.colorNameEmail, backgroundColor: AppColor.bgWordSearch, fontWeight: FontWeight.w600)).build() const TextStyle(fontSize: 15, color: AppColor.colorNameEmail, backgroundColor: AppColor.bgWordSearch, fontWeight: FontWeight.w600)).build()
: Text( : Text(
_getInformationSender(), _getInformationSender(),
maxLines: 1, maxLines: 1,
style: TextStyle(fontSize: 15, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600)) style: const TextStyle(fontSize: 15, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600))
), ),
if (_presentationEmail.hasAttachment == true) if (_presentationEmail.hasAttachment == true)
Padding( Padding(
padding: EdgeInsets.only(left: 8), padding: const EdgeInsets.only(left: 8),
child: (ButtonBuilder(_imagePaths.icAttachment) child: SvgPicture.asset(_imagePaths.icAttachment, width: 16, height: 16, fit: BoxFit.fill)),
..paddingIcon(EdgeInsets.zero)
..size(16))
.build()),
Padding( Padding(
padding: EdgeInsets.only(right: 4, left: 8), padding: const EdgeInsets.only(right: 4, left: 8),
child: Text( child: Text(
'${_presentationEmail.getReceivedAt(Localizations.localeOf(_context).toLanguageTag())}', _presentationEmail.getReceivedAt(Localizations.localeOf(_context).toLanguageTag()),
maxLines: 1, maxLines: 1,
style: TextStyle(fontSize: 13, color: AppColor.colorContentEmail))), style: const TextStyle(fontSize: 13, color: AppColor.colorContentEmail))),
(ButtonBuilder(_imagePaths.icChevron) SvgPicture.asset(_imagePaths.icChevron, width: 16, height: 16, fit: BoxFit.fill)
..paddingIcon(EdgeInsets.zero)
..size(16))
.build(),
]), ]),
subtitle: Transform( subtitle: Transform(
transform: Matrix4.translationValues(0.0, 8.0, 0.0), transform: Matrix4.translationValues(0.0, 8.0, 0.0),
@@ -161,53 +155,50 @@ class EmailTileBuilder {
children: [ children: [
Expanded(child: _searchStatus == SearchStatus.ACTIVE && _searchQuery != null && _searchQuery!.value.isNotEmpty Expanded(child: _searchStatus == SearchStatus.ACTIVE && _searchQuery != null && _searchQuery!.value.isNotEmpty
? RichTextBuilder( ? RichTextBuilder(
'${_presentationEmail.getEmailTitle()}', _presentationEmail.getEmailTitle(),
'${_searchQuery!.value}', _searchQuery!.value,
TextStyle(fontSize: 13, color: AppColor.colorNameEmail), const TextStyle(fontSize: 13, color: AppColor.colorNameEmail),
TextStyle(fontSize: 13, backgroundColor: AppColor.bgWordSearch, color: AppColor.colorNameEmail)).build() const TextStyle(fontSize: 13, backgroundColor: AppColor.bgWordSearch, color: AppColor.colorNameEmail)).build()
: Text( : Text(
'${_presentationEmail.getEmailTitle()}', _presentationEmail.getEmailTitle(),
maxLines: 1, maxLines: 1,
style: TextStyle(fontSize: 13, color: AppColor.colorNameEmail)) style: const TextStyle(fontSize: 13, color: AppColor.colorNameEmail))
), ),
if (_searchStatus == SearchStatus.ACTIVE && _presentationEmail.mailboxName.isNotEmpty) if (_searchStatus == SearchStatus.ACTIVE && _presentationEmail.mailboxName.isNotEmpty)
Container( Container(
margin: EdgeInsets.only(left: 8), margin: const EdgeInsets.only(left: 8),
padding: EdgeInsets.only(left: 8, right: 8, top: 3, bottom: 3), padding: const EdgeInsets.only(left: 8, right: 8, top: 3, bottom: 3),
constraints: BoxConstraints(maxWidth: 100), constraints: const BoxConstraints(maxWidth: 100),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
color: AppColor.backgroundCounterMailboxColor), color: AppColor.backgroundCounterMailboxColor),
child: Text( child: Text(
'${_presentationEmail.mailboxName}', _presentationEmail.mailboxName,
maxLines: 1, maxLines: 1,
style: TextStyle(fontSize: 10, color: AppColor.mailboxTextColor, fontWeight: FontWeight.bold), style: const TextStyle(fontSize: 10, color: AppColor.mailboxTextColor, fontWeight: FontWeight.bold),
) )
), ),
if (_presentationEmail.hasStarred) if (_presentationEmail.hasStarred)
(ButtonBuilder(_imagePaths.icStar) SvgPicture.asset(_imagePaths.icStar, width: 15, height: 15, fit: BoxFit.fill),
..paddingIcon(EdgeInsets.zero)
..size(15))
.build(),
], ],
)), )),
Padding( Padding(
padding: EdgeInsets.only(top: 8), padding: const EdgeInsets.only(top: 8),
child: Row(children: [ child: Row(children: [
Expanded(child: _searchStatus == SearchStatus.ACTIVE && _searchQuery != null && _searchQuery!.value.isNotEmpty Expanded(child: _searchStatus == SearchStatus.ACTIVE && _searchQuery != null && _searchQuery!.value.isNotEmpty
? RichTextBuilder( ? RichTextBuilder(
'${_presentationEmail.getPartialContent()}', _presentationEmail.getPartialContent(),
'${_searchQuery!.value}', _searchQuery!.value,
TextStyle(fontSize: 13, color: AppColor.colorContentEmail), const TextStyle(fontSize: 13, color: AppColor.colorContentEmail),
TextStyle(fontSize: 13, color: AppColor.colorContentEmail, backgroundColor: AppColor.bgWordSearch)).build() const TextStyle(fontSize: 13, color: AppColor.colorContentEmail, backgroundColor: AppColor.bgWordSearch)).build()
: Text( : Text(
'${_presentationEmail.getPartialContent()}', _presentationEmail.getPartialContent(),
maxLines: 1, maxLines: 1,
style: TextStyle(fontSize: 13, color: AppColor.colorContentEmail)) style: const TextStyle(fontSize: 13, color: AppColor.colorContentEmail))
), ),
])), ])),
if (_selectModeAll == SelectMode.INACTIVE) if (_selectModeAll == SelectMode.INACTIVE)
Padding( const Padding(
padding: EdgeInsets.only(top: 12), padding: EdgeInsets.only(top: 12),
child: Divider(color: AppColor.lineItemListColor, height: 1, thickness: 0.2)), child: Divider(color: AppColor.lineItemListColor, height: 1, thickness: 0.2)),
], ],
@@ -225,32 +216,32 @@ class EmailTileBuilder {
onHover: (value) => setState(() => isHoverItem = value), onHover: (value) => setState(() => isHoverItem = value),
child: Row(crossAxisAlignment: CrossAxisAlignment.start, children: [ child: Row(crossAxisAlignment: CrossAxisAlignment.start, children: [
Padding( Padding(
padding: EdgeInsets.only(top: 8), padding: const EdgeInsets.only(top: 8),
child: GestureDetector( child: GestureDetector(
onTap: () => _emailActionClick?.call( onTap: () => _emailActionClick?.call(
_selectModeAll == SelectMode.ACTIVE ? EmailActionType.selection : EmailActionType.preview, _selectModeAll == SelectMode.ACTIVE ? EmailActionType.selection : EmailActionType.preview,
_presentationEmail), _presentationEmail),
child: _buildAvatarIcon())), child: _buildAvatarIcon())),
SizedBox(width: 12), const SizedBox(width: 12),
Expanded(child: Column(children: [ Expanded(child: Column(children: [
Transform( Transform(
transform: Matrix4.translationValues(0.0, isHoverItem ? -10.0 : 0.0, 0.0), transform: Matrix4.translationValues(0.0, isHoverItem ? -10.0 : 0.0, 0.0),
child: Row(children: [ child: Row(children: [
if (!_presentationEmail.hasRead) if (!_presentationEmail.hasRead)
Padding( Padding(
padding: EdgeInsets.only(right: 5), padding: const EdgeInsets.only(right: 5),
child: SvgPicture.asset(_imagePaths.icUnreadStatus, width: 9, height: 9, fit: BoxFit.fill)), child: SvgPicture.asset(_imagePaths.icUnreadStatus, width: 9, height: 9, fit: BoxFit.fill)),
Expanded( Expanded(
child: _searchStatus == SearchStatus.ACTIVE && _searchQuery != null && _searchQuery!.value.isNotEmpty child: _searchStatus == SearchStatus.ACTIVE && _searchQuery != null && _searchQuery!.value.isNotEmpty
? RichTextBuilder( ? RichTextBuilder(
_getInformationSender(), _getInformationSender(),
'${_searchQuery!.value}', _searchQuery!.value,
TextStyle(fontSize: 15, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600), const TextStyle(fontSize: 15, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600),
TextStyle(fontSize: 15, color: AppColor.colorNameEmail, backgroundColor: AppColor.bgWordSearch, fontWeight: FontWeight.w600)).build() const TextStyle(fontSize: 15, color: AppColor.colorNameEmail, backgroundColor: AppColor.bgWordSearch, fontWeight: FontWeight.w600)).build()
: Text( : Text(
_getInformationSender(), _getInformationSender(),
maxLines: 1, maxLines: 1,
style: TextStyle(fontSize: 15, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600)) style: const TextStyle(fontSize: 15, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600))
), ),
if (isHoverItem) if (isHoverItem)
_buildListActionButtonWhenHover() _buildListActionButtonWhenHover()
@@ -270,55 +261,52 @@ class EmailTileBuilder {
children: [ children: [
Expanded(child: _searchStatus == SearchStatus.ACTIVE && _searchQuery != null && _searchQuery!.value.isNotEmpty Expanded(child: _searchStatus == SearchStatus.ACTIVE && _searchQuery != null && _searchQuery!.value.isNotEmpty
? RichTextBuilder( ? RichTextBuilder(
'${_presentationEmail.getEmailTitle()}', _presentationEmail.getEmailTitle(),
'${_searchQuery!.value}', _searchQuery!.value,
TextStyle(fontSize: 13, color: AppColor.colorNameEmail), const TextStyle(fontSize: 13, color: AppColor.colorNameEmail),
TextStyle(fontSize: 13, backgroundColor: AppColor.bgWordSearch, color: AppColor.colorNameEmail)).build() const TextStyle(fontSize: 13, backgroundColor: AppColor.bgWordSearch, color: AppColor.colorNameEmail)).build()
: Text( : Text(
'${_presentationEmail.getEmailTitle()}', _presentationEmail.getEmailTitle(),
maxLines: 1, maxLines: 1,
style: TextStyle(fontSize: 13, color: AppColor.colorNameEmail)) style: const TextStyle(fontSize: 13, color: AppColor.colorNameEmail))
), ),
if (_searchStatus == SearchStatus.ACTIVE && _presentationEmail.mailboxName.isNotEmpty) if (_searchStatus == SearchStatus.ACTIVE && _presentationEmail.mailboxName.isNotEmpty)
Container( Container(
margin: EdgeInsets.only(left: 8), margin: const EdgeInsets.only(left: 8),
padding: EdgeInsets.only(left: 8, right: 8, top: 3, bottom: 3), padding: const EdgeInsets.only(left: 8, right: 8, top: 3, bottom: 3),
constraints: BoxConstraints(maxWidth: 100), constraints: const BoxConstraints(maxWidth: 100),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
color: AppColor.backgroundCounterMailboxColor), color: AppColor.backgroundCounterMailboxColor),
child: Text( child: Text(
'${_presentationEmail.mailboxName}', _presentationEmail.mailboxName,
maxLines: 1, maxLines: 1,
style: TextStyle(fontSize: 10, color: AppColor.mailboxTextColor, fontWeight: FontWeight.bold), style: const TextStyle(fontSize: 10, color: AppColor.mailboxTextColor, fontWeight: FontWeight.bold),
) )
), ),
if (_presentationEmail.hasStarred) if (_presentationEmail.hasStarred)
(ButtonBuilder(_imagePaths.icStar) SvgPicture.asset(_imagePaths.icStar, width: 15, height: 15, fit: BoxFit.fill)
..paddingIcon(EdgeInsets.zero)
..size(15))
.build(),
], ],
)), )),
Padding( Padding(
padding: EdgeInsets.only(top: 8), padding: const EdgeInsets.only(top: 8),
child: Row(children: [ child: Row(children: [
Expanded(child: _searchStatus == Expanded(child: _searchStatus ==
SearchStatus.ACTIVE && _searchQuery != null && SearchStatus.ACTIVE && _searchQuery != null &&
_searchQuery!.value.isNotEmpty _searchQuery!.value.isNotEmpty
? RichTextBuilder( ? RichTextBuilder(
'${_presentationEmail.getPartialContent()}', _presentationEmail.getPartialContent(),
'${_searchQuery!.value}', _searchQuery!.value,
TextStyle(fontSize: 13, color: AppColor.colorContentEmail), const TextStyle(fontSize: 13, color: AppColor.colorContentEmail),
TextStyle(fontSize: 13, color: AppColor.colorContentEmail, backgroundColor: AppColor.bgWordSearch)).build() const TextStyle(fontSize: 13, color: AppColor.colorContentEmail, backgroundColor: AppColor.bgWordSearch)).build()
: Text( : Text(
'${_presentationEmail.getPartialContent()}', _presentationEmail.getPartialContent(),
maxLines: 1, maxLines: 1,
style: TextStyle(fontSize: 13, color: AppColor.colorContentEmail)) style: const TextStyle(fontSize: 13, color: AppColor.colorContentEmail))
), ),
])), ])),
if (_selectModeAll == SelectMode.INACTIVE) if (_selectModeAll == SelectMode.INACTIVE)
Padding( const Padding(
padding: EdgeInsets.only(top: 12), padding: EdgeInsets.only(top: 12),
child: Divider(color: AppColor.lineItemListColor, height: 1, thickness: 0.2)), child: Divider(color: AppColor.lineItemListColor, height: 1, thickness: 0.2)),
], ],
@@ -339,11 +327,11 @@ class EmailTileBuilder {
child: Column(children: [ child: Column(children: [
Row(children: [ Row(children: [
Container( Container(
padding: EdgeInsets.only(left: 16, right: 16), padding: const EdgeInsets.only(left: 16, right: 16),
alignment: Alignment.center, alignment: Alignment.center,
child: !_presentationEmail.hasRead child: !_presentationEmail.hasRead
? SvgPicture.asset(_imagePaths.icUnreadStatus, width: 9, height: 9, fit: BoxFit.fill) ? SvgPicture.asset(_imagePaths.icUnreadStatus, width: 9, height: 9, fit: BoxFit.fill)
: SizedBox(width: 9)), : const SizedBox(width: 9)),
buildIconWeb( buildIconWeb(
icon: SvgPicture.asset( icon: SvgPicture.asset(
_presentationEmail.hasStarred ? _imagePaths.icStar : _imagePaths.icUnStar, _presentationEmail.hasStarred ? _imagePaths.icStar : _imagePaths.icUnStar,
@@ -354,7 +342,7 @@ class EmailTileBuilder {
onTap: () => _emailActionClick?.call( onTap: () => _emailActionClick?.call(
_presentationEmail.hasStarred ? EmailActionType.unMarkAsStarred : EmailActionType.markAsStarred, _presentationEmail.hasStarred ? EmailActionType.unMarkAsStarred : EmailActionType.markAsStarred,
_presentationEmail)), _presentationEmail)),
if (_selectModeAll == SelectMode.INACTIVE) SizedBox(width: 8), if (_selectModeAll == SelectMode.INACTIVE) const SizedBox(width: 8),
GestureDetector( GestureDetector(
onTap: () { onTap: () {
if (_selectModeAll == SelectMode.ACTIVE) { if (_selectModeAll == SelectMode.ACTIVE) {
@@ -365,32 +353,32 @@ class EmailTileBuilder {
}, },
child: _buildAvatarIcon( child: _buildAvatarIcon(
iconSize: 32, iconSize: 32,
textStyle: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Colors.white), textStyle: const TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Colors.white),
paddingIconSelect: EdgeInsets.all(5)), paddingIconSelect: const EdgeInsets.all(5)),
), ),
if (_selectModeAll == SelectMode.INACTIVE) SizedBox(width: 10), if (_selectModeAll == SelectMode.INACTIVE) const SizedBox(width: 10),
Container( SizedBox(
width: 160, width: 160,
child: _isSearchEnabled child: _isSearchEnabled
? RichTextBuilder( ? RichTextBuilder(
_getInformationSender(), _getInformationSender(),
'${_searchQuery!.value}', _searchQuery!.value,
TextStyle(fontSize: 15, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600), const TextStyle(fontSize: 15, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600),
TextStyle(fontSize: 15, color: AppColor.colorNameEmail, backgroundColor: AppColor.bgWordSearch, fontWeight: FontWeight.w600)).build() const TextStyle(fontSize: 15, color: AppColor.colorNameEmail, backgroundColor: AppColor.bgWordSearch, fontWeight: FontWeight.w600)).build()
: Text('${_getInformationSender()}', : Text(_getInformationSender(),
maxLines: 1, maxLines: 1,
style: TextStyle(fontSize: 15, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600)), style: const TextStyle(fontSize: 15, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600)),
), ),
SizedBox(width: 24), const SizedBox(width: 24),
Expanded(child: _buildSubjectAndContent()), Expanded(child: _buildSubjectAndContent()),
SizedBox(width: 16), const SizedBox(width: 16),
if (isHoverItem) if (isHoverItem)
_buildListActionButtonWhenHover() _buildListActionButtonWhenHover()
else else
_buildDateTimeForDesktopScreen() _buildDateTimeForDesktopScreen()
]), ]),
if (_selectModeAll == SelectMode.INACTIVE) if (_selectModeAll == SelectMode.INACTIVE)
Padding( const Padding(
padding: EdgeInsets.only(top: 7.5, bottom: 7.5, left: 70), padding: EdgeInsets.only(top: 7.5, bottom: 7.5, left: 70),
child: Divider(color: AppColor.lineItemListColor, height: 1, thickness: 0.2)), child: Divider(color: AppColor.lineItemListColor, height: 1, thickness: 0.2)),
]), ]),
@@ -454,7 +442,7 @@ class EmailTileBuilder {
_onMoreActionClick?.call(_presentationEmail, position); _onMoreActionClick?.call(_presentationEmail, position);
} }
}), }),
if (_responsiveUtils.isDesktop(_context)) SizedBox(width: 16), if (_responsiveUtils.isDesktop(_context)) const SizedBox(width: 16),
]); ]);
} }
@@ -462,25 +450,22 @@ class EmailTileBuilder {
return Row(children: [ return Row(children: [
if (_searchStatus == SearchStatus.ACTIVE && _presentationEmail.mailboxName.isNotEmpty) if (_searchStatus == SearchStatus.ACTIVE && _presentationEmail.mailboxName.isNotEmpty)
Container( Container(
margin: EdgeInsets.only(left: 8), margin: const EdgeInsets.only(left: 8),
padding: EdgeInsets.symmetric(horizontal: 8, vertical: 3), padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
constraints: BoxConstraints(maxWidth: 100), constraints: const BoxConstraints(maxWidth: 100),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.backgroundCounterMailboxColor), decoration: BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.backgroundCounterMailboxColor),
child: Text('${_presentationEmail.mailboxName}', child: Text(_presentationEmail.mailboxName,
maxLines: 1, maxLines: 1,
style: TextStyle(fontSize: 10, color: AppColor.mailboxTextColor, fontWeight: FontWeight.bold), style: const TextStyle(fontSize: 10, color: AppColor.mailboxTextColor, fontWeight: FontWeight.bold),
) )
), ),
if (_presentationEmail.hasAttachment == true) if (_presentationEmail.hasAttachment == true)
Padding(padding: EdgeInsets.only(left: 8), Padding(padding: const EdgeInsets.only(left: 8),
child: (ButtonBuilder(_imagePaths.icAttachment) child: SvgPicture.asset(_imagePaths.icAttachment, width: 16, height: 16, fit: BoxFit.fill)),
..paddingIcon(EdgeInsets.zero) Padding(padding: const EdgeInsets.only(right: 20, left: 8),
..size(16)) child: Text(_presentationEmail.getReceivedAt(Localizations.localeOf(_context).toLanguageTag()),
.build()),
Padding(padding: EdgeInsets.only(right: 20, left: 8),
child: Text('${_presentationEmail.getReceivedAt(Localizations.localeOf(_context).toLanguageTag())}',
maxLines: 1, maxLines: 1,
style: TextStyle(fontSize: 13, color: AppColor.colorContentEmail, fontWeight: FontWeight.normal))) style: const TextStyle(fontSize: 13, color: AppColor.colorContentEmail, fontWeight: FontWeight.normal)))
]); ]);
} }
@@ -488,20 +473,14 @@ class EmailTileBuilder {
return Row(children: [ return Row(children: [
if (_presentationEmail.hasAttachment == true) if (_presentationEmail.hasAttachment == true)
Padding( Padding(
padding: EdgeInsets.only(left: 8), padding: const EdgeInsets.only(left: 8),
child: (ButtonBuilder(_imagePaths.icAttachment) child: SvgPicture.asset(_imagePaths.icAttachment, width: 16, height: 16, fit: BoxFit.fill)),
..paddingIcon(EdgeInsets.zero)
..size(16))
.build()),
Padding( Padding(
padding: EdgeInsets.only(right: 4, left: 8), padding: const EdgeInsets.only(right: 4, left: 8),
child: Text('${_presentationEmail.getReceivedAt(Localizations.localeOf(_context).toLanguageTag())}', child: Text(_presentationEmail.getReceivedAt(Localizations.localeOf(_context).toLanguageTag()),
maxLines: 1, maxLines: 1,
style: TextStyle(fontSize: 13, color: AppColor.colorContentEmail))), style: const TextStyle(fontSize: 13, color: AppColor.colorContentEmail))),
(ButtonBuilder(_imagePaths.icChevron) SvgPicture.asset(_imagePaths.icChevron, width: 16, height: 16, fit: BoxFit.fill)
..paddingIcon(EdgeInsets.zero)
..size(16))
.build()
]); ]);
} }
@@ -512,26 +491,26 @@ class EmailTileBuilder {
constraints: BoxConstraints(maxWidth: constraints.maxWidth / 2), constraints: BoxConstraints(maxWidth: constraints.maxWidth / 2),
child: _isSearchEnabled child: _isSearchEnabled
? RichTextBuilder( ? RichTextBuilder(
'${_presentationEmail.getEmailTitle()}', _presentationEmail.getEmailTitle(),
'${_searchQuery!.value}', _searchQuery!.value,
TextStyle(fontSize: 13, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600), const TextStyle(fontSize: 13, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600),
TextStyle(fontSize: 13, backgroundColor: AppColor.bgWordSearch, color: AppColor.colorNameEmail)).build() const TextStyle(fontSize: 13, backgroundColor: AppColor.bgWordSearch, color: AppColor.colorNameEmail)).build()
: Text('${_presentationEmail.getEmailTitle()}', : Text(_presentationEmail.getEmailTitle(),
maxLines: 1, maxLines: 1,
style: TextStyle(fontSize: 13, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600)) style: const TextStyle(fontSize: 13, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600))
), ),
if (_presentationEmail.getEmailTitle().isNotEmpty) SizedBox(width: 12), if (_presentationEmail.getEmailTitle().isNotEmpty) const SizedBox(width: 12),
Expanded( Expanded(
child: Container( child: Container(
child: _isSearchEnabled child: _isSearchEnabled
? RichTextBuilder( ? RichTextBuilder(
'${_presentationEmail.getPartialContent()}', _presentationEmail.getPartialContent(),
'${_searchQuery!.value}', _searchQuery!.value,
TextStyle(fontSize: 13, color: AppColor.colorContentEmail, fontWeight: FontWeight.normal), const TextStyle(fontSize: 13, color: AppColor.colorContentEmail, fontWeight: FontWeight.normal),
TextStyle(fontSize: 13, color: AppColor.colorContentEmail, backgroundColor: AppColor.bgWordSearch)).build() const TextStyle(fontSize: 13, color: AppColor.colorContentEmail, backgroundColor: AppColor.bgWordSearch)).build()
: Text('${_presentationEmail.getPartialContent()}', : Text(_presentationEmail.getPartialContent(),
maxLines: 1, maxLines: 1,
style: TextStyle(fontSize: 13, color: AppColor.colorContentEmail, fontWeight: FontWeight.normal)) style: const TextStyle(fontSize: 13, color: AppColor.colorContentEmail, fontWeight: FontWeight.normal))
) )
), ),
]); ]);
@@ -546,17 +525,29 @@ class EmailTileBuilder {
if (_selectModeAll == SelectMode.ACTIVE) { if (_selectModeAll == SelectMode.ACTIVE) {
return Tooltip( return Tooltip(
child: Padding( child: Padding(
padding: EdgeInsets.all(12), padding: const EdgeInsets.all(12),
child: SvgPicture.asset(_presentationEmail.selectMode == SelectMode.ACTIVE ? _imagePaths.icSelected : _imagePaths.icUnSelected, fit: BoxFit.fill)), child: SvgPicture.asset(_presentationEmail.selectMode == SelectMode.ACTIVE ? _imagePaths.icSelected : _imagePaths.icUnSelected, fit: BoxFit.fill)),
message: AppLocalizations.of(_context).select); message: AppLocalizations.of(_context).select);
} else { } else {
return (AvatarBuilder() return Container(
..text('${_presentationEmail.getAvatarText()}') width: iconSize ?? 48,
..size(iconSize ?? 48) height: iconSize ?? 48,
..textColor(Colors.white) alignment: Alignment.center,
..addTextStyle(textStyle) decoration: BoxDecoration(
..avatarColor(_presentationEmail.avatarColors)) borderRadius: BorderRadius.circular((iconSize ?? 48) * 0.5),
.build(); border: Border.all(color: Colors.transparent),
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
stops: const [0.0, 1.0],
colors: _presentationEmail.avatarColors),
color: AppColor.avatarColor
),
child: Text(
_presentationEmail.getAvatarText(),
style: textStyle ?? const TextStyle(fontSize: 20, color: Colors.white, fontWeight: FontWeight.w500)
)
);
} }
} }
@@ -564,9 +555,9 @@ class EmailTileBuilder {
if (_mailboxRole == PresentationMailbox.roleSent if (_mailboxRole == PresentationMailbox.roleSent
|| _mailboxRole == PresentationMailbox.roleDrafts || _mailboxRole == PresentationMailbox.roleDrafts
|| _mailboxRole == PresentationMailbox.roleOutbox) { || _mailboxRole == PresentationMailbox.roleOutbox) {
return '${_presentationEmail.recipientsName()}'; return _presentationEmail.recipientsName();
} }
return '${_presentationEmail.getSenderName()}'; return _presentationEmail.getSenderName();
} }
bool get _isSearchEnabled => _searchStatus == SearchStatus.ACTIVE bool get _isSearchEnabled => _searchStatus == SearchStatus.ACTIVE
lib/features/thread/presentation/widgets/filter_message_cupertino_action_sheet_action_builder.dart
+2 -2
View File
@@ -36,12 +36,12 @@ class FilterMessageCupertinoActionSheetActionBuilder extends CupertinoActionShee
key: key, key: key,
child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [ child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [
Padding( Padding(
padding: iconLeftPadding ?? EdgeInsets.only(left: 12, right: 16), padding: iconLeftPadding ?? const EdgeInsets.only(left: 12, right: 16),
child: actionIcon), child: actionIcon),
Expanded(child: Text(actionName, textAlign: TextAlign.left, style: actionTextStyle())), Expanded(child: Text(actionName, textAlign: TextAlign.left, style: actionTextStyle())),
if (optionCurrent == option && actionSelected != null) if (optionCurrent == option && actionSelected != null)
Padding( Padding(
padding: iconRightPadding ?? EdgeInsets.only(right: 12), padding: iconRightPadding ?? const EdgeInsets.only(right: 12),
child: actionSelected!), child: actionSelected!),
]), ]),
onPressed: () { onPressed: () {
lib/features/thread/presentation/widgets/search_app_bar_widget.dart
+6 -6
View File
@@ -88,13 +88,13 @@ class SearchAppBarWidget {
Widget build() { Widget build() {
return Container( return Container(
key: Key('search_app_bar_widget'), key: const Key('search_app_bar_widget'),
height: _heightSearchBar, height: _heightSearchBar,
decoration: _decoration, decoration: _decoration,
padding: _padding ?? EdgeInsets.zero, padding: _padding ?? EdgeInsets.zero,
margin: _margin, margin: _margin,
child: MediaQuery( child: MediaQuery(
data: MediaQueryData(padding: EdgeInsets.zero), data: const MediaQueryData(padding: EdgeInsets.zero),
child: Row( child: Row(
children: [ children: [
if (hasBackButton) _buildBackButton(), if (hasBackButton) _buildBackButton(),
@@ -133,22 +133,22 @@ class SearchAppBarWidget {
Widget _buildSearchInputForm() { Widget _buildSearchInputForm() {
return (TextFieldBuilder() return (TextFieldBuilder()
..key(Key('search_input_form')) ..key(const Key('search_input_form'))
..textInputAction(TextInputAction.done) ..textInputAction(TextInputAction.done)
..onChange((value) => _onTextChangeSearchAction?.call(value)) ..onChange((value) => _onTextChangeSearchAction?.call(value))
..onSubmitted((value) => _onSearchTextAction?.call(value)) ..onSubmitted((value) => _onSearchTextAction?.call(value))
..cursorColor(AppColor.colorTextButton) ..cursorColor(AppColor.colorTextButton)
..autoFocus(true) ..autoFocus(true)
..addFocusNode(_searchFocusNode) ..addFocusNode(_searchFocusNode)
..textStyle(TextStyle(color: AppColor.colorNameEmail, fontSize: 17)) ..textStyle(const TextStyle(color: AppColor.colorNameEmail, fontSize: 17))
..textDecoration(InputDecoration( ..textDecoration(InputDecoration(
border: InputBorder.none, border: InputBorder.none,
focusedBorder: InputBorder.none, focusedBorder: InputBorder.none,
enabledBorder: InputBorder.none, enabledBorder: InputBorder.none,
contentPadding: EdgeInsets.zero, contentPadding: EdgeInsets.zero,
hintText: _hintText, hintText: _hintText,
hintStyle: TextStyle(color: AppColor.colorHintSearchBar, fontSize: 17.0), hintStyle: const TextStyle(color: AppColor.colorHintSearchBar, fontSize: 17.0),
labelStyle: TextStyle(color: AppColor.colorHintSearchBar, fontSize: 17.0))) labelStyle: const TextStyle(color: AppColor.colorHintSearchBar, fontSize: 17.0)))
..addController(_searchInputController)) ..addController(_searchInputController))
.build(); .build();
} }
lib/features/thread/presentation/widgets/suggestion_box_widget.dart
+4 -4
View File
@@ -15,7 +15,7 @@ class SuggestionBoxWidget {
double? _suggestionHeight; double? _suggestionHeight;
double? _elevation; double? _elevation;
List<String> _listData; final List<String> _listData;
SuggestionBoxWidget( SuggestionBoxWidget(
this._context, this._context,
@@ -48,7 +48,7 @@ class SuggestionBoxWidget {
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
itemCount: _listData.length, itemCount: _listData.length,
itemBuilder: (BuildContext context, int index) => ListTile( itemBuilder: (BuildContext context, int index) => ListTile(
contentPadding: EdgeInsets.symmetric(horizontal: 10), contentPadding: const EdgeInsets.symmetric(horizontal: 10),
onTap: () { onTap: () {
if (_onSelectedSuggestion != null) { if (_onSelectedSuggestion != null) {
_onSelectedSuggestion!(_listData[index]); _onSelectedSuggestion!(_listData[index]);
@@ -69,13 +69,13 @@ class SuggestionBoxWidget {
children: [ children: [
Text( Text(
'${AppLocalizations.of(_context).prefix_suggestion_search} ', '${AppLocalizations.of(_context).prefix_suggestion_search} ',
style: TextStyle(fontSize: 15, color: AppColor.baseTextColor), style: const TextStyle(fontSize: 15, color: AppColor.baseTextColor),
), ),
Expanded(child: Text( Expanded(child: Text(
'"${_listData[index]}"', '"${_listData[index]}"',
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 15, color: AppColor.colorNameEmail), style: const TextStyle(fontSize: 15, color: AppColor.colorNameEmail),
)) ))
], ],
) )