Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry pick #3345 sort order blinks to master #3481

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -490,10 +490,7 @@ class SearchEmailController extends BaseController
final lastEmail = listResultSearch.last;

if (searchEmailFilter.value.sortOrderType.isScrollByPosition()) {
_updateSimpleSearchFilter(
positionOption: Some(listResultSearch.length),
beforeOption: const None()
);
_updateSimpleSearchFilter(positionOption: Some(listResultSearch.length));
} else if (searchEmailFilter.value.sortOrderType == EmailSortOrderType.oldest) {
_updateSimpleSearchFilter(startDateOption: optionOf(lastEmail.receivedAt));
} else {
Expand Down
28 changes: 27 additions & 1 deletion lib/features/thread/presentation/thread_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,15 @@ class ThreadController extends BaseController with EmailActionController {
}
}

@visibleForTesting
EmailFilterCondition getFilterCondition({
PresentationEmail? oldestEmail,
MailboxId? mailboxIdSelected,
}) => _getFilterCondition(
oldestEmail: oldestEmail,
mailboxIdSelected: mailboxIdSelected,
);

EmailFilterCondition _getFilterCondition({PresentationEmail? oldestEmail, MailboxId? mailboxIdSelected}) {
switch(mailboxDashBoardController.filterMessageOption.value) {
case FilterMessageOption.all:
Expand Down Expand Up @@ -656,6 +665,9 @@ class ThreadController extends BaseController with EmailActionController {
}
}

@visibleForTesting
Future<void> refreshChangeSearchEmail() => _refreshChangeSearchEmail();

Future<void> _refreshChangeSearchEmail() async {
await _refreshChangeListEmailCache();

Expand All @@ -666,7 +678,9 @@ class ThreadController extends BaseController with EmailActionController {
_searchEmailFilter.sortOrderType.isScrollByPosition(),
0,
),
beforeOption: const None(),
beforeOption: !_searchEmailFilter.sortOrderType.isScrollByPosition()
? const None()
: null,
);
final searchViewState = await _searchEmailInteractor.execute(
_session!,
Expand Down Expand Up @@ -936,6 +950,15 @@ class ThreadController extends BaseController with EmailActionController {
searchController.clearTextSearch();
}

@visibleForTesting
void searchEmail({
UnsignedInt? limit,
bool needRefreshSearchState = false,
}) => _searchEmail(
limit: limit,
needRefreshSearchState: needRefreshSearchState,
);

void _searchEmail({UnsignedInt? limit, bool needRefreshSearchState = false}) {
if (_session != null && _accountId != null) {
if (!needRefreshSearchState && listEmailController.hasClients) {
Expand Down Expand Up @@ -1016,6 +1039,9 @@ class ThreadController extends BaseController with EmailActionController {
}
}

@visibleForTesting
void searchMoreEmails() => _searchMoreEmails();

void _searchMoreEmails() {
log('ThreadController::_searchMoreEmails:');
if (canSearchMore && _session != null && _accountId != null) {
Expand Down
Loading
Loading