added code changes

app/src/main/java/com/nivesh/production/niveshfd/adapter/PaymentModeAdapter.kt

@@ -5,7 +5,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.cardview.widget.CardView
 import androidx.recyclerview.widget.RecyclerView
 import com.nivesh.production.niveshfd.R
 import com.nivesh.production.niveshfd.model.GetCodes
@@ -38,43 +37,41 @@ class PaymentModeAdapter(
     }
 
     override fun onBindViewHolder(holder: BankListViewHolder, position: Int) {
-        val listOfPayMode = listOfPayMode?.get(position)
-        if (listOfPayMode != null) {
-            holder.itemView.apply {
-
-                holder.paymentMethod.text = listOfPayMode.Value
-                if (listOfPayMode.Value.equals("UPI")) {
-                    holder.tvUpiMsg.text = context.getString(R.string.upto1LakhOnly)
-                } else {
-                    holder.tvUpiMsg.text = ""
-                }
+        val listOfPayMode = listOfPayMode[position]
+        holder.itemView.apply {
+
+            holder.paymentMethod.text = listOfPayMode.Value
+            if (listOfPayMode.Value == "UPI") {
+                holder.tvUpiMsg.text = context.getString(R.string.upto1LakhOnly)
+            } else {
+                holder.tvUpiMsg.text = ""
+            }
 
 
 
-                if (selectedAmount !=null && (checkedPosition == -2)) {
-                    holder.paymentSelector.setBackgroundResource(R.drawable.ic_select_green)
-                    checkedPosition = holder.adapterPosition
-                } else if (checkedPosition == -1) {
-                    holder.paymentSelector.setBackgroundResource(R.drawable.ic_select_outline)
-                } else if (checkedPosition == holder.adapterPosition) {
-                    holder.paymentSelector.setBackgroundResource(R.drawable.ic_select_green)
-                } else {
-                    holder.paymentSelector.setBackgroundResource(R.drawable.ic_select_outline)
-                }
+            if (selectedAmount != null && (checkedPosition == -2)) {
+                holder.paymentSelector.setBackgroundResource(R.drawable.ic_select_green)
+                checkedPosition = holder.adapterPosition
+            } else if (checkedPosition == -1) {
+                holder.paymentSelector.setBackgroundResource(R.drawable.ic_select_outline)
+            } else if (checkedPosition == holder.adapterPosition) {
+                holder.paymentSelector.setBackgroundResource(R.drawable.ic_select_green)
+            } else {
+                holder.paymentSelector.setBackgroundResource(R.drawable.ic_select_outline)
+            }
 
-                holder.itemView.setOnClickListener {
-                    holder.paymentSelector.setBackgroundResource(R.drawable.ic_select_green)
-                    if (checkedPosition != holder.adapterPosition) {
-                        notifyItemChanged(checkedPosition)
-                        checkedPosition = holder.adapterPosition
-                    }
+            holder.itemView.setOnClickListener {
+                holder.paymentSelector.setBackgroundResource(R.drawable.ic_select_green)
+                if (checkedPosition != holder.adapterPosition) {
+                    notifyItemChanged(checkedPosition)
+                    checkedPosition = holder.adapterPosition
                 }
             }
         }
     }
 
     override fun getItemCount(): Int {
-        return listOfPayMode?.size!!
+        return listOfPayMode.size
     }
 
     private var onItemClickListener: ((GetCodes) -> Unit)? = null
@@ -86,14 +83,8 @@ class PaymentModeAdapter(
 
     fun getSelected(): GetCodes? {
         return if (checkedPosition != -1) {
-            listOfPayMode?.get(checkedPosition)
+            listOfPayMode[checkedPosition]
         } else null
     }
 
-
-    private fun removeItem(position: Int) {
-        listOfPayMode?.removeAt(position)
-        notifyItemRemoved(position)
-        listOfPayMode?.let { notifyItemRangeChanged(position, it.size) }
-    }
 }

app/src/main/java/com/nivesh/production/niveshfd/ui/activity/NiveshFdMainActivity.kt

@@ -30,7 +30,6 @@ import com.nivesh.production.niveshfd.util.Common
 import com.nivesh.production.niveshfd.util.Common.Companion.defaultShape
 import com.nivesh.production.niveshfd.util.Common.Companion.selectedShape
 import com.nivesh.production.niveshfd.util.Common.Companion.showDialogValidation
-import com.nivesh.production.niveshfd.util.Constants.Companion.token
 import com.nivesh.production.niveshfd.util.ProgressUtil.hideLoading
 import com.nivesh.production.niveshfd.util.ProgressUtil.showLoading
 import com.nivesh.production.niveshfd.util.Resource
@@ -60,7 +59,6 @@ class NiveshFdMainActivity : BaseActivity() {
     private lateinit var sectionsPagerAdapter: SectionsPagerAdapter
     private lateinit var fragments: Array<Fragment>
     var dialogWebView: Dialog? = null
-    var loginRole: Int = 0
     var stepCount: Int = 0
     var uniqueId: String = ""
 
@@ -69,6 +67,7 @@ class NiveshFdMainActivity : BaseActivity() {
         init()
     }
 
+
     private fun init() {
         //start Repository
         viewModel = ViewModelProvider(
@@ -80,12 +79,11 @@ class NiveshFdMainActivity : BaseActivity() {
             setContentView(this.root)
         }
 
-        // For Set Data
-        PreferenceManager(this@NiveshFdMainActivity).setSubBrokerID("")
-        // For Get Data
-        PreferenceManager(context = this@NiveshFdMainActivity).getSubBrokerID()
+        PreferenceManager(this@NiveshFdMainActivity).setLoginRole(5)
+        PreferenceManager(this@NiveshFdMainActivity).setClientCode("8872")
+        PreferenceManager(this@NiveshFdMainActivity).setSubBrokerID("1038")
+        PreferenceManager(this@NiveshFdMainActivity).setToken("636F8F63-06C4-4D95-8562-392B34025FB0")
 
-        loginRole = 5
         if (Common.isNetworkAvailable(this)) {
             getStepsCountApi()
         }
@@ -99,8 +97,13 @@ class NiveshFdMainActivity : BaseActivity() {
         if (Common.isNetworkAvailable(this)) {
             val fdStepsCount = FDStepsCountRequest()
             fdStepsCount.FDProvider = getString(R.string.bajaj)
-            fdStepsCount.NiveshClientCode = "8872" // 60476
-            viewModel.getStepsCount(fdStepsCount, token, this)
+            fdStepsCount.NiveshClientCode =
+                PreferenceManager(this@NiveshFdMainActivity).getClientCode()
+            viewModel.getStepsCount(
+                fdStepsCount,
+                PreferenceManager(this@NiveshFdMainActivity).getToken(),
+                this
+            )
             viewModel.getStepsCountMutableData.observe(this) { response ->
                 when (response) {
                     is Resource.Success -> {
@@ -152,15 +155,17 @@ class NiveshFdMainActivity : BaseActivity() {
     private fun getClientDetailsApi(stepsCount: Int) {
         if (Common.isNetworkAvailable(this@NiveshFdMainActivity)) {
             val getClientDetailsRequest = getClientDetailsRequest()
-            getClientDetailsRequest.client_code = "8872"
+            getClientDetailsRequest.client_code =
+                PreferenceManager(this@NiveshFdMainActivity).getClientCode()
             getClientDetailsRequest.AppOrWeb = getString(R.string.app)
-            getClientDetailsRequest.sub_broker_code = "1038"
+            getClientDetailsRequest.sub_broker_code =
+                PreferenceManager(this@NiveshFdMainActivity).getSubBrokerID()
             val userRequest = UserRequest()
             userRequest.UID = 0
             userRequest.IPAddress = ""
             userRequest.Source = getString(R.string.source)
             userRequest.AppOrWeb = getString(R.string.app)
-            userRequest.LoggedInRoleId = loginRole
+            userRequest.LoggedInRoleId = PreferenceManager(this@NiveshFdMainActivity).getLoginRole()
 
             val deviceInfo = DeviceInfo()
             deviceInfo.device_id = ""
@@ -175,7 +180,11 @@ class NiveshFdMainActivity : BaseActivity() {
             getClientDetailsRequest.UserRequest = userRequest
             Log.e("getClientDetail ", " Request -->" + Gson().toJson(getClientDetailsRequest))
             showLoading(this@NiveshFdMainActivity)
-            viewModel.getClientDetails(getClientDetailsRequest, token, this)
+            viewModel.getClientDetails(
+                getClientDetailsRequest,
+                PreferenceManager(this@NiveshFdMainActivity).getToken(),
+                this
+            )
             viewModel.getClientDetailsMutableData.observe(this) { response ->
                 when (response) {
                     is Resource.Success -> {
@@ -363,7 +372,7 @@ class NiveshFdMainActivity : BaseActivity() {
         Log.e("payUrl", "-->$payUrl")
         Log.e("value", "-->$value")
         dialogWebView = Dialog(this@NiveshFdMainActivity)
-        dialogWebView!!.setContentView(R.layout.row_fd_pay)
+        dialogWebView!!.setContentView(R.layout.row_fd_pay1)
         dialogWebView!!.setCancelable(true)
         val tvCancel = dialogWebView!!.findViewById<TextView>(R.id.tvCancel)
         tvCancel.setOnClickListener {
@@ -405,7 +414,11 @@ class NiveshFdMainActivity : BaseActivity() {
             paymentReQueryRequest.NiveshClientCode =
                 getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
             showLoading(this@NiveshFdMainActivity)
-            viewModel.getPaymentReQuery(paymentReQueryRequest, token, this)
+            viewModel.getPaymentReQuery(
+                paymentReQueryRequest,
+                PreferenceManager(this@NiveshFdMainActivity).getToken(),
+                this
+            )
             viewModel.getPaymentReQueryMutableData.observe(this) { response ->
                 when (response) {
                     is Resource.Success -> {

app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFiveNiveshFDFragment.kt

@@ -10,10 +10,10 @@ import androidx.fragment.app.Fragment
 import com.google.gson.Gson
 import com.nivesh.production.niveshfd.R
 import com.nivesh.production.niveshfd.databinding.FragmentNiveshfdStepFiveBinding
+import com.nivesh.production.niveshfd.db.PreferenceManager
 import com.nivesh.production.niveshfd.model.*
 import com.nivesh.production.niveshfd.ui.activity.NiveshFdMainActivity
 import com.nivesh.production.niveshfd.util.Common
-import com.nivesh.production.niveshfd.util.Constants
 import com.nivesh.production.niveshfd.util.Resource
 
 class StepFiveNiveshFDFragment : Fragment() {
@@ -37,7 +37,7 @@ class StepFiveNiveshFDFragment : Fragment() {
 
         }
 
-        binding.tvRetry.setOnClickListener{
+        binding.tvRetry.setOnClickListener {
             (activity as NiveshFdMainActivity).retryMethod()
         }
     }
@@ -45,7 +45,8 @@ class StepFiveNiveshFDFragment : Fragment() {
     fun getData(paymentReQueryResponse: PaymentReQueryResponse) {
         if (paymentReQueryResponse.Response.StatusCode == 200) {
             if (paymentReQueryResponse.Response.Message.isNotEmpty()) {
-                val arrOfStr: List<String> = paymentReQueryResponse.Response.Message.split(" ", limit = 2)
+                val arrOfStr: List<String> =
+                    paymentReQueryResponse.Response.Message.split(" ", limit = 2)
                 binding.tvCongrats.text = arrOfStr[0]
                 binding.tvCongrats.setTextColor(
                     ContextCompat.getColor(
@@ -57,7 +58,7 @@ class StepFiveNiveshFDFragment : Fragment() {
             }
             finalizeFDApi()
             finalizeKYCApi()
-        }else{
+        } else {
             if (paymentReQueryResponse.Response.Message.isNotEmpty()) {
                 if (paymentReQueryResponse.Response.Message.isNotEmpty()) {
                     binding.tvCongrats.text = paymentReQueryResponse.Response.Status
@@ -77,17 +78,22 @@ class StepFiveNiveshFDFragment : Fragment() {
     }
 
     private fun finalizeFDApi() {
-        val finalizeFDRequest  = FinalizeFDRequest()
-        val finaliseFD  = FinaliseFD()
+        val finalizeFDRequest = FinalizeFDRequest()
+        val finaliseFD = FinaliseFD()
         finaliseFD.FDProvider = getString(R.string.bajaj)
-        finaliseFD.NiveshClientCode = (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
+        finaliseFD.NiveshClientCode =
+            (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
         finaliseFD.UniqueId = (activity as NiveshFdMainActivity).uniqueId
         finalizeFDRequest.FinaliseFD = finaliseFD
 
         (activity as NiveshFdMainActivity).viewModel.finaliseFD(
-            finalizeFDRequest, Constants.token, activity as NiveshFdMainActivity
+            finalizeFDRequest,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
+            activity as NiveshFdMainActivity
         )
-        (activity as NiveshFdMainActivity).viewModel.getFinalizeFDMutableData.observe(viewLifecycleOwner){ response ->
+        (activity as NiveshFdMainActivity).viewModel.getFinalizeFDMutableData.observe(
+            viewLifecycleOwner
+        ) { response ->
             when (response) {
                 is Resource.Success -> {
                     Log.e("finalizeKYC ", " response-->${response.data.toString()}")
@@ -127,12 +133,17 @@ class StepFiveNiveshFDFragment : Fragment() {
     private fun finalizeKYCApi() {
         val finalizeKYCRequest = FinalizeKYCRequest()
         finalizeKYCRequest.FDProvider = getString(R.string.bajaj)
-        finalizeKYCRequest.NiveshClientCode = (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
-        finalizeKYCRequest.UniqueId  = (activity as NiveshFdMainActivity).uniqueId
+        finalizeKYCRequest.NiveshClientCode =
+            (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
+        finalizeKYCRequest.UniqueId = (activity as NiveshFdMainActivity).uniqueId
         (activity as NiveshFdMainActivity).viewModel.finaliseKYC(
-            finalizeKYCRequest, Constants.token, activity as NiveshFdMainActivity
+            finalizeKYCRequest,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
+            activity as NiveshFdMainActivity
         )
-        (activity as NiveshFdMainActivity).viewModel.getFinalizeKYCMutableData.observe(viewLifecycleOwner){ response ->
+        (activity as NiveshFdMainActivity).viewModel.getFinalizeKYCMutableData.observe(
+            viewLifecycleOwner
+        ) { response ->
             when (response) {
                 is Resource.Success -> {
                     Log.e("finalizeKYC ", " response-->${response.data.toString()}")

app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFourNiveshFDFragment.kt

@@ -12,12 +12,11 @@ import com.google.gson.Gson
 import com.nivesh.production.niveshfd.R
 import com.nivesh.production.niveshfd.adapter.CustomerListAdapter
 import com.nivesh.production.niveshfd.databinding.FragmentNiveshfdStepFourBinding
+import com.nivesh.production.niveshfd.db.PreferenceManager
 import com.nivesh.production.niveshfd.model.*
 import com.nivesh.production.niveshfd.ui.activity.NiveshFdMainActivity
 import com.nivesh.production.niveshfd.util.Common
 import com.nivesh.production.niveshfd.util.Common.Companion.showDialogValidation
-import com.nivesh.production.niveshfd.util.Constants.Companion.token
-import com.nivesh.production.niveshfd.util.ProgressUtil
 import com.nivesh.production.niveshfd.util.Resource
 
 class StepFourNiveshFDFragment : Fragment() {
@@ -42,7 +41,7 @@ class StepFourNiveshFDFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        if ((activity as NiveshFdMainActivity).loginRole == 5) {
+        if (PreferenceManager(activity as NiveshFdMainActivity).getLoginRole() == 5) {
             binding.btnNext.text = getString(R.string.pay)
             binding.btnNext.setBackgroundColor(
                 ResourcesCompat.getColor(
@@ -73,19 +72,19 @@ class StepFourNiveshFDFragment : Fragment() {
                     }
                 }
             }
-           if (validated()) {
-               if ((activity as NiveshFdMainActivity).loginRole == 5) {
-                   val saveFDOtherDataRequest = SaveFDOtherDataRequest()
-                   saveFDOtherDataRequest.FDProvider = getString(R.string.bajaj)
-                   saveFDOtherDataRequest.UniqueId = (activity as NiveshFdMainActivity).uniqueId
-                   saveFDOtherDataRequest.Values = selectedList
-                   saveFDOtherDataRequest.NiveshClientCode =
-                       (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
-                   saveFDOtherData(saveFDOtherDataRequest, payUrl, value)
-               } else {
-                   // go to view order
-               }
-           }
+            if (validated()) {
+                if (PreferenceManager(activity as NiveshFdMainActivity).getLoginRole() == 5) {
+                    val saveFDOtherDataRequest = SaveFDOtherDataRequest()
+                    saveFDOtherDataRequest.FDProvider = getString(R.string.bajaj)
+                    saveFDOtherDataRequest.UniqueId = (activity as NiveshFdMainActivity).uniqueId
+                    saveFDOtherDataRequest.Values = selectedList
+                    saveFDOtherDataRequest.NiveshClientCode =
+                        (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
+                    saveFDOtherData(saveFDOtherDataRequest, payUrl, value)
+                } else {
+                    // go to view order
+                }
+            }
         }
 
         binding.btnBack.setOnClickListener {
@@ -116,13 +115,15 @@ class StepFourNiveshFDFragment : Fragment() {
     }
 
     private fun saveFDOtherData(data: SaveFDOtherDataRequest, payUrl: String, value: String) {
-      //  ProgressUtil.showLoading(activity as NiveshFdMainActivity)
+        //  ProgressUtil.showLoading(activity as NiveshFdMainActivity)
         (activity as NiveshFdMainActivity).viewModel.saveFDOtherData(
             data,
-            token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             activity as NiveshFdMainActivity
         )
-        (activity as NiveshFdMainActivity).viewModel.getFDOtherMutableData.observe(viewLifecycleOwner) { response ->
+        (activity as NiveshFdMainActivity).viewModel.getFDOtherMutableData.observe(
+            viewLifecycleOwner
+        ) { response ->
             when (response) {
                 is Resource.Success -> {
                     Log.e("saveFDOtherData", " response -->${response.data.toString()}")
@@ -153,7 +154,7 @@ class StepFourNiveshFDFragment : Fragment() {
                     }
                 }
                 is Resource.Loading -> {
-                 //   ProgressUtil.hideLoading()
+                    //   ProgressUtil.hideLoading()
                 }
                 is Resource.DataError -> {
 
@@ -175,7 +176,7 @@ class StepFourNiveshFDFragment : Fragment() {
         getCodeRequest.InputValue = ""
         (activity as NiveshFdMainActivity).viewModel.customerListApi(
             getCodeRequest,
-            token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             activity as NiveshFdMainActivity
         )
         (activity as NiveshFdMainActivity).viewModel.customerListMutableData.observe(
@@ -237,7 +238,7 @@ class StepFourNiveshFDFragment : Fragment() {
             getFDDetailsRequest.UniqueId = (activity as NiveshFdMainActivity).uniqueId
             (activity as NiveshFdMainActivity).viewModel.getFDDetails(
                 getFDDetailsRequest,
-                token,
+                PreferenceManager(activity as NiveshFdMainActivity).getToken(),
                 activity as NiveshFdMainActivity
             )
             (activity as NiveshFdMainActivity).viewModel.getFDDetailsMutableData.observe(

app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepOneNiveshFDFragment.kt

@@ -21,12 +21,12 @@ import com.google.gson.Gson
 import com.nivesh.production.niveshfd.R
 import com.nivesh.production.niveshfd.adapter.HorizontalRecyclerViewAdapter
 import com.nivesh.production.niveshfd.databinding.FragmentNiveshfdStepOneBinding
+import com.nivesh.production.niveshfd.db.PreferenceManager
 import com.nivesh.production.niveshfd.model.*
 import com.nivesh.production.niveshfd.ui.activity.NiveshFdMainActivity
 import com.nivesh.production.niveshfd.util.Common
 import com.nivesh.production.niveshfd.util.Common.Companion.commonErrorMethod
 import com.nivesh.production.niveshfd.util.Common.Companion.removeError
-import com.nivesh.production.niveshfd.util.Constants.Companion.token
 import com.nivesh.production.niveshfd.util.Resource
 import com.nivesh.production.niveshfd.viewModel.MyObseravble
 
@@ -45,7 +45,7 @@ class StepOneNiveshFDFragment : Fragment() {
 
     private var tenure: Int = 0
     private var interest: Double = 0.0
-    private  var maturityText : String = ""
+    private var maturityText: String = ""
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
@@ -110,15 +110,15 @@ class StepOneNiveshFDFragment : Fragment() {
         }
 
         // Maturity Options
-        maturityText  = getString(R.string.totalDeduction)
+        maturityText = getString(R.string.totalDeduction)
         rgMaturity.text = getString(R.string.additionalDetailOne)
         binding.radioGroup.setOnCheckedChangeListener { group, checkedId ->
             rgMaturity = group.findViewById(checkedId)
             Log.e("Maturity", "-->" + rgMaturity.text)
-            if (rgMaturity.text.contains("credit")){
-                maturityText = getString(R.string.totalDeduction)
-            }else{
-                maturityText = getString(R.string.principalDeduction)
+            maturityText = if (rgMaturity.text.contains("credit")) {
+                getString(R.string.totalDeduction)
+            } else {
+                getString(R.string.principalDeduction)
             }
         }
 
@@ -172,12 +172,12 @@ class StepOneNiveshFDFragment : Fragment() {
     private fun interestPayoutApi() {
         val getCodeRequest = GetCodeRequest()
         getCodeRequest.ProductName = getString(R.string.bajajFD)
-        getCodeRequest.Category = getString(R.string.category)
+        getCodeRequest.Category = getString(R.string.niveshCategory)
         getCodeRequest.Language = getString(R.string.language)
         getCodeRequest.InputValue = ""
         (activity as NiveshFdMainActivity).viewModel.getCode(
             getCodeRequest,
-            token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             activity as NiveshFdMainActivity
         )
         (activity as NiveshFdMainActivity).viewModel.getCodeMutableData.observe(viewLifecycleOwner) { response ->
@@ -204,7 +204,7 @@ class StepOneNiveshFDFragment : Fragment() {
                                     binding.tvFrequency.text =
                                         adapter.getItem(listOfFrequency.size - 1)?.Value
                                     getRatesApi()
-                                }else{
+                                } else {
                                     Common.showDialogValidation(
                                         activity as NiveshFdMainActivity,
                                         "Interest Payout Frequency Data Is Missing."
@@ -245,7 +245,7 @@ class StepOneNiveshFDFragment : Fragment() {
         getCodeRequest.InputValue = ""
         (activity as NiveshFdMainActivity).viewModel.getMinAmount(
             getCodeRequest,
-            token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             activity as NiveshFdMainActivity
         )
         (activity as NiveshFdMainActivity).viewModel.getMinAmountMutableData.observe(
@@ -265,7 +265,7 @@ class StepOneNiveshFDFragment : Fragment() {
 //                                }
                                 maxAmountApi()
                             }
-                              650 -> ""
+                            650 -> ""
                             else -> {
                                 Common.showDialogValidation(
                                     activity as NiveshFdMainActivity,
@@ -299,7 +299,7 @@ class StepOneNiveshFDFragment : Fragment() {
         getCodeRequest.InputValue = ""
         (activity as NiveshFdMainActivity).viewModel.getMaxAmount(
             getCodeRequest,
-            token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             activity as NiveshFdMainActivity
         )
         (activity as NiveshFdMainActivity).viewModel.getMaxAmountMutableData.observe(
@@ -315,7 +315,7 @@ class StepOneNiveshFDFragment : Fragment() {
                             200 -> {
                                 listOfMaxAmount = getCodeResponse.Response.GetCodesList
                             }
-                              650 -> ""
+                            650 -> ""
                             else -> {
                                 Common.showDialogValidation(
                                     activity as NiveshFdMainActivity,
@@ -372,7 +372,8 @@ class StepOneNiveshFDFragment : Fragment() {
             maturityAmountRequest.Interest = interest
             (activity as NiveshFdMainActivity).viewModel.getMaturityAmount(
                 maturityAmountRequest,
-                activity as NiveshFdMainActivity
+                activity as NiveshFdMainActivity,
+                PreferenceManager(activity as NiveshFdMainActivity).getToken()
             )
             (activity as NiveshFdMainActivity).viewModel.getMaturityAmountMutableData.observe(
                 viewLifecycleOwner
@@ -438,13 +439,13 @@ class StepOneNiveshFDFragment : Fragment() {
                 binding.tlDepositAmount,
                 getString(R.string.validMinAmount)
             )
-        }  else if (binding.edtAmount.text.toString().toInt() % 1000 != 0) {
+        } else if (binding.edtAmount.text.toString().toInt() % 1000 != 0) {
             commonErrorMethod(
                 binding.edtAmount,
                 binding.tlDepositAmount,
                 getString(R.string.validMultipleAmount)
             )
-        }else if (binding.edtAmount.text.toString()
+        } else if (binding.edtAmount.text.toString()
                 .toDouble() > listOfMaxAmount[0].Value.toDouble()
         ) {
             commonErrorMethod(
@@ -480,7 +481,7 @@ class StepOneNiveshFDFragment : Fragment() {
         }
         (activity as NiveshFdMainActivity).viewModel.getRates(
             getRatesRequest,
-            token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             activity as NiveshFdMainActivity
         )
         (activity as NiveshFdMainActivity).viewModel.getRatesMutableData.observe(viewLifecycleOwner) { response ->
@@ -553,6 +554,6 @@ class StepOneNiveshFDFragment : Fragment() {
 
     override fun onDestroyView() {
         super.onDestroyView()
-          _binding = null
+        _binding = null
     }
 }

app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepThreeNiveshFDFragment.kt

@@ -30,12 +30,12 @@ import com.google.gson.Gson
 import com.nivesh.production.niveshfd.BuildConfig
 import com.nivesh.production.niveshfd.R
 import com.nivesh.production.niveshfd.databinding.FragmentNiveshfdStepThreeBinding
+import com.nivesh.production.niveshfd.db.PreferenceManager
 import com.nivesh.production.niveshfd.model.*
 import com.nivesh.production.niveshfd.ui.activity.NiveshFdMainActivity
 import com.nivesh.production.niveshfd.util.Common
 import com.nivesh.production.niveshfd.util.Common.Companion.getFileExtension
 import com.nivesh.production.niveshfd.util.Common.Companion.showDialogWithTwoButtons
-import com.nivesh.production.niveshfd.util.Constants
 import com.nivesh.production.niveshfd.util.ImageUtil
 import com.nivesh.production.niveshfd.util.Resource
 import java.io.*
@@ -105,7 +105,9 @@ class StepThreeNiveshFDFragment : Fragment() {
             selectImageIntent?.launch("image/*")
         } else {
             showDialogWithTwoButtons(
-                (activity as NiveshFdMainActivity), getString(R.string.galleryPermission), getString(
+                (activity as NiveshFdMainActivity),
+                getString(R.string.galleryPermission),
+                getString(
                     R.string.permissionsRequired
                 )
             )
@@ -465,7 +467,7 @@ class StepThreeNiveshFDFragment : Fragment() {
         du.UniqueId = (activity as NiveshFdMainActivity).uniqueId
         (activity as NiveshFdMainActivity).viewModel.documentsUpload(
             du,
-            Constants.token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             activity as NiveshFdMainActivity
         )
         (activity as NiveshFdMainActivity).viewModel.getDocumentUploadMutableData.observe(
@@ -518,7 +520,7 @@ class StepThreeNiveshFDFragment : Fragment() {
     private fun createFDApi(data: CreateFDRequest) {
         (activity as NiveshFdMainActivity).viewModel.createFDApi(
             data,
-            Constants.token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             activity as NiveshFdMainActivity
         )
         (activity as NiveshFdMainActivity).viewModel.getFDResponseMutableData.observe(
@@ -571,10 +573,12 @@ class StepThreeNiveshFDFragment : Fragment() {
         getCodeRequest.InputValue = ""
         (activity as NiveshFdMainActivity).viewModel.docTypeApi(
             getCodeRequest,
-            Constants.token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             activity as NiveshFdMainActivity
         )
-        (activity as NiveshFdMainActivity).viewModel.getDocTypeMutableData.observe(viewLifecycleOwner) { response ->
+        (activity as NiveshFdMainActivity).viewModel.getDocTypeMutableData.observe(
+            viewLifecycleOwner
+        ) { response ->
             when (response) {
                 is Resource.Success -> {
                     Log.e("response", "-->$response")

app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepTwoNiveshFDFragment.kt

@@ -28,6 +28,7 @@ import com.nivesh.production.niveshfd.adapter.BankListAdapter
 import com.nivesh.production.niveshfd.adapter.PaymentModeAdapter
 import com.nivesh.production.niveshfd.adapter.RecommendedBankListAdapter
 import com.nivesh.production.niveshfd.databinding.FragmentNiveshfdStepTwoBinding
+import com.nivesh.production.niveshfd.db.PreferenceManager
 import com.nivesh.production.niveshfd.model.*
 import com.nivesh.production.niveshfd.ui.activity.NiveshFdMainActivity
 import com.nivesh.production.niveshfd.util.Common.Companion.commonErrorAutoCompleteMethod
@@ -42,7 +43,6 @@ import com.nivesh.production.niveshfd.util.Common.Companion.isValidName
 import com.nivesh.production.niveshfd.util.Common.Companion.isValidPan
 import com.nivesh.production.niveshfd.util.Common.Companion.removeError
 import com.nivesh.production.niveshfd.util.Common.Companion.showDialogValidation
-import com.nivesh.production.niveshfd.util.Constants.Companion.token
 import com.nivesh.production.niveshfd.util.ProgressUtil
 import com.nivesh.production.niveshfd.util.Resource
 import com.nivesh.production.niveshfd.viewModel.MyObseravble
@@ -520,7 +520,7 @@ class StepTwoNiveshFDFragment : Fragment() {
                         .plus(binding.edtMiddleName.text.toString()).plus(" ")
                         .plus(binding.edtLastName.text.toString()),
                     binding.edtMobileNumber.text.toString(),
-                    (activity as NiveshFdMainActivity).loginRole
+                    PreferenceManager(activity as NiveshFdMainActivity).getLoginRole()
                 )
             }
         }
@@ -733,7 +733,7 @@ class StepTwoNiveshFDFragment : Fragment() {
                 (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE.toString()
             (activity as NiveshFdMainActivity).viewModel.checkFDKYC(
                 checkFDKYCRequest,
-                token,
+                PreferenceManager(activity as NiveshFdMainActivity).getToken(),
                 activity as NiveshFdMainActivity
             )
             (activity as NiveshFdMainActivity).viewModel.getFDKYCMutableData.observe(this) { response ->
@@ -781,7 +781,7 @@ class StepTwoNiveshFDFragment : Fragment() {
         ProgressUtil.showLoading(activity as NiveshFdMainActivity)
         (activity as NiveshFdMainActivity).viewModel.createFDApi(
             data,
-            token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             activity as NiveshFdMainActivity
         )
         (activity as NiveshFdMainActivity).viewModel.getFDResponseMutableData.observe(
@@ -905,7 +905,8 @@ class StepTwoNiveshFDFragment : Fragment() {
 
         (activity as NiveshFdMainActivity).viewModel.ifscCodeDetailsApi(
             ifscCode,
-            activity as NiveshFdMainActivity
+            activity as NiveshFdMainActivity,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken()
         )
         (activity as NiveshFdMainActivity).viewModel.getIfscCodeDetailsCheckMutableData.observe(
             viewLifecycleOwner
@@ -955,7 +956,7 @@ class StepTwoNiveshFDFragment : Fragment() {
         ProgressUtil.showLoading(activity as NiveshFdMainActivity)
         (activity as NiveshFdMainActivity).viewModel.bankValidationApi(
             bankValidationApiRequest,
-            token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             activity as NiveshFdMainActivity
         )
         (activity as NiveshFdMainActivity).viewModel.bankValidationApiMutableData.observe(
@@ -1134,7 +1135,7 @@ class StepTwoNiveshFDFragment : Fragment() {
         getCodeRequest.InputValue = ""
         (activity as NiveshFdMainActivity).viewModel.titleApi(
             getCodeRequest,
-            token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             activity as NiveshFdMainActivity
         )
         (activity as NiveshFdMainActivity).viewModel.getTitleMutableData.observe(viewLifecycleOwner) { response ->
@@ -1221,7 +1222,7 @@ class StepTwoNiveshFDFragment : Fragment() {
         getCodeRequest.InputValue = ""
         (activity as NiveshFdMainActivity).viewModel.paymentModeApi(
             getCodeRequest,
-            token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             activity as NiveshFdMainActivity
         )
         (activity as NiveshFdMainActivity).viewModel.getPaymentModeMutableData.observe(
@@ -1306,7 +1307,7 @@ class StepTwoNiveshFDFragment : Fragment() {
         getCodeRequest.InputValue = ""
         (activity as NiveshFdMainActivity).viewModel.genderApi(
             getCodeRequest,
-            token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             activity as NiveshFdMainActivity
         )
         (activity as NiveshFdMainActivity).viewModel.getGenderMutableData.observe(viewLifecycleOwner) { response ->
@@ -1366,7 +1367,7 @@ class StepTwoNiveshFDFragment : Fragment() {
         getCodeRequest.InputValue = ""
         (activity as NiveshFdMainActivity).viewModel.relationShipApi(
             getCodeRequest,
-            token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             activity as NiveshFdMainActivity
         )
         (activity as NiveshFdMainActivity).viewModel.getRelationShipMutableData.observe(
@@ -1452,7 +1453,7 @@ class StepTwoNiveshFDFragment : Fragment() {
         getCodeRequest.InputValue = ""
         (activity as NiveshFdMainActivity).viewModel.maritalStatusApi(
             getCodeRequest,
-            token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             activity as NiveshFdMainActivity
         )
         (activity as NiveshFdMainActivity).viewModel.getMaritalStatusMutableData.observe(
@@ -1514,7 +1515,7 @@ class StepTwoNiveshFDFragment : Fragment() {
         getCodeRequest.InputValue = ""
         (activity as NiveshFdMainActivity).viewModel.occupationApi(
             getCodeRequest,
-            token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             activity as NiveshFdMainActivity
         )
         (activity as NiveshFdMainActivity).viewModel.getOccupationMutableData.observe(
@@ -1589,7 +1590,7 @@ class StepTwoNiveshFDFragment : Fragment() {
         getCodeRequest.InputValue = ""
         (activity as NiveshFdMainActivity).viewModel.annualIncomeApi(
             getCodeRequest,
-            token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             activity as NiveshFdMainActivity
         )
         (activity as NiveshFdMainActivity).viewModel.getAnnualIncomeMutableData.observe(
@@ -1645,7 +1646,7 @@ class StepTwoNiveshFDFragment : Fragment() {
 
     private fun stateListApi() {
         (activity as NiveshFdMainActivity).viewModel.stateApi(
-            token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             activity as NiveshFdMainActivity
         )
         (activity as NiveshFdMainActivity).viewModel.getStateMasterMutableData.observe(
@@ -1727,7 +1728,7 @@ class StepTwoNiveshFDFragment : Fragment() {
         cityRequest.Type = ""
         cityRequest.ClientCode =
             (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
-        cityRequest.RoleID = (activity as NiveshFdMainActivity).loginRole
+        cityRequest.RoleID = PreferenceManager(activity as NiveshFdMainActivity).getLoginRole()
         cityRequest.APIName = ""
         cityRequest.UID = 0
         cityRequest.Subbroker_Code =
@@ -1738,7 +1739,7 @@ class StepTwoNiveshFDFragment : Fragment() {
         cityRequest.APP_Web = getString(R.string.app)
         (activity as NiveshFdMainActivity).viewModel.cityListApi(
             cityRequest,
-            token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             activity as NiveshFdMainActivity
         )
         (activity as NiveshFdMainActivity).viewModel.getCityListMutableData.observe(
@@ -1807,7 +1808,7 @@ class StepTwoNiveshFDFragment : Fragment() {
     private fun apiForEligibleBankList() {
         ProgressUtil.showLoading(activity as NiveshFdMainActivity)
         (activity as NiveshFdMainActivity).viewModel.bankListApi(
-            token,
+            PreferenceManager(activity as NiveshFdMainActivity).getToken(),
             getString(R.string.language),
             activity as NiveshFdMainActivity
         )

app/src/main/java/com/nivesh/production/niveshfd/util/Constants.kt

@@ -4,6 +4,6 @@ class Constants() {
 
     companion object {
         const val BASE_URL = "https://providential.in/WebApi_Bajaj/api/"
-        const val token = "636F8F63-06C4-4D95-8562-392B34025FB0"
+      //  const val token = "636F8F63-06C4-4D95-8562-392B34025FB0"
     }
 }

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

@@ -78,15 +78,13 @@ open class BajajFDViewModel(private val mainRepository: MainRepository) : ViewMo
         }
 
     val getMaturityAmountMutableData: MutableLiveData<Resource<JsonObject>> = MutableLiveData()
-    fun getMaturityAmount(requestBody: GetMaturityAmountRequest, activity: Activity) =
+    fun getMaturityAmount(requestBody: GetMaturityAmountRequest, activity: Activity, token: String) =
         viewModelScope.launch(
             handleError(activity)
         ) {
             if (Common.isNetworkAvailable(activity)) {
                 getMaturityAmountMutableData.postValue(Resource.Loading())
-                val response = mainRepository.createCalculateFDMaturityAmount(requestBody,
-                    Constants.token
-                )
+                val response = mainRepository.createCalculateFDMaturityAmount(requestBody, token)
                 getMaturityAmountMutableData.postValue(handleResponse(response))
             }
         }
@@ -238,12 +236,12 @@ open class BajajFDViewModel(private val mainRepository: MainRepository) : ViewMo
     }
 
     val getIfscCodeDetailsCheckMutableData: MutableLiveData<Resource<String>> = MutableLiveData()
-    fun ifscCodeDetailsApi(ifsc : String,activity : Activity) = viewModelScope.launch(
+    fun ifscCodeDetailsApi(ifsc : String,activity : Activity, token:String) = viewModelScope.launch(
         handleError(activity)
     ) {
         if (Common.isNetworkAvailable(activity)) {
             getIfscCodeDetailsCheckMutableData.postValue(Resource.Loading())
-            val response = mainRepository.ifscCodeBankDetailsCheck(ifsc, Constants.token)
+            val response = mainRepository.ifscCodeBankDetailsCheck(ifsc, token)
             getIfscCodeDetailsCheckMutableData.postValue(Common.handleResponse1(response))
         }
     }

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

@@ -178,7 +178,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/margin_10"
                         android:layout_marginEnd="@dimen/margin_10"
-                        android:theme="@style/SCBSwitch"
+                        android:theme="@style/SCBSwitch1"
                         android:text="@string/upto0.25next"
                         android:textColor="@color/black"
                         android:textSize="@dimen/text_size_12" />

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

@@ -20,7 +20,7 @@
             android:id="@+id/tvCustomerName"
             android:layout_width="wrap_content"
             android:padding="@dimen/margin_7"
-            android:theme="@style/SCBSwitch"
+            android:theme="@style/SCBSwitch1"
             android:layout_height="wrap_content"
             android:layout_weight="0.13"
             android:checked="false"

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

@@ -39,7 +39,7 @@
     <string name="FourYears">4 Years</string>
     <string name="FiveYears">5 Years</string>
     <string name="bajajFD">BajajFD</string>
-    <string name="category">InterestPayoutFreq</string>
+    <string name="niveshCategory">InterestPayoutFreq</string>
     <string name="language">en-UK-0</string>
     <string name="minMaxValidation">Min. 12 months, Max. 60 months</string>
     <string name="minAmountCategory">MINAmount</string>

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

@@ -39,7 +39,7 @@
     <string name="FourYears">4 Years</string>
     <string name="FiveYears">5 Years</string>
     <string name="bajajFD">BajajFD</string>
-    <string name="category">InterestPayoutFreq</string>
+    <string name="niveshCategory">InterestPayoutFreq</string>
     <string name="language">en-UK-0</string>
     <string name="minMaxValidation">Min. 12 months, Max. 60 months</string>
     <string name="minAmountCategory">MINAmount</string>

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

@@ -14,7 +14,7 @@
         <!-- Customize your theme here. -->
     </style>
 
-    <style name="SCBSwitch" parent="Theme.AppCompat.Light">
+    <style name="SCBSwitch1" parent="Theme.AppCompat.Light">
         <!-- active thumb & track color (30% transparency) -->
         <item name="colorControlActivated">@color/green</item>