Always show default mailbox in all MailboxView, Search Mailbox and Settings

This commit is contained in:
dab246
2023-02-17 13:28:08 +07:00
committed by Dat Vu
parent ed3d04a8da
commit 7e969c5e38
14 changed files with 115 additions and 151 deletions
@@ -33,7 +33,6 @@ import 'package:tmail_ui_user/features/mailbox/domain/usecases/refresh_all_mailb
import 'package:tmail_ui_user/features/mailbox/domain/usecases/search_mailbox_interactor.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_categories_expand_mode.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_tree_builder.dart';
import 'package:tmail_ui_user/features/mailbox_creator/domain/model/verification/duplicate_name_validator.dart';
@@ -64,7 +63,6 @@ class DestinationPickerController extends BaseMailboxController {
final listMailboxSearched = <PresentationMailbox>[].obs;
final searchState = SearchState.initial().obs;
final searchQuery = SearchQuery.initial().obs;
final mailboxCategoriesExpandMode = MailboxCategoriesExpandMode.initial().obs;
final destinationScreenType = DestinationScreenType.destinationPicker.obs;
final mailboxDestination = Rxn<PresentationMailbox>();
final newNameMailbox = Rxn<String>();
@@ -343,6 +343,7 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
context,
key: const Key('children_tree_mailbox_child'),
isExpanded: mailboxNode.expandMode == ExpandMode.EXPAND,
paddingChild: const EdgeInsets.only(left: 14),
parent: (MailBoxFolderTileBuilder(
context,
_imagePaths,
@@ -147,11 +147,9 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM
super.onData(newState);
newState.map((success) async {
if (success is GetAllMailboxSuccess) {
currentMailboxState = success.currentMailboxState;
_buildMailboxTreeHasSubscribed(success.mailboxList);
_handleGetAllMailboxSuccess(success);
} else if (success is RefreshChangesAllMailboxSuccess) {
currentMailboxState = success.currentMailboxState;
_refreshMailboxTreeHasSubscribed(success.mailboxList);
_handleRefreshChangesAllMailboxSuccess(success);
}
});
}
@@ -979,14 +977,16 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM
curve: Curves.fastOutSlowIn);
}
void _buildMailboxTreeHasSubscribed(List<PresentationMailbox> mailboxList) async {
final _mailboxList = mailboxList.listSubscribedMailboxes;
await buildTree(_mailboxList);
void _handleGetAllMailboxSuccess(GetAllMailboxSuccess success) async {
currentMailboxState = success.currentMailboxState;
final listMailboxDisplayed = success.mailboxList.listSubscribedMailboxesAndDefaultMailboxes;
await buildTree(listMailboxDisplayed);
}
void _refreshMailboxTreeHasSubscribed(List<PresentationMailbox> mailboxList) async {
final _mailboxList = mailboxList.listSubscribedMailboxes;
await refreshTree(_mailboxList);
void _handleRefreshChangesAllMailboxSuccess(RefreshChangesAllMailboxSuccess success) async {
currentMailboxState = success.currentMailboxState;
final listMailboxDisplayed = success.mailboxList.listSubscribedMailboxesAndDefaultMailboxes;
await refreshTree(listMailboxDisplayed);
}
void _unsubscribeMailboxAction(MailboxId mailboxId) {
@@ -1,10 +1,10 @@
import 'package:core/core.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart';
import 'package:model/model.dart';
import 'package:package_info_plus/package_info_plus.dart';
import 'package:tmail_ui_user/features/base/mixin/app_loader_mixin.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/mailbox_controller.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/mixin/mailbox_widget_mixin.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_categories.dart';
@@ -15,7 +15,9 @@ import 'package:tmail_ui_user/features/mailbox/presentation/widgets/user_informa
import 'package:tmail_ui_user/features/quotas/presentation/widget/quotas_footer_widget.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
class MailboxView extends GetWidget<MailboxController> with MailboxWidgetMixin {
class MailboxView extends GetWidget<MailboxController>
with MailboxWidgetMixin,
AppLoaderMixin {
final _imagePaths = Get.find<ImagePaths>();
final _responsiveUtils = Get.find<ResponsiveUtils>();
@@ -156,12 +158,7 @@ class MailboxView extends GetWidget<MailboxController> with MailboxWidgetMixin {
return Obx(() => controller.viewState.value.fold(
(failure) => const SizedBox.shrink(),
(success) => success is LoadingState
? const Center(child: Padding(
padding: EdgeInsets.only(top: 16),
child: SizedBox(
width: 24,
height: 24,
child: CupertinoActivityIndicator(color: AppColor.colorTextButton))))
? Padding(padding: const EdgeInsets.only(top: 16), child: loadingWidget)
: const SizedBox.shrink()));
}
@@ -334,12 +331,14 @@ class MailboxView extends GetWidget<MailboxController> with MailboxWidgetMixin {
context,
key: const Key('children_tree_mailbox_child'),
isExpanded: mailboxNode.expandMode == ExpandMode.EXPAND,
paddingChild: const EdgeInsets.only(left: 14),
parent: Obx(() => (MailBoxFolderTileBuilder(
context,
_imagePaths,
mailboxNode,
lastNode: lastNode,
allSelectMode: controller.currentSelectMode.value)
allSelectMode: controller.currentSelectMode.value,
mailboxNodeSelected: controller.mailboxDashBoardController.selectedMailbox.value)
..addOnLongPressMailboxNodeAction((mailboxNode) {
openMailboxMenuActionOnMobile(
context,
@@ -360,7 +359,8 @@ class MailboxView extends GetWidget<MailboxController> with MailboxWidgetMixin {
_imagePaths,
mailboxNode,
lastNode: lastNode,
allSelectMode: controller.currentSelectMode.value)
allSelectMode: controller.currentSelectMode.value,
mailboxNodeSelected: controller.mailboxDashBoardController.selectedMailbox.value)
..addOnLongPressMailboxNodeAction((mailboxNode) {
openMailboxMenuActionOnMobile(
context,
@@ -89,10 +89,10 @@ class MailboxView extends GetWidget<MailboxController>
Widget _buildLoadingView() {
return Obx(() => controller.viewState.value.fold(
(failure) => const SizedBox.shrink(),
(success) => success is LoadingState
? Padding(padding: const EdgeInsets.only(top: 16), child: loadingWidget)
: const SizedBox.shrink()));
(failure) => const SizedBox.shrink(),
(success) => success is LoadingState
? Padding(padding: const EdgeInsets.only(top: 16), child: loadingWidget)
: const SizedBox.shrink()));
}
Widget _buildListMailbox(BuildContext context) {
@@ -294,6 +294,7 @@ class MailboxView extends GetWidget<MailboxController>
context,
key: const Key('children_tree_mailbox_child'),
isExpanded: mailboxNode.expandMode == ExpandMode.EXPAND,
paddingChild: const EdgeInsets.only(left: 14),
parent: Obx(() => (MailBoxFolderTileBuilder(
context,
_imagePaths,
@@ -42,7 +42,7 @@ mixin MailboxWidgetMixin {
List<MailboxActions> _listActionForPersonalMailbox(PresentationMailbox mailbox) {
return [
if (BuildUtils.isWeb)
if (BuildUtils.isWeb && mailbox.isSubscribedMailbox)
MailboxActions.openInNewTab,
MailboxActions.markAsRead,
MailboxActions.move,
@@ -57,7 +57,7 @@ mixin MailboxWidgetMixin {
List<MailboxActions> _listActionForTeamMailbox(PresentationMailbox mailbox) {
return [
if (BuildUtils.isWeb)
if (BuildUtils.isWeb && mailbox.isSubscribedMailbox)
MailboxActions.openInNewTab,
MailboxActions.markAsRead,
if (mailbox.isTeamMailboxes)
@@ -1,9 +1,15 @@
import 'package:core/core.dart';
import 'package:core/presentation/extensions/color_extension.dart';
import 'package:core/presentation/resources/image_paths.dart';
import 'package:core/presentation/utils/style_utils.dart';
import 'package:core/presentation/views/button/icon_button_web.dart';
import 'package:core/utils/build_utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart';
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
import 'package:model/model.dart';
import 'package:model/email/presentation_email.dart';
import 'package:model/mailbox/expand_mode.dart';
import 'package:model/mailbox/presentation_mailbox.dart';
import 'package:model/mailbox/select_mode.dart';
import 'package:tmail_ui_user/features/mailbox/domain/extensions/presentation_mailbox_extension.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_actions.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_displayed.dart';
@@ -13,8 +19,6 @@ import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
class MailBoxFolderTileBuilder {
final _responsiveUtils = Get.find<ResponsiveUtils>();
final MailboxNode _mailboxNode;
final BuildContext _context;
final ImagePaths _imagePaths;
@@ -90,79 +94,62 @@ class MailBoxFolderTileBuilder {
Widget _buildMailboxItem() {
if (mailboxDisplayed == MailboxDisplayed.mailbox) {
if (BuildUtils.isWeb) {
return Theme(
data: ThemeData(
splashColor: Colors.transparent,
highlightColor: Colors.transparent),
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return InkWell(
onTap: () => _onOpenMailboxFolderClick?.call(_mailboxNode),
onHover: (value) => setState(() => isHoverItem = value),
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: backgroundColorItem),
padding: EdgeInsets.only(
left: _mailboxNode.item.hasRole() ? 0 : 4,
right: 4,
top: 8,
bottom: 8),
margin: const EdgeInsets.only(bottom: 4),
child: Row(
crossAxisAlignment: _mailboxNode.item.isTeamMailboxes
? CrossAxisAlignment.start
: CrossAxisAlignment.center,
children: [
_buildLeadingMailboxItem(),
const SizedBox(width: 4),
Expanded(child: _buildTitleFolderItem()),
const SizedBox(width: 8),
_buildTrailingItemForMailboxView()
])
),
);
}
),
return StatefulBuilder(
builder: (context, setState) {
return InkWell(
onTap: () => _onOpenMailboxFolderClick?.call(_mailboxNode),
onHover: (value) => setState(() => isHoverItem = value),
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
color: backgroundColorItem),
padding: const EdgeInsets.all(8),
child: Row(
crossAxisAlignment: _mailboxNode.item.isTeamMailboxes
? CrossAxisAlignment.start
: CrossAxisAlignment.center,
children: [
_buildLeadingMailboxItem(),
const SizedBox(width: 4),
Expanded(child: _buildTitleFolderItem()),
const SizedBox(width: 8),
_buildTrailingItemForMailboxView()
])
),
);
}
);
} else {
return AbsorbPointer(
absorbing: !_mailboxNode.isActivated,
child: Opacity(
opacity: _mailboxNode.isActivated ? 1.0 : 0.3,
child: Material(
color: Colors.transparent,
child: InkWell(
onLongPress: () => _onLongPressMailboxNodeAction?.call(_mailboxNode),
onTap: () => allSelectMode == SelectMode.ACTIVE
? _onSelectMailboxFolderClick?.call(_mailboxNode)
: _onOpenMailboxFolderClick?.call(_mailboxNode),
borderRadius: const BorderRadius.all(Radius.circular(8)),
child: ClipRRect(
borderRadius: const BorderRadius.all(Radius.circular(14)),
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Padding(
padding: EdgeInsets.symmetric(
vertical: _mailboxNode.hasChildren() ? 8 : 15),
child: Row(
crossAxisAlignment: _mailboxNode.item.isTeamMailboxes
? CrossAxisAlignment.start
: CrossAxisAlignment.center,
children: [
_buildLeadingMailboxItem(),
const SizedBox(width: 8),
Expanded(child: _buildTitleFolderItem()),
_buildSelectedIcon(),
const SizedBox(width: 8),
_buildTrailingItemForMailboxView()
]),
),
]
)
),
return Material(
color: Colors.transparent,
child: InkWell(
onLongPress: () => _onLongPressMailboxNodeAction?.call(_mailboxNode),
onTap: () => allSelectMode == SelectMode.ACTIVE
? _onSelectMailboxFolderClick?.call(_mailboxNode)
: _onOpenMailboxFolderClick?.call(_mailboxNode),
borderRadius: const BorderRadius.all(Radius.circular(8)),
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
color: backgroundColorItem),
padding: const EdgeInsets.all(8),
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Row(
crossAxisAlignment: _mailboxNode.item.isTeamMailboxes
? CrossAxisAlignment.start
: CrossAxisAlignment.center,
children: [
_buildLeadingMailboxItem(),
const SizedBox(width: 8),
Expanded(child: _buildTitleFolderItem()),
_buildSelectedIcon(),
const SizedBox(width: 8),
_buildTrailingItemForMailboxView()
]),
]
),
),
),
@@ -188,8 +175,7 @@ class MailBoxFolderTileBuilder {
_buildLeadingMailboxItem(),
const SizedBox(width: 8),
Expanded(child: _buildTitleFolderItem()),
_buildSelectedIcon(),
const SizedBox(width: 8)
_buildSelectedIcon()
])
),
),
@@ -209,9 +195,9 @@ class MailBoxFolderTileBuilder {
_mailboxNode.expandMode == ExpandMode.EXPAND
? _imagePaths.icExpandFolder
: _imagePaths.icCollapseFolder,
color: _mailboxNode.expandMode == ExpandMode.EXPAND
? AppColor.colorExpandMailbox
: AppColor.colorCollapseMailbox,
color: _mailboxNode.item.isSubscribedMailbox
? AppColor.primaryColor
: AppColor.colorIconUnSubscribedMailbox,
fit: BoxFit.fill
),
minSize: 12,
@@ -383,15 +369,10 @@ class MailBoxFolderTileBuilder {
if (mailboxDisplayed == MailboxDisplayed.destinationPicker) {
return Colors.white;
} else {
if (BuildUtils.isWeb) {
if (mailboxNodeSelected?.id == _mailboxNode.item.id || isHoverItem) {
return AppColor.colorBgMailboxSelected;
}
return _responsiveUtils.isDesktop(_context)
? AppColor.colorBgDesktop
: Colors.white;
if (mailboxNodeSelected?.id == _mailboxNode.item.id || isHoverItem) {
return AppColor.colorBgMailboxSelected;
} else {
return Colors.white;
return Colors.transparent;
}
}
}
@@ -12,7 +12,6 @@ import 'package:get/get.dart';
import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
import 'package:model/mailbox/expand_mode.dart';
import 'package:model/mailbox/presentation_mailbox.dart';
import 'package:tmail_ui_user/features/base/base_mailbox_controller.dart';
import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_subscribe_action_state.dart';
import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_subscribe_state.dart';
@@ -30,7 +29,6 @@ import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_catego
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_tree_builder.dart';
import 'package:tmail_ui_user/features/mailbox_creator/domain/usecases/verify_name_interactor.dart';
import 'package:tmail_ui_user/features/manage_account/presentation/mailbox_visibility/state/mailbox_visibility_state.dart';
import 'package:tmail_ui_user/features/manage_account/presentation/manage_account_dashboard_controller.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
import 'package:tmail_ui_user/main/routes/route_navigation.dart';
@@ -69,13 +67,13 @@ class MailboxVisibilityController extends BaseMailboxController {
@override
void onData(Either<Failure, Success> newState) {
super.onData(newState);
newState.fold((failure) => null, (success) {
if (success is GetAllMailboxSuccess) {
newState.fold((failure) => null, (success) async {
if (success is GetAllMailboxSuccess) {
currentMailboxState = success.currentMailboxState;
_handleBuildMailboxTree(success.mailboxList);
await buildTree(success.mailboxList);
} else if (success is RefreshChangesAllMailboxSuccess) {
currentMailboxState = success.currentMailboxState;
refreshTree(success.mailboxList);
await refreshTree(success.mailboxList);
}
});
}
@@ -103,12 +101,6 @@ class MailboxVisibilityController extends BaseMailboxController {
super.onReady();
}
void _handleBuildMailboxTree(List<PresentationMailbox> mailboxList) async {
dispatchState(Right(LoadingBuildTreeMailboxVisibility()));
await buildTree(mailboxList);
dispatchState(Right(BuildTreeMailboxVisibilitySuccess()));
}
void subscribeMailbox(MailboxNode mailboxNode) {
final _mailboxSubscribeState = mailboxNode.item.isSubscribedMailbox
? MailboxSubscribeState.disabled : MailboxSubscribeState.enabled;
@@ -12,7 +12,6 @@ import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_catego
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart';
import 'package:tmail_ui_user/features/manage_account/presentation/base/setting_detail_view_builder.dart';
import 'package:tmail_ui_user/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_controller.dart';
import 'package:tmail_ui_user/features/manage_account/presentation/mailbox_visibility/state/mailbox_visibility_state.dart';
import 'package:tmail_ui_user/features/manage_account/presentation/mailbox_visibility/utils/mailbox_visibility_utils.dart';
import 'package:tmail_ui_user/features/manage_account/presentation/mailbox_visibility/widgets/mailbox_visibility_folder_tile_builder.dart';
import 'package:tmail_ui_user/features/manage_account/presentation/mailbox_visibility/widgets/mailbox_visibility_header_widget.dart';
@@ -57,17 +56,9 @@ class MailboxVisibilityView extends GetWidget<MailboxVisibilityController>
Widget _buildLoadingView() {
return Obx(() => controller.viewState.value.fold(
(failure) => const SizedBox.shrink(),
(success) {
if (success is LoadingState || success is LoadingBuildTreeMailboxVisibility) {
return Padding(
padding: const EdgeInsets.only(top: 16),
child: loadingWidget
);
} else {
return const SizedBox.shrink();
}
}
));
(success) => success is LoadingState
? Padding(padding: const EdgeInsets.only(top: 16), child: loadingWidget)
: const SizedBox.shrink()));
}
Widget _buildListMailbox(BuildContext context) {
@@ -1,5 +0,0 @@
import 'package:core/presentation/state/success.dart';
class LoadingBuildTreeMailboxVisibility extends LoadingState {}
class BuildTreeMailboxVisibilitySuccess extends UIState {}
@@ -35,7 +35,7 @@ class MailBoxVisibilityFolderTileBuilder extends StatelessWidget {
const SizedBox(width: 8),
_buildLeadingMailboxItem(context),
Expanded(child: _buildTitleFolderItem()),
if (!_mailboxNode.item.hasRole() || !_mailboxNode.item.isSubscribedMailbox)
if (!_mailboxNode.item.isDefault)
_buildSubscribeButton(context),
const SizedBox(width: 32),
]
@@ -85,7 +85,7 @@ class MailBoxVisibilityFolderTileBuilder extends StatelessWidget {
overflow: CommonTextStyle.defaultTextOverFlow,
style: TextStyle(
fontSize: _mailboxNode.item.isTeamMailboxes ? 16 : 15,
color: _mailboxNode.item.isSubscribedMailbox
color: _mailboxNode.item.allowedToDisplay
? Colors.black
: AppColor.colorTitleAUnSubscribedMailbox,
fontWeight: _mailboxNode.item.isTeamMailboxes
@@ -114,7 +114,7 @@ class MailBoxVisibilityFolderTileBuilder extends StatelessWidget {
_mailboxNode.item.getMailboxIcon(_imagePaths),
width: 20,
height: 20,
color: _mailboxNode.item.isSubscribedMailbox
color: _mailboxNode.item.allowedToDisplay
? AppColor.primaryColor
: AppColor.colorIconUnSubscribedMailbox,
fit: BoxFit.fill
@@ -182,7 +182,7 @@ class _MailboxSearchedItemBuilderState extends State<MailboxSearchedItemBuilder>
}
void _onTapMailboxAction() {
if (widget._presentationMailbox.isSubscribed?.value == true) {
if (widget._presentationMailbox.allowedToDisplay) {
widget.onClickOpenMailboxAction?.call(widget._presentationMailbox);
}
}
@@ -195,7 +195,7 @@ class _MailboxSearchedItemBuilderState extends State<MailboxSearchedItemBuilder>
Widget _buildMailboxIcon() {
return SvgPicture.asset(
widget._presentationMailbox.isSubscribed?.value == true
widget._presentationMailbox.allowedToDisplay
? widget._presentationMailbox.getMailboxIcon(widget._imagePaths)
: widget._imagePaths.icHideFolder,
width: 20,
@@ -6,6 +6,9 @@ extension ListPresentationMailboxExtension on List<PresentationMailbox> {
List<PresentationMailbox> get listSubscribedMailboxes =>
where((mailbox) => mailbox.isSubscribedMailbox).toList();
List<PresentationMailbox> get listSubscribedMailboxesAndDefaultMailboxes =>
where((mailbox) => mailbox.isSubscribedMailbox || mailbox.isDefault).toList();
List<PresentationMailbox> get listPersonalMailboxes =>
where((mailbox) => mailbox.isPersonal).toList();
}
@@ -105,6 +105,8 @@ class PresentationMailbox with EquatableMixin {
(namespace?.value.indexOf('[') ?? 0) + 1,
namespace?.value.indexOf(']'));
bool get allowedToDisplay => isSubscribedMailbox || isDefault;
@override
List<Object?> get props => [
id,