TF-2304 Implement sort in controller
(cherry picked from commit 8c7921f664e989e310133b779268f3664e39a5d4)
This commit is contained in:
@@ -14,8 +14,6 @@ import 'package:jmap_dart_client/jmap/core/sort/comparator.dart';
|
|||||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/utc_date.dart';
|
import 'package:jmap_dart_client/jmap/core/utc_date.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/email/email_comparator.dart';
|
|
||||||
import 'package:jmap_dart_client/jmap/mail/email/email_comparator_property.dart';
|
|
||||||
import 'package:model/email/email_action_type.dart';
|
import 'package:model/email/email_action_type.dart';
|
||||||
import 'package:model/email/mark_star_action.dart';
|
import 'package:model/email/mark_star_action.dart';
|
||||||
import 'package:model/email/prefix_email_address.dart';
|
import 'package:model/email/prefix_email_address.dart';
|
||||||
@@ -49,6 +47,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/quick_s
|
|||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/save_recent_search_interactor.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/save_recent_search_interactor.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart';
|
||||||
|
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_sort_order_type.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart';
|
||||||
import 'package:tmail_ui_user/features/manage_account/presentation/extensions/datetime_extension.dart';
|
import 'package:tmail_ui_user/features/manage_account/presentation/extensions/datetime_extension.dart';
|
||||||
import 'package:tmail_ui_user/features/search/email/domain/state/refresh_changes_search_email_state.dart';
|
import 'package:tmail_ui_user/features/search/email/domain/state/refresh_changes_search_email_state.dart';
|
||||||
@@ -96,6 +95,7 @@ class SearchEmailController extends BaseController
|
|||||||
final searchIsRunning = RxBool(false);
|
final searchIsRunning = RxBool(false);
|
||||||
final emailReceiveTimeType = EmailReceiveTimeType.allTime.obs;
|
final emailReceiveTimeType = EmailReceiveTimeType.allTime.obs;
|
||||||
final selectionMode = Rx<SelectMode>(SelectMode.INACTIVE);
|
final selectionMode = Rx<SelectMode>(SelectMode.INACTIVE);
|
||||||
|
final emailSortOrderType = EmailSortOrderType.mostRecent.obs;
|
||||||
|
|
||||||
late Debouncer<String> _deBouncerTime;
|
late Debouncer<String> _deBouncerTime;
|
||||||
late Worker dashBoardViewStateWorker;
|
late Worker dashBoardViewStateWorker;
|
||||||
@@ -229,9 +229,7 @@ class SearchEmailController extends BaseController
|
|||||||
session!,
|
session!,
|
||||||
accountId!,
|
accountId!,
|
||||||
limit: limit,
|
limit: limit,
|
||||||
sort: <Comparator>{}
|
sort: emailSortOrderType.value.getSortOrder().toNullable(),
|
||||||
..add(EmailComparator(EmailComparatorProperty.receivedAt)
|
|
||||||
..setIsAscending(false)),
|
|
||||||
filter: simpleSearchFilter.value.mappingToEmailFilterCondition(),
|
filter: simpleSearchFilter.value.mappingToEmailFilterCondition(),
|
||||||
properties: EmailUtils.getPropertiesForEmailGetMethod(session!, accountId!),
|
properties: EmailUtils.getPropertiesForEmailGetMethod(session!, accountId!),
|
||||||
));
|
));
|
||||||
@@ -274,9 +272,7 @@ class SearchEmailController extends BaseController
|
|||||||
session,
|
session,
|
||||||
accountId,
|
accountId,
|
||||||
limit: UnsignedInt(5),
|
limit: UnsignedInt(5),
|
||||||
sort: <Comparator>{}..add(
|
sort: emailSortOrderType.value.getSortOrder().toNullable(),
|
||||||
EmailComparator(EmailComparatorProperty.receivedAt)
|
|
||||||
..setIsAscending(false)),
|
|
||||||
filter: simpleSearchFilter.value.mappingToEmailFilterCondition(),
|
filter: simpleSearchFilter.value.mappingToEmailFilterCondition(),
|
||||||
properties: ThreadConstants.propertiesQuickSearch)
|
properties: ThreadConstants.propertiesQuickSearch)
|
||||||
.then((result) => result.fold(
|
.then((result) => result.fold(
|
||||||
@@ -302,9 +298,7 @@ class SearchEmailController extends BaseController
|
|||||||
session!,
|
session!,
|
||||||
accountId!,
|
accountId!,
|
||||||
limit: ThreadConstants.defaultLimit,
|
limit: ThreadConstants.defaultLimit,
|
||||||
sort: <Comparator>{}
|
sort: emailSortOrderType.value.getSortOrder().toNullable(),
|
||||||
..add(EmailComparator(EmailComparatorProperty.receivedAt)
|
|
||||||
..setIsAscending(false)),
|
|
||||||
filter: simpleSearchFilter.value.mappingToEmailFilterCondition(),
|
filter: simpleSearchFilter.value.mappingToEmailFilterCondition(),
|
||||||
properties: EmailUtils.getPropertiesForEmailGetMethod(session!, accountId!),
|
properties: EmailUtils.getPropertiesForEmailGetMethod(session!, accountId!),
|
||||||
));
|
));
|
||||||
@@ -347,9 +341,7 @@ class SearchEmailController extends BaseController
|
|||||||
session!,
|
session!,
|
||||||
accountId!,
|
accountId!,
|
||||||
limit: ThreadConstants.defaultLimit,
|
limit: ThreadConstants.defaultLimit,
|
||||||
sort: <Comparator>{}
|
sort: simpleSearchFilter.value.sortOrder,
|
||||||
..add(EmailComparator(EmailComparatorProperty.receivedAt)
|
|
||||||
..setIsAscending(false)),
|
|
||||||
filter: simpleSearchFilter.value.mappingToEmailFilterCondition(),
|
filter: simpleSearchFilter.value.mappingToEmailFilterCondition(),
|
||||||
properties: EmailUtils.getPropertiesForEmailGetMethod(session!, accountId!),
|
properties: EmailUtils.getPropertiesForEmailGetMethod(session!, accountId!),
|
||||||
lastEmailId: lastEmail.id
|
lastEmailId: lastEmail.id
|
||||||
@@ -416,6 +408,8 @@ class SearchEmailController extends BaseController
|
|||||||
return simpleSearchFilter.value.hasAttachment == true;
|
return simpleSearchFilter.value.hasAttachment == true;
|
||||||
case QuickSearchFilter.last7Days:
|
case QuickSearchFilter.last7Days:
|
||||||
return true;
|
return true;
|
||||||
|
case QuickSearchFilter.sortBy:
|
||||||
|
return true;
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -436,6 +430,11 @@ class SearchEmailController extends BaseController
|
|||||||
beforeOption: const None()
|
beforeOption: const None()
|
||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
|
case QuickSearchFilter.sortBy:
|
||||||
|
_updateSimpleSearchFilter(
|
||||||
|
sortOrderOption: emailSortOrderType.value.getSortOrder(),
|
||||||
|
beforeOption: const None()
|
||||||
|
);
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -484,6 +483,16 @@ class SearchEmailController extends BaseController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void selectSortOrderQuickSearchFilter(BuildContext context, EmailSortOrderType sortOrderType) {
|
||||||
|
popBack();
|
||||||
|
_updateSimpleSearchFilter(
|
||||||
|
sortOrderOption: sortOrderType.getSortOrder(),
|
||||||
|
beforeOption: const None()
|
||||||
|
);
|
||||||
|
emailSortOrderType.value = sortOrderType;
|
||||||
|
_searchEmailAction(context);
|
||||||
|
}
|
||||||
|
|
||||||
void selectMailboxForSearchFilter(BuildContext context, PresentationMailbox? mailbox) async {
|
void selectMailboxForSearchFilter(BuildContext context, PresentationMailbox? mailbox) async {
|
||||||
final arguments = DestinationPickerArguments(
|
final arguments = DestinationPickerArguments(
|
||||||
mailboxDashBoardController.accountId.value!,
|
mailboxDashBoardController.accountId.value!,
|
||||||
@@ -599,7 +608,8 @@ class SearchEmailController extends BaseController
|
|||||||
Option<bool>? hasAttachmentOption,
|
Option<bool>? hasAttachmentOption,
|
||||||
Option<UTCDate>? beforeOption,
|
Option<UTCDate>? beforeOption,
|
||||||
Option<UTCDate>? startDateOption,
|
Option<UTCDate>? startDateOption,
|
||||||
Option<UTCDate>? endDateOption
|
Option<UTCDate>? endDateOption,
|
||||||
|
Option<Set<Comparator>>? sortOrderOption,
|
||||||
}) {
|
}) {
|
||||||
simpleSearchFilter.value = simpleSearchFilter.value.copyWith(
|
simpleSearchFilter.value = simpleSearchFilter.value.copyWith(
|
||||||
fromOption: fromOption,
|
fromOption: fromOption,
|
||||||
@@ -610,7 +620,8 @@ class SearchEmailController extends BaseController
|
|||||||
hasAttachmentOption: hasAttachmentOption,
|
hasAttachmentOption: hasAttachmentOption,
|
||||||
beforeOption: beforeOption,
|
beforeOption: beforeOption,
|
||||||
startDateOption: startDateOption,
|
startDateOption: startDateOption,
|
||||||
endDateOption: endDateOption
|
endDateOption: endDateOption,
|
||||||
|
sortOrderOption: sortOrderOption
|
||||||
);
|
);
|
||||||
simpleSearchFilter.refresh();
|
simpleSearchFilter.refresh();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -180,7 +180,7 @@ class SearchEmailView extends GetWidget<SearchEmailController>
|
|||||||
onTap: () {
|
onTap: () {
|
||||||
if (filter == QuickSearchFilter.hasAttachment) {
|
if (filter == QuickSearchFilter.hasAttachment) {
|
||||||
controller.selectQuickSearchFilter(context, filter);
|
controller.selectQuickSearchFilter(context, filter);
|
||||||
} else if (_responsiveUtils.isMobile(context)) {
|
} else if (controller.responsiveUtils.isMobile(context)) {
|
||||||
if (filter == QuickSearchFilter.last7Days) {
|
if (filter == QuickSearchFilter.last7Days) {
|
||||||
controller.openContextMenuAction(
|
controller.openContextMenuAction(
|
||||||
context,
|
context,
|
||||||
@@ -201,7 +201,7 @@ class SearchEmailView extends GetWidget<SearchEmailController>
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
onTapDown: (detail) {
|
onTapDown: (detail) {
|
||||||
if (!_responsiveUtils.isMobile(context)) {
|
if (!controller.responsiveUtils.isMobile(context)) {
|
||||||
final screenSize = MediaQuery.of(context).size;
|
final screenSize = MediaQuery.of(context).size;
|
||||||
final offset = detail.globalPosition;
|
final offset = detail.globalPosition;
|
||||||
final position = RelativeRect.fromLTRB(
|
final position = RelativeRect.fromLTRB(
|
||||||
@@ -326,7 +326,7 @@ class SearchEmailView extends GetWidget<SearchEmailController>
|
|||||||
padding: EdgeInsets.zero,
|
padding: EdgeInsets.zero,
|
||||||
child: EmailSortByActionTitleWidget(
|
child: EmailSortByActionTitleWidget(
|
||||||
sortType: sortType,
|
sortType: sortType,
|
||||||
imagePaths: _imagePaths,
|
imagePaths: controller.imagePaths,
|
||||||
onSortOrderSelected: onCallBack,
|
onSortOrderSelected: onCallBack,
|
||||||
sortTypeSelected: sortTypeSelected,
|
sortTypeSelected: sortTypeSelected,
|
||||||
),
|
),
|
||||||
@@ -345,14 +345,14 @@ class SearchEmailView extends GetWidget<SearchEmailController>
|
|||||||
sortType.getTitle(context),
|
sortType.getTitle(context),
|
||||||
sortType,
|
sortType,
|
||||||
sortTypeCurrent: sortOrderSelected,
|
sortTypeCurrent: sortOrderSelected,
|
||||||
iconLeftPadding: _responsiveUtils.isMobile(context)
|
iconLeftPadding: controller.responsiveUtils.isMobile(context)
|
||||||
? const EdgeInsets.only(left: 12, right: 16)
|
? const EdgeInsetsDirectional.only(start: 12, end: 16)
|
||||||
: const EdgeInsets.only(right: 12),
|
: const EdgeInsetsDirectional.only(start: 12),
|
||||||
iconRightPadding: _responsiveUtils.isMobile(context)
|
iconRightPadding: controller.responsiveUtils.isMobile(context)
|
||||||
? const EdgeInsets.only(right: 12)
|
? const EdgeInsetsDirectional.only(end: 12)
|
||||||
: EdgeInsets.zero,
|
: EdgeInsetsDirectional.zero,
|
||||||
actionSelected: SvgPicture.asset(
|
actionSelected: SvgPicture.asset(
|
||||||
_imagePaths.icFilterSelected,
|
controller.imagePaths.icFilterSelected,
|
||||||
width: 20,
|
width: 20,
|
||||||
height: 20,
|
height: 20,
|
||||||
fit: BoxFit.fill
|
fit: BoxFit.fill
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
import 'package:core/core.dart';
|
import 'package:core/presentation/resources/image_paths.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_svg/flutter_svg.dart';
|
import 'package:flutter_svg/flutter_svg.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_sort_order_type.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_sort_order_type.dart';
|
||||||
|
|||||||
+2
-2
@@ -11,8 +11,8 @@ class EmailSortByCupertinoActionSheetActionBuilder extends CupertinoActionSheetN
|
|||||||
final EmailSortOrderType? sortTypeCurrent;
|
final EmailSortOrderType? sortTypeCurrent;
|
||||||
final SvgPicture? actionSelected;
|
final SvgPicture? actionSelected;
|
||||||
final Color? bgColor;
|
final Color? bgColor;
|
||||||
final EdgeInsets? iconLeftPadding;
|
final EdgeInsetsDirectional? iconLeftPadding;
|
||||||
final EdgeInsets? iconRightPadding;
|
final EdgeInsetsDirectional? iconRightPadding;
|
||||||
|
|
||||||
EmailSortByCupertinoActionSheetActionBuilder(
|
EmailSortByCupertinoActionSheetActionBuilder(
|
||||||
String actionName,
|
String actionName,
|
||||||
|
|||||||
Reference in New Issue
Block a user