Browse Source

completed 4th screen

PankajBranch
Hemant Khadase 2 years ago
parent
commit
4d67fd93d7
9 changed files with 126 additions and 87 deletions
  1. +34
    -5
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt
  2. +12
    -16
      app/src/main/res/layout/fragment_bajajfd_step_five.xml
  3. +31
    -33
      app/src/main/res/layout/fragment_bajajfd_step_four.xml
  4. +8
    -6
      app/src/main/res/layout/fragment_bajajfd_step_one.xml
  5. +16
    -19
      app/src/main/res/layout/fragment_bajajfd_step_three.xml
  6. +17
    -7
      app/src/main/res/layout/fragment_bajajfd_step_two.xml
  7. +1
    -0
      app/src/main/res/values-hi-rIN/strings.xml
  8. +5
    -1
      app/src/main/res/values/dimens.xml
  9. +2
    -0
      app/src/main/res/values/strings.xml

+ 34
- 5
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt View File

@ -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


+ 12
- 16
app/src/main/res/layout/fragment_bajajfd_step_five.xml View File

@ -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 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/margin_10">
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/topLayout"
android:layout_width="match_parent"
android:layout_height="@dimen/margin_70"
android:layout_marginStart="@dimen/margin_5"
android:layout_marginBottom="@dimen/margin_12"
android:layout_height="wrap_content"
android:background="@color/white"
android:padding="@dimen/margin_5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/logo"
android:layout_width="@dimen/margin_150"
android:layout_height="18dp"
android:layout_height="@dimen/margin_18"
android:layout_marginTop="@dimen/margin_15"
android:layout_marginStart="@dimen/margin_15"
android:contentDescription="@string/contentDescription"
android:src="@drawable/bajaj_logo"
app:layout_constraintBottom_toTopOf="@+id/tvFdRating"
@ -66,21 +64,19 @@
style="@style/regularStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/margin_15"
android:paddingEnd="@dimen/margin_1"
android:text="@string/schemeRating"
android:textColor="@color/greyColor2"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/logo"
app:layout_constraintVertical_bias="0.0" />
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/logo" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_15"
android:layout_marginTop="@dimen/margin_120"
android:background="@color/greyColor4"
android:paddingBottom="@dimen/margin_10"
app:layout_constraintTop_toBottomOf="@+id/topLayout">


+ 31
- 33
app/src/main/res/layout/fragment_bajajfd_step_four.xml View File

@ -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" />
<TextView
@ -54,9 +53,8 @@
style="@style/regularStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_5"
android:paddingStart="@dimen/margin_15"
android:paddingEnd="@dimen/margin_10"
android:paddingEnd="@dimen/margin_1"
android:text="@string/schemeRating"
android:textColor="@color/greyColor2"
app:layout_constraintLeft_toLeftOf="parent"
@ -283,22 +281,21 @@
<CheckBox
android:id="@+id/checkBox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_8"
android:layout_marginTop="@dimen/margin_20"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginTop="@dimen/margin_10"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/swCitizen" />
<TextView
android:id="@+id/tvTermsAndCondition"
android:layout_width="322dp"
android:layout_height="74dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_15"
android:layout_marginEnd="@dimen/margin_10"
android:layout_marginEnd="@dimen/margin_15"
android:text="@string/termsCondition"
android:textColor="@color/black"
android:textSize="@dimen/text_size_10"
android:textSize="@dimen/text_size_12"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/checkBox"
app:layout_constraintTop_toBottomOf="@+id/swCitizen" />
@ -309,12 +306,24 @@
</androidx.core.widget.NestedScrollView>
<TextView
android:id="@+id/tvOnceClick"
style="@style/regularStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/margin_15"
android:paddingEnd="@dimen/margin_15"
android:text="@string/onceYouClick"
app:layout_constraintBottom_toTopOf="@+id/btnBack"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/scrollView" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btnBack"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="@dimen/margin_15"
android:layout_marginTop="@dimen/margin_5"
android:layout_marginBottom="@dimen/margin_15"
android:backgroundTint="@color/blue"
android:text="@string/back"
@ -322,35 +331,24 @@
android:textSize="@dimen/text_size_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/btnNext"
app:layout_constraintStart_toStartOf="parent"/>
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvOnceClick" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btnNext"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginBottom="@dimen/margin_15"
android:layout_marginTop="@dimen/margin_10"
android:layout_marginBottom="@dimen/margin_15"
android:backgroundTint="@color/colorPrimary"
android:text="@string/viewOrder"
android:textSize="@dimen/text_size_14"
android:textColor="@color/white"
android:textSize="@dimen/text_size_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/btnBack" />
app:layout_constraintStart_toEndOf="@+id/btnBack"
app:layout_constraintTop_toBottomOf="@+id/tvOnceClick" />
<TextView
android:id="@+id/tvOnceClick"
style="@style/regularStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/onceYouClick"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/btnBack"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintVertical_bias="0.0" />
</androidx.constraintlayout.widget.ConstraintLayout>

+ 8
- 6
app/src/main/res/layout/fragment_bajajfd_step_one.xml View File

@ -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">
<ScrollView
<androidx.core.widget.NestedScrollView
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:fillViewport="true"
android:padding="@dimen/margin_10"
android:background="@color/NiveshColorAppBg"
app:layout_constraintBottom_toTopOf="@+id/btnNext"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -50,8 +51,8 @@
android:id="@+id/logo"
android:layout_width="@dimen/margin_150"
android:layout_height="@dimen/margin_18"
android:layout_marginStart="@dimen/margin_10"
android:layout_marginTop="@dimen/margin_5"
android:layout_marginStart="@dimen/margin_10"
android:contentDescription="@string/contentDescription"
android:src="@drawable/bajaj_logo"
app:layout_constraintBottom_toBottomOf="@+id/tvFdRating"
@ -455,7 +456,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</androidx.core.widget.NestedScrollView>
<Button
android:id="@+id/btnNext"
@ -468,7 +469,8 @@
android:textColor="#FFFFFF"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/scrollView"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="@dimen/margin_15"
tool:ignore="TextContrastCheck" />
</androidx.constraintlayout.widget.ConstraintLayout>

+ 16
- 19
app/src/main/res/layout/fragment_bajajfd_step_three.xml View File

@ -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 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/childConstraint"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/margin_30">
android:layout_height="match_parent">
<ImageView
android:layout_marginStart="@dimen/margin_20"
android:id="@+id/logo"
android:layout_width="@dimen/margin_150"
android:layout_height="@dimen/margin_22"
android:layout_marginTop="@dimen/margin_10"
android:layout_height="@dimen/margin_18"
android:layout_marginTop="@dimen/margin_15"
android:layout_marginStart="@dimen/margin_15"
android:contentDescription="@string/contentDescription"
android:src="@drawable/bajaj_logo"
app:layout_constraintBottom_toTopOf="@+id/tvFDRating"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:contentDescription="@string/contentDescription"/>
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tvFDRating"
style="@style/regularStyle"
android:paddingStart="@dimen/margin_20"
android:paddingEnd="@dimen/margin_1"
android:layout_marginStart="@dimen/margin_15"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/schemeRating"
@ -71,13 +66,15 @@
<TextView
android:id="@+id/tvUploadKYCDocument"
style="@style/semiBoldStyle"
android:layout_gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_7"
android:paddingStart="@dimen/margin_20"
android:layout_marginTop="@dimen/margin_15"
android:paddingStart="@dimen/margin_15"
android:paddingEnd="@dimen/margin_20"
android:background="@color/greyColor3"
android:text="@string/uploadKycDocuments"
android:textSize="@dimen/text_size_14"
android:textColor="@color/black"
app:drawableEndCompat="@drawable/svg_down_arrow"
app:layout_constraintTop_toBottomOf="@+id/tvFDRating"
@ -91,8 +88,8 @@
android:layout_height="@dimen/margin_48"
android:layout_marginTop="@dimen/margin_15"
android:layout_marginBottom="@dimen/margin_5"
android:layout_marginStart="@dimen/margin_20"
android:layout_marginEnd="@dimen/margin_20"
android:layout_marginStart="@dimen/margin_15"
android:layout_marginEnd="@dimen/margin_15"
app:hintEnabled="false"
app:layout_constraintTop_toBottomOf="@+id/tvUploadKYCDocument"
app:layout_constraintLeft_toLeftOf="parent"


+ 17
- 7
app/src/main/res/layout/fragment_bajajfd_step_two.xml View File

@ -13,7 +13,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"
@ -39,12 +40,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/margin_15">
android:padding="@dimen/margin_10">
<ImageView
android:id="@+id/logo"
android:layout_width="@dimen/margin_150"
android:layout_height="@dimen/margin_18"
android:layout_marginStart="@dimen/margin_10"
android:layout_marginTop="@dimen/margin_5"
android:contentDescription="@string/contentDescription"
android:src="@drawable/bajaj_logo"
app:layout_constraintBottom_toBottomOf="parent"
@ -59,7 +62,7 @@
style="@style/regularStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_1"
android:layout_marginStart="@dimen/margin_10"
android:text="@string/schemeRating"
android:textColor="@color/greyColor2"
android:textSize="@dimen/text_size_12" />
@ -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">
<TextView
@ -892,7 +903,6 @@
android:layout_weight="0.4"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="@dimen/margin_3"
android:text="@string/paymentMode"
android:textColor="@color/black"
android:textSize="@dimen/text_size_14" />


+ 1
- 0
app/src/main/res/values-hi-rIN/strings.xml View File

@ -179,6 +179,7 @@
<string name="politicallyExposedPerson">Are you a politically exposed person</string>
<string name="outsideOfIndia">I am not a citizen, national or tax resident of any country outside of India</string>
<string name="termsCondition">I 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 <font color='#5077FF'>Terms &amp; conditions</font></string>
<string name="validTermsConditions">Please accept terms &amp; conditions.</string>
<!-- Step Five -->


+ 5
- 1
app/src/main/res/values/dimens.xml View File

@ -64,8 +64,12 @@
<dimen name="margin_54">54dp</dimen>
<dimen name="margin_55">55dp</dimen>
<dimen name="margin_60">60dp</dimen>
<dimen name="margin_70">72dp</dimen>
<dimen name="margin_70">70dp</dimen>
<dimen name="margin_80">80dp</dimen>
<dimen name="margin_85">85dp</dimen>
<dimen name="margin_90">90dp</dimen>
<dimen name="margin_95">95dp</dimen>
<dimen name="margin_100">100dp</dimen>
<dimen name="margin_120">120dp</dimen>
<dimen name="margin_150">150dp</dimen>
<dimen name="margin_290">290dp</dimen>


+ 2
- 0
app/src/main/res/values/strings.xml View File

@ -187,6 +187,8 @@
<string name="outsideOfIndia">I am not a citizen, national or tax resident of any country outside of India</string>
<string name="termsCondition">I 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 <font color='#5077FF'>Terms &amp; conditions</font></string>
<string name="validTermsConditions">Please accept terms &amp; conditions.</string>
<!-- Step Five -->
<string name="viewOrder">View Order</string>


Loading…
Cancel
Save

Powered by TurnKey Linux.