working on step 2 bajaj fd

app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt

@@ -1,16 +1,21 @@
 package com.nivesh.production.bajajfd.ui.fragment
 
-import android.R.attr
-import android.R.attr.phoneNumber
 import android.os.Bundle
+import android.text.Editable
 import android.text.InputFilter
 import android.text.InputFilter.LengthFilter
+import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ArrayAdapter
 import androidx.fragment.app.Fragment
+import com.nivesh.production.bajajfd.R
 import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepTwoBinding
 import com.nivesh.production.bajajfd.interfaces.BajajFDInterface
+import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity
+import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorMethod
+import com.nivesh.production.bajajfd.util.Common.Companion.commonSpinnerErrorMethod
 import com.nivesh.production.bajajfd.util.Common.Companion.isIndianMobileNo
 import com.nivesh.production.bajajfd.util.Common.Companion.isValidEmail
 import com.nivesh.production.bajajfd.util.Common.Companion.isValidName
@@ -38,23 +43,402 @@ class StepTwoBajajFDFragment : Fragment() {
         bajajFDInterface = bajajFDInterfaces
     }
 
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
 
-        _binding = FragmentBajajfdStepTwoBinding.inflate(inflater,container,false)
+        _binding = FragmentBajajfdStepTwoBinding.inflate(inflater, container, false)
         val root = binding.root
 
+        // Personal Details
         binding.edtMobileNumber.filters = arrayOf<InputFilter>(LengthFilter(10))
         binding.edtPANNumber.filters = arrayOf<InputFilter>(LengthFilter(10))
 
+        binding.edtMobileNumber.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) {
+                binding.tlMobileNumber.error = null
+            }
+        })
+        binding.edtDOB.setOnClickListener{
+
+        }
+        binding.edtPANNumber.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) {
+                binding.tlPanNumber.error = null
+            }
+        })
+
+        val titleAdapter = ArrayAdapter(
+            activity as BajajFdMainActivity,
+            R.layout.spinner_dropdown,
+            resources.getStringArray(
+                R.array.title
+            )
+        )
+        binding.spTitle.setAdapter(titleAdapter)
+        binding.spTitle.setOnItemClickListener { parent, view, position, id ->
+            binding.tlTitle.error = null
+        }
+
+        binding.edtFirstName.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) {
+                binding.tlFirstName.error = null
+            }
+        })
+        binding.edtMiddleName.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) {
+                binding.tlMiddleName.error = null
+            }
+        })
+        binding.edtLastName.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) {
+                binding.tlLastName.error = null
+            }
+        })
+
+        val genderAdapter = ArrayAdapter(
+            activity as BajajFdMainActivity,
+            R.layout.spinner_dropdown,
+            resources.getStringArray(
+                R.array.gender
+            )
+        )
+        binding.spGender.setAdapter(genderAdapter)
+        binding.spGender.setOnItemClickListener { parent, view, position, id ->
+            binding.tlGender.error = null
+        }
+
+        binding.edtEmail.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) {
+                binding.tlEmail.error = null
+            }
+        })
+        binding.edtOccupation.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) {
+                binding.tlOccupation.error = null
+            }
+        })
+        binding.edtQualification.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) {
+                binding.tlQualification.error = null
+            }
+        })
+
+        val maritalAdapter = ArrayAdapter(
+            activity as BajajFdMainActivity,
+            R.layout.spinner_dropdown,
+            resources.getStringArray(
+                R.array.maritalStatus
+            )
+        )
+        binding.spMarital.setAdapter(maritalAdapter)
+        binding.spMarital.setOnItemClickListener { parent, view, position, id ->
+            binding.tlMarital.error = null
+        }
+
+        val relationShipAdapter = ArrayAdapter(
+            activity as BajajFdMainActivity,
+            R.layout.spinner_dropdown,
+            resources.getStringArray(
+                R.array.maritalStatus
+            )
+        )
+        binding.spRelation.setAdapter(relationShipAdapter)
+        binding.spRelation.setOnItemClickListener { parent, view, position, id ->
+            binding.tlRelation.error = null
+        }
+
+        binding.edtRelationName.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) {
+                binding.tlRelationName.error = null
+            }
+        })
+        binding.edtAddressLine1.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) {
+                binding.tlAddressLine1.error = null
+            }
+        })
+        binding.edtAddressLine2.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) {
+                binding.tlAddressLine2.error = null
+            }
+        })
+        binding.edtState.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) {
+                binding.tlState.error = null
+            }
+        })
+        binding.edtCity.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) {
+                binding.tlCity.error = null
+            }
+        })
+        binding.edtPinCode.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) {
+                binding.tlPinCode.error = null
+            }
+        })
+
+        // Nominee Details
+        binding.spNomineeTitle.setAdapter(titleAdapter)
+        binding.spNomineeTitle.setOnItemClickListener { parent, view, position, id ->
+            binding.tlNomineeTitle.error = null
+        }
+
+        binding.edtNomineeFirstName.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) {
+                binding.tlNomineeFirstName.error = null
+            }
+        })
+        binding.edtNomineeMiddleName.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) {
+                binding.tlNomineeMiddleName.error = null
+            }
+        })
+        binding.edtNomineeLastName.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) {
+                binding.tlNomineeLastName.error = null
+            }
+        })
+
+        binding.edtNomineeDOB.setOnClickListener{
+
+        }
+
+        binding.spNomineeRelation.setAdapter(relationShipAdapter)
+        binding.spNomineeRelation.setOnItemClickListener { parent, view, position, id ->
+            binding.tlNomineeRelation.error = null
+        }
+
+        binding.cbNomineeSameAddress.setOnCheckedChangeListener { compoundButton, b ->
+
+        }
+
+        // Guardian Details
+        binding.edtGuardianName.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) {
+                binding.tlGuardianName.error = null
+            }
+        })
+        binding.edtGuardianAge.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) {
+                binding.tlGuardianAge.error = null
+            }
+        })
+
+        binding.spGuardianRelation.setAdapter(relationShipAdapter)
+        binding.spGuardianRelation.setOnItemClickListener { parent, view, position, id ->
+            binding.tlGuardianRelation.error = null
+        }
+
+        binding.edtGuardianAddress.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) {
+                binding.tlGuardianAddress.error = null
+            }
+        })
+        binding.edtGuardianPinCode.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) {
+                binding.edtGuardianPinCode.error = null
+            }
+        })
+
+        // Bank Details
+        binding.edtIFSC.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) {
+                binding.tlIFSC.error = null
+            }
+        })
+        binding.edtAccountNumber.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) {
+                binding.tlAccountNumber.error = null
+            }
+        })
+        binding.edtBankName.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) {
+                binding.tlBankName.error = null
+            }
+        })
+        binding.edtbankBranch.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) {
+                binding.tlBankBranchName.error = null
+            }
+        })
 
 
         binding.tvPersonalDetails.setOnClickListener {
@@ -68,70 +452,74 @@ class StepTwoBajajFDFragment : Fragment() {
         binding.tvBankDetails.setOnClickListener {
 
         }
-      // if ( validation())
+        // if ( validation())
         return root
     }
 
     private fun validation(): Boolean {
-        if (binding.edtMobileNumber.text.toString().isEmpty()){
-            return false
-        }else if (binding.edtMobileNumber.text?.length != 10){
-            return false
-        }else if (binding.edtMobileNumber.text?.length == 10 && isIndianMobileNo(binding.edtMobileNumber.text.toString())){
-            return false
-        } else if (binding.edtDOB.text.toString().isEmpty()){
-            return false
-        }else if (binding.edtPANNumber.text.toString().isEmpty()){
-            return false
-        }else if (isValidPan(binding.edtPANNumber.text.toString())){
-            return false
-        }else if (binding.spTitle.text.isEmpty()){
-            return false
-        }else if (binding.edtFirstName.text.toString().isEmpty()){
-            return false
-        }else if (isValidName(binding.edtFirstName.text.toString())){
-            return false
-        }else if (binding.edtMiddleName.text.toString().isEmpty()){
-            return false
-        }else if (isValidName(binding.edtMiddleName.text.toString())){
-            return false
-        }else if (binding.edtLastName.text.toString().isEmpty()){
-            return false
-        }else if (isValidName(binding.edtLastName.text.toString())){
-            return false
-        }else if (binding.spGender.text.toString().isEmpty()){
-            return false
-        }else if (binding.edtEmail.text.toString().isEmpty()){
-            return false
-        }else if (isValidEmail(binding.edtEmail.text.toString())){
-            return false
-        }else if (binding.edtOccupation.text.toString().isEmpty()){
-            return false
-        }else if (binding.edtQualification.text.toString().isEmpty()){
-            return false
-        }else if (binding.spMarital.text.toString().isEmpty()){
-            return false
-        }else if (binding.spRelation.text.toString().isEmpty()){
-            return false
-        }else if (binding.edtRelationName.text.toString().isEmpty()){
-            return false
-        }else if (binding.edtAddressLine1.text.toString().isEmpty()){
-            return false
-        }else if (binding.edtAddressLine2.text.toString().isEmpty()){
-            return false
-        }else if (binding.edtState.text.toString().isEmpty()){
-            return false
-        }else if (binding.edtCity.text.toString().isEmpty()){
-            return false
-        }else if (binding.edtPinCode.text.toString().isEmpty()){
-            return false
-        }else if (binding.edtIFSC.text.toString().isEmpty()){
-            return false
-        }else if (binding.edtAccountNumber.text.toString().isEmpty()){
-            return false
-        }else if (binding.edtBankName.text.toString().isEmpty()){
-            return false
-        }else return !binding.edtbankBranch.text.toString().isEmpty()
+        if (binding.edtMobileNumber.text.toString().isEmpty()) { // EditText
+            return commonErrorMethod(binding.edtMobileNumber, binding.tlMobileNumber, "")
+        } else if (binding.edtMobileNumber.text?.length != 10) { // EditText
+            return commonErrorMethod(binding.edtMobileNumber, binding.tlMobileNumber, "")
+        } else if (binding.edtMobileNumber.text?.length == 10 && !isIndianMobileNo(binding.edtMobileNumber.text.toString())) { // EditText
+            return commonErrorMethod(binding.edtMobileNumber, binding.tlMobileNumber, "")
+        } else if (binding.edtDOB.text.toString().isEmpty()) { // EditText
+            return commonErrorMethod(binding.edtDOB, binding.tlDOB, "")
+        } else if (binding.edtPANNumber.text.toString().isEmpty()) { // EditText
+            return commonErrorMethod(binding.edtPANNumber, binding.tlPanNumber, "")
+        } else if (isValidPan(binding.edtPANNumber.text.toString())) { // EditText
+            return commonErrorMethod(binding.edtPANNumber, binding.tlPanNumber, "")
+        } else if (binding.spTitle.text.isEmpty()) { // Spinner
+            return commonSpinnerErrorMethod(binding.spTitle, binding.tlTitle, "")
+        } else if (binding.edtFirstName.text.toString().isEmpty()) { // EditText
+            return commonErrorMethod(binding.edtFirstName, binding.tlFirstName, "")
+        } else if (isValidName(binding.edtFirstName.text.toString())) { // EditText
+            return commonErrorMethod(binding.edtFirstName, binding.tlFirstName, "")
+        } else if (binding.edtMiddleName.text.toString().isEmpty()) { // EditText
+            return commonErrorMethod(binding.edtMiddleName, binding.tlMiddleName, "")
+        } else if (isValidName(binding.edtMiddleName.text.toString())) { // EditText
+            return commonErrorMethod(binding.edtMiddleName, binding.tlMiddleName, "")
+        } else if (binding.edtLastName.text.toString().isEmpty()) { // EditText
+            return commonErrorMethod(binding.edtLastName, binding.tlLastName, "")
+        } else if (isValidName(binding.edtLastName.text.toString())) { // EditText
+            return commonErrorMethod(binding.edtLastName, binding.tlLastName, "")
+        } else if (binding.spGender.text.toString().isEmpty()) { // Spinner
+            return commonSpinnerErrorMethod(binding.spGender, binding.tlGender, "")
+        } else if (binding.edtEmail.text.toString().isEmpty()) { // EditText
+            return commonErrorMethod(binding.edtEmail, binding.tlEmail, "")
+        } else if (isValidEmail(binding.edtEmail.text.toString())) { // EditText
+            return commonErrorMethod(binding.edtEmail, binding.tlEmail, "")
+        } else if (binding.edtOccupation.text.toString().isEmpty()) { // EditText
+            return commonErrorMethod(binding.edtOccupation, binding.tlOccupation, "")
+        } else if (binding.edtQualification.text.toString().isEmpty()) { // EditText
+            return commonErrorMethod(binding.edtQualification, binding.tlQualification, "")
+        } else if (binding.spMarital.text.toString().isEmpty()) {  // Spinner
+            return commonSpinnerErrorMethod(binding.spMarital, binding.tlMarital, "")
+        } else if (binding.spRelation.text.toString().isEmpty()) { // Spinner
+            return commonSpinnerErrorMethod(binding.spRelation, binding.tlRelation, "")
+        } else if (binding.edtRelationName.text.toString().isEmpty()) {  // EditText
+            return commonErrorMethod(binding.edtRelationName, binding.tlRelationName, "")
+        } else if (binding.edtAddressLine1.text.toString().isEmpty()) {  // EditText
+            return commonErrorMethod(binding.edtAddressLine1, binding.tlAddressLine1, "")
+        } else if (binding.edtAddressLine2.text.toString().isEmpty()) {  // EditText
+            return commonErrorMethod(binding.edtAddressLine2, binding.tlAddressLine2, "")
+        } else if (binding.edtState.text.toString().isEmpty()) {   // EditText
+            return commonErrorMethod(binding.edtState, binding.tlState, "")
+        } else if (binding.edtCity.text.toString().isEmpty()) { // EditText
+            return commonErrorMethod(binding.edtCity, binding.tlCity, "")
+        } else if (binding.edtPinCode.text.toString().isEmpty()) { // EditText
+            return commonErrorMethod(binding.edtPinCode, binding.tlPinCode, "")
+        } else if (binding.edtIFSC.text.toString().isEmpty()) { // EditText
+            return commonErrorMethod(binding.edtIFSC, binding.tlIFSC, "")
+        } else if (binding.edtAccountNumber.text.toString().isEmpty()) { // EditText
+            return commonErrorMethod(binding.edtAccountNumber, binding.tlAccountNumber, "")
+        } else if (binding.edtBankName.text.toString().isEmpty()) { // EditText
+            return commonErrorMethod(binding.edtBankName, binding.tlBankName, "")
+        } else if (binding.edtbankBranch.text.toString().isEmpty()) { // EditText
+            return commonErrorMethod(binding.edtbankBranch, binding.tlBankBranchName, "")
+        } else {
+            return true
+        }
 
     }
 

app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt

@@ -8,6 +8,9 @@ import android.net.NetworkCapabilities
 import android.os.Build
 import android.provider.ContactsContract
 import android.util.Patterns
+import com.google.android.material.textfield.MaterialAutoCompleteTextView
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textfield.TextInputLayout
 import com.nivesh.production.bajajfd.BajajApplication
 import java.util.regex.Matcher
 import java.util.regex.Pattern
@@ -103,5 +106,25 @@ class Common {
             builder.show()
         }
 
+         fun commonErrorMethod(
+            inputText: TextInputEditText,
+            inputError: TextInputLayout,
+            strMessage: String
+        ): Boolean {
+            inputText.requestFocus()
+            inputError.error = strMessage
+            return false
+        }
+
+         fun commonSpinnerErrorMethod(
+            inputText: MaterialAutoCompleteTextView,
+            inputError: TextInputLayout,
+            strMessage: String
+        ): Boolean {
+            inputText.requestFocus()
+            inputError.error = strMessage
+            return false
+        }
+
     }
 }

app/src/main/res/layout/fragment_bajajfd_step_two.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/constraintLayout"
@@ -18,10 +17,11 @@
         android:background="@color/Nivesh_color_AppBg"
         android:fillViewport="true"
         android:visibility="visible"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/btnNext"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/btnNext">
+        app:layout_constraintTop_toTopOf="parent">
+
         <com.google.android.material.card.MaterialCardView
             style="@style/CustomCardViewStyle"
             android:layout_width="match_parent"
@@ -45,14 +45,14 @@
                         android:id="@+id/logo"
                         android:layout_width="@dimen/margin_150"
                         android:layout_height="@dimen/margin_18"
+                        android:contentDescription="@string/content_description"
                         android:src="@drawable/bajaj_logo"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintHorizontal_bias="0.0"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintVertical_bias="0.02"
-                        android:contentDescription="@string/content_description"/>
+                        app:layout_constraintVertical_bias="0.02" />
 
                     <TextView
                         android:id="@+id/tvFDRating"
@@ -82,20 +82,20 @@
                     style="@style/semiBoldStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/margin_18"
-                    android:paddingEnd="@dimen/margin_10"
+                    android:layout_gravity="center"
                     android:background="@color/grey_bg"
+                    android:paddingStart="@dimen/margin_18"
+                    android:paddingEnd="@dimen/margin_15"
                     android:text="Personal Details"
                     android:textColor="@color/black"
-                    app:layout_constraintTop_toBottomOf="@+id/tvFdRating"
                     app:drawableEndCompat="@drawable/svg_down_arrow" />
 
                 <LinearLayout
                     android:id="@+id/llPersonalDetail"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:padding="@dimen/margin_10"
-                    android:orientation="vertical">
+                    android:orientation="vertical"
+                    android:padding="@dimen/margin_10">
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/tlMobileNumber"
@@ -110,8 +110,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="phone"
-                            android:textSize="@dimen/text_size_14"
-                            android:maxEms="10" />
+                            android:maxEms="10"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -128,8 +128,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:drawableEnd="@drawable/svg_cal"
-                            android:textSize="@dimen/text_size_14"
-                            android:inputType="date" />
+                            android:inputType="date"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -143,10 +143,10 @@
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtPANNumber"
-                            android:textSize="@dimen/text_size_14"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:maxEms="10" />
+                            android:maxEms="10"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -186,8 +186,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="text"
-                            android:textSize="@dimen/text_size_14"
-                            android:maxEms="40" />
+                            android:maxEms="40"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -205,8 +205,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="text"
-                            android:textSize="@dimen/text_size_14"
-                            android:maxEms="40" />
+                            android:maxEms="40"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -225,22 +225,22 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="text"
-                            android:textSize="@dimen/text_size_14"
-                            android:maxEms="40" />
+                            android:maxEms="40"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
-<!--                    <Spinner-->
-<!--                        android:id="@+id/spGender"-->
-<!--                        android:layout_width="match_parent"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:layout_margin="@dimen/margin_5"-->
-<!--                        android:background="@drawable/rounded_corner_with_line"-->
-<!--                        android:minHeight="@dimen/margin_48"-->
-<!--                        android:paddingStart="@dimen/margin_10"-->
-<!--                        android:textSize="@dimen/text_size_14"-->
-<!--                        android:paddingEnd="0dp"-->
-<!--                        android:entries="@array/gender" />-->
+                    <!--                    <Spinner-->
+                    <!--                        android:id="@+id/spGender"-->
+                    <!--                        android:layout_width="match_parent"-->
+                    <!--                        android:layout_height="wrap_content"-->
+                    <!--                        android:layout_margin="@dimen/margin_5"-->
+                    <!--                        android:background="@drawable/rounded_corner_with_line"-->
+                    <!--                        android:minHeight="@dimen/margin_48"-->
+                    <!--                        android:paddingStart="@dimen/margin_10"-->
+                    <!--                        android:textSize="@dimen/text_size_14"-->
+                    <!--                        android:paddingEnd="0dp"-->
+                    <!--                        android:entries="@array/gender" />-->
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/tlGender"
@@ -278,8 +278,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="textEmailAddress"
-                            android:textSize="@dimen/text_size_14"
-                            android:maxEms="50" />
+                            android:maxEms="50"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -296,8 +296,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="text"
-                            android:textSize="@dimen/text_size_14"
-                            android:maxEms="60" />
+                            android:maxEms="60"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -314,22 +314,22 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="text"
-                            android:textSize="@dimen/text_size_14"
-                            android:maxEms="60" />
+                            android:maxEms="60"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
-<!--                    <Spinner-->
-<!--                        android:id="@+id/spMarital"-->
-<!--                        android:layout_width="match_parent"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:layout_margin="@dimen/margin_5"-->
-<!--                        android:background="@drawable/rounded_corner_with_line"-->
-<!--                        android:minHeight="@dimen/margin_48"-->
-<!--                        android:paddingStart="@dimen/margin_10"-->
-<!--                        android:textSize="@dimen/text_size_14"-->
-<!--                        android:paddingEnd="0dp"-->
-<!--                        android:entries="@array/maritalStatus"/>-->
+                    <!--                    <Spinner-->
+                    <!--                        android:id="@+id/spMarital"-->
+                    <!--                        android:layout_width="match_parent"-->
+                    <!--                        android:layout_height="wrap_content"-->
+                    <!--                        android:layout_margin="@dimen/margin_5"-->
+                    <!--                        android:background="@drawable/rounded_corner_with_line"-->
+                    <!--                        android:minHeight="@dimen/margin_48"-->
+                    <!--                        android:paddingStart="@dimen/margin_10"-->
+                    <!--                        android:textSize="@dimen/text_size_14"-->
+                    <!--                        android:paddingEnd="0dp"-->
+                    <!--                        android:entries="@array/maritalStatus"/>-->
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/tlMarital"
@@ -355,14 +355,14 @@
                     </com.google.android.material.textfield.TextInputLayout>
 
 
-<!--                    <Spinner-->
-<!--                        android:id="@+id/spRelation"-->
-<!--                        android:layout_width="match_parent"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:layout_margin="@dimen/margin_5"-->
-<!--                        android:background="@drawable/rounded_corner_with_line"-->
-<!--                        android:minHeight="@dimen/margin_48"-->
-<!--                        android:entries="@array/interestPayoutList" />-->
+                    <!--                    <Spinner-->
+                    <!--                        android:id="@+id/spRelation"-->
+                    <!--                        android:layout_width="match_parent"-->
+                    <!--                        android:layout_height="wrap_content"-->
+                    <!--                        android:layout_margin="@dimen/margin_5"-->
+                    <!--                        android:background="@drawable/rounded_corner_with_line"-->
+                    <!--                        android:minHeight="@dimen/margin_48"-->
+                    <!--                        android:entries="@array/interestPayoutList" />-->
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/tlRelation"
@@ -401,8 +401,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="text"
-                            android:textSize="@dimen/text_size_14"
-                            android:maxEms="100" />
+                            android:maxEms="100"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -419,8 +419,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="text"
-                            android:textSize="@dimen/text_size_14"
-                            android:maxEms="100" />
+                            android:maxEms="100"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -437,44 +437,44 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="text"
-                            android:textSize="@dimen/text_size_14"
-                            android:maxEms="100" />
+                            android:maxEms="100"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
-<!--                    <com.google.android.material.textfield.TextInputLayout-->
-<!--                        android:id="@+id/tlArea"-->
-<!--                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"-->
-<!--                        android:layout_width="match_parent"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:layout_margin="@dimen/margin_5"-->
-<!--                        android:hint="Area">-->
-
-<!--                        <com.google.android.material.textfield.TextInputEditText-->
-<!--                            android:layout_width="match_parent"-->
-<!--                            android:layout_height="wrap_content"-->
-<!--                            android:inputType="text"-->
-<!--                            android:textSize="@dimen/text_size_14"-->
-<!--                            android:maxEms="200" />-->
-
-<!--                    </com.google.android.material.textfield.TextInputLayout>-->
-
-<!--                    <com.google.android.material.textfield.TextInputLayout-->
-<!--                        android:id="@+id/tlCountry"-->
-<!--                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"-->
-<!--                        android:layout_width="match_parent"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:layout_margin="@dimen/margin_5"-->
-<!--                        android:hint="Country">-->
-
-<!--                        <com.google.android.material.textfield.TextInputEditText-->
-<!--                            android:layout_width="match_parent"-->
-<!--                            android:layout_height="wrap_content"-->
-<!--                            android:inputType="text"-->
-<!--                            android:textSize="@dimen/text_size_14"-->
-<!--                            android:maxEms="200" />-->
-
-<!--                    </com.google.android.material.textfield.TextInputLayout>-->
+                    <!--                    <com.google.android.material.textfield.TextInputLayout-->
+                    <!--                        android:id="@+id/tlArea"-->
+                    <!--                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"-->
+                    <!--                        android:layout_width="match_parent"-->
+                    <!--                        android:layout_height="wrap_content"-->
+                    <!--                        android:layout_margin="@dimen/margin_5"-->
+                    <!--                        android:hint="Area">-->
+
+                    <!--                        <com.google.android.material.textfield.TextInputEditText-->
+                    <!--                            android:layout_width="match_parent"-->
+                    <!--                            android:layout_height="wrap_content"-->
+                    <!--                            android:inputType="text"-->
+                    <!--                            android:textSize="@dimen/text_size_14"-->
+                    <!--                            android:maxEms="200" />-->
+
+                    <!--                    </com.google.android.material.textfield.TextInputLayout>-->
+
+                    <!--                    <com.google.android.material.textfield.TextInputLayout-->
+                    <!--                        android:id="@+id/tlCountry"-->
+                    <!--                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"-->
+                    <!--                        android:layout_width="match_parent"-->
+                    <!--                        android:layout_height="wrap_content"-->
+                    <!--                        android:layout_margin="@dimen/margin_5"-->
+                    <!--                        android:hint="Country">-->
+
+                    <!--                        <com.google.android.material.textfield.TextInputEditText-->
+                    <!--                            android:layout_width="match_parent"-->
+                    <!--                            android:layout_height="wrap_content"-->
+                    <!--                            android:inputType="text"-->
+                    <!--                            android:textSize="@dimen/text_size_14"-->
+                    <!--                            android:maxEms="200" />-->
+
+                    <!--                    </com.google.android.material.textfield.TextInputLayout>-->
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/tlState"
@@ -489,8 +489,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="text"
-                            android:textSize="@dimen/text_size_14"
-                            android:maxEms="100" />
+                            android:maxEms="100"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -507,8 +507,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="text"
-                            android:textSize="@dimen/text_size_14"
-                            android:maxEms="100" />
+                            android:maxEms="100"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -518,8 +518,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:textSize="@dimen/text_size_14"
-                        android:hint="PinCode">
+                        android:hint="PinCode"
+                        android:textSize="@dimen/text_size_14">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtPinCode"
@@ -537,59 +537,59 @@
                     style="@style/semiBoldStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:background="@color/grey_bg"
                     android:paddingStart="@dimen/margin_18"
                     android:paddingEnd="@dimen/margin_10"
-                    android:textSize="@dimen/text_size_14"
-                    android:background="@color/grey_bg"
                     android:text="Nominee Details (Optional)"
-                    app:drawableEndCompat="@drawable/svg_down_arrow"
-                    android:textColor="@color/black" />
-
-<!--                <RelativeLayout-->
-<!--                    android:layout_width="match_parent"-->
-<!--                    android:layout_height="wrap_content"-->
-<!--                    android:paddingTop="@dimen/margin_5"-->
-<!--                    android:paddingBottom="@dimen/margin_5"-->
-<!--                    android:paddingStart="@dimen/margin_15"-->
-<!--                    android:paddingEnd="@dimen/margin_15"-->
-<!--                    android:background="@color/grey_bg">-->
-
-<!--                    <TextView-->
-<!--                        android:id="@+id/tvNomineeDetails"-->
-<!--                        style="@style/semiBoldStyle"-->
-<!--                        android:layout_width="match_parent"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:padding="@dimen/margin_3"-->
-<!--                        android:layout_centerVertical="true"-->
-<!--                        android:textSize="@dimen/text_size_14"-->
-<!--                        android:text="Nominee Details (Optional)"-->
-<!--                        android:textColor="@color/black" />-->
-
-<!--                    <androidx.appcompat.widget.SwitchCompat-->
-<!--                        android:theme="@style/SCBSwitch"-->
-<!--                        android:layout_width="wrap_content"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:layout_alignParentEnd="true"-->
-<!--                        android:textSize="@dimen/text_size_14"-->
-<!--                        android:layout_marginEnd="@dimen/margin_5"/>-->
-
-<!--                </RelativeLayout>-->
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/text_size_14"
+                    app:drawableEndCompat="@drawable/svg_down_arrow" />
+
+                <!--                <RelativeLayout-->
+                <!--                    android:layout_width="match_parent"-->
+                <!--                    android:layout_height="wrap_content"-->
+                <!--                    android:paddingTop="@dimen/margin_5"-->
+                <!--                    android:paddingBottom="@dimen/margin_5"-->
+                <!--                    android:paddingStart="@dimen/margin_15"-->
+                <!--                    android:paddingEnd="@dimen/margin_15"-->
+                <!--                    android:background="@color/grey_bg">-->
+
+                <!--                    <TextView-->
+                <!--                        android:id="@+id/tvNomineeDetails"-->
+                <!--                        style="@style/semiBoldStyle"-->
+                <!--                        android:layout_width="match_parent"-->
+                <!--                        android:layout_height="wrap_content"-->
+                <!--                        android:padding="@dimen/margin_3"-->
+                <!--                        android:layout_centerVertical="true"-->
+                <!--                        android:textSize="@dimen/text_size_14"-->
+                <!--                        android:text="Nominee Details (Optional)"-->
+                <!--                        android:textColor="@color/black" />-->
+
+                <!--                    <androidx.appcompat.widget.SwitchCompat-->
+                <!--                        android:theme="@style/SCBSwitch"-->
+                <!--                        android:layout_width="wrap_content"-->
+                <!--                        android:layout_height="wrap_content"-->
+                <!--                        android:layout_alignParentEnd="true"-->
+                <!--                        android:textSize="@dimen/text_size_14"-->
+                <!--                        android:layout_marginEnd="@dimen/margin_5"/>-->
+
+                <!--                </RelativeLayout>-->
 
                 <LinearLayout
                     android:id="@+id/llNomineeDetail"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:padding="@dimen/margin_10"
-                    android:orientation="vertical">
-
-<!--                    <Spinner-->
-<!--                        android:id="@+id/spTitle"-->
-<!--                        android:layout_width="match_parent"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:background="@drawable/rounded_corner_with_line"-->
-<!--                        android:minHeight="@dimen/margin_48"-->
-<!--                        android:textSize="@dimen/text_size_14"-->
-<!--                        android:entries="@array/interestPayoutList" />-->
+                    android:orientation="vertical"
+                    android:padding="@dimen/margin_10">
+
+                    <!--                    <Spinner-->
+                    <!--                        android:id="@+id/spTitle"-->
+                    <!--                        android:layout_width="match_parent"-->
+                    <!--                        android:layout_height="wrap_content"-->
+                    <!--                        android:background="@drawable/rounded_corner_with_line"-->
+                    <!--                        android:minHeight="@dimen/margin_48"-->
+                    <!--                        android:textSize="@dimen/text_size_14"-->
+                    <!--                        android:entries="@array/interestPayoutList" />-->
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/tlNomineeTitle"
@@ -628,8 +628,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="text"
-                            android:textSize="@dimen/text_size_14"
-                            android:maxEms="100" />
+                            android:maxEms="100"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -646,8 +646,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="text"
-                            android:textSize="@dimen/text_size_14"
-                            android:maxEms="100" />
+                            android:maxEms="100"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -664,8 +664,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="text"
-                            android:textSize="@dimen/text_size_14"
-                            android:maxEms="100" />
+                            android:maxEms="100"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -682,8 +682,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:drawableEnd="@drawable/svg_cal"
-                            android:textSize="@dimen/text_size_14"
-                            android:inputType="date" />
+                            android:inputType="date"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -703,7 +703,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:background="@drawable/rounded_corner_with_line"
-                            android:hint="@string/selectTitle"
+                            android:hint="@string/selectRelation"
                             android:inputType="none"
                             android:labelFor="@+id/spInterestPayout"
                             android:textColorHint="#757575"
@@ -720,7 +720,7 @@
                         android:textSize="@dimen/text_size_10" />
 
                     <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/TLGuardianName"
+                        android:id="@+id/tlGuardianName"
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -732,8 +732,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="text"
-                            android:textSize="@dimen/text_size_14"
-                            android:maxEms="60" />
+                            android:maxEms="60"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -750,8 +750,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="text"
-                            android:textSize="@dimen/text_size_14"
-                            android:maxEms="60" />
+                            android:maxEms="60"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -771,7 +771,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:background="@drawable/rounded_corner_with_line"
-                            android:hint="@string/selectTitle"
+                            android:hint="@string/selectRelation"
                             android:inputType="none"
                             android:labelFor="@+id/spInterestPayout"
                             android:textColorHint="#757575"
@@ -792,8 +792,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="text"
-                            android:textSize="@dimen/text_size_14"
-                            android:maxEms="60" />
+                            android:maxEms="60"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -810,8 +810,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="text"
-                            android:textSize="@dimen/text_size_14"
-                            android:maxEms="60" />
+                            android:maxEms="60"
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -825,8 +825,8 @@
                     android:background="@color/grey_bg"
                     android:padding="@dimen/margin_3"
                     android:text="Bank Details"
-                    android:textSize="@dimen/text_size_14"
                     android:textColor="@color/black"
+                    android:textSize="@dimen/text_size_14"
                     app:drawableRightCompat="@drawable/svg_down_arrow" />
 
                 <LinearLayout
@@ -834,8 +834,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_margin="@dimen/margin_5"
-                    android:padding="@dimen/margin_10"
-                    android:orientation="vertical">
+                    android:orientation="vertical"
+                    android:padding="@dimen/margin_10">
 
                     <TextView
                         android:id="@+id/tvAccountType"
@@ -844,8 +844,8 @@
                         android:layout_height="wrap_content"
                         android:padding="@dimen/margin_3"
                         android:text="Account type *"
-                        android:textSize="@dimen/text_size_14"
                         android:textColor="@color/black"
+                        android:textSize="@dimen/text_size_14"
                         app:layout_constraintTop_toBottomOf="@+id/tvFdRating"
                         tools:layout_editor_absoluteX="5dp" />
 
@@ -857,8 +857,8 @@
                         <RadioButton
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:checked="true"
                             android:buttonTint="@color/black"
+                            android:checked="true"
                             android:text="Savings account" />
 
                         <RadioButton
@@ -881,7 +881,7 @@
                             android:id="@+id/edtIFSC"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:textSize="@dimen/text_size_14"/>
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -914,7 +914,7 @@
                             android:id="@+id/edtBankName"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:textSize="@dimen/text_size_14"/>
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -931,7 +931,7 @@
                             android:id="@+id/edtbankBranch"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:textSize="@dimen/text_size_14"/>
+                            android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -952,8 +952,8 @@
                         android:layout_marginTop="12dp"
                         android:padding="@dimen/margin_3"
                         android:text="Payment mode"
-                        android:textSize="@dimen/text_size_14"
                         android:textColor="@color/black"
+                        android:textSize="@dimen/text_size_14"
                         tools:layout_editor_absoluteX="5dp" />
 
                     <TextView
@@ -965,8 +965,8 @@
                         android:layout_marginTop="12dp"
                         android:padding="@dimen/margin_3"
                         android:text="Eligible bank option"
-                        android:textSize="@dimen/text_size_14"
                         android:textColor="@color/blue_text_color"
+                        android:textSize="@dimen/text_size_14"
                         tools:layout_editor_absoluteX="5dp" />
 
                 </RelativeLayout>
@@ -978,10 +978,10 @@
                     android:orientation="horizontal">
 
                     <RadioButton
-                        android:checked="true"
-                        android:buttonTint="@color/black"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:buttonTint="@color/black"
+                        android:checked="true"
                         android:text="UPI" />
 
                     <RadioButton
@@ -997,13 +997,13 @@
                     style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/margin_15"
                     android:layout_marginTop="12dp"
+                    android:layout_marginBottom="@dimen/margin_20"
                     android:padding="@dimen/margin_3"
-                    android:textSize="@dimen/text_size_14"
                     android:text="Upto Rs. 1 lakh only"
-                    android:layout_marginStart="@dimen/margin_15"
-                    android:layout_marginBottom="@dimen/margin_20"
                     android:textColor="@color/gray_text_color"
+                    android:textSize="@dimen/text_size_14"
                     tools:layout_editor_absoluteX="5dp" />
 
             </LinearLayout>

app/src/main/res/values/strings.xml

@@ -93,13 +93,11 @@
     </array>
 
     <array name="title">
-        <item>Select Title</item>
         <item>Mr</item>
         <item>Mrs</item>
     </array>
 
     <array name="gender">
-        <item>Select Gender</item>
         <item>Male</item>
         <item>Female</item>
     </array>