Merge branch 'HemantBranch' of https://git.nivesh.com:443/hemant.khadase/BajajFDLib into PankajBranch

# Conflicts:
#	app/src/main/java/com/nivesh/production/bajajfd/adapter/BankListAdapter.kt
#	app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt
#	app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt

app/src/main/java/com/nivesh/production/bajajfd/adapter/BankListAdapter.kt

@@ -12,7 +12,7 @@ import com.nivesh.production.bajajfd.model.ClientBanklist
 class BankListAdapter(
     private val bankList: List<ClientBanklist>?,
     private val selectedAccount: String? = null,
-    private val width:Double?
+    private val width: Double?
 ) : RecyclerView.Adapter<BankListAdapter.BankListViewHolder>() {
     inner class BankListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val bankSelector: ImageView = itemView.findViewById(R.id.bankSelector)
@@ -29,15 +29,16 @@ class BankListAdapter(
         parent: ViewGroup,
         viewType: Int
     ): BankListViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.item_bank_list_preview, parent, false);
+        val view = LayoutInflater.from(parent.context)
+            .inflate(R.layout.item_bank_list_preview, parent, false);
         view.layoutParams = width?.div(1.35)
-            ?.let { ViewGroup.LayoutParams(it.toInt(),ViewGroup.LayoutParams.WRAP_CONTENT) }
+            ?.let { ViewGroup.LayoutParams(it.toInt(), ViewGroup.LayoutParams.WRAP_CONTENT) }
         return BankListViewHolder(view)
     }
 
     override fun onBindViewHolder(holder: BankListViewHolder, position: Int) {
         val bankList = bankList?.get(position)
-        if (bankList !=null) {
+        if (bankList != null) {
             holder.itemView.apply {
                 holder.tvBankName.text = bankList.BankName
                 holder.tvBankIFSC.text = bankList.IFSCCode
@@ -61,8 +62,6 @@ class BankListAdapter(
                         checkedPosition = holder.adapterPosition
                     }
                 }
-
-
             }
         }
     }

app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt

@@ -87,7 +87,7 @@ class BajajFdMainActivity : BaseActivity() {
         if (Common.isNetworkAvailable(this)) {
             val fdStepsCount = FDStepsCountRequest()
             fdStepsCount.FDProvider = getString(R.string.bajaj)
-            fdStepsCount.NiveshClientCode = "60476"
+            fdStepsCount.NiveshClientCode = "8872"
                 //hemant client code =8872  /60476
 
             viewModel.getStepsCount(fdStepsCount, token, this)
@@ -140,9 +140,9 @@ class BajajFdMainActivity : BaseActivity() {
     private fun getClientDetailsApi(stepsCount: Int) {
         if (Common.isNetworkAvailable(this@BajajFdMainActivity)) {
             val getClientDetailsRequest = getClientDetailsRequest()
-            getClientDetailsRequest.client_code = "60476"
+            getClientDetailsRequest.client_code = "8872"
             getClientDetailsRequest.AppOrWeb = getString(R.string.app)
-            getClientDetailsRequest.sub_broker_code = "3435"
+            getClientDetailsRequest.sub_broker_code = "1038"
 
             //hemant 8872/1038
 

app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt

@@ -47,9 +47,6 @@ class StepThreeBajajFDFragment : BaseFragment() {
     private var latestTmpUri: Uri? = null
     private var _binding: FragmentBajajfdStepThreeBinding? = null
     private val binding get() = _binding!!
-    private lateinit var listOfDocType: List<GetCodes>
-    private var docValue: String = ""
-
 
     private lateinit var stepThreeBajajFDViewModel: StepThreeBajajFDViewModel
     private lateinit var dialog: Dialog
@@ -65,12 +62,16 @@ class StepThreeBajajFDFragment : BaseFragment() {
     private var doc1FileExt: String? = ""
     private var doc2fileExt: String? = ""
     private var uniqueId: String? = ""
-    private val MAIN_PAN_UPLOAD: Int = 1
-    private val MAIN_PHOTO_UPLOAD: Int = 2
-    private val FIRST_UPLOAD: Int = 3
-    private val SECOND_UPLOAD: Int = 4
+    private var docValue: String = ""
+    private val mainPANUpload: Int = 1
+    private val mainPhotoUpload: Int = 2
+    private val firstDocUpload: Int = 3
+    private val secondDocUpload: Int = 4
     private var actionType: Int = -1
 
+    private val mapImage: HashMap<String, String> = HashMap()
+    private lateinit var listOfDocType: List<GetCodes>
+
     private val requestPermission = registerForActivityResult(
         ActivityResultContracts.RequestPermission()
     ) { isGranted: Boolean ->
@@ -101,7 +102,7 @@ class StepThreeBajajFDFragment : BaseFragment() {
         { uri: Uri? ->
             if (uri != null) {
                 bitmap = uriToBitmap(uri)
-                uploadDocument(uri,"g")
+                uploadDocument(uri, "g")
             }
         }
 
@@ -109,48 +110,63 @@ class StepThreeBajajFDFragment : BaseFragment() {
             registerForActivityResult(ActivityResultContracts.TakePicture()) { isSuccess ->
                 if (isSuccess) {
                     latestTmpUri?.let { uri ->
-                        uploadDocument(uri,"c")
+                        uploadDocument(uri, "c")
                     }
                 }
             }
 
         binding.btnNext.setOnClickListener {
-//            if (validate()) {
-//                uploadDocApi(
-//                    "PAN",
-//                    "data:image/".plus(panFileExt).plus(";base64, ").plus(panString),
-//                    1
-//                )
-//            }
-            createFDApi((activity as BajajFdMainActivity).createFDRequest)
+            if (validate()) {
+                if (panString.isNotEmpty()) {
+                    mapImage["PAN"] = "data:image/".plus(panFileExt)
+                        .plus(";base64, ").plus(panString)
+                }
+                if (photoString.isNotEmpty()) {
+                    mapImage["Photograph"] = "data:image/".plus(photoFileExt)
+                        .plus(";base64, ").plus(photoString)
+                }
+                if (docString.isNotEmpty()) {
+                    mapImage["docValue"] = "data:image/".plus(doc1FileExt)
+                        .plus(";base64, ").plus(docString)
+                }
+                if (docString2.isNotEmpty()) {
+                    mapImage["Aadhar"] = "data:image/".plus(doc2fileExt)
+                        .plus(";base64, ").plus(docString2)
+                }
+                var uploadPosition = 0
+                for (entry in mapImage.iterator()) {
+                    uploadPosition++
+                    uploadDocApi(entry.key, entry.value, uploadPosition)
+                }
+            }
         }
         binding.btnBack.setOnClickListener {
             (activity as BajajFdMainActivity).binding.viewPager.currentItem = 1
         }
 
         binding.btnPANUpload.setOnClickListener {
-            actionType = MAIN_PAN_UPLOAD
+            actionType = mainPANUpload
             selectImage()
         }
 
         binding.btnPhotoUpload.setOnClickListener {
-            actionType = MAIN_PHOTO_UPLOAD
+            actionType = mainPhotoUpload
             selectImage()
         }
 
         binding.btnAadhaarFrontUpload.setOnClickListener {
-            actionType = FIRST_UPLOAD
+            actionType = firstDocUpload
             selectImage()
         }
 
         binding.btnAadhaarBackUpload.setOnClickListener {
-            actionType = SECOND_UPLOAD
+            actionType = secondDocUpload
             selectImage()
         }
 
         binding.spDocType.onItemClickListener =
             AdapterView.OnItemClickListener { parent, _, position, _ ->
-                val getCodes : GetCodes = parent.getItemAtPosition(position) as GetCodes
+                val getCodes: GetCodes = parent.getItemAtPosition(position) as GetCodes
                 docValue = getCodes.Value
                 docString = ""
                 docString2 = ""
@@ -252,47 +268,47 @@ class StepThreeBajajFDFragment : BaseFragment() {
         binding.btnAadhaarFrontUpload.visibility = View.VISIBLE
     }
 
-    private fun uploadDocument(uri: Uri,type: String) {
+    private fun uploadDocument(uri: Uri, type: String) {
         when (actionType) {
-            MAIN_PAN_UPLOAD -> {
+            mainPANUpload -> {
                 binding.ivPan.visibility = View.VISIBLE
                 val fileDir: File = requireActivity().cacheDir
                 val fileExtension = File(fileDir.toString().plus("/").plus(getFileName(uri)))
                 panFileExt = getFileExtension(getFileName(uri))
-                val size : Double = Common.getFileSizeInMB(fileExtension.length())
-                if (size < 5){
-                    if(type == "c") encodedPANBase64(fileExtension)
+                val size: Double = Common.getFileSizeInMB(fileExtension.length())
+                if (size < 5) {
+                    if (type == "c") encodedPANBase64(fileExtension)
                     else panString = bitmap?.let { ImageUtil.convert(it) }.toString()
-                } else{
+                } else {
                     panString = ""
                     panFileExt = ""
                 }
             }
-            MAIN_PHOTO_UPLOAD -> {
+            mainPhotoUpload -> {
                 binding.ivPhotograph.visibility = View.VISIBLE
                 binding.ivPan.visibility = View.VISIBLE
                 val fileDir: File = requireActivity().cacheDir
                 val fileExtension = File(fileDir.toString().plus("/").plus(getFileName(uri)))
                 photoFileExt = getFileExtension(getFileName(uri))
-                val size : Double = Common.getFileSizeInMB(fileExtension.length())
+                val size: Double = Common.getFileSizeInMB(fileExtension.length())
                 if (size < 5) {
                     if (type == "c") encodedPhotoBase64(fileExtension)
                     else photoString = bitmap?.let { ImageUtil.convert(it) }.toString()
-                }else{
+                } else {
                     photoString = ""
                     photoFileExt = ""
                 }
             }
-            FIRST_UPLOAD -> {
+            firstDocUpload -> {
                 binding.ivAadharFront.visibility = View.VISIBLE
                 val fileDir: File = requireActivity().cacheDir
                 val fileExtension = File(fileDir.toString().plus("/").plus(getFileName(uri)))
                 doc1FileExt = getFileExtension(getFileName(uri))
-                val size : Double = Common.getFileSizeInMB(fileExtension.length())
+                val size: Double = Common.getFileSizeInMB(fileExtension.length())
                 if (size < 5) {
                     if (type == "c") encodedUpload1Base64(fileExtension)
                     else docString = bitmap?.let { ImageUtil.convert(it) }.toString()
-                }else{
+                } else {
                     docString = ""
                     doc1FileExt = ""
                 }
@@ -302,11 +318,11 @@ class StepThreeBajajFDFragment : BaseFragment() {
                 val fileDir: File = requireActivity().cacheDir
                 val fileExtension = File(fileDir.toString().plus("/").plus(getFileName(uri)))
                 doc2fileExt = getFileExtension(getFileName(uri))
-                val size : Double = Common.getFileSizeInMB(fileExtension.length())
+                val size: Double = Common.getFileSizeInMB(fileExtension.length())
                 if (size < 5) {
                     if (type == "c") encodedFileToBase64(fileExtension)
                     else docString2 = bitmap?.let { ImageUtil.convert(it) }.toString()
-                }else{
+                } else {
                     docString2 = ""
                     doc2fileExt = ""
                 }
@@ -314,12 +330,11 @@ class StepThreeBajajFDFragment : BaseFragment() {
         }
     }
 
-
-
     private fun encodedPANBase64(fileName: File) {
         panString = try {
             val bytes: ByteArray = loadFile(fileName)
-            Base64.encodeToString(bytes, Base64.DEFAULT).trim().replace("\n", "").replace("\\s+", "")
+            Base64.encodeToString(bytes, Base64.DEFAULT).trim().replace("\n", "")
+                .replace("\\s+", "")
         } catch (e: Exception) {
             e.printStackTrace()
             ""
@@ -329,7 +344,8 @@ class StepThreeBajajFDFragment : BaseFragment() {
     private fun encodedPhotoBase64(fileName: File) {
         photoString = try {
             val bytes: ByteArray = loadFile(fileName)
-            Base64.encodeToString(bytes, Base64.DEFAULT).trim().replace("\n", "").replace("\\s+", "")
+            Base64.encodeToString(bytes, Base64.DEFAULT).trim().replace("\n", "")
+                .replace("\\s+", "")
         } catch (e: Exception) {
             e.printStackTrace()
             ""
@@ -339,7 +355,8 @@ class StepThreeBajajFDFragment : BaseFragment() {
     private fun encodedUpload1Base64(fileName: File) {
         docString = try {
             val bytes: ByteArray = loadFile(fileName)
-            Base64.encodeToString(bytes, Base64.DEFAULT).trim().replace("\n", "").replace("\\s+", "")
+            Base64.encodeToString(bytes, Base64.DEFAULT).trim().replace("\n", "")
+                .replace("\\s+", "")
         } catch (e: Exception) {
             e.printStackTrace()
             ""
@@ -349,7 +366,8 @@ class StepThreeBajajFDFragment : BaseFragment() {
     private fun encodedFileToBase64(fileName: File) {
         docString2 = try {
             val bytes: ByteArray = loadFile(fileName)
-            Base64.encodeToString(bytes, Base64.DEFAULT).trim().replace("\n", "").replace("\\s+", "")
+            Base64.encodeToString(bytes, Base64.DEFAULT).trim().replace("\n", "")
+                .replace("\\s+", "")
         } catch (e: Exception) {
             e.printStackTrace()
             ""
@@ -399,36 +417,15 @@ class StepThreeBajajFDFragment : BaseFragment() {
                         when (code) {
                             200 -> {
                                 Log.e("check_upload_res", response.message.toString())
-                                if (uploadPosition == 1) {
-                                    uploadDocApi(
-                                        "Photograph",
-                                        "data:image/".plus(photoFileExt).plus(";base64, ")
-                                            .plus(photoString),
-                                        2
-                                    )
-                                } else if (uploadPosition == 2) {
-                                    uploadDocApi(
-                                        docValue,
-                                        "data:image/".plus(doc1FileExt).plus(";base64, ")
-                                            .plus(docString),
-                                        3
-                                    )
-                                } else if (uploadPosition == 3) {
-                                    if (docValue == "Aadhar") {
-                                        uploadDocApi(
-                                            docValue,
-                                            "data:image/".plus(doc2fileExt).plus(";base64, ")
-                                                .plus(docString2),
-                                            4
-                                        )
-                                    } else {
-                                        createFDApi((activity as BajajFdMainActivity).createFDRequest)
-                                    }
-                                } else if (uploadPosition == 4) {
+                                if (uploadPosition == mapImage.size) {
+                                    Toast.makeText(
+                                        requireActivity(),
+                                        "Documents Uploaded Successfully",
+                                        Toast.LENGTH_SHORT
+                                    ).show()
                                     createFDApi((activity as BajajFdMainActivity).createFDRequest)
                                 }
                             }
-
                             //  650 -> refreshToken()
                             else -> {
                                 Common.showDialogValidation(
@@ -503,9 +500,7 @@ class StepThreeBajajFDFragment : BaseFragment() {
         }
     }
 
-
     private fun docTypeApi() {
-
         val getCodeRequest = GetCodeRequest()
         getCodeRequest.ProductName = getString(R.string.bajajFD)
         getCodeRequest.Category = getString(R.string.docType)
@@ -569,30 +564,29 @@ class StepThreeBajajFDFragment : BaseFragment() {
         }
     }
 
-
     private fun validate(): Boolean {
         if (panString.isEmpty()) {
             Common.showDialogValidation(
                 activity as BajajFdMainActivity,
-                "Upload PAN Document"
+                getString(R.string.uploadPanDoc)
             )
             return false
         } else if (photoString.isEmpty()) {
             Common.showDialogValidation(
                 activity as BajajFdMainActivity,
-                "Upload Photo"
+                getString(R.string.uploadPhotoDoc)
             )
             return false
         } else if (docString.isEmpty()) {
             Common.showDialogValidation(
                 activity as BajajFdMainActivity,
-                "Upload $docValue Image"
+                "Upload $docValue Document"
             )
             return false
         } else if (docValue == "Aadhar" && docString2.isEmpty()) {
             Common.showDialogValidation(
                 activity as BajajFdMainActivity,
-                "Upload Aadhar Back Image"
+                getString(R.string.uploadAadharBackDoc)
             )
             return false
         }
@@ -622,19 +616,14 @@ class StepThreeBajajFDFragment : BaseFragment() {
         )
     }
 
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
     fun displayReceivedData(createFDApplicationResponse: CreateFDApplicationResponse) {
         uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId
     }
 
     private fun uriToBitmap(selectedFileUri: Uri): Bitmap? {
         try {
-            val parcelFileDescriptor = requireActivity().contentResolver.openFileDescriptor(selectedFileUri, "r")
+            val parcelFileDescriptor =
+                requireActivity().contentResolver.openFileDescriptor(selectedFileUri, "r")
             val fileDescriptor: FileDescriptor = parcelFileDescriptor!!.fileDescriptor
             val image = BitmapFactory.decodeFileDescriptor(fileDescriptor)
             parcelFileDescriptor.close()
@@ -644,4 +633,9 @@ class StepThreeBajajFDFragment : BaseFragment() {
         }
         return null
     }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
 }

app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt

@@ -33,7 +33,6 @@ import com.nivesh.production.bajajfd.model.*
 import com.nivesh.production.bajajfd.repositories.MainRepository
 import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity
 import com.nivesh.production.bajajfd.ui.providerfactory.StepTwoModelProviderFactory
-import com.nivesh.production.bajajfd.util.Common
 import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorAutoCompleteMethod
 import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorMethod
 import com.nivesh.production.bajajfd.util.Common.Companion.commonSpinnerErrorMethod
@@ -550,9 +549,9 @@ class StepTwoBajajFDFragment : BaseFragment() {
 
         binding.addBankDetail.setOnClickListener {
             if (bankListAdapter.itemCount == 5) {
-                showDialogValidation(mActivity, "You Can Not Add More Than Five Account")
+                showDialogValidation(mActivity, getString(R.string.fiveAccountValidation))
             } else {
-                showHideBankDetail()
+               showHideBankDetail()
             }
         }
 
@@ -753,7 +752,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
                             }
                             //  650 -> refreshToken()
                             else -> {
-                                Common.showDialogValidation(
+                                showDialogValidation(
                                     activity as BajajFdMainActivity,
                                     createFDApplicationResponse.Response.Errors[0].ErrorMessage
                                 )
@@ -764,7 +763,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
 
                 is Resource.Error -> {
                     response.message?.let { message ->
-                        Common.showDialogValidation(activity as BajajFdMainActivity, message)
+                        showDialogValidation(activity as BajajFdMainActivity, message)
                     }
                 }
                 is Resource.Loading -> {
@@ -815,7 +814,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
                                 }
                                 //   650 -> refreshToken()
                                 else -> {
-                                    Common.showDialogValidation(
+                                    showDialogValidation(
                                         activity as BajajFdMainActivity,
                                         getIFSCCodeListResponse.Response.message
                                     )
@@ -826,7 +825,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
 
                     is Resource.Error -> {
                         response.message?.let { message ->
-                            Common.showDialogValidation(
+                            showDialogValidation(
                                 activity as BajajFdMainActivity,
                                 message
                             )
@@ -865,7 +864,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
                 }
                 is Resource.Error -> {
                     response.message?.let { message ->
-                        Common.showDialogValidation(activity as BajajFdMainActivity, message)
+                        showDialogValidation(activity as BajajFdMainActivity, message)
                     }
                 }
                 is Resource.Loading -> {
@@ -908,10 +907,9 @@ class StepTwoBajajFDFragment : BaseFragment() {
                         if (binding.tvAcVerify.visibility == View.GONE) {
                             binding.tvAcVerify.visibility = View.VISIBLE
                         }
-
                         when (code) {
                             200 -> {
-                                if (getBankValidationApiResponse.Message == "Account verified") {
+                                if (getBankValidationApiResponse.Message.equals("Account Verified")) {
                                     val clientBankList = ClientBanklist()
                                     clientBankList.AccountNumber = bankAccount
                                     clientBankList.AccountType = "sb"
@@ -953,7 +951,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
 
                 is Resource.Error -> {
                     response.message?.let { message ->
-                        Common.showDialogValidation(activity as BajajFdMainActivity, message)
+                        showDialogValidation(activity as BajajFdMainActivity, message)
                     }
                 }
                 is Resource.Loading -> {
@@ -1088,7 +1086,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
 
                 is Resource.Error -> {
                     response.message?.let { message ->
-                        Common.showDialogValidation(activity as BajajFdMainActivity, message)
+                        showDialogValidation(activity as BajajFdMainActivity, message)
                     }
                 }
                 is Resource.Loading -> {
@@ -1160,7 +1158,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
                             }
                             //  650 -> refreshToken()
                             else -> {
-                                Common.showDialogValidation(
+                                showDialogValidation(
                                     activity as BajajFdMainActivity,
                                     getCodeResponse.Response.Errors[0].ErrorMessage
                                 )
@@ -1171,7 +1169,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
 
                 is Resource.Error -> {
                     response.message?.let { message ->
-                        Common.showDialogValidation(activity as BajajFdMainActivity, message)
+                        showDialogValidation(activity as BajajFdMainActivity, message)
                     }
                 }
                 is Resource.Loading -> {
@@ -1211,7 +1209,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
                             }
                             //  650 -> refreshToken()
                             else -> {
-                                Common.showDialogValidation(
+                                showDialogValidation(
                                     activity as BajajFdMainActivity,
                                     getCodeResponse.Response.Errors[0].ErrorMessage
                                 )
@@ -1222,7 +1220,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
 
                 is Resource.Error -> {
                     response.message?.let { message ->
-                        Common.showDialogValidation(activity as BajajFdMainActivity, message)
+                        showDialogValidation(activity as BajajFdMainActivity, message)
                     }
                 }
                 is Resource.Loading -> {
@@ -1282,7 +1280,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
                             }
                             //  650 -> refreshToken()
                             else -> {
-                                Common.showDialogValidation(
+                                showDialogValidation(
                                     activity as BajajFdMainActivity,
                                     getCodeResponse.Response.Errors[0].ErrorMessage
                                 )
@@ -1293,7 +1291,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
 
                 is Resource.Error -> {
                     response.message?.let { message ->
-                        Common.showDialogValidation(activity as BajajFdMainActivity, message)
+                        showDialogValidation(activity as BajajFdMainActivity, message)
                     }
                 }
                 is Resource.Loading -> {
@@ -1349,7 +1347,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
                             }
                             //  650 -> refreshToken()
                             else -> {
-                                Common.showDialogValidation(
+                                showDialogValidation(
                                     activity as BajajFdMainActivity,
                                     getCodeResponse.Response.Errors[0].ErrorMessage
                                 )
@@ -1360,7 +1358,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
 
                 is Resource.Error -> {
                     response.message?.let { message ->
-                        Common.showDialogValidation(activity as BajajFdMainActivity, message)
+                        showDialogValidation(activity as BajajFdMainActivity, message)
                     }
                 }
                 is Resource.Loading -> {
@@ -1410,7 +1408,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
                             }
                             //  650 -> refreshToken()
                             else -> {
-                                Common.showDialogValidation(
+                                showDialogValidation(
                                     activity as BajajFdMainActivity,
                                     getCodeResponse.Response.Errors[0].ErrorMessage
                                 )
@@ -1421,7 +1419,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
 
                 is Resource.Error -> {
                     response.message?.let { message ->
-                        Common.showDialogValidation(activity as BajajFdMainActivity, message)
+                        showDialogValidation(activity as BajajFdMainActivity, message)
                     }
                 }
                 is Resource.Loading -> {
@@ -1463,14 +1461,14 @@ class StepTwoBajajFDFragment : BaseFragment() {
                                     )
                                     binding.spOccupation.setAdapter(adapter)
                                     binding.spOccupation.setText(
-                                        adapter.getItem(0)?.Value,
+                                        adapter.getItem(0)?.Label,
                                         false
                                     )
                                 }
                             }
                             //  650 -> refreshToken()
                             else -> {
-                                Common.showDialogValidation(
+                                showDialogValidation(
                                     activity as BajajFdMainActivity,
                                     getCodeResponse.Response.Errors[0].ErrorMessage
                                 )
@@ -1481,7 +1479,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
 
                 is Resource.Error -> {
                     response.message?.let { message ->
-                        Common.showDialogValidation(activity as BajajFdMainActivity, message)
+                        showDialogValidation(activity as BajajFdMainActivity, message)
                     }
                 }
                 is Resource.Loading -> {
@@ -1530,7 +1528,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
                             }
                             //  650 -> refreshToken()
                             else -> {
-                                Common.showDialogValidation(
+                                showDialogValidation(
                                     activity as BajajFdMainActivity,
                                     getCodeResponse.Response.Errors[0].ErrorMessage
                                 )
@@ -1541,7 +1539,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
 
                 is Resource.Error -> {
                     response.message?.let { message ->
-                        Common.showDialogValidation(activity as BajajFdMainActivity, message)
+                        showDialogValidation(activity as BajajFdMainActivity, message)
                     }
                 }
                 is Resource.Loading -> {
@@ -1602,7 +1600,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
                             }
                             //  650 -> refreshToken()
                             else -> {
-                                Common.showDialogValidation(
+                                showDialogValidation(
                                     activity as BajajFdMainActivity,
                                     stateListResponse.response.message
                                 )
@@ -1613,7 +1611,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
 
                 is Resource.Error -> {
                     response.message?.let { message ->
-                        Common.showDialogValidation(activity as BajajFdMainActivity, message)
+                        showDialogValidation(activity as BajajFdMainActivity, message)
                     }
                 }
                 is Resource.Loading -> {
@@ -1680,7 +1678,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
                             }
                             //  650 -> refreshToken()
                             else -> {
-                                Common.showDialogValidation(
+                                showDialogValidation(
                                     activity as BajajFdMainActivity,
                                     cityListResponse.response.message
                                 )
@@ -1691,7 +1689,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
 
                 is Resource.Error -> {
                     response.message?.let { message ->
-                        Common.showDialogValidation(activity as BajajFdMainActivity, message)
+                        showDialogValidation(activity as BajajFdMainActivity, message)
                     }
                 }
                 is Resource.Loading -> {
@@ -1724,7 +1722,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
                             }
                             //  650 -> refreshToken()
                             else -> {
-                                Common.showDialogValidation(
+                                showDialogValidation(
                                     activity as BajajFdMainActivity,
                                     getFDBankListResponse.Response.Errors[0].ErrorMessage
                                 )
@@ -1735,7 +1733,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
 
                 is Resource.Error -> {
                     response.message?.let { message ->
-                        Common.showDialogValidation(activity as BajajFdMainActivity, message)
+                        showDialogValidation(activity as BajajFdMainActivity, message)
                     }
                 }
                 is Resource.Loading -> {

app/src/main/res/values-hi-rIN/strings.xml

@@ -240,6 +240,10 @@
     <string name="Ok"><font fgcolor='#FF8E8E93'>OK</font></string>
     <string name="cancel">Cancel</string>
     <string name="aadhar">Aadhar</string>
+    <string name="uploadPanDoc">Upload PAN Document</string>
+    <string name="uploadPhotoDoc">Upload Photo Document</string>
+    <string name="uploadAadharBackDoc">Upload Aadhar Back Document</string>
+    <string name="fiveAccountValidation">You can not add more than five accounts</string>
 
 
 </resources>

app/src/main/res/values/strings.xml

@@ -240,6 +240,10 @@
     <string name="Ok"><font fgcolor='#FF8E8E93'>OK</font></string>
     <string name="cancel">Cancel</string>
     <string name="aadhar">Aadhar</string>
+    <string name="uploadPanDoc">Upload PAN Document</string>
+    <string name="uploadPhotoDoc">Upload Photo Document</string>
+    <string name="uploadAadharBackDoc">Upload Aadhar Back Document</string>
+    <string name="fiveAccountValidation">You can not add more than five accounts</string>
 
 
 </resources>