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