diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt index 7ff1659..f6c0d6a 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt @@ -25,14 +25,13 @@ import com.nivesh.production.bajajfd.viewModel.BajajFDViewModel import com.nivesh.production.bajajfd.viewModel.StepOneBajajFDViewModel class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface { - private lateinit var binding: ActivityBajajFdBinding + lateinit var binding: ActivityBajajFdBinding + private lateinit var viewModel: BajajFDViewModel lateinit var stepOneBajajFDViewModel: StepOneBajajFDViewModel - private lateinit var viewModel: BajajFDViewModel lateinit var listOfFrequency: List lateinit var createFDRequest: CreateFDRequest lateinit var createFDApplicantRequest: CreateFDApplicationRequest - lateinit var applicantDetails: ApplicantDetails lateinit var fdInvestmentDetails: FDInvestmentDetails lateinit var applicantRelationDetails: ApplicantRelationDetails diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt index 625deaa..c60706b 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt @@ -25,6 +25,7 @@ import com.nivesh.production.bajajfd.model.GetMaturityAmountRequest import com.nivesh.production.bajajfd.model.GetRatesRequest import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity import com.nivesh.production.bajajfd.util.Common +import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorMethod import com.nivesh.production.bajajfd.util.Common.Companion.removeError import com.nivesh.production.bajajfd.util.Resource import com.nivesh.production.bajajfd.viewModel.StepOneBajajFDViewModel @@ -37,9 +38,10 @@ class StepOneBajajFDFragment : Fragment() { private lateinit var stepOneBajajFDViewModel: StepOneBajajFDViewModel private lateinit var rgMaturity: RadioButton private lateinit var listOfTenure: MutableList + private lateinit var recyclerViewDropDownAdapter: HorizontalRecyclerViewAdapter + private var tenure: Int = 0 private var interest: Double = 0.0 - private lateinit var recyclerViewDropDownAdapter: HorizontalRecyclerViewAdapter companion object { fun getInstance(fdInterface: BajajFDInterface): StepOneBajajFDFragment { @@ -60,9 +62,7 @@ class StepOneBajajFDFragment : Fragment() { val root = binding.root stepOneBajajFDViewModel = (activity as BajajFdMainActivity).stepOneBajajFDViewModel - listOfTenure = ArrayList() - // setUpRecyclerView() // Amount binding.edtAmount.addTextChangedListener(object : TextWatcher { @@ -98,6 +98,11 @@ class StepOneBajajFDFragment : Fragment() { getRatesApi() } else { // please enter Amount first + commonErrorMethod( + binding.edtAmount, + binding.tlDepositAmount, + getString(R.string.emptyAmountFirst) + ) } } } @@ -145,7 +150,7 @@ class StepOneBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).fdInvestmentDetails.IPAddress = "" (activity as BajajFdMainActivity).fdInvestmentDetails.Device = getString(R.string.app) - (activity as BajajFdMainActivity).fdInvestmentDetails.Source = "nivesh" + (activity as BajajFdMainActivity).fdInvestmentDetails.Source = getString(R.string.source) if (binding.swSeniorCitizen.isChecked) { (activity as BajajFdMainActivity).fdInvestmentDetails.CitizenType = getString(R.string.seniorCitizen) @@ -186,7 +191,8 @@ class StepOneBajajFDFragment : Fragment() { private fun maturityAmountApi(tenure: Int, interest: Double) { if (Common.isNetworkAvailable(activity as BajajFdMainActivity)) { - if (binding.edtAmount.text.toString().isNotEmpty() && interest.toString().isNotEmpty() && tenure.toString().isNotEmpty() + if (binding.edtAmount.text.toString().isNotEmpty() && interest.toString() + .isNotEmpty() && tenure.toString().isNotEmpty() ) { val maturityAmountRequest = GetMaturityAmountRequest() maturityAmountRequest.FDProvider = getString(R.string.bajaj) @@ -233,7 +239,7 @@ class StepOneBajajFDFragment : Fragment() { private fun validation(): Boolean { return if (binding.edtAmount.text.toString().isEmpty()) { - Common.commonErrorMethod( + commonErrorMethod( binding.edtAmount, binding.tlDepositAmount, getString(R.string.emptyAmount) @@ -286,9 +292,13 @@ class StepOneBajajFDFragment : Fragment() { listOfTenure = getRatesResponse.Response.ROIDatalist // Tenure if (listOfTenure.isNotEmpty()) { - listOfTenure.sortWith { lhs: ROIDataList, rhs: ROIDataList -> rhs.Tenure.compareTo(lhs.Tenure) } + listOfTenure.sortWith { lhs: ROIDataList, rhs: ROIDataList -> + rhs.Tenure.compareTo( + lhs.Tenure + ) + } binding.ORLayout.visibility = View.VISIBLE - val tenureAdapter = + val tenureAdapter = ArrayAdapter( activity as BajajFdMainActivity, R.layout.spinner_dropdown, @@ -296,7 +306,7 @@ class StepOneBajajFDFragment : Fragment() { ) binding.spTenure.setAdapter(tenureAdapter) setUpRecyclerView() - }else{ + } else { binding.ORLayout.visibility = View.GONE } } diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt index 3623a07..1c019b8 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt @@ -8,6 +8,7 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import com.nivesh.production.bajajfd.interfaces.BajajFDInterface import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepThreeBinding +import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity import com.nivesh.production.bajajfd.viewModel.StepThreeBajajFDViewModel class StepThreeBajajFDFragment : Fragment() { @@ -28,11 +29,6 @@ class StepThreeBajajFDFragment : Fragment() { bajajFDInterface = bajajFDInterfaces } - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - } - override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? @@ -41,18 +37,23 @@ class StepThreeBajajFDFragment : Fragment() { _binding = FragmentBajajfdStepThreeBinding.inflate(inflater, container, false) val root = binding.root -// val textView: TextView = binding.sectionLabel -// stepTwoFragment.text.observe(viewLifecycleOwner) { -// textView.text = it -// } -// -// binding.btnClick.setOnClickListener { -// bajajFDInterface.stepTwoApi("stepTwoResponse") -// } + binding.btnNext.setOnClickListener{ + if (validate()){ + + } + } + binding.btnBack.setOnClickListener{ + (activity as BajajFdMainActivity).binding.viewPager.currentItem = 1 + } return root } + private fun validate(): Boolean { + + return false + } + override fun onDestroyView() { super.onDestroyView() _binding = null 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 51187bf..4ac79b4 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 @@ -5,10 +5,12 @@ import android.text.Editable import android.text.InputFilter import android.text.InputFilter.LengthFilter import android.text.TextWatcher +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ArrayAdapter +import android.widget.RadioButton import androidx.fragment.app.Fragment import com.nivesh.production.bajajfd.R import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepTwoBinding @@ -29,6 +31,9 @@ class StepTwoBajajFDFragment : Fragment() { private val binding get() = _binding!! private lateinit var bajajFDInterface: BajajFDInterface + private lateinit var rbBank: RadioButton + private lateinit var rbPaymentMode: RadioButton + companion object { fun getInstance(fdInterface: BajajFDInterface): StepTwoBajajFDFragment { @@ -53,6 +58,8 @@ class StepTwoBajajFDFragment : Fragment() { // Personal Details binding.edtMobileNumber.filters = arrayOf(LengthFilter(10)) binding.edtPANNumber.filters = arrayOf(LengthFilter(10)) + binding.edtPinCode.filters = arrayOf(LengthFilter(6)) + binding.edtIFSC.filters = arrayOf(LengthFilter(11)) binding.edtMobileNumber.addTextChangedListener(object : TextWatcher { @@ -389,6 +396,13 @@ class StepTwoBajajFDFragment : Fragment() { } }) + binding.rgBank.setOnCheckedChangeListener { group, checkedId -> + rbBank = group.findViewById(checkedId) + Log.e("BankType", "-->" + rbBank.text) + } + + + // Bank Details binding.edtIFSC.addTextChangedListener(object : TextWatcher { @@ -439,6 +453,11 @@ class StepTwoBajajFDFragment : Fragment() { } }) + binding.rgPaymentMode.setOnCheckedChangeListener { group, checkedId -> + rbPaymentMode = group.findViewById(checkedId) + Log.e("paymentMode", "-->" + rbPaymentMode.text) + } + binding.tvPersonalDetails.setOnClickListener { if (binding.llPersonalDetail.visibility == View.VISIBLE){ @@ -467,25 +486,25 @@ class StepTwoBajajFDFragment : Fragment() { binding.btnNext.setOnClickListener { if (validation()) { // Applicant Details - (activity as BajajFdMainActivity).applicantDetails.ApplicantSalutation = "" - (activity as BajajFdMainActivity).applicantDetails.ApplicantGender = "" - (activity as BajajFdMainActivity).applicantDetails.ApplicantFirstName = "" - (activity as BajajFdMainActivity).applicantDetails.ApplicantMiddleName = "" - (activity as BajajFdMainActivity).applicantDetails.ApplicantLastName= "" - (activity as BajajFdMainActivity).applicantDetails.ApplicantDOB= "" - (activity as BajajFdMainActivity).applicantDetails.ApplicantPAN= "" - (activity as BajajFdMainActivity).applicantDetails.ApplicantMobile= "" - (activity as BajajFdMainActivity).applicantDetails.ApplicantOccupation= "" - (activity as BajajFdMainActivity).applicantDetails.ApplicantQualification= "" - (activity as BajajFdMainActivity).applicantDetails.ApplicantMaritalStatus= "" - (activity as BajajFdMainActivity).applicantDetails.ApplicantEmail= "" - (activity as BajajFdMainActivity).applicantDetails.ApplicantAddress1= "" - (activity as BajajFdMainActivity).applicantDetails.ApplicantAddress2= "" + (activity as BajajFdMainActivity).applicantDetails.ApplicantSalutation = binding.spTitle.text.toString() + (activity as BajajFdMainActivity).applicantDetails.ApplicantGender = binding.spGender.text.toString() + (activity as BajajFdMainActivity).applicantDetails.ApplicantFirstName = binding.edtFirstName.text.toString() + (activity as BajajFdMainActivity).applicantDetails.ApplicantMiddleName = binding.edtMiddleName.text.toString() + (activity as BajajFdMainActivity).applicantDetails.ApplicantLastName= binding.edtLastName.text.toString() + (activity as BajajFdMainActivity).applicantDetails.ApplicantDOB= binding.edtDOB.text.toString() + (activity as BajajFdMainActivity).applicantDetails.ApplicantPAN= binding.edtPANNumber.text.toString() + (activity as BajajFdMainActivity).applicantDetails.ApplicantMobile= binding.edtMobileNumber.text.toString() + (activity as BajajFdMainActivity).applicantDetails.ApplicantOccupation= binding.edtOccupation.text.toString() + (activity as BajajFdMainActivity).applicantDetails.ApplicantQualification= binding.edtQualification.text.toString() + (activity as BajajFdMainActivity).applicantDetails.ApplicantMaritalStatus= binding.spMarital.text.toString() + (activity as BajajFdMainActivity).applicantDetails.ApplicantEmail= binding.edtEmail.text.toString() + (activity as BajajFdMainActivity).applicantDetails.ApplicantAddress1= binding.edtAddressLine1.text.toString() + (activity as BajajFdMainActivity).applicantDetails.ApplicantAddress2= binding.edtAddressLine2.text.toString() (activity as BajajFdMainActivity).applicantDetails.ApplicantAddress3= "" - (activity as BajajFdMainActivity).applicantDetails.ApplicantCity= "" - (activity as BajajFdMainActivity).applicantDetails.ApplicantState= "" - (activity as BajajFdMainActivity).applicantDetails.ApplicantCountry= "" - (activity as BajajFdMainActivity).applicantDetails.ApplicantPincode= 0 + (activity as BajajFdMainActivity).applicantDetails.ApplicantCity= binding.edtCity.text.toString() + (activity as BajajFdMainActivity).applicantDetails.ApplicantState= binding.edtState.text.toString() + (activity as BajajFdMainActivity).applicantDetails.ApplicantCountry= "India" + (activity as BajajFdMainActivity).applicantDetails.ApplicantPincode= binding.edtPinCode.text.toString().toInt() (activity as BajajFdMainActivity).applicantDetails.AnnualIncome= "" // Applicant Relation Details @@ -497,44 +516,48 @@ class StepTwoBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).applicantRelationDetails.ApplicantMotherLastName= "" // Applicant Nominee Details - (activity as BajajFdMainActivity).nomineeDetails.NomineeSalutation= "" - (activity as BajajFdMainActivity).nomineeDetails.NomineeGender= "" - (activity as BajajFdMainActivity).nomineeDetails.NomineeFirstName= "" - (activity as BajajFdMainActivity).nomineeDetails.NomineeMiddleName= "" - (activity as BajajFdMainActivity).nomineeDetails.NomineeLastName= "" - (activity as BajajFdMainActivity).nomineeDetails.NomineeDOB= "" - (activity as BajajFdMainActivity).nomineeDetails.NomineeRelation= "" + (activity as BajajFdMainActivity).nomineeDetails.NomineeSalutation= binding.spNomineeTitle.text.toString() + (activity as BajajFdMainActivity).nomineeDetails.NomineeGender= binding.spGender.text.toString() + (activity as BajajFdMainActivity).nomineeDetails.NomineeFirstName= binding.edtNomineeFirstName.text.toString() + (activity as BajajFdMainActivity).nomineeDetails.NomineeMiddleName= binding.edtNomineeMiddleName.text.toString() + (activity as BajajFdMainActivity).nomineeDetails.NomineeLastName= binding.edtNomineeLastName.text.toString() + (activity as BajajFdMainActivity).nomineeDetails.NomineeDOB= binding.edtNomineeDOB.text.toString() + (activity as BajajFdMainActivity).nomineeDetails.NomineeRelation= binding.spNomineeRelation.text.toString() (activity as BajajFdMainActivity).nomineeDetails.NomineeAddress1= "" (activity as BajajFdMainActivity).nomineeDetails.NomineeAddress2= "" (activity as BajajFdMainActivity).nomineeDetails.NomineeAddress3= "" (activity as BajajFdMainActivity).nomineeDetails.NomineeCity= "" (activity as BajajFdMainActivity).nomineeDetails.NomineeState = "" - (activity as BajajFdMainActivity).nomineeDetails.NomineeCountry = "india" + (activity as BajajFdMainActivity).nomineeDetails.NomineeCountry = "India" (activity as BajajFdMainActivity).nomineeDetails.NomineePincode = 0 // Applicant Nominee Guardian Details (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianSalutation = "" - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianName = "" - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAge = 0 - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianCountry = "" + (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianName = binding.edtGuardianName.text.toString() + (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAge = binding.edtGuardianAge.text.toString().toInt() + (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianCountry = "India" (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianCity = "" (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianState = "" - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianPincode = 0 - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress1 = "" + (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianPincode = binding.edtGuardianPinCode.text.toString().toInt() + (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress1 = binding.edtGuardianAddress.text.toString() (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress2 = "" - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress3 = "" + (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress3 = binding.spGuardianRelation.text.toString() // Applicant Bank Details - (activity as BajajFdMainActivity).fdBankDetails.AccountType = "" - (activity as BajajFdMainActivity).fdBankDetails.BankBranch = "" - (activity as BajajFdMainActivity).fdBankDetails.IFSCCode = "" - (activity as BajajFdMainActivity).fdBankDetails.AccountNumber = "" - (activity as BajajFdMainActivity).fdBankDetails.BankName = "" - (activity as BajajFdMainActivity).fdBankDetails.PaymentMode = "" + (activity as BajajFdMainActivity).fdBankDetails.AccountType = rbBank.text.toString() + (activity as BajajFdMainActivity).fdBankDetails.BankBranch = binding.edtBankBranch.text.toString() + (activity as BajajFdMainActivity).fdBankDetails.IFSCCode = binding.edtIFSC.text.toString() + (activity as BajajFdMainActivity).fdBankDetails.AccountNumber = binding.edtAccountNumber.text.toString() + (activity as BajajFdMainActivity).fdBankDetails.BankName = binding.edtBankName.text.toString() + (activity as BajajFdMainActivity).fdBankDetails.PaymentMode =rbPaymentMode.text.toString() bajajFDInterface.stepTwoApi("stepTwoResponse") } } + + binding.btnBack.setOnClickListener{ + (activity as BajajFdMainActivity).binding.viewPager.currentItem = 0 + } return root } 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 1570299..114ba9c 100644 --- a/app/src/main/res/layout/fragment_bajajfd_step_two.xml +++ b/app/src/main/res/layout/fragment_bajajfd_step_two.xml @@ -780,6 +780,7 @@ tools:layout_editor_absoluteX="5dp" /> @@ -794,7 +795,7 @@ @@ -899,6 +900,7 @@ BajajFdLib Bajaj App + nivesh + Step 1 Step 2 @@ -45,6 +47,8 @@ Please enter amount + Please enter amount first + Entered amount should be greater than minimum amount Please select Interest Payout Please select Investment Tenure @@ -196,5 +200,4 @@ Senior Citizen Non Senior Citizen - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2721acd..da7e1d3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,6 +2,7 @@ BajajFdLib Bajaj App + nivesh Step 1 Step 2 @@ -45,6 +46,8 @@ Please enter amount + Please enter amount first + Entered amount should be greater than minimum amount Please select Interest Payout Please select Investment Tenure