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

TF-3123 Fix load more is irrelevant when filtering emails by unread

Browse Source
This commit is contained in:
dab246
2024-09-16 02:21:56 +07:00
committed by Dat H. Pham
parent 7daab0bb1a
commit 47c7cb9ee8
5 changed files with 107 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
+28 -16
View File
@@ -1726,18 +1726,24 @@ class MailboxDashBoardController extends ReloadableController with UserSettingPo
dispatchAction(StartSearchEmailAction());
}
bool isEmptyTrashBannerEnabledOnWeb(BuildContext context) {
return selectedMailbox.value != null &&
selectedMailbox.value!.isTrash &&
selectedMailbox.value!.countTotalEmails > 0 &&
bool isEmptyTrashBannerEnabledOnWeb(
BuildContext context,
PresentationMailbox? mailbox
) {
return mailbox != null &&
mailbox.isTrash &&
mailbox.countTotalEmails > 0 &&
!searchController.isSearchActive() &&
responsiveUtils.isWebDesktop(context);
}
bool isEmptyTrashBannerEnabledOnMobile(BuildContext context) {
return selectedMailbox.value != null &&
selectedMailbox.value!.isTrash &&
selectedMailbox.value!.countTotalEmails > 0 &&
bool isEmptyTrashBannerEnabledOnMobile(
BuildContext context,
PresentationMailbox? mailbox
) {
return mailbox != null &&
mailbox.isTrash &&
mailbox.countTotalEmails > 0 &&
!searchController.isSearchActive() &&
!responsiveUtils.isWebDesktop(context);
}
@@ -2184,18 +2190,24 @@ class MailboxDashBoardController extends ReloadableController with UserSettingPo
}
}
bool isEmptySpamBannerEnabledOnWeb(BuildContext context) {
return selectedMailbox.value != null &&
selectedMailbox.value!.isSpam &&
selectedMailbox.value!.countTotalEmails > 0 &&
bool isEmptySpamBannerEnabledOnWeb(
BuildContext context,
PresentationMailbox? mailbox
) {
return mailbox != null &&
mailbox.isSpam &&
mailbox.countTotalEmails > 0 &&
!searchController.isSearchActive() &&
responsiveUtils.isWebDesktop(context);
}
bool isEmptySpamBannerEnabledOnMobile(BuildContext context) {
return selectedMailbox.value != null &&
selectedMailbox.value!.isSpam &&
selectedMailbox.value!.countTotalEmails > 0 &&
bool isEmptySpamBannerEnabledOnMobile(
BuildContext context,
PresentationMailbox? mailbox
) {
return mailbox != null &&
mailbox.isSpam &&
mailbox.countTotalEmails > 0 &&
!searchController.isSearchActive() &&
!responsiveUtils.isWebDesktop(context);
}
lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
+4 -2
View File
@@ -95,7 +95,8 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
),
_buildVacationNotificationMessage(context),
Obx(() {
if (controller.isEmptyTrashBannerEnabledOnWeb(context)) {
final presentationMailbox = controller.selectedMailbox.value;
if (controller.isEmptyTrashBannerEnabledOnWeb(context, presentationMailbox)) {
return Padding(
padding: const EdgeInsetsDirectional.only(
top: BannerEmptyTrashStyles.webTopMargin,
@@ -110,7 +111,8 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
}
}),
Obx(() {
if (controller.isEmptySpamBannerEnabledOnWeb(context)) {
final presentationMailbox = controller.selectedMailbox.value;
if (controller.isEmptySpamBannerEnabledOnWeb(context, presentationMailbox)) {
return Padding(
padding: const EdgeInsetsDirectional.only(
top: BannerDeleteAllSpamEmailsStyles.webTopMargin,