diff --git a/app/src/main/java/com/nivesh/production/bajajfd/adapter/PaymentModeAdapter.kt b/app/src/main/java/com/nivesh/production/bajajfd/adapter/PaymentModeAdapter.kt index 0bada10..bde88fd 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/adapter/PaymentModeAdapter.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/adapter/PaymentModeAdapter.kt @@ -16,6 +16,7 @@ class PaymentModeAdapter( 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 tvUpiMsg: TextView = itemView.findViewById(R.id.tvUpiMsg) } private var checkedPosition: Int = -2 @@ -39,6 +40,11 @@ class PaymentModeAdapter( if (bankList != null) { holder.itemView.apply { holder.tvBankName.text = bankList.Value + if (bankList.Value.equals("UPI")){ + holder.tvUpiMsg.text = context.getString(R.string.upto1LakhOnly) + }else{ + holder.tvUpiMsg.text = "" + } if (selectedAccount == bankList.Value && checkedPosition == -2 ) { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt b/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt index c253c17..6c5c891 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt @@ -148,11 +148,11 @@ interface ApiInterface { @GET("WebAPI_Bajaj/api/GetFDBankList?FDProvider=Bajaj") suspend fun bankListApi(@Header("token") token: String): Response - @GET("WebApi/api/GetIFSC_Autofill?prefix={prefix}") - suspend fun getIFSCApi(@Path("prefix") ifsc : String): Response + @GET("WebApi/api/GetIFSC_Autofill?") + suspend fun getIFSCApi(@Query("prefix") ifsc : String): Response - @GET("WebApi/api/GetBankDetailsFromIFSC?") - suspend fun getIFSCDetailsApi(@Query("ifsc") ifsc : String,@Header("token") token: String): Response + @GET("WebApi_Bajaj/api/GetBankDetailsFromIFSC?") + suspend fun getIFSCDetailsApi(@Query("ifscCode") ifsc : String): Response @POST("WebApi_Bajaj/api/GetCodes") suspend fun payModeApi( diff --git a/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt b/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt index 0b1ba2c..18113e3 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt @@ -80,8 +80,8 @@ class MainRepository constructor(private val apiInterface: ApiInterface) { suspend fun ifscCodeCheck(str: String) = apiInterface.getIFSCApi(str) - suspend fun ifscCodeDetailsCheck(str: String, token: String) = - apiInterface.getIFSCDetailsApi(str, token) + suspend fun ifscCodeDetailsCheck(str: String) = + apiInterface.getIFSCDetailsApi(str) suspend fun payModeCheck(getCodeRequest: GetCodeRequest, token: String) = apiInterface.payModeApi(getCodeRequest, token) diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt index 5e0c24a..d2ea3ed 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt @@ -17,6 +17,7 @@ import android.widget.RadioButton import android.widget.TextView import androidx.core.content.ContextCompat import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.google.android.material.textfield.TextInputEditText @@ -764,7 +765,7 @@ class StepTwoBajajFDFragment : BaseFragment() { private fun ifscCodeCheckApi(ifsc: String) { - if (ifsc.length == 11) { + if (ifsc.length >8) { stepTwoBajajFDViewModel.ifscCodeApi(ifsc, activity as BajajFdMainActivity) stepTwoBajajFDViewModel.getifscCodeCheckMutableData.observe(viewLifecycleOwner) { response -> when (response) { @@ -788,15 +789,26 @@ class StepTwoBajajFDFragment : BaseFragment() { listOfIFSC ) binding.edtIFSC.setAdapter(adapter) - } - binding.edtIFSC.setOnItemClickListener { _, _, position, _ -> - if (listOfIFSC.size > 0) { - binding.edtIFSC.setText(listOfIFSC[position]) - binding.edtIFSC.setSelection(binding.edtIFSC.text.toString().length) - getIFSCDetailsApi(listOfIFSC[position]) + + binding.edtIFSC.setOnItemClickListener { _, _, position, _ -> + if (listOfIFSC.size > 0) { + val enteredText = binding.edtIFSC.getText() + Log.d("bankifsc $enteredText",enteredText.toString()) + // binding.edtIFSC.setText(listOfIFSC[position]) + binding.edtIFSC.setText(adapter.getItem(position).toString()) + binding.edtIFSC.setSelection(binding.edtIFSC.text.toString().length) + getIFSCDetailsApi(enteredText.toString()) + } } + + + } + + + + } // 650 -> refreshToken() else -> { @@ -832,7 +844,6 @@ class StepTwoBajajFDFragment : BaseFragment() { stepTwoBajajFDViewModel.ifscCodeDetailsApi( ifscCode, - token, activity as BajajFdMainActivity ) stepTwoBajajFDViewModel.getifscCodeDetailsCheckMutableData.observe(viewLifecycleOwner) { response -> @@ -1159,7 +1170,7 @@ class StepTwoBajajFDFragment : BaseFragment() { private fun setUpRecyclerViewPaymentMode(listOfPayMode: List) { binding.rvPaymentMode.layoutManager = - LinearLayoutManager(activity as BajajFdMainActivity) + GridLayoutManager(activity as BajajFdMainActivity,2) paymentModeAdapter = PaymentModeAdapter( listOfPayMode, listOfPayMode[0].Value diff --git a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoBajajFDViewModel.kt b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoBajajFDViewModel.kt index db2e02e..eeabc61 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoBajajFDViewModel.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoBajajFDViewModel.kt @@ -137,12 +137,12 @@ class StepTwoBajajFDViewModel(private val mainRepository: MainRepository) : View } val getifscCodeDetailsCheckMutableData: MutableLiveData> = MutableLiveData() - fun ifscCodeDetailsApi(ifsc : String, token: String,activity : Activity) = viewModelScope.launch( + fun ifscCodeDetailsApi(ifsc : String,activity : Activity) = viewModelScope.launch( Common.handleError(activity) ) { if (Common.isNetworkAvailable(activity)) { getifscCodeDetailsCheckMutableData.postValue(Resource.Loading()) - val response = mainRepository.ifscCodeDetailsCheck(ifsc, token) + val response = mainRepository.ifscCodeDetailsCheck(ifsc) getifscCodeDetailsCheckMutableData.postValue(handleResponse(response)) } } diff --git a/app/src/main/res/layout/fragment_bajajfd_step_five.xml b/app/src/main/res/layout/fragment_bajajfd_step_five.xml index 56ca8b1..effefb9 100644 --- a/app/src/main/res/layout/fragment_bajajfd_step_five.xml +++ b/app/src/main/res/layout/fragment_bajajfd_step_five.xml @@ -139,21 +139,21 @@ - + + + + + + + + + + + + + + + + app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintStart_toStartOf="parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_payment_list_preview.xml b/app/src/main/res/layout/item_payment_list_preview.xml index 0e095ca..a43261e 100644 --- a/app/src/main/res/layout/item_payment_list_preview.xml +++ b/app/src/main/res/layout/item_payment_list_preview.xml @@ -4,36 +4,52 @@ 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"> - - + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="@dimen/margin_2"> + + + + + + + + + + android:textSize="@dimen/text_size_12" /> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index bd762f5..4f369e9 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -72,6 +72,8 @@ 100dp 120dp 150dp + 160dp + 170dp 290dp 300dp