diff --git a/assets/images/ic_checked.svg b/assets/images/ic_checked.svg
new file mode 100644
index 000000000..69f667c0a
--- /dev/null
+++ b/assets/images/ic_checked.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/images/ic_language.svg b/assets/images/ic_language.svg
new file mode 100644
index 000000000..c955f8fdd
--- /dev/null
+++ b/assets/images/ic_language.svg
@@ -0,0 +1,3 @@
+
diff --git a/core/lib/presentation/resources/image_paths.dart b/core/lib/presentation/resources/image_paths.dart
index 1167830b4..1a8f5ebe4 100644
--- a/core/lib/presentation/resources/image_paths.dart
+++ b/core/lib/presentation/resources/image_paths.dart
@@ -126,6 +126,8 @@ class ImagePaths {
String get icFilePptx => _getImagePath('ic_file_pptx.svg');
String get icFileEPup => _getImagePath('ic_file_epup.svg');
String get icCloseAdvancedSearch => _getImagePath('ic_close_advanced_search.svg');
+ String get icLanguage => _getImagePath('ic_language.svg');
+ String get icChecked => _getImagePath('ic_checked.svg');
String _getImagePath(String imageName) {
return AssetsPaths.images + imageName;
diff --git a/lib/features/manage_account/presentation/menu/manage_account_menu_controller.dart b/lib/features/manage_account/presentation/menu/manage_account_menu_controller.dart
index c9df51626..64d036d76 100644
--- a/lib/features/manage_account/presentation/menu/manage_account_menu_controller.dart
+++ b/lib/features/manage_account/presentation/menu/manage_account_menu_controller.dart
@@ -9,7 +9,8 @@ class ManageAccountMenuController extends BaseController {
final dashBoardController = Get.find();
final listAccountMenuItem = [
- AccountMenuItem.profiles
+ AccountMenuItem.profiles,
+ AccountMenuItem.languageAndRegion,
];
@override
diff --git a/lib/features/manage_account/presentation/model/account_menu_item.dart b/lib/features/manage_account/presentation/model/account_menu_item.dart
index 1c384bbbc..29dd59c6c 100644
--- a/lib/features/manage_account/presentation/model/account_menu_item.dart
+++ b/lib/features/manage_account/presentation/model/account_menu_item.dart
@@ -4,7 +4,8 @@ import 'package:flutter/cupertino.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
enum AccountMenuItem {
- profiles
+ profiles,
+ languageAndRegion
}
extension AccountMenuItemExtension on AccountMenuItem {
@@ -13,6 +14,8 @@ extension AccountMenuItemExtension on AccountMenuItem {
switch(this) {
case AccountMenuItem.profiles:
return imagePaths.icProfiles;
+ case AccountMenuItem.languageAndRegion:
+ return imagePaths.icLanguage;
}
}
@@ -20,6 +23,8 @@ extension AccountMenuItemExtension on AccountMenuItem {
switch(this) {
case AccountMenuItem.profiles:
return AppLocalizations.of(context).profiles;
+ case AccountMenuItem.languageAndRegion:
+ return AppLocalizations.of(context).languageAndRegion;
}
}
}
\ No newline at end of file
diff --git a/lib/l10n/intl_messages.arb b/lib/l10n/intl_messages.arb
index 5936eb8cf..ba5abcb39 100644
--- a/lib/l10n/intl_messages.arb
+++ b/lib/l10n/intl_messages.arb
@@ -1,5 +1,5 @@
{
- "@@last_modified": "2022-06-28T17:58:17.546714",
+ "@@last_modified": "2022-07-08T13:29:01.231528",
"initializing_data": "Initializing data...",
"@initializing_data": {
"type": "text",
@@ -1513,5 +1513,47 @@
"type": "text",
"placeholders_order": [],
"placeholders": {}
+ },
+ "languageAndRegion": "Language & Region",
+ "@languageAndRegion": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "languageAndRegionSubtitle": "Set the language, time zone, time format you use on TeamMail.",
+ "@languageAndRegionSubtitle": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "language": "Language",
+ "@language": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "languageEnglish": "English",
+ "@languageEnglish": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "languageVietnamese": "Vietnamese",
+ "@languageVietnamese": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "languageFrench": "French",
+ "@languageFrench": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "languageRussian": "Russian",
+ "@languageRussian": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
}
}
\ No newline at end of file
diff --git a/lib/main/localizations/app_localizations.dart b/lib/main/localizations/app_localizations.dart
index 93e0448b7..44f05b5e9 100644
--- a/lib/main/localizations/app_localizations.dart
+++ b/lib/main/localizations/app_localizations.dart
@@ -1559,4 +1559,46 @@ class AppLocalizations {
name: 'selectMailbox',
);
}
+
+ String get languageAndRegion {
+ return Intl.message(
+ 'Language & Region',
+ name: 'languageAndRegion');
+ }
+
+ String get languageAndRegionSubtitle {
+ return Intl.message(
+ 'Set the language, time zone, time format you use on TeamMail.',
+ name: 'languageAndRegionSubtitle');
+ }
+
+ String get language {
+ return Intl.message(
+ 'Language',
+ name: 'language');
+ }
+
+ String get languageEnglish {
+ return Intl.message(
+ 'English',
+ name: 'languageEnglish');
+ }
+
+ String get languageVietnamese {
+ return Intl.message(
+ 'Vietnamese',
+ name: 'languageVietnamese');
+ }
+
+ String get languageFrench {
+ return Intl.message(
+ 'French',
+ name: 'languageFrench');
+ }
+
+ String get languageRussian {
+ return Intl.message(
+ 'Russian',
+ name: 'languageRussian');
+ }
}
\ No newline at end of file