code modification done

app/src/main/AndroidManifest.xml

@@ -3,10 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"
+        tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="ANDROID.PERMISSION.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="ANDROID.PERMISSION.READ_EXTERNAL_STORAGE" />
 
     <uses-feature
         android:name="android.hardware.camera"
@@ -26,15 +29,13 @@
         android:label="@string/appName"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.BajajFdLib"
+        android:theme="@style/Theme.NiveshSDK"
         tools:targetApi="31">
-<!--    android:theme="@style/Theme.BajajFdLib" AppTheme-->
 
         <activity
             android:name=".ui.activity.BajajFdMainActivity"
             android:exported="true"
-            android:windowSoftInputMode="adjustPan"
-            >
+            android:windowSoftInputMode="adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/com/nivesh/production/bajajfd/BajajApplication.kt

@@ -5,7 +5,6 @@ import android.content.Context
 
 class BajajApplication : Application() {
     private var mInstance: BajajApplication? = null
-   // private val mRequestQueue: RequestQueue? = null
    companion object {
         var appContext: Context? = null
    }
@@ -15,8 +14,4 @@ class BajajApplication : Application() {
         appContext = applicationContext
     }
 
-    @Synchronized
-    fun getInstanceApp(): BajajApplication? {
-        return mInstance
-    }
 }

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

@@ -15,18 +15,4 @@ class SectionsPagerAdapter(manager: FragmentManager,private val fragments: Array
 
     override fun getPageTitle(position: Int): CharSequence = titles[position]
 
-}
-//class SectionsPagerAdapter(private val fm: FragmentManager, private val fragments: Array<Fragment>, private val NumberOfTabs: Int) : SmartFragmentStatePagerAdapter(fm) {
-//
-//    override fun getItem(position: Int): Fragment {
-//        return fragments[position]
-//    }
-//
-//    override fun getPageTitle(position: Int): CharSequence? {
-//        return null
-//    }
-//
-//    override fun getCount(): Int {
-//        return NumberOfTabs
-//    }
-//}
+}

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

@@ -1,7 +1,6 @@
 package com.nivesh.production.bajajfd.ui.activity
 
 import android.annotation.SuppressLint
-import android.app.Activity
 import android.app.Dialog
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
@@ -107,7 +106,7 @@ class BajajFdMainActivity : BaseActivity() {
                                     stepCount = stepsCountResponse.Response.StepsCount
                                     getClientDetailsApi(stepsCountResponse.Response.StepsCount)
                                 }
-                                650 -> refreshToken("")
+                                650 -> ""
                                 else -> {
                                     showDialogValidation(
                                         this@BajajFdMainActivity,
@@ -133,11 +132,6 @@ class BajajFdMainActivity : BaseActivity() {
         }
     }
 
-
-    private fun refreshToken(fdStepsCount: String) {
-
-    }
-
     private fun getClientDetailsApi(stepsCount: Int) {
         if (Common.isNetworkAvailable(this@BajajFdMainActivity)) {
             val getClientDetailsRequest = getClientDetailsRequest()
@@ -162,12 +156,12 @@ class BajajFdMainActivity : BaseActivity() {
             deviceInfo.device_os_version = ""
             userRequest.deviceInfo = deviceInfo
             getClientDetailsRequest.UserRequest = userRequest
-            Log.e("getClientDetailRequest", "-->" + Gson().toJson(getClientDetailsRequest))
+            Log.e("getClientDetail ", " Request -->" + Gson().toJson(getClientDetailsRequest))
             viewModel.getClientDetails(getClientDetailsRequest, token, this)
             viewModel.getClientDetailsMutableData.observe(this) { response ->
                 when (response) {
                     is Resource.Success -> {
-                        Log.e("response", "-->${response.data.toString()}")
+                        Log.e("getClientDetail ", " response -->${response.data.toString()}")
                         getClientDetailsResponse =
                             Gson().fromJson(
                                 response.data?.toString(),
@@ -229,7 +223,7 @@ class BajajFdMainActivity : BaseActivity() {
         val viewPager: DisableAdapter = binding.viewPager
         viewPager.setPagingEnabled(false)
         viewPager.adapter = sectionsPagerAdapter
-        if (sectionsPagerAdapter.getCount() > 1) {
+        if (sectionsPagerAdapter.count > 1) {
             viewPager.offscreenPageLimit = sectionsPagerAdapter.count - 1
         } else {
             viewPager.offscreenPageLimit = 1
@@ -451,7 +445,7 @@ class BajajFdMainActivity : BaseActivity() {
                                     }
                                     stepFiveBajajFDFragment.getData(paymentReQueryResponse)
                                 }
-                                650 -> refreshToken("")
+                                650 -> ""
                                 else -> {
                                     showDialogValidation(
                                         this@BajajFdMainActivity,

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

@@ -23,6 +23,7 @@ class StepFourBajajFDFragment : Fragment() {
 
     private var _binding: FragmentBajajfdStepFourBinding? = null
     private val binding get() = _binding!!
+
     private lateinit var listOfCustomer: MutableList<GetCodes>
     private var selectedList: String = ""
     private var payUrl: String = ""
@@ -40,10 +41,6 @@ class StepFourBajajFDFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding.checkBox.setOnCheckedChangeListener { _, _ ->
-
-        }
-
         if ((activity as BajajFdMainActivity).loginRole == 5) {
             binding.btnNext.text = getString(R.string.pay)
             binding.btnNext.setBackgroundColor(
@@ -110,7 +107,7 @@ class StepFourBajajFDFragment : Fragment() {
         (activity as BajajFdMainActivity).viewModel.getFDOtherMutableData.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Resource.Success -> {
-                    Log.e("response", "-->" + response.data.toString())
+                    Log.e("saveFDOtherData", " response -->${response.data.toString()}")
                     val saveFDOtherDataResponse: SaveFDOtherDataResponse =
                         Gson().fromJson(
                             response.data?.toString(),
@@ -153,7 +150,6 @@ class StepFourBajajFDFragment : Fragment() {
     }
 
     private fun customerListApi() {
-
         val getCodeRequest = GetCodeRequest()
         getCodeRequest.ProductName = getString(R.string.bajajFD)
         getCodeRequest.Category = getString(R.string.customerCategory)
@@ -169,7 +165,7 @@ class StepFourBajajFDFragment : Fragment() {
         ) { response ->
             when (response) {
                 is Resource.Success -> {
-                    Log.e("response", "-->$response")
+                    Log.e("customerListApi", " response -->${response.data.toString()}")
                     val getCodeResponse: GetCodeResponse =
                         Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java)
                     getCodeResponse.Response.StatusCode.let { code ->
@@ -231,7 +227,7 @@ class StepFourBajajFDFragment : Fragment() {
             ) { response ->
                 when (response) {
                     is Resource.Success -> {
-                        Log.e("response", "-->$response")
+                        Log.e("getFDDetailsApi", " response -->${response.data.toString()}")
                         val getFDDetailsResponse: GetFDDetailsResponse =
                             Gson().fromJson(
                                 response.data?.toString(),

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

@@ -54,13 +54,12 @@ class StepOneBajajFDFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         listOfTenure = ArrayList()
-        binding.edtAmount.filters = arrayOf<InputFilter>(InputFilter.LengthFilter(8)) // upto 1 Cr
-
         listOfMinAmount = ArrayList()
         listOfMaxAmount = ArrayList()
         listOfFrequency = ArrayList()
-        rgMaturity = RadioButton(activity as BajajFdMainActivity)
 
+        rgMaturity = RadioButton(activity as BajajFdMainActivity)
+        binding.edtAmount.filters = arrayOf<InputFilter>(InputFilter.LengthFilter(8)) // upto 1 Cr
         // Amount
         binding.edtAmount.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {}
@@ -171,7 +170,7 @@ class StepOneBajajFDFragment : Fragment() {
         (activity as BajajFdMainActivity).viewModel.getCodeMutableData.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Resource.Success -> {
-                    Log.e("response", "-->${response.data.toString()}")
+                    Log.e("interestPayoutApi", " response -->${response.data.toString()}")
                     val getCodeResponse: GetCodeResponse =
                         Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java)
                     getCodeResponse.Response.StatusCode.let { code ->
@@ -192,9 +191,14 @@ class StepOneBajajFDFragment : Fragment() {
                                     binding.tvFrequency.text =
                                         adapter.getItem(listOfFrequency.size - 1)?.Value
                                     getRatesApi()
+                                }else{
+                                    Common.showDialogValidation(
+                                        activity as BajajFdMainActivity,
+                                        "Interest Payout Frequency Data Is Missing."
+                                    )
                                 }
                             }
-                            //  650 -> refreshToken()
+                            650 -> ""
                             else -> {
                                 Common.showDialogValidation(
                                     activity as BajajFdMainActivity,
@@ -236,7 +240,7 @@ class StepOneBajajFDFragment : Fragment() {
         ) { response ->
             when (response) {
                 is Resource.Success -> {
-                    Log.e("response", "-->${response.data.toString()}")
+                    Log.e("minAmountApi ", " response-->${response.data.toString()}")
                     val getCodeResponse: GetCodeResponse =
                         Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java)
                     getCodeResponse.Response.StatusCode.let { code ->
@@ -250,7 +254,7 @@ class StepOneBajajFDFragment : Fragment() {
                                 }
                                 maxAmountApi()
                             }
-                            //  650 -> refreshToken()
+                              650 -> ""
                             else -> {
                                 Common.showDialogValidation(
                                     activity as BajajFdMainActivity,
@@ -292,7 +296,7 @@ class StepOneBajajFDFragment : Fragment() {
         ) { response ->
             when (response) {
                 is Resource.Success -> {
-                    Log.e("response", "-->${response.data.toString()}")
+                    Log.e("maxAmountApi ", " response-->${response.data.toString()}")
                     val getCodeResponse: GetCodeResponse =
                         Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java)
                     getCodeResponse.Response.StatusCode.let { code ->
@@ -300,7 +304,7 @@ class StepOneBajajFDFragment : Fragment() {
                             200 -> {
                                 listOfMaxAmount = getCodeResponse.Response.GetCodesList
                             }
-                            //  650 -> refreshToken()
+                              650 -> ""
                             else -> {
                                 Common.showDialogValidation(
                                     activity as BajajFdMainActivity,
@@ -364,6 +368,7 @@ class StepOneBajajFDFragment : Fragment() {
             ) { response ->
                 when (response) {
                     is Resource.Success -> {
+                        Log.e("maturityAmountApi ", " response-->${response.data.toString()}")
                         val getMaturityAmountResponse =
                             Gson().fromJson(
                                 response.data?.toString(),

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

@@ -39,13 +39,18 @@ import java.io.*
 
 class StepThreeBajajFDFragment : Fragment() {
 
-    private var bitmap: Bitmap? = null
-    private var latestTmpUri: Uri? = null
+
     private var _binding: FragmentBajajfdStepThreeBinding? = null
     private val binding get() = _binding!!
 
     private var takeImageResult: ActivityResultLauncher<Uri>? = null
     private var selectImageIntent: ActivityResultLauncher<String>? = null
+    private var bitmap: Bitmap? = null
+    private var latestTmpUri: Uri? = null
+
+    private val mapImage: HashMap<String, String> = HashMap()
+    private lateinit var listOfDocType: List<GetCodes>
+    private var check: Array<String>? = null
 
     private var panString: String = ""
     private var photoString: String = ""
@@ -62,10 +67,6 @@ class StepThreeBajajFDFragment : Fragment() {
     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 check = arrayOf<CharSequence>("Take Photo", "Choose from Gallery", "Cancel")
 
     private val requestPermission = registerForActivityResult(
         ActivityResultContracts.RequestPermission()
@@ -89,6 +90,12 @@ class StepThreeBajajFDFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        check = arrayOf(
+            getString(R.string.takePhoto),
+            getString(R.string.chooseFromGallery),
+            getString(R.string.cancel)
+        )
+
         selectImageIntent = registerForActivityResult(ActivityResultContracts.GetContent())
         { uri: Uri? ->
             if (uri != null) {
@@ -199,11 +206,11 @@ class StepThreeBajajFDFragment : Fragment() {
         val builder = AlertDialog.Builder(
             activity as BajajFdMainActivity
         )
-        builder.setTitle("Add Photo!")
+        builder.setTitle(getString(R.string.addPhoto))
         builder.setItems(
             check
         ) { dialog: DialogInterface, item: Int ->
-            if (check[item] == "Take Photo") {
+            if (check!![item] == getString(R.string.takePhoto)) {
                 val permission = ContextCompat.checkSelfPermission(
                     activity as BajajFdMainActivity,
                     Manifest.permission.CAMERA
@@ -216,7 +223,7 @@ class StepThreeBajajFDFragment : Fragment() {
                     )
                 }
                 dialog.dismiss()
-            } else if (check[item] == "Choose from Gallery") {
+            } else if (check!![item] == getString(R.string.chooseFromGallery)) {
                 val permission = ContextCompat.checkSelfPermission(
                     activity as BajajFdMainActivity,
                     Manifest.permission.READ_EXTERNAL_STORAGE
@@ -228,7 +235,7 @@ class StepThreeBajajFDFragment : Fragment() {
                         Manifest.permission.READ_EXTERNAL_STORAGE
                     )
                 }
-            } else if (check[item] == "Cancel") {
+            } else if (check!![item] == getString(R.string.cancel)) {
                 dialog.dismiss()
             }
         }

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

@@ -51,10 +51,6 @@ class StepTwoBajajFDFragment : Fragment() {
     private var _binding: FragmentBajajfdStepTwoBinding? = null
     private val binding get() = _binding!!
 
-    private lateinit var rbBank: RadioButton
-    private lateinit var rbPaymentMode: RadioButton
-    private var cal = Calendar.getInstance()
-
     private lateinit var listOfTitle: List<GetCodes>
     private lateinit var listOfGender: List<GetCodes>
     private lateinit var listOfAnnualIncome: List<GetCodes>
@@ -71,12 +67,14 @@ class StepTwoBajajFDFragment : Fragment() {
     private lateinit var stateObject: DataObject
     private val listOfBanks: MutableList<ClientBanklist> = mutableListOf()
 
+    private lateinit var rbBank: RadioButton
+    private lateinit var rbPaymentMode: RadioButton
+    private var cal = Calendar.getInstance()
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-
         _binding = FragmentBajajfdStepTwoBinding.inflate(inflater, container, false)
         return binding.root
     }
@@ -92,9 +90,7 @@ class StepTwoBajajFDFragment : Fragment() {
         listOfStates = ArrayList()
         listOfIFSC = ArrayList()
         listOfPayMode = ArrayList()
-
         stateObject = DataObject()
-
         rbPaymentMode = RadioButton(activity as BajajFdMainActivity)
 
         // Personal Details
@@ -519,8 +515,7 @@ class StepTwoBajajFDFragment : Fragment() {
                     binding.edtFirstName.text.toString().plus(" ")
                         .plus(binding.edtMiddleName.text.toString()).plus(" ")
                         .plus(binding.edtLastName.text.toString()),
-                    binding.edtMobileNumber.text.toString(),
-                    1
+                    binding.edtMobileNumber.text.toString()
                 , (activity as BajajFdMainActivity).loginRole)
             }
         }
@@ -722,7 +717,7 @@ class StepTwoBajajFDFragment : Fragment() {
         (activity as BajajFdMainActivity).viewModel.getFDResponseMutableData.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Resource.Success -> {
-                    Log.e("response", "-->$response")
+                    Log.e("createFDApi ", " response -->$response")
                     val createFDApplicationResponse: CreateFDApplicationResponse =
                         Gson().fromJson(
                             response.data?.toString(),
@@ -767,6 +762,7 @@ class StepTwoBajajFDFragment : Fragment() {
             (activity as BajajFdMainActivity).viewModel.getIfscCodeCheckMutableData.observe(viewLifecycleOwner) { response ->
                 when (response) {
                     is Resource.Success -> {
+                        Log.e("ifscCodeCheckApi ", " response -->$response")
                         val getIFSCCodeListResponse =
                             Gson().fromJson(
                                 response.data?.toString(),
@@ -837,6 +833,7 @@ class StepTwoBajajFDFragment : Fragment() {
             when (response) {
                 is Resource.Success -> {
                     if (response.data.toString().isNotEmpty()) {
+                        Log.e("getIFSCDetailsApi ", " response -->$response")
                         val getIFSCCodeResponse = Gson().fromJson(
                             response.data.toString(),
                             GetIFSCCodeResponse::class.java
@@ -865,7 +862,7 @@ class StepTwoBajajFDFragment : Fragment() {
     }
 
     private fun verifyAccountNo(
-        bankAccount: String, Ifsc: String, name: String, phoneNumber: String, bankNo: Int
+        bankAccount: String, Ifsc: String, name: String, phoneNumber: String
     ,loginRole : Int) {
 
         val bankValidationApiRequest = BankValidationApiRequest()
@@ -874,7 +871,7 @@ class StepTwoBajajFDFragment : Fragment() {
         bankValidationApiRequest.Name = name
         bankValidationApiRequest.PhoneNo = phoneNumber
         bankValidationApiRequest.RoleId = loginRole
-        bankValidationApiRequest.BankNo = bankNo
+        bankValidationApiRequest.BankNo = 1
         (activity as BajajFdMainActivity).viewModel.bankValidationApi(
             bankValidationApiRequest,
             token,
@@ -883,6 +880,7 @@ class StepTwoBajajFDFragment : Fragment() {
         (activity as BajajFdMainActivity).viewModel.bankValidationApiMutableData.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Resource.Success -> {
+                    Log.e("verifyAccountNo ", " response -->$response")
                     val getBankValidationApiResponse =
                         Gson().fromJson(
                             response.data?.toString(),
@@ -894,7 +892,7 @@ class StepTwoBajajFDFragment : Fragment() {
                         }
                         when (code) {
                             200 -> {
-                                if (getBankValidationApiResponse.Message == "Account Verified") {
+                                if (getBankValidationApiResponse.Message == getString(R.string.accountVerified)) {
                                     val clientBankList = ClientBanklist()
                                     clientBankList.AccountNumber = bankAccount
                                     clientBankList.AccountType = "sb"
@@ -1055,6 +1053,7 @@ class StepTwoBajajFDFragment : Fragment() {
         (activity as BajajFdMainActivity).viewModel.getPanCheckMutableData.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Resource.Success -> {
+                    Log.e("panCheckApi ", " response -->$response")
                     val panCheckResponse =
                         Gson().fromJson(
                             response.data?.toString(),
@@ -1113,7 +1112,7 @@ class StepTwoBajajFDFragment : Fragment() {
         (activity as BajajFdMainActivity).viewModel.getTitleMutableData.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Resource.Success -> {
-                    Log.e("response", "-->$response")
+                    Log.e("titleApi ", " response -->$response")
                     val getCodeResponse: GetCodeResponse =
                         Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java)
                     getCodeResponse.Response.StatusCode.let { code ->
@@ -1200,7 +1199,7 @@ class StepTwoBajajFDFragment : Fragment() {
         (activity as BajajFdMainActivity).viewModel.getPaymentModeMutableData.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Resource.Success -> {
-                    Log.e("response", "-->$response")
+                    Log.e("paymentModeApi ", " response -->$response")
                     val getCodeResponse: GetCodeResponse =
                         Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java)
                     getCodeResponse.Response.StatusCode.let { code ->
@@ -1262,7 +1261,7 @@ class StepTwoBajajFDFragment : Fragment() {
         (activity as BajajFdMainActivity).viewModel.getGenderMutableData.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Resource.Success -> {
-                    Log.e("response", "-->$response")
+                    Log.e("genderApi ", " response -->$response")
                     val getCodeResponse: GetCodeResponse =
                         Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java)
                     getCodeResponse.Response.StatusCode.let { code ->
@@ -1322,7 +1321,7 @@ class StepTwoBajajFDFragment : Fragment() {
         (activity as BajajFdMainActivity).viewModel.getRelationShipMutableData.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Resource.Success -> {
-                    Log.e("response", "-->$response")
+                    Log.e("relationShipApi ", " response -->$response")
                     val getCodeResponse: GetCodeResponse =
                         Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java)
                     getCodeResponse.Response.StatusCode.let { code ->
@@ -1390,7 +1389,7 @@ class StepTwoBajajFDFragment : Fragment() {
         (activity as BajajFdMainActivity).viewModel.getMaritalStatusMutableData.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Resource.Success -> {
-                    Log.e("response", "-->$response")
+                    Log.e("maritalStatusApi ", " response -->$response")
                     val getCodeResponse: GetCodeResponse =
                         Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java)
                     getCodeResponse.Response.StatusCode.let { code ->
@@ -1450,7 +1449,7 @@ class StepTwoBajajFDFragment : Fragment() {
         (activity as BajajFdMainActivity).viewModel.getOccupationMutableData.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Resource.Success -> {
-                    Log.e("response", "-->$response")
+                    Log.e("occupationApi ", " response -->$response")
                     val getCodeResponse: GetCodeResponse =
                         Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java)
                     getCodeResponse.Response.StatusCode.let { code ->
@@ -1510,7 +1509,7 @@ class StepTwoBajajFDFragment : Fragment() {
         (activity as BajajFdMainActivity).viewModel.getAnnualIncomeMutableData.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Resource.Success -> {
-                    Log.e("response", "-->$response")
+                    Log.e("annualIncomeApi ", " response -->$response")
                     val getCodeResponse: GetCodeResponse =
                         Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java)
                     getCodeResponse.Response.StatusCode.let { code ->
@@ -1561,7 +1560,7 @@ class StepTwoBajajFDFragment : Fragment() {
         (activity as BajajFdMainActivity).viewModel.getStateMasterMutableData.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Resource.Success -> {
-                    Log.e("response", "-->$response")
+                    Log.e("stateListApi ", " response -->$response")
                     val stateListResponse: StateListResponse =
                         Gson().fromJson(
                             response.data?.toString(),
@@ -1637,7 +1636,7 @@ class StepTwoBajajFDFragment : Fragment() {
             (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
         cityRequest.RoleID = (activity as BajajFdMainActivity).loginRole
         cityRequest.APIName = ""
-        cityRequest.UID = 19060
+        cityRequest.UID = 0
         cityRequest.Subbroker_Code =
             (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.sub_broker_code
         cityRequest.RMCode = ""
@@ -1648,7 +1647,7 @@ class StepTwoBajajFDFragment : Fragment() {
         (activity as BajajFdMainActivity).viewModel.getCityListMutableData.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Resource.Success -> {
-                    Log.e("response", "-->$response")
+                    Log.e("cityListApi ", " response -->$response")
                     val cityListResponse: CityListResponse =
                         Gson().fromJson(response.data?.toString(), CityListResponse::class.java)
                     cityListResponse.response.status_code.let { code ->
@@ -1711,7 +1710,7 @@ class StepTwoBajajFDFragment : Fragment() {
         (activity as BajajFdMainActivity).viewModel.getFDBankListMutableData.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Resource.Success -> {
-                    Log.e("response", "-->$response")
+                    Log.e("apiForEligibleBankList ", " response -->$response")
                     val getFDBankListResponse: GetFDBankListResponse =
                         Gson().fromJson(
                             response.data?.toString(),

app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt

@@ -8,7 +8,6 @@ import android.graphics.drawable.GradientDrawable
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
 import android.os.Build
-import android.provider.ContactsContract
 import android.text.format.DateFormat
 import android.util.Log
 import android.util.Patterns
@@ -59,7 +58,7 @@ class Common {
                 connectivityManager.activeNetworkInfo?.run {
                     return when (type) {
                         ConnectivityManager.TYPE_WIFI -> true
-                        ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE -> true
+                        ConnectivityManager.TYPE_MOBILE -> true
                         ConnectivityManager.TYPE_ETHERNET -> true
                         else -> false
                     }
@@ -82,7 +81,7 @@ class Common {
 
         //validPanCard
         fun isValidPan(pan: String?): Boolean {
-            val mPattern = Pattern.compile("[A-Z]{5}[0-9]{4}[A-Z]{1}")
+            val mPattern = Pattern.compile("[A-Z]{5}[0-9]{4}[A-Z]")
             val mMatcher = mPattern.matcher(pan.toString())
             return mMatcher.matches()
         }
@@ -103,7 +102,7 @@ class Common {
             if (textInputLayout.error != null) {
                 textInputLayout.error = null
                 if (textInputLayout.isErrorEnabled) {
-                    textInputLayout.isErrorEnabled = false;
+                    textInputLayout.isErrorEnabled = false
                 }
             }
         }
@@ -189,7 +188,7 @@ class Common {
             return simpleDateFormat.format(mDate as Date)
         }
 
-        fun handleResponse(response: retrofit2.Response<JsonObject>): Resource<JsonObject> {
+        fun handleResponse(response: Response<JsonObject>): Resource<JsonObject> {
             //   try {
             if (response.isSuccessful && response.body() != null) {
                 response.body()?.let { resultResponse ->
@@ -210,15 +209,15 @@ class Common {
 
          fun handleResponse1(response: Response<String>): Resource<String> {
              if (response.isSuccessful && response.body() != null) {
-                 if (response.body().toString().isNotEmpty()) {
+                 return if (response.body().toString().isNotEmpty()) {
                      Log.e("response", "-->$response")
                      val str: String = response.body().toString().replace("\r\n", "")
                      Log.e("str", "-->$str")
                      val jsonObject = JSONObject(str)
                      Log.e("jsonObject", "-->$jsonObject")
-                     return Resource.Success(jsonObject.toString())
+                     Resource.Success(jsonObject.toString())
                  }else {
-                     return Resource.Error(response.message())
+                     Resource.Error(response.message())
                  }
              }
              return Resource.Error(response.message())
@@ -243,8 +242,8 @@ class Common {
         }
 
         fun isMinor(date: String): Boolean {
-            val simpleDateFormat = SimpleDateFormat("yyyy-mm-dd")
-            val dt1: Date = simpleDateFormat.parse(date)
+            val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
+            val dt1: Date = simpleDateFormat.parse(date) as Date
             val year: Int = DateFormat.format("yyyy", dt1).toString().toInt()
             val month: Int = DateFormat.format("mm", dt1).toString().toInt()
             val day = DateFormat.format("dd", dt1).toString().toInt()
@@ -254,7 +253,7 @@ class Common {
             return minAdultAge.before(userAge)
         }
 
-        /* this function is used for file size in readable formate(End)*/
+        /* this function is used for file size in readable format(End)*/
         fun getFileSizeInMB(length: Long): Double {
             // Get length of file in bytes
             val fileSizeInBytes = length.toDouble()

app/src/main/java/com/nivesh/production/bajajfd/util/Resource.kt

@@ -10,17 +10,7 @@ sealed class Resource<T>(
     class Success<T>(data: T) : Resource<T>(data)
     class Error<T>(message: String, data: T? = null) : Resource<T>(data, message)
     class Loading<T> : Resource<T>()
-    class DataError<T>(errorCode: Int, message: String, data: T? = null) :
+    class DataError<T>(errorCode: Int, message: String) :
         Resource<T>(null, message, errorCode)
 
-
-    override fun toString(): String {
-        return when (this) {
-            is Success<*> -> "Success[data=$data]"
-            is DataError -> "ErrorCode[exception=$errorCode]"
-            is Loading<T> -> "Loading"
-            is Error -> "Error[exception=${error(Any())}]"
-        }
-
-    }
 }

app/src/main/java/com/nivesh/production/bajajfd/viewModel/BajajFDViewModel.kt

@@ -364,12 +364,4 @@ open class BajajFDViewModel(private val mainRepository: MainRepository) : ViewMo
         }
     }
 
-    fun paymentReQuery(getRatesRequest: PaymentReQueryRequest, token: String,
-                       activity: Activity) = viewModelScope.launch(handleError(activity)) {
-        if (Common.isNetworkAvailable(activity)) {
-            getRatesMutableData.postValue(Resource.Loading())
-            val response = mainRepository.paymentReQueryResponse(getRatesRequest, token)
-            getRatesMutableData.postValue(handleResponse(response))
-        }
-    }
 }

app/src/main/res/layout/fragment_bajajfd_step_one.xml

@@ -78,7 +78,8 @@
                             android:inputType="number"
                             android:maxLength="12"
                             android:textColorHint="@color/greyColor2"
-                            android:textSize="@dimen/text_size_14" />
+                            android:textSize="@dimen/text_size_14"
+                            tool:ignore="TextContrastCheck" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 

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

@@ -1,5 +1,5 @@
 <resources>
-    <string name="appName">BajajFdLib</string>
+    <string name="appName">NiveshSDK</string>
     <string name="bajaj">Bajaj</string>
     <string name="app">App</string>
     <string name="source">nivesh</string>
@@ -140,6 +140,7 @@
 
     <string name="emptyPAN">Please enter PAN number</string>
     <string name="invalidPAN">Invalid PAN</string>
+    <string name="accountVerified">Account Verified</string>
 
 
     <string name="emptyTitle">Please select title</string>
@@ -198,7 +199,16 @@
     <string name="selectOption">Select Option</string>
     <string name="gallery">Gallery</string>
     <string name="camera">Camera</string>
-
+    <string name="panLabel">PAN</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>
+    <string name="takePhoto">Take Photo</string>
+    <string name="chooseFromGallery">Choose from Gallery</string>
+    <string name="addPhoto">Add Photo!</string>
+    <string name="cancel">Cancel</string>
+    <string name="aadhar">Aadhar</string>
 
     <!--  Step Four  -->
     <string name="makePayment">Make Payment</string>
@@ -238,13 +248,6 @@
     <string name="add_new_account">Add New Account</string>
 
     <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>
-    <string name="panLabel">PAN</string>
 
 
 </resources>

app/src/main/res/values-night/themes.xml

@@ -1,6 +1,6 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="Theme.BajajFdLib" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.NiveshSDK" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">#FFBB86FC</item>
         <item name="colorPrimaryVariant">@color/colorPrimary</item>

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

@@ -1,5 +1,5 @@
 <resources>
-    <string name="appName">BajajFdLib</string>
+    <string name="appName">NiveshSDK</string>
     <string name="bajaj">Bajaj</string>
     <string name="app">App</string>
     <string name="source">nivesh</string>
@@ -140,6 +140,7 @@
 
     <string name="emptyPAN">Please enter PAN number</string>
     <string name="invalidPAN">Invalid PAN</string>
+    <string name="accountVerified">Account Verified</string>
 
 
     <string name="emptyTitle">Please select title</string>
@@ -199,7 +200,15 @@
     <string name="gallery">Gallery</string>
     <string name="camera">Camera</string>
     <string name="panLabel">PAN</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>
+    <string name="takePhoto">Take Photo</string>
+    <string name="chooseFromGallery">Choose from Gallery</string>
+    <string name="addPhoto">Add Photo!</string>
+    <string name="cancel">Cancel</string>
+    <string name="aadhar">Aadhar</string>
 
     <!--  Step Four  -->
     <string name="makePayment">Make Payment</string>
@@ -239,12 +248,6 @@
     <string name="add_new_account">Add New Account</string>
 
     <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/themes.xml

@@ -1,6 +1,6 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="Theme.BajajFdLib" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="Theme.NiveshSDK" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">#898989</item>
         <item name="colorPrimaryVariant">@color/colorPrimary</item>

app/src/main/res/xml/data_extraction_rules.xml

@@ -1,19 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   Sample data extraction rules file; uncomment and customize as necessary.
-   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
-   for details.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <data-extraction-rules>
     <cloud-backup>
-        <!-- TODO: Use <include> and <exclude> to control what is backed up.
-        <include .../>
-        <exclude .../>
-        -->
     </cloud-backup>
-    <!--
-    <device-transfer>
-        <include .../>
-        <exclude .../>
-    </device-transfer>
-    -->
 </data-extraction-rules>

settings.gradle

@@ -13,5 +13,5 @@ dependencyResolutionManagement {
         maven { url 'https://jitpack.io' }
     }
 }
-rootProject.name = "BajajFdLib"
+rootProject.name = "NiveshSDK"
 include ':app'