From e08429d42c828153f510b1251b7333131df9261e Mon Sep 17 00:00:00 2001 From: dab246 Date: Mon, 1 Aug 2022 15:03:45 +0700 Subject: [PATCH] TF-688 Fix [Trash folder] the deleted folder should not count messages --- .../widgets/mailbox_folder_tile_builder.dart | 3 +++ model/lib/mailbox/presentation_mailbox.dart | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart b/lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart index 68be20f11..af1f4ec0f 100644 --- a/lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart +++ b/lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart @@ -185,6 +185,7 @@ class MailBoxFolderTileBuilder { if (isHoverItem) { return _buildMenuIcon(); } else if (_mailboxNode.item.getCountUnReadEmails().isNotEmpty + && _mailboxNode.item.matchCountingRules() && mailboxDisplayed == MailboxDisplayed.mailbox) { return Padding( padding: const EdgeInsets.only(right: 10), @@ -219,6 +220,7 @@ class MailBoxFolderTileBuilder { child: Row( children: [ if (_mailboxNode.item.getCountUnReadEmails().isNotEmpty + && _mailboxNode.item.matchCountingRules() && mailboxDisplayed == MailboxDisplayed.mailbox) _buildCounter(), buildIconWeb( @@ -242,6 +244,7 @@ class MailBoxFolderTileBuilder { ), ); } else if (_mailboxNode.item.getCountUnReadEmails().isNotEmpty + && _mailboxNode.item.matchCountingRules() && mailboxDisplayed == MailboxDisplayed.mailbox) { return Padding( padding: const EdgeInsets.only(right: 20), diff --git a/model/lib/mailbox/presentation_mailbox.dart b/model/lib/mailbox/presentation_mailbox.dart index 7ba6dae8c..83d9710fa 100644 --- a/model/lib/mailbox/presentation_mailbox.dart +++ b/model/lib/mailbox/presentation_mailbox.dart @@ -66,6 +66,18 @@ class PresentationMailbox with EquatableMixin { bool get isDrafts => role == roleDrafts; + bool get isTemplates => role == roleTemplates; + + bool get isSent => role == roleSent; + + bool matchCountingRules() { + if (isSpam || isTrash || isDrafts || isTemplates || isSent) { + return false; + } else { + return true; + } + } + @override List get props => [ id,