From 7904a97847a89db31809e447206b4356478ab923 Mon Sep 17 00:00:00 2001 From: ManhNTX Date: Fri, 21 Oct 2022 05:48:11 +0700 Subject: [PATCH] TF-1083: remove unnecessary function --- .../widgets/mailbox_folder_tile_builder.dart | 1 - .../widgets/mailbox_search_tile_builder.dart | 1 - .../mailbox_dashboard_controller.dart | 4 -- .../presentation/thread_controller.dart | 38 ++++++++++--------- .../thread/presentation/thread_view.dart | 3 +- 5 files changed, 21 insertions(+), 26 deletions(-) diff --git a/lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart b/lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart index f4b1ac2a5..be69f2512 100644 --- a/lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart +++ b/lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart @@ -78,7 +78,6 @@ class MailBoxFolderTileBuilder { }, onAccept: (emails) { _onDragItemAccepted?.call(emails, _mailboxNode.item); - print(emails); }, ); diff --git a/lib/features/mailbox/presentation/widgets/mailbox_search_tile_builder.dart b/lib/features/mailbox/presentation/widgets/mailbox_search_tile_builder.dart index 8fee6c0de..395151ce6 100644 --- a/lib/features/mailbox/presentation/widgets/mailbox_search_tile_builder.dart +++ b/lib/features/mailbox/presentation/widgets/mailbox_search_tile_builder.dart @@ -72,7 +72,6 @@ class MailboxSearchTileBuilder { }, onAccept: (emails) { _onDragItemAccepted?.call(emails, _presentationMailbox); - print(emails.first.preview); }, ), ); diff --git a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart index 026536696..a6c9e4c78 100644 --- a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart +++ b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart @@ -74,7 +74,6 @@ import 'package:tmail_ui_user/features/thread/domain/usecases/mark_as_multiple_e import 'package:tmail_ui_user/features/thread/domain/usecases/mark_as_star_multiple_email_interactor.dart'; import 'package:tmail_ui_user/features/thread/domain/usecases/move_multiple_email_to_mailbox_interactor.dart'; import 'package:tmail_ui_user/features/thread/presentation/model/delete_action_type.dart'; -import 'package:tmail_ui_user/features/thread/presentation/thread_controller.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; import 'package:tmail_ui_user/main/routes/app_routes.dart'; import 'package:tmail_ui_user/main/routes/route_navigation.dart'; @@ -704,9 +703,6 @@ class MailboxDashBoardController extends ReloadableController { destinationMailboxId = success.destinationMailboxId; moveAction = success.moveAction; emailActionType = success.emailActionType; - if (Get.isRegistered()){ - Get.find().refreshEmailChanges(currentEmailState: success.currentEmailState); - } } else if (success is MoveMultipleEmailToMailboxHasSomeEmailFailure) { destinationPath = success.destinationPath; movedEmailIds = success.movedListEmailId; diff --git a/lib/features/thread/presentation/thread_controller.dart b/lib/features/thread/presentation/thread_controller.dart index 26696049e..d5fea5ed1 100644 --- a/lib/features/thread/presentation/thread_controller.dart +++ b/lib/features/thread/presentation/thread_controller.dart @@ -304,25 +304,27 @@ class ThreadController extends BaseController { if (viewState is Either) { viewState.map((success) { if (success is MarkAsEmailReadSuccess) { - refreshEmailChanges(currentEmailState: success.currentEmailState); + _refreshEmailChanges(currentEmailState: success.currentEmailState); } else if (success is MoveToMailboxSuccess) { - refreshEmailChanges(currentEmailState: success.currentEmailState); + _refreshEmailChanges(currentEmailState: success.currentEmailState); } else if (success is MarkAsStarEmailSuccess) { - refreshEmailChanges(currentEmailState: success.currentEmailState); + _refreshEmailChanges(currentEmailState: success.currentEmailState); } else if (success is DeleteEmailPermanentlySuccess) { - refreshEmailChanges(currentEmailState: success.currentEmailState); + _refreshEmailChanges(currentEmailState: success.currentEmailState); } else if (success is SaveEmailAsDraftsSuccess) { - refreshEmailChanges(currentEmailState: success.currentEmailState); + _refreshEmailChanges(currentEmailState: success.currentEmailState); } else if (success is RemoveEmailDraftsSuccess) { - refreshEmailChanges(currentEmailState: success.currentEmailState); + _refreshEmailChanges(currentEmailState: success.currentEmailState); } else if (success is SendEmailSuccess) { - refreshEmailChanges(currentEmailState: success.currentEmailState); + _refreshEmailChanges(currentEmailState: success.currentEmailState); } else if (success is UpdateEmailDraftsSuccess) { - refreshEmailChanges(currentEmailState: success.currentEmailState); + _refreshEmailChanges(currentEmailState: success.currentEmailState); } else if (success is MarkAsMailboxReadAllSuccess) { - refreshEmailChanges(currentEmailState: success.currentEmailState); + _refreshEmailChanges(currentEmailState: success.currentEmailState); } else if (success is MarkAsMailboxReadHasSomeEmailFailure) { - refreshEmailChanges(currentEmailState: success.currentEmailState); + _refreshEmailChanges(currentEmailState: success.currentEmailState); + } else if (success is MoveMultipleEmailToMailboxAllSuccess) { + _refreshEmailChanges(currentEmailState: success.currentEmailState); } }); } @@ -425,8 +427,8 @@ class ThreadController extends BaseController { } } - void refreshEmailChanges({jmap.State? currentEmailState}) { - log('ThreadController::refreshEmailChanges(): currentEmailState: $currentEmailState'); + void _refreshEmailChanges({jmap.State? currentEmailState}) { + log('ThreadController::_refreshEmailChanges(): currentEmailState: $currentEmailState'); if (isSearchActive()) { if (_accountId != null && searchQuery != null) { final limit = emailList.isNotEmpty @@ -437,7 +439,7 @@ class ThreadController extends BaseController { } } else { final newEmailState = currentEmailState ?? _currentEmailState; - log('ThreadController::refreshEmailChanges(): newEmailState: $newEmailState'); + log('ThreadController::_refreshEmailChanges(): newEmailState: $newEmailState'); if (_accountId != null && newEmailState != null) { consumeState(_refreshChangesEmailsInMailboxInteractor.execute( _accountId!, @@ -576,7 +578,7 @@ class ThreadController extends BaseController { message: message, icon: readActions == ReadActions.markAsUnread ? _imagePaths.icUnreadToast : _imagePaths.icReadToast); } - refreshEmailChanges(currentEmailState: currentEmailState); + _refreshEmailChanges(currentEmailState: currentEmailState); } void _markAsReadSelectedMultipleEmailFailure(Failure failure) { @@ -733,7 +735,7 @@ class ThreadController extends BaseController { ); } - refreshEmailChanges(currentEmailState: currentEmailState); + _refreshEmailChanges(currentEmailState: currentEmailState); } void moveSelectedMultipleEmailToTrash( @@ -821,7 +823,7 @@ class ThreadController extends BaseController { } void _markAsStarEmailSuccess(MarkAsStarEmailSuccess success) { - refreshEmailChanges(currentEmailState: success.currentEmailState); + _refreshEmailChanges(currentEmailState: success.currentEmailState); } void markAsStarSelectedMultipleEmail( @@ -862,7 +864,7 @@ class ThreadController extends BaseController { icon: markStarAction == MarkStarAction.unMarkStar ? _imagePaths.icUnStar : _imagePaths.icStar); } - refreshEmailChanges(currentEmailState: currentEmailState); + _refreshEmailChanges(currentEmailState: currentEmailState); } void _markAsStarMultipleEmailFailure(Failure failure) { @@ -1317,7 +1319,7 @@ class ThreadController extends BaseController { icon: _imagePaths.icDeleteToast); } - refreshEmailChanges(currentEmailState: currentEmailState); + _refreshEmailChanges(currentEmailState: currentEmailState); } void _emptyTrashFolderAction() { diff --git a/lib/features/thread/presentation/thread_view.dart b/lib/features/thread/presentation/thread_view.dart index b399e0583..a997cafe9 100644 --- a/lib/features/thread/presentation/thread_view.dart +++ b/lib/features/thread/presentation/thread_view.dart @@ -342,8 +342,7 @@ class ThreadView extends GetWidget with AppLoaderMixin, controller.searchController.searchState.value.searchStatus, controller.searchQuery, mailboxCurrent: controller.searchController.isSearchEmailRunning - ? listPresentationEmail[index].findMailboxContain( - controller.mailboxDashBoardController.mapMailboxById) + ? listPresentationEmail[index].findMailboxContain(controller.mailboxDashBoardController.mapMailboxById) : controller.currentMailbox, advancedSearchActivated: controller.searchController.isAdvancedSearchHasApply.isTrue) ..addOnPressEmailActionClick((action, email) =>