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 ece5279..740db9c 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 @@ -146,7 +146,7 @@ interface ApiInterface { ): Response @GET("GetFDBankList?FDProvider=Bajaj") - suspend fun bankListApi(@Header("token") token: String): Response + suspend fun bankListApi(@Header("token") token: String, @Query("Language") language : String): Response @GET("GetIFSC_Autofill?") suspend fun getIFSCApi(@Query("prefix") ifsc : String): Response 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 5ba37a4..dae4441 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 @@ -74,8 +74,8 @@ class MainRepository constructor(private val apiInterface: ApiInterface) { suspend fun cityCheck(cityRequest: CityRequest, token: String) = apiInterface.cityApi(cityRequest, token) - suspend fun bankListCheck(token: String) = - apiInterface.bankListApi(token) + suspend fun bankListCheck(token: String, language: String) = + apiInterface.bankListApi(token, language) suspend fun ifscCodeCheck(str: String) = apiInterface.getIFSCApi(str) 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 f44458e..829ed81 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 @@ -33,6 +33,7 @@ import com.nivesh.production.bajajfd.model.* import com.nivesh.production.bajajfd.repositories.MainRepository import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity import com.nivesh.production.bajajfd.ui.providerfactory.StepTwoModelProviderFactory +import com.nivesh.production.bajajfd.util.Common import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorAutoCompleteMethod import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorMethod import com.nivesh.production.bajajfd.util.Common.Companion.commonSpinnerErrorMethod @@ -132,7 +133,7 @@ class StepTwoBajajFDFragment : BaseFragment() { } binding.edtDOB.setOnClickListener { removeError(binding.tlDOB) - datePicker(binding.edtDOB) + datePicker(binding.edtDOB, 1) } @@ -390,7 +391,7 @@ class StepTwoBajajFDFragment : BaseFragment() { } binding.edtNomineeDOB.setOnClickListener { removeError(binding.tlNomineeDOB) - datePicker(binding.edtNomineeDOB) + datePicker(binding.edtNomineeDOB, 2) } binding.spNomineeRelation.setText( @@ -401,9 +402,6 @@ class StepTwoBajajFDFragment : BaseFragment() { binding.spNomineeRelation.setOnItemClickListener { _, _, _, _ -> removeError(binding.tlNomineeRelation) } - binding.cbNomineeSameAddress.setOnCheckedChangeListener { _, _ -> - - } // Guardian Details binding.edtGuardianName.addTextChangedListener(object : TextWatcher { @@ -663,7 +661,7 @@ class StepTwoBajajFDFragment : BaseFragment() { (activity as BajajFdMainActivity).nomineeDetails.NomineePincode = 0 // Applicant Nominee Guardian Details - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianSalutation = "" + (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianSalutation = binding.spGuardianRelation.text.toString() (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianName = binding.edtGuardianName.text.toString() if (binding.edtGuardianAge.text.toString().isEmpty()) { @@ -685,8 +683,7 @@ class StepTwoBajajFDFragment : BaseFragment() { (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress1 = binding.edtGuardianAddress.text.toString() (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress2 = "" - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress3 = - binding.spGuardianRelation.text.toString() + (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress3 = "" // Applicant Bank Details (activity as BajajFdMainActivity).fdBankDetails.AccountType = @@ -930,6 +927,7 @@ class StepTwoBajajFDFragment : BaseFragment() { clientBankList.AccountNumber.toString() ) showHideBankDetail() + } else { showDialogValidation( activity as BajajFdMainActivity, @@ -1016,7 +1014,7 @@ class StepTwoBajajFDFragment : BaseFragment() { binding.rvClientBankList.adapter = bankListAdapter } - private fun datePicker(edtDOB: TextInputEditText) { + private fun datePicker(edtDOB: TextInputEditText, number : Int) { val year = cal.get(Calendar.YEAR) val month = cal.get(Calendar.MONTH) val day = cal.get(Calendar.DAY_OF_MONTH) @@ -1030,6 +1028,15 @@ class StepTwoBajajFDFragment : BaseFragment() { .plus(dayOfMonth.toString()) ) edtDOB.setSelection(edtDOB.text.toString().length) + if (number == 2){ + if (isMinor(years.toString().plus("-").plus(monthOfYear + 1).plus("-") + .plus(dayOfMonth.toString())) + ){ + guardianCodeVisibility(View.VISIBLE) + }else{ + guardianCodeVisibility(View.GONE) + } + } }, year, month, day ) datePickerDialog.datePicker.maxDate = cal.timeInMillis @@ -1039,6 +1046,15 @@ class StepTwoBajajFDFragment : BaseFragment() { datePickerDialog.show() } + private fun guardianCodeVisibility(visibility: Int) { + binding.tlGuardianName.visibility = visibility + binding.tlGuardianName.visibility = visibility + binding.tlGuardianName.visibility = visibility + binding.tlGuardianName.visibility = visibility + binding.tlGuardianName.visibility = visibility + + } + private fun panCheckApi() { val panCheck = PanCheckRequest() panCheck.clientCode = @@ -1703,7 +1719,7 @@ class StepTwoBajajFDFragment : BaseFragment() { } private fun apiForEligibleBankList() { - stepTwoBajajFDViewModel.bankListApi(token, activity as BajajFdMainActivity) + stepTwoBajajFDViewModel.bankListApi(token,getString(R.string.language), activity as BajajFdMainActivity) stepTwoBajajFDViewModel.getFDBankListMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { @@ -1720,7 +1736,7 @@ class StepTwoBajajFDFragment : BaseFragment() { dialogForBankList(getFDBankListResponse.Response.BankList) } } - // 650 -> refreshToken() + 650 -> refreshToken() else -> { showDialogValidation( activity as BajajFdMainActivity, @@ -1746,6 +1762,11 @@ class StepTwoBajajFDFragment : BaseFragment() { } } + private fun refreshToken() { + + + } + private fun dialogForBankList(bankList: List) { val dialog = Dialog(activity as BajajFdMainActivity) dialog.setContentView(R.layout.layout_bank_list) 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 2f957dc..7a8d89a 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 @@ -13,6 +13,7 @@ import com.nivesh.production.bajajfd.util.Common.Companion.handleResponse1 import com.nivesh.production.bajajfd.util.Constants.Companion.token import com.nivesh.production.bajajfd.util.Resource import kotlinx.coroutines.launch +import org.intellij.lang.annotations.Language class StepTwoBajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() { @@ -117,12 +118,12 @@ class StepTwoBajajFDViewModel(private val mainRepository: MainRepository) : View } val getFDBankListMutableData: MutableLiveData> = MutableLiveData() - fun bankListApi( token: String,activity : Activity) = viewModelScope.launch( + fun bankListApi( token: String,language: String, activity : Activity) = viewModelScope.launch( Common.handleError(activity) ) { if (Common.isNetworkAvailable(activity)) { getFDBankListMutableData.postValue(Resource.Loading()) - val response = mainRepository.bankListCheck(token) + val response = mainRepository.bankListCheck(token, language) getFDBankListMutableData.postValue(handleResponse(response)) } } diff --git a/app/src/main/res/layout/fragment_bajajfd_step_two.xml b/app/src/main/res/layout/fragment_bajajfd_step_two.xml index bb1be44..bc5145b 100644 --- a/app/src/main/res/layout/fragment_bajajfd_step_two.xml +++ b/app/src/main/res/layout/fragment_bajajfd_step_two.xml @@ -705,16 +705,9 @@ - - -