From fa96a291f88e975549e80f94a6e9d0e20878d430 Mon Sep 17 00:00:00 2001 From: dab246 Date: Tue, 8 Aug 2023 20:24:49 +0700 Subject: [PATCH] TF-1982 Change mailboxes label to folder (cherry picked from commit b909124c9f5016df6b82ed9316491a57f0380008) --- .../destination_picker_controller.dart | 6 +++--- .../presentation/destination_picker_view.dart | 2 +- .../mailbox/presentation/mailbox_controller.dart | 8 ++++---- .../mailbox/presentation/mailbox_view.dart | 2 +- .../mailbox/presentation/mailbox_view_web.dart | 4 ++-- .../presentation/model/mailbox_categories.dart | 14 +++++++------- .../model/mailbox_categories_expand_mode.dart | 10 +++++----- .../mailbox_visibility_controller.dart | 6 +++--- .../mailbox_visibility_view.dart | 2 +- lib/l10n/intl_ar.arb | 4 ++-- lib/l10n/intl_fr.arb | 4 ++-- lib/l10n/intl_it.arb | 4 ++-- lib/l10n/intl_messages.arb | 12 +++++++++--- lib/l10n/intl_ru.arb | 4 ++-- lib/l10n/intl_vi.arb | 4 ++-- lib/main/localizations/app_localizations.dart | 6 +++--- 16 files changed, 49 insertions(+), 43 deletions(-) diff --git a/lib/features/destination_picker/presentation/destination_picker_controller.dart b/lib/features/destination_picker/presentation/destination_picker_controller.dart index 04c3fb465..4e3e49af3 100644 --- a/lib/features/destination_picker/presentation/destination_picker_controller.dart +++ b/lib/features/destination_picker/presentation/destination_picker_controller.dart @@ -172,11 +172,11 @@ class DestinationPickerController extends BaseMailboxController { mailboxCategoriesExpandMode.value.defaultMailbox = newExpandMode; mailboxCategoriesExpandMode.refresh(); break; - case MailboxCategories.personalMailboxes: - final newExpandMode = mailboxCategoriesExpandMode.value.personalMailboxes == ExpandMode.EXPAND + case MailboxCategories.personalFolders: + final newExpandMode = mailboxCategoriesExpandMode.value.personalFolders == ExpandMode.EXPAND ? ExpandMode.COLLAPSE : ExpandMode.EXPAND; - mailboxCategoriesExpandMode.value.personalMailboxes = newExpandMode; + mailboxCategoriesExpandMode.value.personalFolders = newExpandMode; mailboxCategoriesExpandMode.refresh(); break; case MailboxCategories.teamMailboxes: diff --git a/lib/features/destination_picker/presentation/destination_picker_view.dart b/lib/features/destination_picker/presentation/destination_picker_view.dart index 7d633bc06..2286cbb5b 100644 --- a/lib/features/destination_picker/presentation/destination_picker_view.dart +++ b/lib/features/destination_picker/presentation/destination_picker_view.dart @@ -230,7 +230,7 @@ class DestinationPickerView extends GetWidget const SizedBox(height: 8), _buildMailboxCategory( context, - MailboxCategories.personalMailboxes, + MailboxCategories.personalFolders, controller.personalRootNode, actions, mailboxIdSelected diff --git a/lib/features/mailbox/presentation/mailbox_controller.dart b/lib/features/mailbox/presentation/mailbox_controller.dart index 6742e316b..0b91a6ceb 100644 --- a/lib/features/mailbox/presentation/mailbox_controller.dart +++ b/lib/features/mailbox/presentation/mailbox_controller.dart @@ -284,7 +284,7 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM && (_responsiveUtils.isMobile(currentContext!) || _responsiveUtils.isTablet(currentContext!))) { mailboxCategoriesExpandMode.value = MailboxCategoriesExpandMode( defaultMailbox: ExpandMode.COLLAPSE, - personalMailboxes: ExpandMode.COLLAPSE, + personalFolders: ExpandMode.COLLAPSE, teamMailboxes: ExpandMode.COLLAPSE); } else { mailboxCategoriesExpandMode.value = MailboxCategoriesExpandMode.initial(); @@ -832,9 +832,9 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM mailboxCategoriesExpandMode.value.defaultMailbox = newExpandMode; mailboxCategoriesExpandMode.refresh(); break; - case MailboxCategories.personalMailboxes: - final newExpandMode = mailboxCategoriesExpandMode.value.personalMailboxes == ExpandMode.EXPAND ? ExpandMode.COLLAPSE : ExpandMode.EXPAND; - mailboxCategoriesExpandMode.value.personalMailboxes = newExpandMode; + case MailboxCategories.personalFolders: + final newExpandMode = mailboxCategoriesExpandMode.value.personalFolders == ExpandMode.EXPAND ? ExpandMode.COLLAPSE : ExpandMode.EXPAND; + mailboxCategoriesExpandMode.value.personalFolders = newExpandMode; mailboxCategoriesExpandMode.refresh(); if (personalMailboxTree.value.root.hasChildren()) { _triggerToggleMailboxCategories(); diff --git a/lib/features/mailbox/presentation/mailbox_view.dart b/lib/features/mailbox/presentation/mailbox_view.dart index 17ab108a2..1d3ae1942 100644 --- a/lib/features/mailbox/presentation/mailbox_view.dart +++ b/lib/features/mailbox/presentation/mailbox_view.dart @@ -237,7 +237,7 @@ class MailboxView extends BaseMailboxView { if (controller.personalMailboxIsNotEmpty) { return _buildMailboxCategory( context, - MailboxCategories.personalMailboxes, + MailboxCategories.personalFolders, controller.personalRootNode ); } else { diff --git a/lib/features/mailbox/presentation/mailbox_view_web.dart b/lib/features/mailbox/presentation/mailbox_view_web.dart index c147a94da..32f0ac315 100644 --- a/lib/features/mailbox/presentation/mailbox_view_web.dart +++ b/lib/features/mailbox/presentation/mailbox_view_web.dart @@ -119,7 +119,7 @@ class MailboxView extends BaseMailboxView { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Expanded(child: Text( - AppLocalizations.of(context).mailBoxes, + AppLocalizations.of(context).folders, style: const TextStyle( fontSize: 17, color: Colors.black, @@ -159,7 +159,7 @@ class MailboxView extends BaseMailboxView { if (controller.personalMailboxIsNotEmpty) { return _buildMailboxCategory( context, - MailboxCategories.personalMailboxes, + MailboxCategories.personalFolders, controller.personalRootNode ); } else { diff --git a/lib/features/mailbox/presentation/model/mailbox_categories.dart b/lib/features/mailbox/presentation/model/mailbox_categories.dart index a4b2f1bbb..0c05ec080 100644 --- a/lib/features/mailbox/presentation/model/mailbox_categories.dart +++ b/lib/features/mailbox/presentation/model/mailbox_categories.dart @@ -6,7 +6,7 @@ import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; enum MailboxCategories { exchange, - personalMailboxes, + personalFolders, appGrid, teamMailboxes } @@ -17,8 +17,8 @@ extension MailboxCategoriessExtension on MailboxCategories { switch(this) { case MailboxCategories.exchange: return 'exchange'; - case MailboxCategories.personalMailboxes: - return 'personalMailboxes'; + case MailboxCategories.personalFolders: + return 'personalFolders'; case MailboxCategories.appGrid: return 'appGrid'; case MailboxCategories.teamMailboxes: @@ -30,8 +30,8 @@ extension MailboxCategoriessExtension on MailboxCategories { switch(this) { case MailboxCategories.exchange: return AppLocalizations.of(context).exchange; - case MailboxCategories.personalMailboxes: - return AppLocalizations.of(context).personalMailboxes; + case MailboxCategories.personalFolders: + return AppLocalizations.of(context).personalFolders; case MailboxCategories.appGrid: return AppLocalizations.of(context).appGridTittle; case MailboxCategories.teamMailboxes: @@ -43,8 +43,8 @@ extension MailboxCategoriessExtension on MailboxCategories { switch(this) { case MailboxCategories.exchange: return categoriesExpandMode.defaultMailbox; - case MailboxCategories.personalMailboxes: - return categoriesExpandMode.personalMailboxes; + case MailboxCategories.personalFolders: + return categoriesExpandMode.personalFolders; case MailboxCategories.teamMailboxes: return categoriesExpandMode.teamMailboxes; default: diff --git a/lib/features/mailbox/presentation/model/mailbox_categories_expand_mode.dart b/lib/features/mailbox/presentation/model/mailbox_categories_expand_mode.dart index 6f46d64c4..e0f32c2aa 100644 --- a/lib/features/mailbox/presentation/model/mailbox_categories_expand_mode.dart +++ b/lib/features/mailbox/presentation/model/mailbox_categories_expand_mode.dart @@ -4,21 +4,21 @@ import 'package:model/mailbox/expand_mode.dart'; class MailboxCategoriesExpandMode with EquatableMixin { ExpandMode defaultMailbox; - ExpandMode personalMailboxes; + ExpandMode personalFolders; ExpandMode teamMailboxes; MailboxCategoriesExpandMode({ required this.defaultMailbox, - required this.personalMailboxes, + required this.personalFolders, required this.teamMailboxes}); factory MailboxCategoriesExpandMode.initial() { return MailboxCategoriesExpandMode( - defaultMailbox: ExpandMode.EXPAND, - personalMailboxes: ExpandMode.EXPAND, + defaultMailbox: ExpandMode.EXPAND, + personalFolders: ExpandMode.EXPAND, teamMailboxes: ExpandMode.EXPAND); } @override - List get props => [defaultMailbox, personalMailboxes, teamMailboxes]; + List get props => [defaultMailbox, personalFolders, teamMailboxes]; } \ No newline at end of file diff --git a/lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_controller.dart b/lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_controller.dart index 969b9f6a3..172850a92 100644 --- a/lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_controller.dart +++ b/lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_controller.dart @@ -144,9 +144,9 @@ class MailboxVisibilityController extends BaseMailboxController { mailboxCategoriesExpandMode.value.defaultMailbox = newExpandMode; mailboxCategoriesExpandMode.refresh(); break; - case MailboxCategories.personalMailboxes: - final newExpandMode = mailboxCategoriesExpandMode.value.personalMailboxes == ExpandMode.EXPAND ? ExpandMode.COLLAPSE : ExpandMode.EXPAND; - mailboxCategoriesExpandMode.value.personalMailboxes = newExpandMode; + case MailboxCategories.personalFolders: + final newExpandMode = mailboxCategoriesExpandMode.value.personalFolders == ExpandMode.EXPAND ? ExpandMode.COLLAPSE : ExpandMode.EXPAND; + mailboxCategoriesExpandMode.value.personalFolders = newExpandMode; mailboxCategoriesExpandMode.refresh(); break; case MailboxCategories.teamMailboxes: diff --git a/lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_view.dart b/lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_view.dart index 6e0d49a97..b536af0ea 100644 --- a/lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_view.dart +++ b/lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_view.dart @@ -85,7 +85,7 @@ class MailboxVisibilityView extends GetWidget Obx(() => controller.personalMailboxIsNotEmpty ? _buildMailboxCategory( context, - MailboxCategories.personalMailboxes, + MailboxCategories.personalFolders, controller.personalRootNode) : const SizedBox.shrink() ) diff --git a/lib/l10n/intl_ar.arb b/lib/l10n/intl_ar.arb index a26c0efa9..732cd9990 100644 --- a/lib/l10n/intl_ar.arb +++ b/lib/l10n/intl_ar.arb @@ -1223,8 +1223,8 @@ "placeholders_order": [], "placeholders": {} }, - "personalMailboxes": "صناديق البريد الشخصية", - "@personalMailboxes": { + "personalFolders": "المجلدات الشخصية", + "@personalFolders": { "type": "text", "placeholders_order": [], "placeholders": {} diff --git a/lib/l10n/intl_fr.arb b/lib/l10n/intl_fr.arb index a624a7f2a..a2380930f 100644 --- a/lib/l10n/intl_fr.arb +++ b/lib/l10n/intl_fr.arb @@ -1892,8 +1892,8 @@ "placeholders_order": [], "placeholders": {} }, - "personalMailboxes": "Boîtes aux lettres personnelles", - "@personalMailboxes": { + "personalFolders": "Dossiers personnels", + "@personalFolders": { "type": "text", "placeholders_order": [], "placeholders": {} diff --git a/lib/l10n/intl_it.arb b/lib/l10n/intl_it.arb index 6618f0cb0..561758c14 100644 --- a/lib/l10n/intl_it.arb +++ b/lib/l10n/intl_it.arb @@ -2837,8 +2837,8 @@ "placeholders_order": [], "placeholders": {} }, - "personalMailboxes": "Caselle di posta personali", - "@personalMailboxes": { + "personalFolders": "Cartelle personali", + "@personalFolders": { "type": "text", "placeholders_order": [], "placeholders": {} diff --git a/lib/l10n/intl_messages.arb b/lib/l10n/intl_messages.arb index 1445faeed..5834339a4 100644 --- a/lib/l10n/intl_messages.arb +++ b/lib/l10n/intl_messages.arb @@ -1,5 +1,5 @@ { - "@@last_modified": "2023-08-04T21:19:31.613036", + "@@last_modified": "2023-08-08T20:09:51.612589", "initializing_data": "Initializing data...", "@initializing_data": { "type": "text", @@ -126,8 +126,8 @@ "placeholders_order": [], "placeholders": {} }, - "personalMailboxes": "Personal mailboxes", - "@personalMailboxes": { + "personalFolders": "Personal folders", + "@personalFolders": { "type": "text", "placeholders_order": [], "placeholders": {} @@ -3092,6 +3092,12 @@ "placeholders_order": [], "placeholders": {} }, + "deleteAllSpamEmailsNow": "Delete all spam emails now", + "@deleteAllSpamEmailsNow": { + "type": "text", + "placeholders_order": [], + "placeholders": {} + }, "quotaStateLabel": "{used} of {limit} Used", "@quotaStateLabel": { "type": "text", diff --git a/lib/l10n/intl_ru.arb b/lib/l10n/intl_ru.arb index 2f7a58e20..9ee39a366 100644 --- a/lib/l10n/intl_ru.arb +++ b/lib/l10n/intl_ru.arb @@ -2656,8 +2656,8 @@ "placeholders_order": [], "placeholders": {} }, - "personalMailboxes": "Личные почтовые ящики", - "@personalMailboxes": { + "personalFolders": "Личные папки", + "@personalFolders": { "type": "text", "placeholders_order": [], "placeholders": {} diff --git a/lib/l10n/intl_vi.arb b/lib/l10n/intl_vi.arb index 5c0c28a65..87f7d1f67 100644 --- a/lib/l10n/intl_vi.arb +++ b/lib/l10n/intl_vi.arb @@ -2672,8 +2672,8 @@ "placeholders_order": [], "placeholders": {} }, - "personalMailboxes": "Hộp thư cá nhân", - "@personalMailboxes": { + "personalFolders": "Thư mục cá nhân", + "@personalFolders": { "type": "text", "placeholders_order": [], "placeholders": {} diff --git a/lib/main/localizations/app_localizations.dart b/lib/main/localizations/app_localizations.dart index bb52f303d..926a2b00d 100644 --- a/lib/main/localizations/app_localizations.dart +++ b/lib/main/localizations/app_localizations.dart @@ -121,10 +121,10 @@ class AppLocalizations { ); } - String get personalMailboxes { + String get personalFolders { return Intl.message( - 'Personal mailboxes', - name: 'personalMailboxes', + 'Personal folders', + name: 'personalFolders', ); }