Merge branch 'master' into development_sikander

assets/langs/ar-SA.json

@@ -401,6 +401,7 @@
   "ITGForms": "ITG نماذج",
   "itemCreation": "أنشاء عنصر",
   "stamp": "ختم",
+  "addFavoriteList": "هل تريد اضافة {name} لقائمة المفضله",
   "profile": {
     "reset_password": {
       "label": "Reset Password",
@@ -411,7 +412,7 @@
     "completeProfile": "الملف الشخصي الكامل",
     "personalInformation": "معلومات شخصية",
     "basicDetails": "تفاصيل أساسية",
-    "address": "تبوك",
+    "address": "العنوان",
     "contactDetails": "بيانات التواصل",
     "familyDetails": "تفاصيل عائلية",
     "effectiveDate": "تاريخ النفاذ",

assets/langs/en-US.json

@@ -401,6 +401,7 @@
   "ITGForms": "ITG Forms",
   "itemCreation": "Item Creation",
   "stamp": "Stamp",
+  "addFavoriteList": "Do you want to add {name} in your favorite list",
   "profile": {
     "reset_password": {
       "label": "Reset Password",

lib/generated/codegen_loader.g.dart

@@ -46,7 +46,7 @@ class CodegenLoader extends AssetLoader{
   "services": "خدمات",
   "viewAllServices": "عرض جميع الخدمات",
   "monthlyAttendance": "الحضور الشهري",
-  "vacationRule": "حكم اجازة",
+  "vacationRule": "قاعدة الاجازات",
   "vacationType": "نوع الاجازة",
   "startDateT": "تاريخ البدء",
   "endDateT": "تاريخ الانتهاء",
@@ -417,6 +417,7 @@ class CodegenLoader extends AssetLoader{
   "ITGForms": "ITG نماذج",
   "itemCreation": "أنشاء عنصر",
   "stamp": "ختم",
+  "addFavoriteList": "هل تريد اضافة {name} لقائمة المفضله",
   "profile": {
     "reset_password": {
       "label": "Reset Password",
@@ -427,7 +428,7 @@ class CodegenLoader extends AssetLoader{
     "completeProfile": "الملف الشخصي الكامل",
     "personalInformation": "معلومات شخصية",
     "basicDetails": "تفاصيل أساسية",
-    "address": "تبوك",
+    "address": "العنوان",
     "contactDetails": "بيانات التواصل",
     "familyDetails": "تفاصيل عائلية",
     "effectiveDate": "تاريخ النفاذ",
@@ -854,6 +855,7 @@ static const Map<String,dynamic> en_US = {
   "ITGForms": "ITG Forms",
   "itemCreation": "Item Creation",
   "stamp": "Stamp",
+  "addFavoriteList": "Do you want to add {name} in your favorite list",
   "profile": {
     "reset_password": {
       "label": "Reset Password",

lib/generated/locale_keys.g.dart

@@ -402,6 +402,7 @@ abstract class  LocaleKeys {
   static const ITGForms = 'ITGForms';
   static const itemCreation = 'itemCreation';
   static const stamp = 'stamp';
+  static const addFavoriteList = 'addFavoriteList';
   static const profile_reset_password_label = 'profile.reset_password.label';
   static const profile_reset_password_username = 'profile.reset_password.username';
   static const profile_reset_password_password = 'profile.reset_password.password';

lib/ui/my_team/employee_details.dart

@@ -252,16 +252,20 @@ class _EmployeeDetailsState extends State<EmployeeDetails> {
         height: 150,
         child: Column(
           children: [
-            AppState().isArabic(context)
-             ? Text("هل تريد اضافة" + " ${getEmployeeSubordinates!.eMPLOYEENAME} " + "لقائمة المفضله")
-             : Text("Do you want to add" + " ${getEmployeeSubordinates!.eMPLOYEENAME} " + "in your favorite list "),
-            CircularAvatar(
-              url: getEmployeeSubordinates!.eMPLOYEEIMAGE ?? "",
-              height: 50,
+            Text(LocaleKeys.addFavoriteList).tr(namedArgs: {'name': '${getEmployeeSubordinates!.eMPLOYEENAME}'}),
+            Image.memory(
+              Utils.getPostBytes(
+                getEmployeeSubordinates!.eMPLOYEEIMAGE ?? "",
+              ),
+              errorBuilder: (BuildContext context, error, stackTrace) {
+                return SvgPicture.asset(
+                  "assets/images/user.svg", height: 50, width: 50,
+                );
+              },
               width: 50,
-              isImageBase64: true,
-            ).paddingOnly(top: 21),
-            //  16.width,
+              height: 50,
+              fit: BoxFit.cover,
+            ).circle(50).paddingOnly(top: 21),
           ],
         ),
       ),