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

TF-4358 Remove mail in trash by default in search result (#4361)

Browse Source
This commit is contained in:
Dat Vu
2026-04-10 15:15:53 +07:00
committed by GitHub
parent bc707b2612
commit c9e2e5db80
17 changed files with 290 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/destination_picker/presentation/destination_picker_controller.dart
+2 -1
View File
@@ -332,7 +332,8 @@ class DestinationPickerController extends BaseMailboxController {
}
mailboxDestination.value = presentationMailbox;
if (presentationMailbox == null ||
presentationMailbox.id == PresentationMailbox.unifiedMailbox.id) {
presentationMailbox.id == PresentationMailbox.unifiedMailbox.id ||
presentationMailbox.id == PresentationMailbox.allEmailTrashAndSpamFolder.id) {
unAllSelectedMailboxNode();
} else {
if (mailboxNode != null) {
lib/features/destination_picker/presentation/destination_picker_view.dart
+67 -80
View File
@@ -21,15 +21,15 @@ import 'package:tmail_ui_user/features/base/mixin/app_loader_mixin.dart';
import 'package:tmail_ui_user/features/base/widget/scrollbar_list_view.dart';
import 'package:tmail_ui_user/features/destination_picker/presentation/destination_picker_controller.dart';
import 'package:tmail_ui_user/features/destination_picker/presentation/model/destination_screen_type.dart';
import 'package:tmail_ui_user/features/destination_picker/presentation/widgets/destination_picker_folder_item.dart';
import 'package:tmail_ui_user/features/destination_picker/presentation/widgets/destination_picker_search_mailbox_item_builder.dart';
import 'package:tmail_ui_user/features/destination_picker/presentation/widgets/top_bar_destination_picker_builder.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/extensions/presentation_mailbox_extension.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/mixin/mailbox_widget_mixin.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_actions.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_categories.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_displayed.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/styles/mailbox_icon_widget_styles.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/styles/mailbox_item_widget_styles.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_category_widget.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_item_widget.dart';
import 'package:tmail_ui_user/features/destination_picker/presentation/widgets/create_mailbox_name_input_decoration_builder.dart';
@@ -272,16 +272,28 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
actions,
mailboxIdSelected)
: const SizedBox.shrink()),
if (actions == MailboxActions.select)
...[
const Padding(
padding: EdgeInsetsDirectional.only(start: 16, end: 16, bottom: 8),
child: Divider(color: AppColor.colorDividerMailbox, height: 1),
),
_buildAllEmailTrashAndSpamFolderWidget(context, mailboxIdSelected),
const Padding(
padding: EdgeInsetsDirectional.symmetric(horizontal: 16, vertical: 8),
child: Divider(color: AppColor.colorDividerMailbox, height: 1),
),
],
Obx(() {
if (controller.personalMailboxIsNotEmpty) {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
const Divider(
color: AppColor.colorDividerMailbox,
height: 1,
),
const SizedBox(height: 8),
if (actions != MailboxActions.select)
const Padding(
padding: EdgeInsetsDirectional.only(bottom: 8),
child: Divider(color: AppColor.colorDividerMailbox, height: 1),
),
_buildMailboxCategory(
context,
MailboxCategories.personalFolders,
@@ -494,81 +506,56 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
MailboxActions? actions,
MailboxId? mailboxIdSelected
) {
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Material(
color: Colors.transparent,
child: InkWell(
onTap: () {
if (mailboxIdSelected != null
&& mailboxIdSelected != PresentationMailbox.unifiedMailbox.id
) {
controller.selectMailboxAction(PresentationMailbox.unifiedMailbox);
controller.dispatchSelectMailboxDestination(context);
}
},
customBorder: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(
PlatformInfo.isWeb
? MailboxItemWidgetStyles.borderRadius
: MailboxItemWidgetStyles.mobileBorderRadius,
)),
),
hoverColor: AppColor.colorMailboxHovered,
child: Obx(() => Container(
padding: const EdgeInsetsDirectional.symmetric(
horizontal: MailboxItemWidgetStyles.itemPadding,
),
color: controller.mailboxDestination.value == PresentationMailbox.unifiedMailbox
? AppColor.colorItemSelected
: Colors.transparent,
height: PlatformInfo.isWeb
? MailboxItemWidgetStyles.height
: MailboxItemWidgetStyles.mobileHeight,
child: Row(children: [
SvgPicture.asset(
controller.imagePaths.icFolderMailbox,
width: MailboxIconWidgetStyles.iconSize,
height: MailboxIconWidgetStyles.iconSize,
fit: BoxFit.fill
),
const SizedBox(
width: MailboxItemWidgetStyles.labelIconSpace,
),
Expanded(child: Text(
AppLocalizations.of(context).allFolders,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: ThemeUtils.textStyleInter500(),
)),
const SizedBox(
width: MailboxItemWidgetStyles.labelIconSpace,
),
if (_validateDisplaySelectedIcon(
actions: actions,
mailboxIdSelected: mailboxIdSelected
))
SvgPicture.asset(
actions == MailboxActions.create
? controller.imagePaths.icSelectedSB
: controller.imagePaths.icFilterSelected,
width: MailboxIconWidgetStyles.iconSize,
height: MailboxIconWidgetStyles.iconSize,
fit: BoxFit.fill
)
])
)),
),
),
);
final appLocalizations = AppLocalizations.of(context);
final folderName = actions == MailboxActions.select
? appLocalizations.allEmail
: appLocalizations.allFolders;
final folderIcon = actions == MailboxActions.select
? controller.imagePaths.icAllEmail
: controller.imagePaths.icFolderMailbox;
final isAllEmailIdSelected = mailboxIdSelected == null ||
mailboxIdSelected == PresentationMailbox.unifiedMailbox.id;
final isDesktop = controller.responsiveUtils.isDesktop(context);
return Obx(() {
final isSelected = controller.mailboxDestination.value?.isAllEmail == true || isAllEmailIdSelected;
return DestinationPickerFolderItem(
text: folderName,
folderIcon: folderIcon,
selectedIcon: controller.imagePaths.icSelectedSB,
isDesktop: isDesktop,
isSelected: isSelected,
margin: const EdgeInsets.symmetric(horizontal: 16),
onTap: () {
if (!isSelected) {
controller.selectMailboxAction(PresentationMailbox.unifiedMailbox);
controller.dispatchSelectMailboxDestination(context);
}
},
);
});
}
bool _validateDisplaySelectedIcon({
MailboxActions? actions,
MailboxId? mailboxIdSelected
}) {
return (actions == MailboxActions.select || actions == MailboxActions.create)
&& (mailboxIdSelected == null || mailboxIdSelected == PresentationMailbox.unifiedMailbox.id);
Widget _buildAllEmailTrashAndSpamFolderWidget(BuildContext context, MailboxId? mailboxIdSelected) {
final isMailboxIdSelected = mailboxIdSelected == PresentationMailbox.allEmailTrashAndSpamFolder.id;
final isDesktop = controller.responsiveUtils.isDesktop(context);
final folderName = AppLocalizations.of(context).allEmailTrashAndSpam;
return Obx(() {
final isSelected = controller.mailboxDestination.value?.isAllEmailTrashAndSpamFolder == true || isMailboxIdSelected;
return DestinationPickerFolderItem(
text: folderName,
folderIcon: controller.imagePaths.icMoveFolderContent,
selectedIcon: controller.imagePaths.icSelectedSB,
isSelected: isSelected,
isDesktop: isDesktop,
margin: const EdgeInsets.symmetric(horizontal: 16),
onTap: () {
if (!isSelected) {
controller.selectMailboxAction(PresentationMailbox.allEmailTrashAndSpamFolder);
controller.dispatchSelectMailboxDestination(context);
}
},
);
});
}
void _handleOpenMailboxNodeClick(MailboxNode mailboxNode) {
lib/features/destination_picker/presentation/widgets/destination_picker_folder_item.dart
+104
View File
@@ -0,0 +1,104 @@
import 'package:core/presentation/extensions/color_extension.dart';
import 'package:core/presentation/utils/theme_utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/styles/mailbox_icon_widget_styles.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/styles/mailbox_item_widget_styles.dart';
class DestinationPickerFolderItem extends StatelessWidget {
final bool isSelected;
final bool isDesktop;
final String text;
final String folderIcon;
final String selectedIcon;
final EdgeInsetsGeometry? margin;
final VoidCallback onTap;
const DestinationPickerFolderItem({
super.key,
required this.isSelected,
required this.isDesktop,
required this.text,
required this.folderIcon,
required this.selectedIcon,
required this.onTap,
this.margin,
});
@override
Widget build(BuildContext context) {
final folderIconWidget = SvgPicture.asset(
folderIcon,
width: MailboxIconWidgetStyles.iconSize,
height: MailboxIconWidgetStyles.iconSize,
colorFilter: AppColor.primaryLinShare.asFilter(),
fit: BoxFit.fill,
);
final displayNameWidget = Text(
text,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: _displayNameTextStyle,
);
final selectedIconWidget = SvgPicture.asset(
selectedIcon,
width: MailboxIconWidgetStyles.iconSize,
height: MailboxIconWidgetStyles.iconSize,
fit: BoxFit.fill,
);
final itemHeight = isDesktop
? MailboxItemWidgetStyles.height
: MailboxItemWidgetStyles.mobileHeight;
final borderRadius = BorderRadius.all(Radius.circular(
isDesktop
? MailboxItemWidgetStyles.borderRadius
: MailboxItemWidgetStyles.mobileBorderRadius,
));
Widget itemWidget = Material(
type: MaterialType.transparency,
child: InkWell(
onTap: onTap,
customBorder: RoundedRectangleBorder(borderRadius: borderRadius),
hoverColor: AppColor.colorMailboxHovered,
child: Container(
padding: const EdgeInsetsDirectional.symmetric(
horizontal: MailboxItemWidgetStyles.itemPadding,
),
height: itemHeight,
child: Row(
children: [
folderIconWidget,
const SizedBox(width: MailboxItemWidgetStyles.labelIconSpace),
Expanded(child: displayNameWidget),
if (isSelected) ...[
const SizedBox(width: MailboxItemWidgetStyles.labelIconSpace),
selectedIconWidget,
],
],
),
),
),
);
if (margin != null) {
itemWidget = Padding(padding: margin!, child: itemWidget);
}
return itemWidget;
}
TextStyle get _displayNameTextStyle {
if (isSelected) {
return ThemeUtils.textStyleInter700(fontSize: 14);
} else {
return isDesktop
? ThemeUtils.textStyleBodyBody3(color: Colors.black)
: ThemeUtils.textStyleInter500();
}
}
}