TF-1982 Change mailboxes label to folder
(cherry picked from commit b909124c9f5016df6b82ed9316491a57f0380008)
This commit is contained in:
@@ -172,11 +172,11 @@ class DestinationPickerController extends BaseMailboxController {
|
|||||||
mailboxCategoriesExpandMode.value.defaultMailbox = newExpandMode;
|
mailboxCategoriesExpandMode.value.defaultMailbox = newExpandMode;
|
||||||
mailboxCategoriesExpandMode.refresh();
|
mailboxCategoriesExpandMode.refresh();
|
||||||
break;
|
break;
|
||||||
case MailboxCategories.personalMailboxes:
|
case MailboxCategories.personalFolders:
|
||||||
final newExpandMode = mailboxCategoriesExpandMode.value.personalMailboxes == ExpandMode.EXPAND
|
final newExpandMode = mailboxCategoriesExpandMode.value.personalFolders == ExpandMode.EXPAND
|
||||||
? ExpandMode.COLLAPSE
|
? ExpandMode.COLLAPSE
|
||||||
: ExpandMode.EXPAND;
|
: ExpandMode.EXPAND;
|
||||||
mailboxCategoriesExpandMode.value.personalMailboxes = newExpandMode;
|
mailboxCategoriesExpandMode.value.personalFolders = newExpandMode;
|
||||||
mailboxCategoriesExpandMode.refresh();
|
mailboxCategoriesExpandMode.refresh();
|
||||||
break;
|
break;
|
||||||
case MailboxCategories.teamMailboxes:
|
case MailboxCategories.teamMailboxes:
|
||||||
|
|||||||
@@ -230,7 +230,7 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
|
|||||||
const SizedBox(height: 8),
|
const SizedBox(height: 8),
|
||||||
_buildMailboxCategory(
|
_buildMailboxCategory(
|
||||||
context,
|
context,
|
||||||
MailboxCategories.personalMailboxes,
|
MailboxCategories.personalFolders,
|
||||||
controller.personalRootNode,
|
controller.personalRootNode,
|
||||||
actions,
|
actions,
|
||||||
mailboxIdSelected
|
mailboxIdSelected
|
||||||
|
|||||||
@@ -284,7 +284,7 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM
|
|||||||
&& (_responsiveUtils.isMobile(currentContext!) || _responsiveUtils.isTablet(currentContext!))) {
|
&& (_responsiveUtils.isMobile(currentContext!) || _responsiveUtils.isTablet(currentContext!))) {
|
||||||
mailboxCategoriesExpandMode.value = MailboxCategoriesExpandMode(
|
mailboxCategoriesExpandMode.value = MailboxCategoriesExpandMode(
|
||||||
defaultMailbox: ExpandMode.COLLAPSE,
|
defaultMailbox: ExpandMode.COLLAPSE,
|
||||||
personalMailboxes: ExpandMode.COLLAPSE,
|
personalFolders: ExpandMode.COLLAPSE,
|
||||||
teamMailboxes: ExpandMode.COLLAPSE);
|
teamMailboxes: ExpandMode.COLLAPSE);
|
||||||
} else {
|
} else {
|
||||||
mailboxCategoriesExpandMode.value = MailboxCategoriesExpandMode.initial();
|
mailboxCategoriesExpandMode.value = MailboxCategoriesExpandMode.initial();
|
||||||
@@ -832,9 +832,9 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM
|
|||||||
mailboxCategoriesExpandMode.value.defaultMailbox = newExpandMode;
|
mailboxCategoriesExpandMode.value.defaultMailbox = newExpandMode;
|
||||||
mailboxCategoriesExpandMode.refresh();
|
mailboxCategoriesExpandMode.refresh();
|
||||||
break;
|
break;
|
||||||
case MailboxCategories.personalMailboxes:
|
case MailboxCategories.personalFolders:
|
||||||
final newExpandMode = mailboxCategoriesExpandMode.value.personalMailboxes == ExpandMode.EXPAND ? ExpandMode.COLLAPSE : ExpandMode.EXPAND;
|
final newExpandMode = mailboxCategoriesExpandMode.value.personalFolders == ExpandMode.EXPAND ? ExpandMode.COLLAPSE : ExpandMode.EXPAND;
|
||||||
mailboxCategoriesExpandMode.value.personalMailboxes = newExpandMode;
|
mailboxCategoriesExpandMode.value.personalFolders = newExpandMode;
|
||||||
mailboxCategoriesExpandMode.refresh();
|
mailboxCategoriesExpandMode.refresh();
|
||||||
if (personalMailboxTree.value.root.hasChildren()) {
|
if (personalMailboxTree.value.root.hasChildren()) {
|
||||||
_triggerToggleMailboxCategories();
|
_triggerToggleMailboxCategories();
|
||||||
|
|||||||
@@ -237,7 +237,7 @@ class MailboxView extends BaseMailboxView {
|
|||||||
if (controller.personalMailboxIsNotEmpty) {
|
if (controller.personalMailboxIsNotEmpty) {
|
||||||
return _buildMailboxCategory(
|
return _buildMailboxCategory(
|
||||||
context,
|
context,
|
||||||
MailboxCategories.personalMailboxes,
|
MailboxCategories.personalFolders,
|
||||||
controller.personalRootNode
|
controller.personalRootNode
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ class MailboxView extends BaseMailboxView {
|
|||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
children: [
|
children: [
|
||||||
Expanded(child: Text(
|
Expanded(child: Text(
|
||||||
AppLocalizations.of(context).mailBoxes,
|
AppLocalizations.of(context).folders,
|
||||||
style: const TextStyle(
|
style: const TextStyle(
|
||||||
fontSize: 17,
|
fontSize: 17,
|
||||||
color: Colors.black,
|
color: Colors.black,
|
||||||
@@ -159,7 +159,7 @@ class MailboxView extends BaseMailboxView {
|
|||||||
if (controller.personalMailboxIsNotEmpty) {
|
if (controller.personalMailboxIsNotEmpty) {
|
||||||
return _buildMailboxCategory(
|
return _buildMailboxCategory(
|
||||||
context,
|
context,
|
||||||
MailboxCategories.personalMailboxes,
|
MailboxCategories.personalFolders,
|
||||||
controller.personalRootNode
|
controller.personalRootNode
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
|||||||
|
|
||||||
enum MailboxCategories {
|
enum MailboxCategories {
|
||||||
exchange,
|
exchange,
|
||||||
personalMailboxes,
|
personalFolders,
|
||||||
appGrid,
|
appGrid,
|
||||||
teamMailboxes
|
teamMailboxes
|
||||||
}
|
}
|
||||||
@@ -17,8 +17,8 @@ extension MailboxCategoriessExtension on MailboxCategories {
|
|||||||
switch(this) {
|
switch(this) {
|
||||||
case MailboxCategories.exchange:
|
case MailboxCategories.exchange:
|
||||||
return 'exchange';
|
return 'exchange';
|
||||||
case MailboxCategories.personalMailboxes:
|
case MailboxCategories.personalFolders:
|
||||||
return 'personalMailboxes';
|
return 'personalFolders';
|
||||||
case MailboxCategories.appGrid:
|
case MailboxCategories.appGrid:
|
||||||
return 'appGrid';
|
return 'appGrid';
|
||||||
case MailboxCategories.teamMailboxes:
|
case MailboxCategories.teamMailboxes:
|
||||||
@@ -30,8 +30,8 @@ extension MailboxCategoriessExtension on MailboxCategories {
|
|||||||
switch(this) {
|
switch(this) {
|
||||||
case MailboxCategories.exchange:
|
case MailboxCategories.exchange:
|
||||||
return AppLocalizations.of(context).exchange;
|
return AppLocalizations.of(context).exchange;
|
||||||
case MailboxCategories.personalMailboxes:
|
case MailboxCategories.personalFolders:
|
||||||
return AppLocalizations.of(context).personalMailboxes;
|
return AppLocalizations.of(context).personalFolders;
|
||||||
case MailboxCategories.appGrid:
|
case MailboxCategories.appGrid:
|
||||||
return AppLocalizations.of(context).appGridTittle;
|
return AppLocalizations.of(context).appGridTittle;
|
||||||
case MailboxCategories.teamMailboxes:
|
case MailboxCategories.teamMailboxes:
|
||||||
@@ -43,8 +43,8 @@ extension MailboxCategoriessExtension on MailboxCategories {
|
|||||||
switch(this) {
|
switch(this) {
|
||||||
case MailboxCategories.exchange:
|
case MailboxCategories.exchange:
|
||||||
return categoriesExpandMode.defaultMailbox;
|
return categoriesExpandMode.defaultMailbox;
|
||||||
case MailboxCategories.personalMailboxes:
|
case MailboxCategories.personalFolders:
|
||||||
return categoriesExpandMode.personalMailboxes;
|
return categoriesExpandMode.personalFolders;
|
||||||
case MailboxCategories.teamMailboxes:
|
case MailboxCategories.teamMailboxes:
|
||||||
return categoriesExpandMode.teamMailboxes;
|
return categoriesExpandMode.teamMailboxes;
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -4,21 +4,21 @@ import 'package:model/mailbox/expand_mode.dart';
|
|||||||
|
|
||||||
class MailboxCategoriesExpandMode with EquatableMixin {
|
class MailboxCategoriesExpandMode with EquatableMixin {
|
||||||
ExpandMode defaultMailbox;
|
ExpandMode defaultMailbox;
|
||||||
ExpandMode personalMailboxes;
|
ExpandMode personalFolders;
|
||||||
ExpandMode teamMailboxes;
|
ExpandMode teamMailboxes;
|
||||||
|
|
||||||
MailboxCategoriesExpandMode({
|
MailboxCategoriesExpandMode({
|
||||||
required this.defaultMailbox,
|
required this.defaultMailbox,
|
||||||
required this.personalMailboxes,
|
required this.personalFolders,
|
||||||
required this.teamMailboxes});
|
required this.teamMailboxes});
|
||||||
|
|
||||||
factory MailboxCategoriesExpandMode.initial() {
|
factory MailboxCategoriesExpandMode.initial() {
|
||||||
return MailboxCategoriesExpandMode(
|
return MailboxCategoriesExpandMode(
|
||||||
defaultMailbox: ExpandMode.EXPAND,
|
defaultMailbox: ExpandMode.EXPAND,
|
||||||
personalMailboxes: ExpandMode.EXPAND,
|
personalFolders: ExpandMode.EXPAND,
|
||||||
teamMailboxes: ExpandMode.EXPAND);
|
teamMailboxes: ExpandMode.EXPAND);
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
List<Object?> get props => [defaultMailbox, personalMailboxes, teamMailboxes];
|
List<Object?> get props => [defaultMailbox, personalFolders, teamMailboxes];
|
||||||
}
|
}
|
||||||
+3
-3
@@ -144,9 +144,9 @@ class MailboxVisibilityController extends BaseMailboxController {
|
|||||||
mailboxCategoriesExpandMode.value.defaultMailbox = newExpandMode;
|
mailboxCategoriesExpandMode.value.defaultMailbox = newExpandMode;
|
||||||
mailboxCategoriesExpandMode.refresh();
|
mailboxCategoriesExpandMode.refresh();
|
||||||
break;
|
break;
|
||||||
case MailboxCategories.personalMailboxes:
|
case MailboxCategories.personalFolders:
|
||||||
final newExpandMode = mailboxCategoriesExpandMode.value.personalMailboxes == ExpandMode.EXPAND ? ExpandMode.COLLAPSE : ExpandMode.EXPAND;
|
final newExpandMode = mailboxCategoriesExpandMode.value.personalFolders == ExpandMode.EXPAND ? ExpandMode.COLLAPSE : ExpandMode.EXPAND;
|
||||||
mailboxCategoriesExpandMode.value.personalMailboxes = newExpandMode;
|
mailboxCategoriesExpandMode.value.personalFolders = newExpandMode;
|
||||||
mailboxCategoriesExpandMode.refresh();
|
mailboxCategoriesExpandMode.refresh();
|
||||||
break;
|
break;
|
||||||
case MailboxCategories.teamMailboxes:
|
case MailboxCategories.teamMailboxes:
|
||||||
|
|||||||
+1
-1
@@ -85,7 +85,7 @@ class MailboxVisibilityView extends GetWidget<MailboxVisibilityController>
|
|||||||
Obx(() => controller.personalMailboxIsNotEmpty
|
Obx(() => controller.personalMailboxIsNotEmpty
|
||||||
? _buildMailboxCategory(
|
? _buildMailboxCategory(
|
||||||
context,
|
context,
|
||||||
MailboxCategories.personalMailboxes,
|
MailboxCategories.personalFolders,
|
||||||
controller.personalRootNode)
|
controller.personalRootNode)
|
||||||
: const SizedBox.shrink()
|
: const SizedBox.shrink()
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1223,8 +1223,8 @@
|
|||||||
"placeholders_order": [],
|
"placeholders_order": [],
|
||||||
"placeholders": {}
|
"placeholders": {}
|
||||||
},
|
},
|
||||||
"personalMailboxes": "صناديق البريد الشخصية",
|
"personalFolders": "المجلدات الشخصية",
|
||||||
"@personalMailboxes": {
|
"@personalFolders": {
|
||||||
"type": "text",
|
"type": "text",
|
||||||
"placeholders_order": [],
|
"placeholders_order": [],
|
||||||
"placeholders": {}
|
"placeholders": {}
|
||||||
|
|||||||
@@ -1892,8 +1892,8 @@
|
|||||||
"placeholders_order": [],
|
"placeholders_order": [],
|
||||||
"placeholders": {}
|
"placeholders": {}
|
||||||
},
|
},
|
||||||
"personalMailboxes": "Boîtes aux lettres personnelles",
|
"personalFolders": "Dossiers personnels",
|
||||||
"@personalMailboxes": {
|
"@personalFolders": {
|
||||||
"type": "text",
|
"type": "text",
|
||||||
"placeholders_order": [],
|
"placeholders_order": [],
|
||||||
"placeholders": {}
|
"placeholders": {}
|
||||||
|
|||||||
@@ -2837,8 +2837,8 @@
|
|||||||
"placeholders_order": [],
|
"placeholders_order": [],
|
||||||
"placeholders": {}
|
"placeholders": {}
|
||||||
},
|
},
|
||||||
"personalMailboxes": "Caselle di posta personali",
|
"personalFolders": "Cartelle personali",
|
||||||
"@personalMailboxes": {
|
"@personalFolders": {
|
||||||
"type": "text",
|
"type": "text",
|
||||||
"placeholders_order": [],
|
"placeholders_order": [],
|
||||||
"placeholders": {}
|
"placeholders": {}
|
||||||
|
|||||||
@@ -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": "Initializing data...",
|
||||||
"@initializing_data": {
|
"@initializing_data": {
|
||||||
"type": "text",
|
"type": "text",
|
||||||
@@ -126,8 +126,8 @@
|
|||||||
"placeholders_order": [],
|
"placeholders_order": [],
|
||||||
"placeholders": {}
|
"placeholders": {}
|
||||||
},
|
},
|
||||||
"personalMailboxes": "Personal mailboxes",
|
"personalFolders": "Personal folders",
|
||||||
"@personalMailboxes": {
|
"@personalFolders": {
|
||||||
"type": "text",
|
"type": "text",
|
||||||
"placeholders_order": [],
|
"placeholders_order": [],
|
||||||
"placeholders": {}
|
"placeholders": {}
|
||||||
@@ -3092,6 +3092,12 @@
|
|||||||
"placeholders_order": [],
|
"placeholders_order": [],
|
||||||
"placeholders": {}
|
"placeholders": {}
|
||||||
},
|
},
|
||||||
|
"deleteAllSpamEmailsNow": "Delete all spam emails now",
|
||||||
|
"@deleteAllSpamEmailsNow": {
|
||||||
|
"type": "text",
|
||||||
|
"placeholders_order": [],
|
||||||
|
"placeholders": {}
|
||||||
|
},
|
||||||
"quotaStateLabel": "{used} of {limit} Used",
|
"quotaStateLabel": "{used} of {limit} Used",
|
||||||
"@quotaStateLabel": {
|
"@quotaStateLabel": {
|
||||||
"type": "text",
|
"type": "text",
|
||||||
|
|||||||
@@ -2656,8 +2656,8 @@
|
|||||||
"placeholders_order": [],
|
"placeholders_order": [],
|
||||||
"placeholders": {}
|
"placeholders": {}
|
||||||
},
|
},
|
||||||
"personalMailboxes": "Личные почтовые ящики",
|
"personalFolders": "Личные папки",
|
||||||
"@personalMailboxes": {
|
"@personalFolders": {
|
||||||
"type": "text",
|
"type": "text",
|
||||||
"placeholders_order": [],
|
"placeholders_order": [],
|
||||||
"placeholders": {}
|
"placeholders": {}
|
||||||
|
|||||||
@@ -2672,8 +2672,8 @@
|
|||||||
"placeholders_order": [],
|
"placeholders_order": [],
|
||||||
"placeholders": {}
|
"placeholders": {}
|
||||||
},
|
},
|
||||||
"personalMailboxes": "Hộp thư cá nhân",
|
"personalFolders": "Thư mục cá nhân",
|
||||||
"@personalMailboxes": {
|
"@personalFolders": {
|
||||||
"type": "text",
|
"type": "text",
|
||||||
"placeholders_order": [],
|
"placeholders_order": [],
|
||||||
"placeholders": {}
|
"placeholders": {}
|
||||||
|
|||||||
@@ -121,10 +121,10 @@ class AppLocalizations {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
String get personalMailboxes {
|
String get personalFolders {
|
||||||
return Intl.message(
|
return Intl.message(
|
||||||
'Personal mailboxes',
|
'Personal folders',
|
||||||
name: 'personalMailboxes',
|
name: 'personalFolders',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user