merge conflict fixed

lib/extensions/string_extensions.dart

@@ -64,7 +64,10 @@ extension EmailValidator on String {
         this,
         style: TextStyle(color: color ?? MyColors.darkTextColor, fontSize: 17, letterSpacing: -0.68, fontWeight: isBold ? FontWeight.bold : FontWeight.w600),
       );
-
+  Widget toText20({Color? color, bool isBold = false}) => Text(
+    this,
+    style: TextStyle(fontSize: 20, fontWeight: isBold ? FontWeight.bold : FontWeight.w600, color: color ?? MyColors.darkTextColor, letterSpacing: -0.4),
+  );
   Widget toText22({Color? color, bool isBold = false}) => Text(
         this,
         style: TextStyle(height: 1, color: color ?? MyColors.darkTextColor, fontSize: 22, letterSpacing: -1.44, fontWeight: isBold ? FontWeight.bold : FontWeight.w600),

lib/generated/codegen_loader.g.dart

@@ -211,9 +211,6 @@ class CodegenLoader extends AssetLoader{
   "rfqUOM": "RFQ UOM",
   "rfqQty": "RFQ الكمية",
   "rfqNumber": "رقم RFQ",
-  "msg": "Hello {} in the {} world ",
-  "msg_named": "{} are written in the {lang} language",
-  "clickMe": "Click me",
   "human": "بشري",
   "resources": "موارد",
   "details": "تفاصيل",
@@ -250,12 +247,32 @@ class CodegenLoader extends AssetLoader{
   "myAttendance": "حضوري",
   "workOnBreak": "التعويض عن العمل اثناءالاستراحه",
   "next": "التالي",
+  "mobile": "التليفون المحمول",
+  "completingYear": "نحن نقدر لك لاستكمال خدمة",
+  "year": "سنة",
+  "month": "شهر",
+  "day": "يوم",
+  "address": "العنوان",
+  "phoneNumber": "رقم الجوال",
+  "businessGroup": "مجموعة العمل",
+  "Payroll": "الراتب",
+  "civilIdentityNumber": "رقم الهويه",
+  "dateOfBirth": "تاريخ الميلاد",
+  "maritalStatus ": "الحالة الاجتماعية",
+  "fullName": "الأسم الكامل",
+  "remove": "حذف",
   "profile": {
     "reset_password": {
       "label": "Reset Password",
       "username": "Username",
       "password": "password"
-    }
+    },
+    "profileCompletionPer": "استكمال الملف الشخصي",
+    "completeProfile": "الملف الشخصي الكامل",
+    "personalInformation": "معلومات شخصية",
+    "basicDetails": "تفاصيل أساسية",
+    "contactDetails": "بيانات التواصل",
+    "familyDetails": "تفاصيل عائلية"
   },
   "clicked": {
     "zero": "You clicked {} times!",
@@ -372,7 +389,6 @@ static const Map<String,dynamic> en_US = {
   "whatsapp": "Whatsapp",
   "reject": "Reject",
   "approve": "Approve",
-  "attendanceDetails": "Attendence Details",
   "cancel": "Cancel",
   "requestedItems": "Requested Items",
   "request": "Request",
@@ -517,6 +533,7 @@ static const Map<String,dynamic> en_US = {
   "myAttendance": "My Attendance",
   "workOnBreak": "Work On Break",
   "next": "Next",
+  "mobile": "Mobile",
   "year": "Year",
   "month": "Month",
   "day": "Day",
@@ -536,7 +553,13 @@ static const Map<String,dynamic> en_US = {
       "label": "Reset Password",
       "username": "Username",
       "password": "password"
-    }
+    },
+    "profileCompletionPer": "Profile Completion",
+    "completeProfile": "Complete Profile",
+    "personalInformation": "Personal Information",
+    "basicDetails": "Basic Details",
+    "contactDetails": "Contact Details",
+    "familyDetails": "Family Members"
   },
   "clicked": {
     "zero": "You clicked {} times!",

lib/generated/locale_keys.g.dart

@@ -232,6 +232,7 @@ abstract class  LocaleKeys {
   static const myAttendance = 'myAttendance';
   static const workOnBreak = 'workOnBreak';
   static const next = 'next';
+  static const mobile = 'mobile';
   static const completingYear = 'completingYear';
   static const year = 'year';
   static const month = 'month';