Browse Source

added code for stepfour

PankajBranch
Hemant Khadase 2 years ago
parent
commit
8e4bb6a1e1
10 changed files with 77 additions and 49 deletions
  1. +9
    -13
      app/src/main/java/com/nivesh/production/bajajfd/adapter/CustomerListAdapter.kt
  2. +2
    -1
      app/src/main/java/com/nivesh/production/bajajfd/interfaces/BajajFDInterface.kt
  3. +8
    -0
      app/src/main/java/com/nivesh/production/bajajfd/model/SaveFDOtherDataRequest.kt
  4. +5
    -4
      app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt
  5. +23
    -9
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt
  6. +6
    -1
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt
  7. +3
    -3
      app/src/main/res/layout/fragment_bajajfd_step_four.xml
  8. +19
    -18
      app/src/main/res/layout/item_customer_list_preview.xml
  9. +1
    -0
      app/src/main/res/values-hi-rIN/strings.xml
  10. +1
    -0
      app/src/main/res/values/strings.xml

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

@ -3,18 +3,16 @@ package com.nivesh.production.bajajfd.adapter
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.switchmaterial.SwitchMaterial
import com.nivesh.production.bajajfd.R
import com.nivesh.production.bajajfd.model.GetCodes
class CustomerListAdapter(
private val bankList: List<GetCodes>?
private val customerList: List<GetCodes>?
) : RecyclerView.Adapter<CustomerListAdapter.BankListViewHolder>() {
inner class BankListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
val bankSelector: ImageView = itemView.findViewById(R.id.bankSelector)
val tvBankName: TextView = itemView.findViewById(R.id.tvBankName)
val tvCustomerName: SwitchMaterial = itemView.findViewById(R.id.tvCustomerName)
}
private var checkedPosition: Int = -2
@ -34,15 +32,13 @@ class CustomerListAdapter(
}
override fun onBindViewHolder(holder: BankListViewHolder, position: Int) {
val bankList = bankList?.get(position)
if (bankList != null) {
val cList = customerList?.get(position)
if (cList != null) {
holder.itemView.apply {
holder.tvBankName.text = bankList.Value
holder.tvCustomerName.text = cList.Label
setOnClickListener {
onItemClickListener?.let {
it(bankList)
holder.bankSelector.setBackgroundResource(R.drawable.ic_select_green)
it(cList)
if (checkedPosition != holder.adapterPosition) {
notifyItemChanged(checkedPosition)
checkedPosition = holder.adapterPosition
@ -55,7 +51,7 @@ class CustomerListAdapter(
}
override fun getItemCount(): Int {
return bankList?.size!!
return customerList?.size!!
}
private var onItemClickListener: ((GetCodes) -> Unit)? = null
@ -67,7 +63,7 @@ class CustomerListAdapter(
fun getSelected(): GetCodes? {
return if (checkedPosition != -1) {
bankList?.get(checkedPosition)
customerList?.get(checkedPosition)
} else null
}

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

@ -1,10 +1,11 @@
package com.nivesh.production.bajajfd.interfaces
import com.nivesh.production.bajajfd.model.CreateFDRequest
import com.nivesh.production.bajajfd.model.SaveFDOtherDataRequest
interface BajajFDInterface {
fun stepOneApi(data: String?)
fun stepTwoApi(data: CreateFDRequest)
fun stepThreeApi(data: CreateFDRequest)
fun stepFourApi(data: String?)
fun stepFourApi(data: SaveFDOtherDataRequest)
}

+ 8
- 0
app/src/main/java/com/nivesh/production/bajajfd/model/SaveFDOtherDataRequest.kt View File

@ -0,0 +1,8 @@
package com.nivesh.production.bajajfd.model
data class SaveFDOtherDataRequest(
var FDProvider: String?= "",
var NiveshClientCode: String? = "",
var UniqueId: String? = "",
var Values: String? = ""
)

+ 5
- 4
app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt View File

@ -402,9 +402,10 @@ class BajajFdMainActivity : BaseActivity(), BajajFDInterface {
}
// step 4 response
override fun stepFourApi(data: String?) {
override fun stepFourApi(data: SaveFDOtherDataRequest) {
Log.e("stepFourApi", " response ---> $data")
binding.viewPager.currentItem = 4
// binding.viewPager.currentItem = 4
}
private fun createFDApi(data: CreateFDRequest, currentItem: Int, step: String) {
@ -426,12 +427,12 @@ class BajajFdMainActivity : BaseActivity(), BajajFDInterface {
binding.viewPager.currentItem = currentItem
if (step == "2"){
val stepThreeBajajFDFragment: StepThreeBajajFDFragment =
sectionsPagerAdapter.getRegisteredFragment(stepCount - 1) as StepThreeBajajFDFragment
sectionsPagerAdapter.getRegisteredFragment(currentItem) as StepThreeBajajFDFragment
stepThreeBajajFDFragment.displayReceivedData(createFDApplicationResponse)
}
else{
val stepFourFDFragment: StepFourBajajFDFragment =
sectionsPagerAdapter.getRegisteredFragment(stepCount - 1) as StepFourBajajFDFragment
sectionsPagerAdapter.getRegisteredFragment(currentItem) as StepFourBajajFDFragment
stepFourFDFragment.displayReceivedData(createFDApplicationResponse)
}
}


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

@ -5,7 +5,6 @@ import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.LinearLayoutManager
import com.google.gson.Gson
import com.nivesh.production.bajajfd.R
@ -57,7 +56,12 @@ class StepFourBajajFDFragment : BaseFragment() {
binding.btnNext.setOnClickListener {
if (binding.checkBox.isChecked) {
bajajFDInterface.stepFourApi("stepFourResponse")
val saveFDOtherDataRequest = SaveFDOtherDataRequest()
saveFDOtherDataRequest.FDProvider = getString(R.string.bajaj)
saveFDOtherDataRequest.UniqueId = uniqueId
saveFDOtherDataRequest.Values = ""
saveFDOtherDataRequest.NiveshClientCode = (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
bajajFDInterface.stepFourApi(saveFDOtherDataRequest)
} else {
showDialogValidation(
activity as BajajFdMainActivity,
@ -103,14 +107,19 @@ class StepFourBajajFDFragment : BaseFragment() {
}
}
// 650 -> refreshToken()
else -> {}
else -> {
showDialogValidation(
activity as BajajFdMainActivity,
getCodeResponse.Response.Message
)
}
}
}
}
is Resource.Error -> {
response.message?.let { message ->
Log.e(" ", "An error occurred:$message")
showDialogValidation(activity as BajajFdMainActivity, message)
}
}
is Resource.Loading -> {
@ -151,23 +160,28 @@ class StepFourBajajFDFragment : BaseFragment() {
when (code) {
200 -> {
binding.tvInvestedAmount.text =
getFDDetailsResponse.Response.FDDataResponse.FDAmount.toString()
getString(R.string.rs).plus(getFDDetailsResponse.Response.FDDataResponse.FDAmount.toString())
binding.tvTenure.text =
getFDDetailsResponse.Response.FDDataResponse.Tenure.toString()
getFDDetailsResponse.Response.FDDataResponse.Tenure.toString().plus(" Months")
binding.tvInterestPayout.text =
getFDDetailsResponse.Response.FDDataResponse.Frequency
binding.tvRateOfInterest.text =
getFDDetailsResponse.Response.FDDataResponse.RateOfInterest.toString()
getFDDetailsResponse.Response.FDDataResponse.RateOfInterest.toString().plus(" % p.a.")
}
// 650 -> refreshToken()
else -> {}
else -> {
showDialogValidation(
activity as BajajFdMainActivity,
getFDDetailsResponse.Response.Message
)
}
}
}
}
is Resource.Error -> {
response.message?.let { message ->
Log.e(" ", "An error occurred:$message")
showDialogValidation(activity as BajajFdMainActivity, message)
}
}
is Resource.Loading -> {


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

@ -261,7 +261,12 @@ class StepThreeBajajFDFragment : BaseFragment() {
}
}
// 650 -> refreshToken()
else -> {}
else -> {
Common.showDialogValidation(
activity as BajajFdMainActivity,
getCodeResponse.Response.Message
)
}
}
}
}


+ 3
- 3
app/src/main/res/layout/fragment_bajajfd_step_four.xml View File

@ -284,10 +284,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="@dimen/margin_10"
android:layout_marginTop="@dimen/margin_5"
android:layout_marginBottom="@dimen/margin_15"
android:backgroundTint="@color/colorPrimary"
android:text="@string/viewOrder"
android:backgroundTint="@color/green"
android:text="@string/pay"
android:textColor="@color/white"
android:textSize="@dimen/text_size_14"
app:layout_constraintBottom_toBottomOf="parent"


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

@ -4,36 +4,37 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="3dp"
app:cardElevation="3dp"
app:cardCornerRadius="2dp"
app:cardElevation="2dp"
app:cardMaxElevation="1dp"
app:cardPreventCornerOverlap="true"
app:cardUseCompatPadding="true">
<LinearLayout
android:padding="@dimen/margin_3"
android:padding="@dimen/margin_1"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/bankSelector"
android:layout_width="@dimen/margin_25"
android:layout_height="@dimen/margin_25"
android:layout_marginStart="@dimen/margin_10"
android:layout_marginEnd="@dimen/margin_10"
android:layout_marginBottom="@dimen/margin_10"
android:padding="@dimen/margin_5"
android:contentDescription="@null" />
<TextView
android:id="@+id/tvBankName"
android:layout_width="match_parent"
android:id="@+id/txtLabel"
android:gravity="start"
android:layout_gravity="center_vertical"
android:padding="@dimen/margin_2"
android:layout_weight="0.87"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_4"
android:textColor="@color/black"
android:textSize="@dimen/text_size_14"
android:textStyle="bold" />
android:textSize="@dimen/text_size_12"/>
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/tvCustomerName"
android:layout_width="0dp"
android:padding="@dimen/margin_4"
android:layout_height="wrap_content"
android:layout_weight="0.13"
android:checked="false"
android:drawablePadding="@dimen/margin_2" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>

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

@ -244,5 +244,6 @@
<string name="camera">Camera</string>
<string name="paymentModeCategory">PaymentMode</string>
<string name="customerCategory">CustomerCategory</string>
<string name="pay">PAY</string>
</resources>

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

@ -246,6 +246,7 @@
<string name="camera">Camera</string>
<string name="paymentModeCategory">PaymentMode</string>
<string name="customerCategory">CustomerCategory</string>
<string name="pay">PAY</string>
<array name="addressType">
<item>Aadhaar Card</item>


Loading…
Cancel
Save

Powered by TurnKey Linux.