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 a07a592..903ca10 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
@@ -5,9 +5,11 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
+import com.nivesh.production.bajajfd.R
import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepFourBinding
import com.nivesh.production.bajajfd.interfaces.BajajFDInterface
import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity
+import com.nivesh.production.bajajfd.util.Common.Companion.showDialogValidation
import com.nivesh.production.bajajfd.viewModel.StepFourBajajFDViewModel
class StepFourBajajFDFragment : Fragment() {
@@ -41,19 +43,46 @@ class StepFourBajajFDFragment : Fragment() {
stepFourBajajFDViewModel = (activity as BajajFdMainActivity).stepFourBajajFDViewModel
+ binding.tvInvestedAmount.text = ""
+ binding.tvTenure.text = ""
+ binding.tvInterestPayout.text = ""
+ binding.tvRateOfInterest.text = ""
+
+
+ binding.swDirectorBajajFinance.setOnCheckedChangeListener { _, _ ->
+
+ }
+ binding.swPromoterBajajFinance.setOnCheckedChangeListener { _, _ ->
+
+ }
+ binding.swRelativeDirector.setOnCheckedChangeListener { _, _ ->
+
+ }
+ binding.swShareholder.setOnCheckedChangeListener { _, _ ->
+
+ }
+ binding.swPoliticallyExposed.setOnCheckedChangeListener { _, _ ->
+
+ }
+ binding.swCitizen.setOnCheckedChangeListener { _, _ ->
+
+ }
+
+ binding.checkBox.setOnCheckedChangeListener { _, _ ->
+
+ }
+
binding.btnNext.setOnClickListener {
- if (validate()) {
+ if (binding.checkBox.isChecked) {
bajajFDInterface.stepThreeApi("stepThreeResponse")
+ }else{
+ showDialogValidation(activity as BajajFdMainActivity, resources.getString(R.string.validTermsConditions))
}
}
return root
}
- private fun validate(): Boolean {
- return false
- }
-
override fun onDestroyView() {
super.onDestroyView()
_binding = null
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 4fe62f0..56ca8b1 100644
--- a/app/src/main/res/layout/fragment_bajajfd_step_five.xml
+++ b/app/src/main/res/layout/fragment_bajajfd_step_five.xml
@@ -12,7 +12,8 @@
android:id="@+id/linearLayoutTwo"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginBottom="@dimen/margin_70"
+ android:layout_marginBottom="@dimen/margin_80"
+ android:padding="@dimen/margin_5"
android:background="@color/NiveshColorAppBg"
android:fillViewport="true"
android:orientation="vertical"
@@ -26,7 +27,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:foreground="?android:attr/selectableItemBackground"
- android:padding="@dimen/margin_10"
app:cardElevation="@dimen/margin_1"
app:cardUseCompatPadding="true"
app:layout_constraintEnd_toEndOf="parent"
@@ -35,24 +35,22 @@
+ android:layout_height="match_parent">
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/logo" />
diff --git a/app/src/main/res/layout/fragment_bajajfd_step_four.xml b/app/src/main/res/layout/fragment_bajajfd_step_four.xml
index 520da76..22a13de 100644
--- a/app/src/main/res/layout/fragment_bajajfd_step_four.xml
+++ b/app/src/main/res/layout/fragment_bajajfd_step_four.xml
@@ -12,9 +12,10 @@
android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginBottom="70dp"
+ android:layout_marginBottom="@dimen/margin_100"
android:background="@color/NiveshColorAppBg"
android:fillViewport="true"
+ android:padding="@dimen/margin_5"
app:layout_constraintBottom_toTopOf="@+id/btnNext"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -25,7 +26,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:foreground="?android:attr/selectableItemBackground"
- android:padding="@dimen/margin_10"
app:cardElevation="1dp"
app:cardUseCompatPadding="true"
app:layout_constraintEnd_toEndOf="parent"
@@ -41,12 +41,11 @@
android:id="@+id/logo"
android:layout_width="@dimen/margin_150"
android:layout_height="@dimen/margin_18"
+ android:layout_marginStart="@dimen/margin_15"
android:layout_marginTop="@dimen/margin_15"
android:contentDescription="@string/contentDescription"
android:src="@drawable/bajaj_logo"
- app:layout_constraintHorizontal_bias="0.065"
- app:layout_constraintLeft_toLeftOf="parent"
- app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -309,12 +306,24 @@
+
+
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/tvOnceClick" />
+ app:layout_constraintStart_toEndOf="@+id/btnBack"
+ app:layout_constraintTop_toBottomOf="@+id/tvOnceClick" />
-
\ No newline at end of file
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 26be7dd..8011512 100644
--- a/app/src/main/res/layout/fragment_bajajfd_step_one.xml
+++ b/app/src/main/res/layout/fragment_bajajfd_step_one.xml
@@ -5,16 +5,17 @@
android:id="@+id/constraintLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/greyColor4"
+ android:background="@color/NiveshColorAppBg"
tool:context=".ui.fragment.StepTwoBajajFDFragment">
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_bajajfd_step_three.xml b/app/src/main/res/layout/fragment_bajajfd_step_three.xml
index a34b3ae..d95444d 100644
--- a/app/src/main/res/layout/fragment_bajajfd_step_three.xml
+++ b/app/src/main/res/layout/fragment_bajajfd_step_three.xml
@@ -12,7 +12,8 @@
android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginBottom="@dimen/margin_70"
+ android:layout_marginBottom="@dimen/margin_80"
+ android:padding="@dimen/margin_5"
android:background="@color/NiveshColorAppBg"
android:fillViewport="true"
android:visibility="visible"
@@ -26,7 +27,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:foreground="?android:attr/selectableItemBackground"
- android:padding="@dimen/margin_10"
app:cardElevation="@dimen/margin_1"
app:cardUseCompatPadding="true"
app:layout_constraintEnd_toEndOf="parent"
@@ -36,28 +36,23 @@
+ android:layout_height="match_parent">
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+ android:padding="@dimen/margin_10">
@@ -69,7 +72,8 @@
style="@style/regularStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/margin_15"
+ android:layout_marginTop="@dimen/margin_10"
+ android:layout_marginStart="@dimen/margin_10"
android:layout_marginBottom="@dimen/margin_1"
android:text="@string/mandatoryField"
android:textColor="@color/greyColor2"
@@ -87,6 +91,7 @@
android:paddingStart="@dimen/margin_18"
android:paddingEnd="@dimen/margin_15"
android:text="@string/personalDetails"
+ android:textSize="@dimen/text_size_14"
android:textColor="@color/black"
app:drawableEndCompat="@drawable/svg_down_arrow" />
@@ -508,9 +513,10 @@
style="@style/semiBoldStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/margin_5"
android:background="@color/greyColor3"
android:paddingStart="@dimen/margin_18"
- android:paddingEnd="@dimen/margin_10"
+ android:paddingEnd="@dimen/margin_15"
android:text="@string/nomineeDetailsOptional"
android:textColor="@color/black"
android:textSize="@dimen/text_size_14"
@@ -765,8 +771,10 @@
style="@style/semiBoldStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/margin_5"
android:background="@color/greyColor3"
- android:padding="@dimen/margin_3"
+ android:paddingStart="@dimen/margin_18"
+ android:paddingEnd="@dimen/margin_15"
android:text="@string/bankDetails"
android:textColor="@color/black"
android:textSize="@dimen/text_size_14"
@@ -884,6 +892,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
+ android:paddingStart="@dimen/margin_18"
+ android:paddingEnd="@dimen/margin_15"
+ android:layout_marginTop="@dimen/margin_5"
android:background="@color/greyColor3">
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 3ffeedf..ea9e0db 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -179,6 +179,7 @@
Are you a politically exposed personI am not a citizen, national or tax resident of any country outside of IndiaI undertake to inform company any change in status of my nationality or tax residence. I am making investment from my Indian resident Individual Savings bank account. I/ We confirm that 1/we have read and understood the detailed terms and conditions annexed to this Application including the interest rate and other charges. I have gone through the financials and other statements/particulars representations furnished/made by the company and after careful consideration I am making the deposit with the company at my own risk and volition. I have read and agree to the Terms & conditions
+ Please accept terms & conditions.
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index b61447b..bd762f5 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -64,8 +64,12 @@
54dp55dp60dp
- 72dp
+ 70dp80dp
+ 85dp
+ 90dp
+ 95dp
+ 100dp120dp150dp290dp
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 67b86b6..8d271b1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -187,6 +187,8 @@
I am not a citizen, national or tax resident of any country outside of IndiaI undertake to inform company any change in status of my nationality or tax residence. I am making investment from my Indian resident Individual Savings bank account. I/ We confirm that 1/we have read and understood the detailed terms and conditions annexed to this Application including the interest rate and other charges. I have gone through the financials and other statements/particulars representations furnished/made by the company and after careful consideration I am making the deposit with the company at my own risk and volition. I have read and agree to the Terms & conditions
+ Please accept terms & conditions.
+
View Order