Browse Source

completed stepfour coding

PankajBranch
Hemant Khadase 2 years ago
parent
commit
0323379e9a
9 changed files with 56 additions and 54 deletions
  1. +9
    -27
      app/src/main/java/com/nivesh/production/bajajfd/adapter/CustomerListAdapter.kt
  2. +2
    -1
      app/src/main/java/com/nivesh/production/bajajfd/model/GetCodes.kt
  3. +1
    -1
      app/src/main/java/com/nivesh/production/bajajfd/model/ResponseX.kt
  4. +18
    -3
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt
  5. +2
    -2
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt
  6. +1
    -0
      app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt
  7. +19
    -18
      app/src/main/res/layout/item_customer_list_preview.xml
  8. +3
    -1
      app/src/main/res/values-hi-rIN/strings.xml
  9. +1
    -1
      app/src/main/res/values/strings.xml

+ 9
- 27
app/src/main/java/com/nivesh/production/bajajfd/adapter/CustomerListAdapter.kt View File

@ -1,21 +1,24 @@
package com.nivesh.production.bajajfd.adapter package com.nivesh.production.bajajfd.adapter
import android.util.Log
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.switchmaterial.SwitchMaterial import com.google.android.material.switchmaterial.SwitchMaterial
import com.nivesh.production.bajajfd.R import com.nivesh.production.bajajfd.R
import com.nivesh.production.bajajfd.model.GetCodes import com.nivesh.production.bajajfd.model.GetCodes
class CustomerListAdapter( class CustomerListAdapter(
private val customerList: List<GetCodes>?
private val customerList: MutableList<GetCodes>?
) : RecyclerView.Adapter<CustomerListAdapter.BankListViewHolder>() { ) : RecyclerView.Adapter<CustomerListAdapter.BankListViewHolder>() {
inner class BankListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { inner class BankListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
val tvCustomerName: SwitchMaterial = itemView.findViewById(R.id.tvCustomerName) val tvCustomerName: SwitchMaterial = itemView.findViewById(R.id.tvCustomerName)
val txtLabel: TextView = itemView.findViewById(R.id.txtLabel)
} }
private var checkedPosition: Int = -2
var mExpandedPosition = -1
override fun onCreateViewHolder( override fun onCreateViewHolder(
@ -34,18 +37,10 @@ class CustomerListAdapter(
override fun onBindViewHolder(holder: BankListViewHolder, position: Int) { override fun onBindViewHolder(holder: BankListViewHolder, position: Int) {
val cList = customerList?.get(position) val cList = customerList?.get(position)
if (cList != null) { if (cList != null) {
holder.itemView.apply {
holder.tvCustomerName.text = cList.Label
setOnClickListener {
onItemClickListener?.let {
it(cList)
if (checkedPosition != holder.adapterPosition) {
notifyItemChanged(checkedPosition)
checkedPosition = holder.adapterPosition
}
}
}
holder.txtLabel.text = cList.Label
holder.tvCustomerName.setOnCheckedChangeListener { _, isChecked ->
cList.isSelected = isChecked
Log.e("isSelected","-->"+cList.isSelected)
} }
} }
} }
@ -54,17 +49,4 @@ class CustomerListAdapter(
return customerList?.size!! return customerList?.size!!
} }
private var onItemClickListener: ((GetCodes) -> Unit)? = null
fun setOnItemClickListener(listener: (GetCodes) -> Unit) {
onItemClickListener = listener
}
fun getSelected(): GetCodes? {
return if (checkedPosition != -1) {
customerList?.get(checkedPosition)
} else null
}
} }

+ 2
- 1
app/src/main/java/com/nivesh/production/bajajfd/model/GetCodes.kt View File

@ -2,7 +2,8 @@ package com.nivesh.production.bajajfd.model
data class GetCodes( data class GetCodes(
val Label: String, val Label: String,
val Value: String
val Value: String,
var isSelected : Boolean
) { ) {
override fun toString(): String { override fun toString(): String {
return Label return Label


+ 1
- 1
app/src/main/java/com/nivesh/production/bajajfd/model/ResponseX.kt View File

@ -2,7 +2,7 @@ package com.nivesh.production.bajajfd.model
data class ResponseX( data class ResponseX(
val Errors: List<Errors>, val Errors: List<Errors>,
val GetCodesList: List<GetCodes>,
val GetCodesList: MutableList<GetCodes>,
val Message: String, val Message: String,
val Status: String, val Status: String,
val StatusCode: Int val StatusCode: Int

+ 18
- 3
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt View File

@ -25,6 +25,9 @@ class StepFourBajajFDFragment : BaseFragment() {
private var _binding: FragmentBajajfdStepFourBinding? = null private var _binding: FragmentBajajfdStepFourBinding? = null
private val binding get() = _binding!! private val binding get() = _binding!!
private var uniqueId: String? = "" private var uniqueId: String? = ""
private lateinit var listOfCustomer: MutableList<GetCodes>
var selectedList : String = ""
private lateinit var bajajFDInterface: BajajFDInterface private lateinit var bajajFDInterface: BajajFDInterface
@ -55,11 +58,22 @@ class StepFourBajajFDFragment : BaseFragment() {
} }
binding.btnNext.setOnClickListener { binding.btnNext.setOnClickListener {
for (getCodes in listOfCustomer){
if (getCodes.isSelected){
if (selectedList.isEmpty()){
selectedList = getCodes.Value
}else{
selectedList = selectedList.plus(",").plus(getCodes.Value)
}
}
}
Log.e("selectedList", "-->$selectedList")
if (binding.checkBox.isChecked) { if (binding.checkBox.isChecked) {
val saveFDOtherDataRequest = SaveFDOtherDataRequest() val saveFDOtherDataRequest = SaveFDOtherDataRequest()
saveFDOtherDataRequest.FDProvider = getString(R.string.bajaj) saveFDOtherDataRequest.FDProvider = getString(R.string.bajaj)
saveFDOtherDataRequest.UniqueId = uniqueId saveFDOtherDataRequest.UniqueId = uniqueId
saveFDOtherDataRequest.Values = ""
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) bajajFDInterface.stepFourApi(saveFDOtherDataRequest)
} else { } else {
@ -103,7 +117,8 @@ class StepFourBajajFDFragment : BaseFragment() {
when (code) { when (code) {
200 -> { 200 -> {
if (getCodeResponse.Response.GetCodesList.isNotEmpty()) { if (getCodeResponse.Response.GetCodesList.isNotEmpty()) {
setUpRecyclerView(getCodeResponse.Response.GetCodesList)
listOfCustomer = getCodeResponse.Response.GetCodesList
setUpRecyclerView(listOfCustomer)
} }
} }
// 650 -> refreshToken() // 650 -> refreshToken()
@ -132,7 +147,7 @@ class StepFourBajajFDFragment : BaseFragment() {
} }
private fun setUpRecyclerView(getCustomerList: List<GetCodes>) {
private fun setUpRecyclerView(getCustomerList: MutableList<GetCodes>) {
binding.rvTerms.layoutManager = binding.rvTerms.layoutManager =
LinearLayoutManager(activity as BajajFdMainActivity) LinearLayoutManager(activity as BajajFdMainActivity)
val customerListAdapter = CustomerListAdapter(getCustomerList) val customerListAdapter = CustomerListAdapter(getCustomerList)


+ 2
- 2
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt View File

@ -108,9 +108,9 @@ class StepThreeBajajFDFragment : BaseFragment() {
binding.btnNext.setOnClickListener { binding.btnNext.setOnClickListener {
if (validate()) { if (validate()) {
uploadDocApi()
// uploadDocApi()
// //
// bajajFDInterface.stepThreeApi((activity as BajajFdMainActivity).createFDRequest)
bajajFDInterface.stepThreeApi((activity as BajajFdMainActivity).createFDRequest)
} }
} }
binding.btnBack.setOnClickListener { binding.btnBack.setOnClickListener {


+ 1
- 0
app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt View File

@ -111,6 +111,7 @@ class Common {
fun showDialogValidation(activity: Activity?, message: CharSequence?) { fun showDialogValidation(activity: Activity?, message: CharSequence?) {
val builder = AlertDialog.Builder(activity) val builder = AlertDialog.Builder(activity)
builder.setMessage(message) builder.setMessage(message)
builder.setCancelable(false)
if (activity != null) { if (activity != null) {
builder.setPositiveButton(activity.getString(R.string.ok)) { dialogInterface, _ -> builder.setPositiveButton(activity.getString(R.string.ok)) { dialogInterface, _ ->
dialogInterface.dismiss() dialogInterface.dismiss()


+ 19
- 18
app/src/main/res/layout/item_customer_list_preview.xml View File

@ -1,20 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="2dp"
app:cardElevation="2dp"
app:cardMaxElevation="1dp"
app:cardPreventCornerOverlap="true"
app:cardUseCompatPadding="true">
<!--<com.google.android.material.card.MaterialCardView-->
<!-- xmlns:android="http://schemas.android.com/apk/res/android"-->
<!-- xmlns:app="http://schemas.android.com/apk/res-auto"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- app:cardBackgroundColor="@color/white"-->
<!-- app:cardCornerRadius="2dp"-->
<!-- app:cardElevation="2dp"-->
<!-- app:cardMaxElevation="1dp"-->
<!-- app:cardPreventCornerOverlap="true"-->
<!-- app:cardUseCompatPadding="true">-->
<LinearLayout
android:padding="@dimen/margin_1"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:padding="@dimen/margin_1"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView <TextView
android:id="@+id/txtLabel" android:id="@+id/txtLabel"
@ -22,14 +23,14 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:padding="@dimen/margin_2" android:padding="@dimen/margin_2"
android:layout_weight="0.87" android:layout_weight="0.87"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/text_size_12"/> android:textSize="@dimen/text_size_12"/>
<com.google.android.material.switchmaterial.SwitchMaterial <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/tvCustomerName" android:id="@+id/tvCustomerName"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:padding="@dimen/margin_4" android:padding="@dimen/margin_4"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.13" android:layout_weight="0.13"
@ -37,4 +38,4 @@
android:drawablePadding="@dimen/margin_2" /> android:drawablePadding="@dimen/margin_2" />
</LinearLayout> </LinearLayout>
</com.google.android.material.card.MaterialCardView>
<!--</com.google.android.material.card.MaterialCardView>-->

+ 3
- 1
app/src/main/res/values-hi-rIN/strings.xml View File

@ -237,9 +237,11 @@
<string name="nonSeniorCitizen">Non Senior Citizen</string> <string name="nonSeniorCitizen">Non Senior Citizen</string>
<string name="add_new_account">Add New Account</string> <string name="add_new_account">Add New Account</string>
<string name="ok">OK</string>
<string name="ok"><font fgcolor='#FF8E8E93'>OK</font></string>
<string name="cancel">Cancel</string> <string name="cancel">Cancel</string>
<string name="aadhar">Aadhar</string> <string name="aadhar">Aadhar</string>
<string name="selectOption">Select Option</string>
<string name="gallery">Gallery</string> <string name="gallery">Gallery</string>
<string name="camera">Camera</string> <string name="camera">Camera</string>
<string name="paymentModeCategory">PaymentMode</string> <string name="paymentModeCategory">PaymentMode</string>


+ 1
- 1
app/src/main/res/values/strings.xml View File

@ -237,7 +237,7 @@
<string name="nonSeniorCitizen">Non Senior Citizen</string> <string name="nonSeniorCitizen">Non Senior Citizen</string>
<string name="add_new_account">Add New Account</string> <string name="add_new_account">Add New Account</string>
<string name="ok">OK</string>
<string name="ok"><font fgcolor='#FF8E8E93'>OK</font></string>
<string name="cancel">Cancel</string> <string name="cancel">Cancel</string>
<string name="aadhar">Aadhar</string> <string name="aadhar">Aadhar</string>


Loading…
Cancel
Save

Powered by TurnKey Linux.