From 528cf616ee113f175db0972cc635ad926faf5d6e Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Mon, 19 Dec 2022 22:04:31 +0530 Subject: [PATCH] updated UI and Validation --- .../ui/fragment/StepFiveBajajFDFragment.kt | 2 - .../ui/fragment/StepFourBajajFDFragment.kt | 2 - .../ui/fragment/StepOneBajajFDFragment.kt | 85 +++++++++-- .../ui/fragment/StepThreeBajajFDFragment.kt | 2 - .../ui/fragment/StepTwoBajajFDFragment.kt | 2 - .../production/bajajfd/util/Constants.kt | 2 +- .../res/layout/fragment_bajajfd_step_one.xml | 133 +++++++++--------- app/src/main/res/values/strings.xml | 14 +- 8 files changed, 152 insertions(+), 90 deletions(-) diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt index 79e2036..654ce7d 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt @@ -30,9 +30,7 @@ class StepFiveBajajFDFragment : Fragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - stepFourViewModel = ViewModelProvider(this)[StepFiveBajajFDViewModel::class.java].apply { - } } override fun onCreateView( diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt index 7982184..eb62457 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt @@ -31,9 +31,7 @@ class StepFourBajajFDFragment : Fragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - stepFourBajajFDViewModel = ViewModelProvider(this)[StepFourBajajFDViewModel::class.java].apply { - } } override fun onCreateView( 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 3fa867a..fe23d4d 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 @@ -2,12 +2,17 @@ package com.nivesh.production.bajajfd.ui.fragment import GetRatesResponse import android.os.Bundle +import android.text.Editable +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.google.gson.Gson +import com.nivesh.production.bajajfd.R import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepOneBinding import com.nivesh.production.bajajfd.interfaces.BajajFDInterface import com.nivesh.production.bajajfd.model.GetRatesRequest @@ -21,6 +26,7 @@ class StepOneBajajFDFragment : Fragment() { private lateinit var bajajFDInterface: BajajFDInterface private lateinit var stepOneBajajFDViewModel: StepOneBajajFDViewModel + private lateinit var rgMaturity: RadioButton companion object { fun getInstance(fdInterface: BajajFDInterface): StepOneBajajFDFragment { @@ -42,16 +48,59 @@ class StepOneBajajFDFragment : Fragment() { stepOneBajajFDViewModel = (activity as BajajFdMainActivity).viewModel - // binding.tlDepositAmount - // binding.spInterestPayout - // binding.swSeniorCitizen - // binding.radioGroup - // binding.rbDeductTax - // binding.tvROI - // binding.tvFrequency - // binding.tvMaturityAmount - getRatesApi() + // Amount + binding.edtAmount.addTextChangedListener(object : TextWatcher { + override fun afterTextChanged(s: Editable?) { + } + + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + } + }) + + // Frequency + val adapter = ArrayAdapter( + activity as BajajFdMainActivity, + android.R.layout.simple_spinner_item, + resources.getStringArray( + R.array.interestPayoutList + ) + ) + binding.tvInterestPayout.setAdapter(adapter) + binding.tvInterestPayout.setOnItemClickListener { parent, view, position, id -> + + } + + // Tenure + binding.tvTenure.setAdapter(adapter) + binding.tvTenure.setOnItemClickListener { parent, view, position, id -> + // getRatesApi() + } + + + binding.swSeniorCitizen.setOnCheckedChangeListener { compoundButton, b -> + binding.swSeniorCitizen.isChecked = !b + } + + // Maturity Options + binding.radioGroup.setOnCheckedChangeListener { group, checkedId -> + rgMaturity = group.findViewById(checkedId) + Log.e("rgMaturity", "-->"+rgMaturity.text) + } + // TAX Deduct + binding.rbDeductTax.setOnCheckedChangeListener { compoundButton, b -> + binding.rbDeductTax.isChecked = !b + } + + + binding.tvROI.text = "" + binding.tvFrequency.text = "" + binding.tvMaturityAmount.text = "" + + // Next Button binding.btnNext.setOnClickListener { if (validation()) { bajajFDInterface.stepOneApi("stepOneResponse") @@ -60,6 +109,19 @@ class StepOneBajajFDFragment : Fragment() { return root } + private fun validation(): Boolean { + if (binding.edtAmount.text?.isEmpty()!!){ + return false + }else if (binding.tvInterestPayout.text.isEmpty()){ + return false + }else if (binding.tvTenure.text.isEmpty()){ + return false + }else{ + return true + } + } + + private fun getRatesApi() { val getRatesRequest = GetRatesRequest() getRatesRequest.fdProvider = "" @@ -92,10 +154,6 @@ class StepOneBajajFDFragment : Fragment() { } } - private fun validation(): Boolean { - TODO("Not yet implemented") - } - private fun refreshToken() { @@ -112,4 +170,5 @@ class StepOneBajajFDFragment : Fragment() { super.onDestroyView() _binding = null } + } \ No newline at end of file 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 b920138..3623a07 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 @@ -30,9 +30,7 @@ class StepThreeBajajFDFragment : Fragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - stepThreeBajajFDViewModel = ViewModelProvider(this)[StepThreeBajajFDViewModel::class.java].apply { - } } override fun onCreateView( 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 ef4dc8e..25905aa 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,9 +33,7 @@ class StepTwoBajajFDFragment : Fragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - stepTwoBajajFDViewModel = ViewModelProvider(this)[StepTwoBajajFDViewModel::class.java].apply { - } } override fun onCreateView( diff --git a/app/src/main/java/com/nivesh/production/bajajfd/util/Constants.kt b/app/src/main/java/com/nivesh/production/bajajfd/util/Constants.kt index a05ff84..e2677cf 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/util/Constants.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/util/Constants.kt @@ -15,7 +15,7 @@ import java.util.regex.Pattern class Constants() { companion object { - const val BASE_URL ="put your base url here" + const val BASE_URL ="https://www.providential.in/api/" /** *Before use this method write following code in model class app:Application(in activity and model) diff --git a/app/src/main/res/layout/fragment_bajajfd_step_one.xml b/app/src/main/res/layout/fragment_bajajfd_step_one.xml index d3fe8d1..5214979 100644 --- a/app/src/main/res/layout/fragment_bajajfd_step_one.xml +++ b/app/src/main/res/layout/fragment_bajajfd_step_one.xml @@ -65,7 +65,7 @@ style="@style/regularStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Ratings: CRISIL AAA/Stable & ICRA AAA/Stable" + android:text="@string/schemeRating" android:textColor="@color/light_text" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" @@ -79,15 +79,16 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_2sdp" - android:hint="Select Investment Amount" + android:hint="@string/investmentAmount" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvFdRating" app:layout_constraintVertical_bias="0.02"> @@ -108,19 +109,26 @@ app:layout_constraintTop_toBottomOf="@+id/tlDepositAmount" app:layout_constraintVertical_bias="0.02" /> - + app:layout_constraintTop_toBottomOf="@+id/tvDepositLabel"> + + + - + app:layout_constraintTop_toBottomOf="@+id/tvInvestmentTenure"> + + + + + - - + android:layout_height="match_parent" + android:padding="@dimen/margin_10"> + app:layout_constraintTop_toTopOf="parent"> @@ -244,8 +251,7 @@ style="@style/semiBoldStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="@dimen/margin_10" - android:layout_marginTop="@dimen/margin_15" + android:layout_marginTop="@dimen/margin_10" android:text="@string/tax_deducted_at_source_tds" android:textColor="@color/text_color_dark" app:layout_constraintEnd_toEndOf="parent" @@ -260,9 +266,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:drawablePadding="@dimen/margin_10" - android:padding="@dimen/margin_10" - android:text="Please ensure to upload the Form 15 G / H, when you receive a mail from the -Company for the same" + android:padding="@dimen/_1sdp" + android:text="@string/TDSForm" android:textColor="@color/text_color_dark" android:textSize="@dimen/text_size_12" app:layout_constraintEnd_toEndOf="parent" @@ -275,7 +280,8 @@ Company for the same" android:id="@+id/rbDeductTax" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="@dimen/_2sdp" + android:checked="true" + android:buttonTint="@color/black" android:orientation="horizontal" android:text="@string/deduct_tds" android:textSize="@dimen/text_size_12" @@ -285,13 +291,10 @@ Company for the same" @@ -350,7 +353,7 @@ Company for the same" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/margin_2" - android:text="7.5 %" + android:text="" android:textColor="@color/text_color_blue" android:textSize="@dimen/text_size_14" /> @@ -367,7 +370,7 @@ Company for the same" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="@dimen/margin_10" - android:text="Regular Interest Payment:" + android:text="@string/regularInterestPayment" android:textColor="@color/text_color_dark" android:textSize="@dimen/text_size_14" /> @@ -377,7 +380,7 @@ Company for the same" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/margin_2" - android:text="Quarterly" + android:text="" android:textColor="@color/text_color_blue" android:textSize="@dimen/text_size_14" /> @@ -394,7 +397,7 @@ Company for the same" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="@dimen/margin_10" - android:text="Maturity Amount:" + android:text="@string/maturityAmount" android:textColor="@color/text_color_dark" android:textSize="@dimen/text_size_14" /> @@ -404,7 +407,7 @@ Company for the same" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/margin_2" - android:text="5XXXXXX" + android:text="" android:textColor="@color/text_color_blue" android:textSize="@dimen/text_size_14" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index be619ec..01a7f72 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -55,15 +55,23 @@ Guardian Address (Optional) Guardian PinCode (Optional) content description + Select + + Select Investment Amount + Please ensure to upload the Form 15 G / H, when you receive a mail from the Company for the same + In case you are eligible for non deduction of TDS then please submit 15G/H form to Bajaj or Nivesh team + Non- Cumulative ROI: + Regular Interest Payment: + Maturity Amount: - + Interest Payout On Maturity Monthly Quarterly Half Yearly Yearly - + Aadhaar Card @@ -90,7 +98,7 @@ Unmarried - + Interest Payout On Maturity Monthly