From 19aacb27898eb3d7c382b53d92ea6451654a4386 Mon Sep 17 00:00:00 2001 From: Dat PHAM HOANG Date: Fri, 11 Mar 2022 14:19:07 +0700 Subject: [PATCH] TF-189 Refactor destination picker components: observe only Tree variable --- .../destination_picker_controller.dart | 42 ++-------- .../presentation/destination_picker_view.dart | 77 +++++++++---------- 2 files changed, 41 insertions(+), 78 deletions(-) diff --git a/lib/features/destination_picker/presentation/destination_picker_controller.dart b/lib/features/destination_picker/presentation/destination_picker_controller.dart index ca50aaf6a..52c88fec4 100644 --- a/lib/features/destination_picker/presentation/destination_picker_controller.dart +++ b/lib/features/destination_picker/presentation/destination_picker_controller.dart @@ -1,35 +1,27 @@ import 'package:core/core.dart'; import 'package:dartz/dartz.dart'; +import 'package:get/get.dart'; import 'package:jmap_dart_client/jmap/account_id.dart'; import 'package:model/model.dart'; -import 'package:tmail_ui_user/features/base/base_controller.dart'; +import 'package:tmail_ui_user/features/base/base_mailbox_controller.dart'; import 'package:tmail_ui_user/features/destination_picker/presentation/model/destination_picker_arguments.dart'; import 'package:tmail_ui_user/features/mailbox/domain/state/get_all_mailboxes_state.dart'; import 'package:tmail_ui_user/features/mailbox/domain/usecases/get_all_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_node.dart'; -import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_tree.dart'; -import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_tree_builder.dart'; -import 'package:tmail_ui_user/features/mailbox/presentation/extensions/list_mailbox_node_extension.dart'; -import 'package:get/get.dart'; import 'package:tmail_ui_user/main/routes/route_navigation.dart'; -class DestinationPickerController extends BaseController { +class DestinationPickerController extends BaseMailboxController { final GetAllMailboxInteractor _getAllMailboxInteractor; - final TreeBuilder _treeBuilder; - MailboxTree folderMailboxTree = MailboxTree(MailboxNode.root()); - final defaultMailboxList = [].obs; - final folderMailboxNodeList = [].obs; final mailboxAction = Rxn(); AccountId? accountId; DestinationPickerController( this._getAllMailboxInteractor, - this._treeBuilder, - ); + treeBuilder, + ) : super(treeBuilder); @override void onReady() { @@ -47,18 +39,13 @@ class DestinationPickerController extends BaseController { super.onData(newState); newState.map((success) { if (success is GetAllMailboxSuccess) { - _buildTree(success.folderMailboxList); + buildTree(success.mailboxList); } }); } @override void onDone() { - viewState.value.map((success) { - if (success is GetAllMailboxSuccess) { - defaultMailboxList.value = success.defaultMailboxList; - } - }); } @override @@ -70,23 +57,6 @@ class DestinationPickerController extends BaseController { } } - void _buildTree(List folderMailboxList) async { - folderMailboxTree = await _treeBuilder.generateMailboxTree(folderMailboxList); - folderMailboxNodeList.value = folderMailboxTree.root.childrenItems ?? []; - } - - void toggleMailboxFolder(MailboxNode selectedMailboxNode) { - final newExpandMode = selectedMailboxNode.expandMode == ExpandMode.COLLAPSE - ? ExpandMode.EXPAND - : ExpandMode.COLLAPSE; - - final newMailboxNodeList = folderMailboxNodeList.updateNode( - selectedMailboxNode.item.id, - selectedMailboxNode.copyWith(newExpandMode: newExpandMode)); - - folderMailboxNodeList.value = newMailboxNodeList; - } - void selectMailboxAction(PresentationMailbox? destinationMailbox) { popBack(result: destinationMailbox); } diff --git a/lib/features/destination_picker/presentation/destination_picker_view.dart b/lib/features/destination_picker/presentation/destination_picker_view.dart index 85e6c4d7c..4112e95a0 100644 --- a/lib/features/destination_picker/presentation/destination_picker_view.dart +++ b/lib/features/destination_picker/presentation/destination_picker_view.dart @@ -6,12 +6,10 @@ import 'package:model/model.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_picker_arguments.dart'; import 'package:tmail_ui_user/features/destination_picker/presentation/widgets/app_bar_destination_picker_builder.dart'; -import 'package:tmail_ui_user/features/mailbox/domain/state/get_all_mailboxes_state.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_node.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart'; -import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_tile_builder.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; class DestinationPickerView extends GetWidget { @@ -224,47 +222,37 @@ class DestinationPickerView extends GetWidget { } Widget _buildDefaultMailbox(BuildContext context) { - return Obx(() => controller.viewState.value.fold( - (failure) => SizedBox.shrink(), - (success) { - if (success is GetAllMailboxSuccess) { - final defaultMailboxList = success.defaultMailboxList; - return ListView.builder( - padding: EdgeInsets.only(top: 8, left: 8, right: 10, bottom: 8), - key: Key('default_mailbox_list'), - itemCount: defaultMailboxList.length, - shrinkWrap: true, - primary: false, - itemBuilder: (context, index) => (MailboxTileBuilder( - _imagePaths, - defaultMailboxList[index], - mailboxDisplayed: MailboxDisplayed.destinationPicker, - isLastElement: index == defaultMailboxList.length - 1) - ..addOnOpenMailboxAction((mailbox) => - controller.selectMailboxAction(mailbox.toPresentationMailboxWithMailboxPath(mailbox.name?.name ?? '')))) - .build()); - } else { - return SizedBox.shrink(); - } - }) + return Obx(() => controller.defaultMailboxTree.value.root.childrenItems?.isNotEmpty ?? false + ? Transform( + transform: Matrix4.translationValues(-4.0, 0.0, 0.0), + child: Padding( + padding: EdgeInsets.only(top: 10, bottom: 10), + child: TreeView( + startExpanded: false, + key: Key('default_mailbox_list'), + children: _buildListChildTileWidget(context, controller.defaultMailboxTree.value.root) + ) + ) + ) + : SizedBox.shrink() ); } Widget _buildFolderMailbox(BuildContext context) { - return Obx(() => controller.folderMailboxNodeList.isNotEmpty + return Obx(() => controller.folderMailboxTree.value.root.childrenItems?.isNotEmpty ?? false ? Padding( padding: EdgeInsets.only(top: 8, bottom: 8), child: TreeView( startExpanded: false, key: Key('folder_mailbox_list'), - children: _buildListChildTileWidget(context, controller.folderMailboxNodeList))) + children: _buildListChildTileWidget(context, controller.folderMailboxTree.value.root))) : SizedBox.shrink() ); } - List _buildListChildTileWidget(BuildContext context, List listMailboxNode) { - return listMailboxNode - .map((mailboxNode) => mailboxNode.hasChildren() + List _buildListChildTileWidget(BuildContext context, MailboxNode parentNode) { + return parentNode.childrenItems + ?.map((mailboxNode) => mailboxNode.hasChildren() ? Padding( padding: EdgeInsets.only(left: 20), child: TreeViewChild( @@ -276,14 +264,10 @@ class DestinationPickerView extends GetWidget { _imagePaths, mailboxNode, mailboxDisplayed: MailboxDisplayed.destinationPicker) - ..addOnOpenMailboxFolderClick((mailboxNode) => controller.selectMailboxAction(mailboxNode.item.toPresentationMailboxWithMailboxPath( - mailboxNode.getPathMailboxNode( - controller.folderMailboxTree, - controller.defaultMailboxList, - )))) + ..addOnOpenMailboxFolderClick(_handleOpenMailboxClick) ..addOnExpandFolderActionClick((mailboxNode) => controller.toggleMailboxFolder(mailboxNode))) .build(), - children: _buildListChildTileWidget(context, mailboxNode.childrenItems!) + children: _buildListChildTileWidget(context, mailboxNode) ).build()) : Padding( padding: EdgeInsets.only(left: 20), @@ -292,14 +276,10 @@ class DestinationPickerView extends GetWidget { _imagePaths, mailboxNode, mailboxDisplayed: MailboxDisplayed.destinationPicker) - ..addOnOpenMailboxFolderClick((mailboxNode) => controller.selectMailboxAction(mailboxNode.item.toPresentationMailboxWithMailboxPath( - mailboxNode.getPathMailboxNode( - controller.folderMailboxTree, - controller.defaultMailboxList, - ))))) + ..addOnOpenMailboxFolderClick(_handleOpenMailboxClick)) .build(), )) - .toList(); + .toList() ?? []; } EdgeInsets _getMarginDestinationPicker(BuildContext context) { @@ -375,4 +355,17 @@ class DestinationPickerView extends GetWidget { ) ); } + + void _handleOpenMailboxClick(MailboxNode mailboxNode) { + var presentationMailbox; + final path = controller.findNodePath(mailboxNode.item.id) + ?? mailboxNode.item.name?.name; + if (path != null) { + presentationMailbox = mailboxNode.item + .toPresentationMailboxWithMailboxPath(path); + } else { + presentationMailbox = mailboxNode.item; + } + controller.selectMailboxAction(presentationMailbox); + } } \ No newline at end of file