merge conflicts fixed.

android/app/src/main/AndroidManifest.xml

@@ -10,9 +10,8 @@
     <application
         android:icon="@mipmap/ic_launcher"
         android:label="Mohemm"
-        android:icon="@mipmap/ic_launcher"
+        android:networkSecurityConfig="@xml/network_security_config"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/ic_launcher_round">
-    android:networkSecurityConfig="@xml/network_security_config">
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"

lib/generated/codegen_loader.g.dart

@@ -261,14 +261,13 @@ class CodegenLoader extends AssetLoader{
   "maritalStatus ": "الحالة الاجتماعية",
   "fullName": "الأسم الكامل",
   "remove": "حذف",
-    "submit": "ارسال",
+  "submit": "ارسال",
-    "areYouSureYouWantToSubmit": "هل أنت متأكد أنك تريد أن تقدم؟",
+  "areYouSureYouWantToSubmit": "هل أنت متأكد أنك تريد أن تقدم؟",
-    "comments": "تعليقات",
+  "comments": "تعليقات",
-    "writeComment": "أكتب تعليقا",
+  "writeComment": "أكتب تعليقا",
-    "approversList": "قائمة الموافقين",
+  "approversList": "قائمة الموافقين",
-    "yourRequestHasBeenSubmittedForApprovals": "تم تقديم طلبك للموافقات",
+  "yourRequestHasBeenSubmittedForApprovals": "تم تقديم طلبك للموافقات",
-
+  "profile": {
-    "profile": {
     "reset_password": {
       "label": "Reset Password",
       "username": "Username",
@@ -561,7 +560,6 @@ static const Map<String,dynamic> en_US = {
   "writeComment": "Write a comment",
   "approversList": "Approvers List",
   "yourRequestHasBeenSubmittedForApprovals": "Your request has been submitted for approvals",
-
   "profile": {
     "reset_password": {
       "label": "Reset Password",

lib/generated/locale_keys.g.dart

@@ -1,6 +1,6 @@
 // DO NOT EDIT. This is code generated via package:easy_localization/generate.dart
 
-abstract class LocaleKeys {
+abstract class  LocaleKeys {
   static const mohemm = 'mohemm';
   static const english = 'english';
   static const arabic = 'arabic';
@@ -243,7 +243,7 @@ abstract class LocaleKeys {
   static const Payroll = 'Payroll';
   static const civilIdentityNumber = 'civilIdentityNumber';
   static const dateOfBirth = 'dateOfBirth';
-  static const maritalStatus = 'maritalStatus ';
+  static const maritalStatus  = 'maritalStatus ';
   static const fullName = 'fullName';
   static const remove = 'remove';
   static const submit = 'submit';
@@ -252,7 +252,6 @@ abstract class LocaleKeys {
   static const writeComment = 'writeComment';
   static const approversList = 'approversList';
   static const yourRequestHasBeenSubmittedForApprovals = 'yourRequestHasBeenSubmittedForApprovals';
-
   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';
@@ -269,4 +268,5 @@ abstract class LocaleKeys {
   static const gender_with_arg = 'gender.with_arg';
   static const gender = 'gender';
   static const reset_locale = 'reset_locale';
+
 }

lib/models/generic_response_model.dart

@@ -4,7 +4,6 @@ import 'package:mohem_flutter_app/models/get_absence_collection_notification_bod
 import 'package:mohem_flutter_app/models/get_action_history_list_model.dart';
 import 'package:mohem_flutter_app/models/get_approves_list_model.dart';
 import 'package:mohem_flutter_app/models/get_attachement_list_model.dart';
-import 'package:mohem_flutter_app/models/get_basic_det_ntf_body_list_model.dart';
 import 'package:mohem_flutter_app/models/get_default_value_list_model.dart';
 import 'package:mohem_flutter_app/models/worklist/hr/get_basic_det_ntf_body_list_model.dart';
 import 'package:mohem_flutter_app/models/get_eit_dff_structure_list_model.dart';

lib/ui/login/login_screen.dart

@@ -132,10 +132,9 @@ class _LoginScreenState extends State<LoginScreen> {
 
   @override
   Widget build(BuildContext context) {
-    // username.text = "15153";
+    username.text = "15153";
     password.text = "Abcd@1234";
-    username.text = "15444";
+    // username.text = "15444";
-
 
     return Scaffold(
       body: Column(