Browse Source

code change in step three xml

PankajBranch
Hemant Khadase 2 years ago
parent
commit
6bdfa1c3f8
5 changed files with 68 additions and 61 deletions
  1. +13
    -1
      .idea/dbnavigator.xml
  2. +0
    -3
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneFragment.kt
  3. +47
    -49
      app/src/main/res/layout/fragment_step_three.xml
  4. +3
    -3
      app/src/main/res/layout/fragment_step_two.xml
  5. +5
    -5
      app/src/main/res/values/strings.xml

+ 13
- 1
.idea/dbnavigator.xml View File

@ -2,15 +2,27 @@
<project version="4">
<component name="DBNavigator.Project.DataEditorManager">
<record-view-column-sorting-type value="BY_INDEX" />
<value-preview-text-wrapping value="true" />
<value-preview-text-wrapping value="false" />
<value-preview-pinned value="false" />
</component>
<component name="DBNavigator.Project.DatabaseBrowserManager">
<autoscroll-to-editor value="false" />
<autoscroll-from-editor value="true" />
<show-object-properties value="true" />
<loaded-nodes />
</component>
<component name="DBNavigator.Project.DatabaseFileManager">
<open-files />
</component>
<component name="DBNavigator.Project.EditorStateManager">
<last-used-providers />
</component>
<component name="DBNavigator.Project.ExecutionManager">
<retain-sticky-names value="false" />
</component>
<component name="DBNavigator.Project.ParserDiagnosticsManager">
<diagnostics-history />
</component>
<component name="DBNavigator.Project.Settings">
<connections />
<browser-settings>


+ 0
- 3
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneFragment.kt View File

@ -1,12 +1,9 @@
package com.nivesh.production.bajajfd.ui.fragment
import android.content.Intent
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.LinearLayout
import android.widget.TextView
import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
import com.nivesh.production.bajajfd.`interface`.BajajFDInterface


+ 47
- 49
app/src/main/res/layout/fragment_step_three.xml View File

@ -87,11 +87,12 @@
android:layout_height="wrap_content"
android:paddingStart="@dimen/_5sdp"
android:paddingEnd="@dimen/_5sdp"
android:layout_marginStart="@dimen/_5sdp"
android:text="Invested Amount"
android:textSize="@dimen/text_size_14"
app:layout_constraintBottom_toBottomOf="@id/lblTenure"
app:layout_constraintStart_toStartOf="@+id/tvMakePayment"
app:layout_constraintTop_toTopOf="@+id/tvInvestedAmount"
app:layout_constraintTop_toBottomOf="@+id/tvMakePayment"
app:layout_constraintBottom_toTopOf="@id/lblTenure"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintVertical_bias="0.0" />
<TextView
@ -106,7 +107,6 @@
android:text="Rs. 50,000"
android:textColor="@color/black"
android:textSize="@dimen/text_size_14"
app:layout_constraintBottom_toBottomOf="@+id/tvTenure"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/lblMakePayment"
@ -120,12 +120,13 @@
android:layout_height="wrap_content"
android:paddingStart="@dimen/_5sdp"
android:paddingEnd="@dimen/_5sdp"
android:layout_marginStart="@dimen/_5sdp"
android:text="Tenure"
android:textSize="@dimen/text_size_14"
app:layout_constraintBottom_toBottomOf="@id/lblTenure"
app:layout_constraintVertical_bias="0.0"
app:layout_constraintStart_toStartOf="@id/lblMakePayment"
app:layout_constraintTop_toTopOf="@+id/tvTenure" />
app:layout_constraintTop_toBottomOf="@+id/lblMakePayment"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@+id/lblInterestPayout" />
<TextView
android:id="@+id/tvTenure"
@ -137,9 +138,9 @@
android:paddingEnd="@dimen/_5sdp"
android:layout_marginTop="@dimen/_5sdp"
android:layout_marginEnd="@dimen/_7sdp"
android:layout_marginStart="@dimen/_5sdp"
android:textColor="@color/black"
android:textSize="@dimen/text_size_14"
app:layout_constraintBottom_toBottomOf="@id/tvInterestPayout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/lblTenure"
@ -152,11 +153,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Interest Payout"
android:layout_marginStart="@dimen/_5sdp"
android:paddingStart="@dimen/_5sdp"
android:paddingEnd="@dimen/_5sdp"
android:textSize="@dimen/text_size_14"
app:layout_constraintBottom_toBottomOf="@+id/lblRateOfInterest"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/lblTenure"
app:layout_constraintTop_toTopOf="@+id/tvInterestPayout"
app:layout_constraintBottom_toTopOf="@+id/lblRateOfInterest"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/lblTenure"
app:layout_constraintVertical_bias="0.0" />
<TextView
@ -166,11 +169,12 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:paddingStart="@dimen/_5sdp"
android:paddingEnd="@dimen/_5sdp"
android:text="Monthly"
android:textSize="@dimen/text_size_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintHorizontal_bias="0.9"
app:layout_constraintStart_toEndOf="@+id/lblInterestPayout"
app:layout_constraintTop_toBottomOf="@+id/tvTenure"
app:layout_constraintVertical_bias="0.0" />
@ -180,27 +184,32 @@
style="@style/tv_regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="14dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="19dp"
android:paddingStart="@dimen/_5sdp"
android:paddingEnd="@dimen/_5sdp"
android:layout_marginStart="@dimen/_5sdp"
android:text="Rate of Interest"
android:textSize="@dimen/text_size_14"
app:layout_constraintBottom_toTopOf="@+id/tvMakePayment2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/lblInterestPayout" />
app:layout_constraintTop_toBottomOf="@+id/lblInterestPayout"
app:layout_constraintVertical_bias="0.0" />
<TextView
android:id="@+id/tvRateOfInterest"
style="@style/tv_regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_14"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:paddingStart="@dimen/_5sdp"
android:paddingEnd="@dimen/_5sdp"
android:textSize="@dimen/text_size_14"
android:text="6.75%"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/tvInterestPayout"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.9"
app:layout_constraintStart_toEndOf="@+id/lblRateOfInterest"
app:layout_constraintTop_toBottomOf="@+id/tvInterestPayout"
app:layout_constraintBottom_toTopOf="@+id/tvMakePayment2"
app:layout_constraintVertical_bias="0.0" />
<TextView
@ -223,7 +232,6 @@
android:layout_marginStart="8dp"
android:layout_marginEnd="5dp"
android:text="Director of Bajaj Finance Ltd."
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvMakePayment2"
@ -231,6 +239,7 @@
<com.google.android.material.switchmaterial.SwitchMaterial
style="@style/tv_regular"
android:id="@+id/switch3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
@ -238,14 +247,13 @@
android:layout_marginEnd="5dp"
android:layout_marginBottom="8dp"
android:text="Promoter of Bajaj Finance Ltd."
app:layout_constraintBottom_toTopOf="@+id/switch3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/switch2"
app:layout_constraintVertical_bias="0.0" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/switch3"
android:id="@+id/switch4"
style="@style/tv_regular"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -254,15 +262,14 @@
android:layout_marginEnd="5dp"
android:layout_marginBottom="8dp"
android:text="Relative of director or promotor of Bajaj Finance Ltd."
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/switch2"
app:layout_constraintTop_toBottomOf="@+id/switch3"
app:layout_constraintVertical_bias="0.0" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/switch4"
android:id="@+id/switch5"
style="@style/tv_regular"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -271,14 +278,12 @@
android:layout_marginEnd="5dp"
android:layout_marginBottom="8dp"
android:text="Shareholder of Bajaj Finance Ltd."
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/switch2"
app:layout_constraintVertical_bias="0.153" />
app:layout_constraintTop_toBottomOf="@+id/switch4" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/switch5"
android:id="@+id/switch6"
style="@style/tv_regular"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -287,14 +292,12 @@
android:layout_marginEnd="5dp"
android:layout_marginBottom="8dp"
android:text="Are you a politicallly exposed person"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/switch3"
app:layout_constraintVertical_bias="0.181" />
app:layout_constraintTop_toBottomOf="@+id/switch5" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/switch6"
android:id="@+id/switch7"
style="@style/tv_regular"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -303,10 +306,9 @@
android:layout_marginEnd="5dp"
android:layout_marginBottom="8dp"
android:text="I am not a citizen, national or tax resident of any country outside of India"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/switch5"
app:layout_constraintTop_toBottomOf="@+id/switch6"
app:layout_constraintVertical_bias="0.0" />
<CheckBox
@ -314,12 +316,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="1dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/textView14"
android:layout_marginTop="25dp"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/switch6"
app:layout_constraintTop_toBottomOf="@+id/switch7"
app:layout_constraintVertical_bias="0.0" />
<TextView
@ -327,14 +327,13 @@
android:layout_width="322dp"
android:layout_height="74dp"
android:layout_marginTop="15dp"
android:layout_marginEnd="16dp"
android:layout_marginEnd="10dp"
android:text="@string/terms_condition"
android:textColor="@color/black"
android:textSize="@dimen/margin_8"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/checkBox"
app:layout_constraintTop_toBottomOf="@+id/switch6" />
app:layout_constraintTop_toBottomOf="@+id/switch7" />
</androidx.constraintlayout.widget.ConstraintLayout>
@ -347,7 +346,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="24dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:backgroundTint="@color/blue"
android:text="@string/back"
@ -355,7 +354,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/btnNext"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/card_view_1"
app:layout_constraintVertical_bias="0.812" />
<com.google.android.material.button.MaterialButton
@ -364,7 +362,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="16dp"
android:layout_marginTop="24dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:backgroundTint="@color/colorPrimary"
android:text="View Order"
@ -372,7 +370,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/btnBack"
app:layout_constraintTop_toBottomOf="@+id/card_view_1"
app:layout_constraintTop_toBottomOf="@+id/scrollView"
app:layout_constraintVertical_bias="0.812" />
<TextView


+ 3
- 3
app/src/main/res/layout/fragment_step_two.xml View File

@ -46,7 +46,7 @@
android:layout_height="wrap_content"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:layout_marginTop="10dp"
android:layout_marginTop="13dp"
android:text="@string/bajaj_finance"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
@ -120,7 +120,7 @@
style="@style/tv_regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/aadhar_front"
android:text="@string/aadhaar_front"
android:textColor="@color/text_default"
android:textSize="@dimen/text_size_12"
app:layout_constraintBottom_toBottomOf="@+id/btnAadhaarFrontUpload"
@ -154,7 +154,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="@string/aadhar_back"
android:text="@string/aadhaar_back"
android:textColor="@color/text_default"
android:textSize="@dimen/text_size_12"
app:layout_constraintBottom_toBottomOf="@+id/btnAadhaarBackUpload"


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

@ -13,13 +13,13 @@
<string name="select_interest_payout">Select Interest Payout</string>
<string name="select_interest_tenure">Select Investment Tenure</string>
<string name="tv_select_hint">Select</string>
<string name="upto_0.25">Upto 0.25% p.a for </string>
<string name="upto_0.25">Up to 0.25% p.a for </string>
<string name="upto_0.25_next">Senior Citizens, 60+</string>
<string name="following_option">Additional Details</string>
<string name="additional_detail_one">Automatically credit to my bank account</string>
<string name="additional_detail_two">Automatically renew principal amount</string>
<string name="additional_detail_three">Automatically renew both principal and interest amount</string>
<string name="maturity_instructions">Maturity Instrutions:</string>
<string name="maturity_instructions">Maturity Instructions:</string>
<string name="deduct_tds">Deduct TDS (Income is taxable)</string>
<string name="next">Next</string>
<string name="once_you_click">Once you click on PAY, your order will be placed and you will be redirected to payment gateway.</string>
@ -43,8 +43,8 @@
<string name="viewpager">viewpager</string>
<string name="tax_deducted_at_source_tds">Tax Deducted at Source (TDS):</string>
<string name="address_proof_type">Address Proof Type <font color='#E9161E'>*</font></string>
<string name="aadhar_front">Aadhar front <font color='#E9161E'>*</font></string>
<string name="aadhar_back">Aadhar Back <font color='#E9161E'>*</font></string>
<string name="aadhaar_front">Aadhaar front <font color='#E9161E'>*</font></string>
<string name="aadhaar_back">Aadhaar Back <font color='#E9161E'>*</font></string>
<string name="pan_upload">PAN Upload <font color='#E9161E'>*</font></string>
<string name="photo_upload">Photo Upload <font color='#E9161E'>*</font></string>
<string name="terms_condition">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>
@ -65,7 +65,7 @@
</array>
<array name="address_type">
<item>Aadhar Card</item>
<item>Aadhaar Card</item>
<item>PAN</item>
<item>Voter Id</item>
<item>Driving Licence</item>


Loading…
Cancel
Save

Powered by TurnKey Linux.