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

TF-942 Re-normalizing variable names makes more sense

Browse Source
This commit is contained in:
dab246
2022-09-23 11:05:43 +07:00
committed by Dat H. Pham
parent ca7c7fda96
commit 1722543808
12 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/thread/presentation/mixin/email_action_controller.dart
+1 -1
View File
@@ -48,7 +48,7 @@ mixin EmailActionController {
void moveToTrash(PresentationEmail email) async {
final currentMailbox = mailboxDashBoardController.selectedMailbox.value;
final accountId = mailboxDashBoardController.accountId.value;
final trashMailboxId = mailboxDashBoardController.mapDefaultMailboxId[PresentationMailbox.roleTrash];
final trashMailboxId = mailboxDashBoardController.mapDefaultMailboxIdByRole[PresentationMailbox.roleTrash];
if (currentMailbox != null && accountId != null && trashMailboxId != null) {
_moveToTrashAction(accountId, MoveToMailboxRequest(
lib/features/thread/presentation/thread_controller.dart
+9 -9
View File
@@ -279,7 +279,7 @@ class ThreadController extends BaseController {
mailboxDashBoardController.clearDashBoardAction();
} else if (action is OpenEmailDetailedFromSuggestionQuickSearchAction) {
final mailboxContain = action.presentationEmail
.findMailboxContain(mailboxDashBoardController.mapMailbox);
.findMailboxContain(mailboxDashBoardController.mapMailboxById);
pressEmailAction(
action.context,
EmailActionType.preview,
@@ -902,7 +902,7 @@ class ThreadController extends BaseController {
void _searchEmailsSuccess(SearchEmailSuccess success) {
final resultEmailSearchList = success.emailList
.map((email) => email.toSearchPresentationEmail(mailboxDashBoardController.mapMailbox))
.map((email) => email.toSearchPresentationEmail(mailboxDashBoardController.mapMailboxById))
.toList();
final emailsSearchBeforeChanges = emailList;
@@ -928,7 +928,7 @@ class ThreadController extends BaseController {
void _searchMoreEmailsSuccess(SearchMoreEmailSuccess success) {
if (success.emailList.isNotEmpty) {
final resultEmailSearchList = success.emailList
.map((email) => email.toSearchPresentationEmail(mailboxDashBoardController.mapMailbox))
.map((email) => email.toSearchPresentationEmail(mailboxDashBoardController.mapMailboxById))
.where((email) => !emailList.contains(email))
.toList();
emailList.addAll(resultEmailSearchList);
@@ -956,7 +956,7 @@ class ThreadController extends BaseController {
break;
case EmailActionType.moveToMailbox:
final mailboxContainCurrent = searchController.isSearchEmailRunning
? selectionEmail.getCurrentMailboxContain(mailboxDashBoardController.mapMailbox)
? selectionEmail.getCurrentMailboxContain(mailboxDashBoardController.mapMailboxById)
: currentMailbox;
if (mailboxContainCurrent != null) {
moveSelectedMultipleEmailToMailbox(selectionEmail, mailboxContainCurrent);
@@ -964,7 +964,7 @@ class ThreadController extends BaseController {
break;
case EmailActionType.moveToTrash:
final mailboxContainCurrent = searchController.isSearchEmailRunning
? selectionEmail.getCurrentMailboxContain(mailboxDashBoardController.mapMailbox)
? selectionEmail.getCurrentMailboxContain(mailboxDashBoardController.mapMailboxById)
: currentMailbox;
if (mailboxContainCurrent != null) {
moveSelectedMultipleEmailToTrash(selectionEmail, mailboxContainCurrent);
@@ -972,7 +972,7 @@ class ThreadController extends BaseController {
break;
case EmailActionType.deletePermanently:
final mailboxContainCurrent = searchController.isSearchEmailRunning
? selectionEmail.getCurrentMailboxContain(mailboxDashBoardController.mapMailbox)
? selectionEmail.getCurrentMailboxContain(mailboxDashBoardController.mapMailboxById)
: currentMailbox;
if (mailboxContainCurrent != null) {
deleteSelectionEmailsPermanently(
@@ -984,7 +984,7 @@ class ThreadController extends BaseController {
break;
case EmailActionType.moveToSpam:
final mailboxContainCurrent = searchController.isSearchEmailRunning
? selectionEmail.getCurrentMailboxContain(mailboxDashBoardController.mapMailbox)
? selectionEmail.getCurrentMailboxContain(mailboxDashBoardController.mapMailboxById)
: currentMailbox;
if (mailboxContainCurrent != null) {
moveSelectedMultipleEmailToSpam(selectionEmail, mailboxContainCurrent);
@@ -1125,7 +1125,7 @@ class ThreadController extends BaseController {
void moveToTrash(PresentationEmail email) async {
final currentMailbox = mailboxDashBoardController.selectedMailbox.value;
final accountId = mailboxDashBoardController.accountId.value;
final trashMailboxId = mailboxDashBoardController.mapDefaultMailboxId[PresentationMailbox.roleTrash];
final trashMailboxId = mailboxDashBoardController.mapDefaultMailboxIdByRole[PresentationMailbox.roleTrash];
if (currentMailbox != null && accountId != null && trashMailboxId != null) {
_moveToTrashAction(accountId, MoveToMailboxRequest(
@@ -1294,7 +1294,7 @@ class ThreadController extends BaseController {
void _emptyTrashFolderAction() {
cancelSelectEmail();
final trashMailboxId = mailboxDashBoardController.mapDefaultMailboxId[PresentationMailbox.roleTrash];
final trashMailboxId = mailboxDashBoardController.mapDefaultMailboxIdByRole[PresentationMailbox.roleTrash];
log('ThreadController::_emptyTrashFolderAction(): trashMailboxId: $trashMailboxId');
if (_accountId != null && trashMailboxId != null) {
consumeState(_emptyTrashFolderInteractor.execute(_accountId!, trashMailboxId));
lib/features/thread/presentation/thread_view.dart
+3 -3
View File
@@ -340,7 +340,7 @@ class ThreadView extends GetWidget<ThreadController> with AppLoaderMixin,
controller.searchQuery,
mailboxCurrent: controller.searchController.isSearchEmailRunning
? listPresentationEmail[index].findMailboxContain(
controller.mailboxDashBoardController.mapMailbox)
controller.mailboxDashBoardController.mapMailboxById)
: controller.currentMailbox,
advancedSearchActivated: controller.searchController.isAdvancedSearchHasApply.isTrue)
..addOnPressEmailActionClick((action, email) =>
@@ -349,7 +349,7 @@ class ThreadView extends GetWidget<ThreadController> with AppLoaderMixin,
action,
email,
mailboxContain: controller.searchController.isSearchEmailRunning
? email.findMailboxContain(controller.mailboxDashBoardController.mapMailbox)
? email.findMailboxContain(controller.mailboxDashBoardController.mapMailboxById)
: controller.currentMailbox))
..addOnMoreActionClick((email, position) => _responsiveUtils.isMobile(context)
? controller.openContextMenuAction(context, _contextMenuActionTile(context, email))
@@ -450,7 +450,7 @@ class ThreadView extends GetWidget<ThreadController> with AppLoaderMixin,
Widget _markAsEmailSpamOrUnSpamAction(BuildContext context, PresentationEmail email) {
final mailboxContain = controller.searchController.isSearchEmailRunning
? email.findMailboxContain(controller.mailboxDashBoardController.mapMailbox)
? email.findMailboxContain(controller.mailboxDashBoardController.mapMailboxById)
: controller.currentMailbox;
return (EmailActionCupertinoActionSheetActionBuilder(
const Key('mark_as_spam_or_un_spam_action'),