From 14f72f3c9f97465c6a9d338116b7fdd762741b6a Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Tue, 3 Jan 2023 20:55:15 +0530 Subject: [PATCH] updated code --- .../bajajfd/adapter/CustomerListAdapter.kt | 5 -- .../ui/fragment/StepFourBajajFDFragment.kt | 50 +++++++++++-------- .../nivesh/production/bajajfd/util/Common.kt | 3 -- .../res/layout/item_customer_list_preview.xml | 13 ----- 4 files changed, 28 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/com/nivesh/production/bajajfd/adapter/CustomerListAdapter.kt b/app/src/main/java/com/nivesh/production/bajajfd/adapter/CustomerListAdapter.kt index 1083c34..40e48d5 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/adapter/CustomerListAdapter.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/adapter/CustomerListAdapter.kt @@ -1,6 +1,5 @@ package com.nivesh.production.bajajfd.adapter -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -18,9 +17,6 @@ class CustomerListAdapter( val txtLabel: TextView = itemView.findViewById(R.id.txtLabel) } - var mExpandedPosition = -1 - - override fun onCreateViewHolder( parent: ViewGroup, viewType: Int @@ -40,7 +36,6 @@ class CustomerListAdapter( holder.txtLabel.text = cList.Label holder.tvCustomerName.setOnCheckedChangeListener { _, isChecked -> cList.isSelected = isChecked - Log.e("isSelected","-->"+cList.isSelected) } } } diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt index a6489fc..8735f74 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt @@ -24,10 +24,9 @@ class StepFourBajajFDFragment : BaseFragment() { private lateinit var stepFourBajajFDViewModel: StepFourBajajFDViewModel private var _binding: FragmentBajajfdStepFourBinding? = null private val binding get() = _binding!! - private var uniqueId: String? = "" private lateinit var listOfCustomer: MutableList - var selectedList : String = "" - + private var selectedList: String = "" + private var uniqueId: String? = "" private lateinit var bajajFDInterface: BajajFDInterface @@ -58,23 +57,24 @@ class StepFourBajajFDFragment : BaseFragment() { } binding.btnNext.setOnClickListener { - for (getCodes in listOfCustomer){ - if (getCodes.isSelected){ - if (selectedList.isEmpty()){ - selectedList = getCodes.Value - }else{ - selectedList = selectedList.plus(",").plus(getCodes.Value) + selectedList = "" + for (getCodes in listOfCustomer) { + if (getCodes.isSelected) { + selectedList = if (selectedList.isEmpty()) { + getCodes.Value + } else { + selectedList.plus(",").plus(getCodes.Value) } } } Log.e("selectedList", "-->$selectedList") if (binding.checkBox.isChecked) { - - val saveFDOtherDataRequest = SaveFDOtherDataRequest() + val saveFDOtherDataRequest = SaveFDOtherDataRequest() saveFDOtherDataRequest.FDProvider = getString(R.string.bajaj) saveFDOtherDataRequest.UniqueId = uniqueId saveFDOtherDataRequest.Values = selectedList - saveFDOtherDataRequest.NiveshClientCode = (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + saveFDOtherDataRequest.NiveshClientCode = + (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE bajajFDInterface.stepFourApi(saveFDOtherDataRequest) } else { showDialogValidation( @@ -84,18 +84,21 @@ class StepFourBajajFDFragment : BaseFragment() { } } - binding.btnBack.setOnClickListener{ + binding.btnBack.setOnClickListener { (activity as BajajFdMainActivity).binding.viewPager.currentItem = 2 } return root } - fun displayReceivedData(createFDApplicationResponse: CreateFDApplicationResponse) { - Log.e("createFDApplication", "Response-->"+createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId) - uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId - getFDDetailsApi(createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId) - customerListApi() + fun displayReceivedData(createFDApplicationResponse: CreateFDApplicationResponse) { + Log.e( + "createFDApplication", + "Response-->" + createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId + ) + uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId + getFDDetailsApi(createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId) + customerListApi() } @@ -159,7 +162,8 @@ class StepFourBajajFDFragment : BaseFragment() { if (Common.isNetworkAvailable(mActivity!!)) { val getFDDetailsRequest = GetFDDetailsRequest() getFDDetailsRequest.FDProvider = mActivity!!.getString(R.string.bajaj) - getFDDetailsRequest.NiveshClientCode = (mActivity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + getFDDetailsRequest.NiveshClientCode = + (mActivity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE getFDDetailsRequest.UniqueId = uniqueId stepFourBajajFDViewModel.getFDDetails(getFDDetailsRequest, Constants.token) stepFourBajajFDViewModel.getFDDetailsMutableData.observe(viewLifecycleOwner) { response -> @@ -175,13 +179,15 @@ class StepFourBajajFDFragment : BaseFragment() { when (code) { 200 -> { binding.tvInvestedAmount.text = - getString(R.string.rs).plus(getFDDetailsResponse.Response.FDDataResponse.FDAmount.toString()) + getString(R.string.rs).plus(getFDDetailsResponse.Response.FDDataResponse.FDAmount.toString()) binding.tvTenure.text = - getFDDetailsResponse.Response.FDDataResponse.Tenure.toString().plus(" Months") + getFDDetailsResponse.Response.FDDataResponse.Tenure.toString() + .plus(" Months") binding.tvInterestPayout.text = getFDDetailsResponse.Response.FDDataResponse.Frequency binding.tvRateOfInterest.text = - getFDDetailsResponse.Response.FDDataResponse.RateOfInterest.toString().plus(" % p.a.") + getFDDetailsResponse.Response.FDDataResponse.RateOfInterest.toString() + .plus(" % p.a.") } // 650 -> refreshToken() else -> { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt b/app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt index 7716ed0..2616268 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt @@ -9,7 +9,6 @@ import android.net.ConnectivityManager import android.net.NetworkCapabilities import android.os.Build import android.provider.ContactsContract -import android.util.Log import android.util.Patterns import com.google.android.material.textfield.MaterialAutoCompleteTextView import com.google.android.material.textfield.TextInputEditText @@ -17,9 +16,7 @@ import com.google.android.material.textfield.TextInputLayout import com.google.gson.JsonObject import com.nivesh.production.bajajfd.R import com.nivesh.production.bajajfd.ui.activity.BaseActivity -import okhttp3.Interceptor.* import retrofit2.HttpException -import retrofit2.Response import java.io.IOException import java.net.SocketTimeoutException import java.text.SimpleDateFormat diff --git a/app/src/main/res/layout/item_customer_list_preview.xml b/app/src/main/res/layout/item_customer_list_preview.xml index ea3e1ab..f2ae760 100644 --- a/app/src/main/res/layout/item_customer_list_preview.xml +++ b/app/src/main/res/layout/item_customer_list_preview.xml @@ -1,16 +1,4 @@ - - - - - - - - - - - - -