completed first step

app/src/main/AndroidManifest.xml

@@ -9,7 +9,7 @@
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+        android:label="@string/appName"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.BajajFdLib"

app/src/main/java/com/nivesh/production/bajajfd/adapter/SpinnerAdapter.kt

@@ -1,35 +0,0 @@
-package com.nivesh.production.bajajfd.adapter
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ArrayAdapter
-import android.widget.TextView
-import com.nivesh.production.bajajfd.R
-import com.nivesh.production.bajajfd.model.GetCodes
-
-
-internal class SpinnerAdapter(
-    context: Context,
-    private var listItems: List<GetCodes>
-) :
-    ArrayAdapter<GetCodes>(context, R.layout.spinner_dropdown, listItems) {
-
-    override fun getItemId(position: Int): Long {
-        return position.toLong()
-    }
-
-    override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup): View {
-        var v = convertView
-        if (v == null) {
-            val inflater = LayoutInflater.from(context)
-            v = inflater.inflate(R.layout.spinner_dropdown, parent, false)
-        }
-        val lbl = v!!.findViewById<View>(R.id.tvText) as TextView
-        val getCode : GetCodes = listItems[position]
-        lbl.text = getCode.Value
-        return v
-    }
-
-}

app/src/main/java/com/nivesh/production/bajajfd/interfaces/BajajFDInterface.kt

@@ -1,5 +1,7 @@
 package com.nivesh.production.bajajfd.interfaces
 
+import com.nivesh.production.bajajfd.model.CreateFDRequest
+
 interface BajajFDInterface {
     fun stepOneApi(data: String?)
     fun stepTwoApi(data: String?)

app/src/main/java/com/nivesh/production/bajajfd/model/ApplicantDetails.kt

@@ -0,0 +1,24 @@
+package com.nivesh.production.bajajfd.model
+
+data class ApplicantDetails(
+    var AnnualIncome: String?= null,
+    var ApplicantAddress1: String?= null,
+    var ApplicantAddress2: String?= null,
+    var ApplicantAddress3: String?= null,
+    var ApplicantCity: String?= null,
+    var ApplicantCountry: String?= null,
+    var ApplicantDOB: String?= null,
+    var ApplicantEmail: String?= null,
+    var ApplicantFirstName: String?= null,
+    var ApplicantGender: String?= null,
+    var ApplicantLastName: String?= null,
+    var ApplicantMaritalStatus: String?= null,
+    var ApplicantMiddleName: String?= null,
+    var ApplicantMobile: String?= null,
+    var ApplicantOccupation: String?= null,
+    var ApplicantPAN: String?= null,
+    var ApplicantPincode: Int?= 0,
+    var ApplicantQualification: String?= null,
+    var ApplicantSalutation: String?= null,
+    var ApplicantState: String?= null
+)

app/src/main/java/com/nivesh/production/bajajfd/model/ApplicantRelationDetails.kt

@@ -0,0 +1,10 @@
+package com.nivesh.production.bajajfd.model
+
+data class ApplicantRelationDetails(
+    var ApplicantMotherFirstName: String? = null,
+    var ApplicantMotherLastName: String? = null,
+    var ApplicantRelation: String? = null,
+    var ApplicantRelationFirstName: String? = null,
+    var ApplicantRelationLastName: String? = null,
+    var ApplicantRelationSalutation: String? = null
+)

app/src/main/java/com/nivesh/production/bajajfd/model/CreateFDApplicationRequest.kt

@@ -0,0 +1,10 @@
+package com.nivesh.production.bajajfd.model
+
+data class CreateFDApplicationRequest(
+    var ApplicantDetails: ApplicantDetails ? = null,
+    var ApplicantRelationDetails: ApplicantRelationDetails? = null,
+    var FDInvestmentDetails: FDInvestmentDetails? = null,
+    var FdBankDetails: FdBankDetails? = null,
+    var NomineeDetails: NomineeDetails? = null,
+    var NomineeGuardianDetails: NomineeGuardianDetails ? = null
+)

app/src/main/java/com/nivesh/production/bajajfd/model/CreateFDRequest.kt

@@ -0,0 +1,5 @@
+package com.nivesh.production.bajajfd.model
+
+data class CreateFDRequest(
+    var CreateFDApplicationRequest: CreateFDApplicationRequest? = null
+)

app/src/main/java/com/nivesh/production/bajajfd/model/FDInvestmentDetails.kt

@@ -0,0 +1,16 @@
+package com.nivesh.production.bajajfd.model
+
+data class FDInvestmentDetails(
+    var CKYCNumber: String? = null,
+    var CitizenType: String? = null,
+    var CustomerType: String? = null,
+    var Device: String? = null,
+    var FDAmount: Double? = 0.0,
+    var Frequency: String? = null,
+    var IPAddress: String? = null,
+    var Interest: Double? = 0.0,
+    var NiveshClientCode: String? = null,
+    var Provider: String? = null,
+    var Source: String? = null,
+    var Tenure: Int? = 0
+)

app/src/main/java/com/nivesh/production/bajajfd/model/FdBankDetails.kt

@@ -0,0 +1,10 @@
+package com.nivesh.production.bajajfd.model
+
+data class FdBankDetails(
+    var AccountNumber: String?= null,
+    var AccountType: String?= null,
+    var BankBranch: String?= null,
+    var BankName: String?= null,
+    var IFSCCode: String?= null,
+    var PaymentMode: String?= null
+)

app/src/main/java/com/nivesh/production/bajajfd/model/NomineeDetails.kt

@@ -0,0 +1,18 @@
+package com.nivesh.production.bajajfd.model
+
+data class NomineeDetails(
+    var NomineeAddress1: String?= null,
+    var NomineeAddress2: String?= null,
+    var NomineeAddress3: String?= null,
+    var NomineeCity: String?= null,
+    var NomineeCountry: String?= null,
+    var NomineeDOB: String?= null,
+    var NomineeFirstName: String?= null,
+    var NomineeGender: String?= null,
+    var NomineeLastName: String?= null,
+    var NomineeMiddleName: String?= null,
+    var NomineePincode: Int?= 0,
+    var NomineeRelation: String?= null,
+    var NomineeSalutation: String?= null,
+    var NomineeState: String?= null
+)

app/src/main/java/com/nivesh/production/bajajfd/model/NomineeGuardianDetails.kt

@@ -0,0 +1,14 @@
+package com.nivesh.production.bajajfd.model
+
+data class NomineeGuardianDetails(
+    var GuardianAddress1: String?= null,
+    var GuardianAddress2: String?= null,
+    var GuardianAddress3: String?= null,
+    var GuardianAge: Int?= 0,
+    var GuardianCity: String?= null,
+    var GuardianCountry: String?= null,
+    var GuardianName: String?= null,
+    var GuardianPincode: Int?= 0,
+    var GuardianSalutation: String?= null,
+    var GuardianState: String?= null
+)

app/src/main/java/com/nivesh/production/bajajfd/model/ROIDataList.kt

@@ -6,6 +6,6 @@ data class ROIDatalist(
     val Type: String
 ) {
     override fun toString(): String {
-        return Tenure.plus(" Months ").plus(" | ").plus(ROI).plus(" % ")
+        return Tenure.plus(" Months ").plus(" |  ").plus(ROI).plus("%")
     }
 }

app/src/main/java/com/nivesh/production/bajajfd/model/Response.kt

@@ -1,7 +1,7 @@
 data class Response(
     val Errors: List<Any>,
     val Message: String,
-    val ROIDatalist: List<ROIDatalist>,
+    val ROIDatalist: MutableList<ROIDatalist>,
     val Status: String,
     val StatusCode: Int
 )

app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt

@@ -11,13 +11,12 @@ import com.nivesh.production.bajajfd.adapter.SectionsPagerAdapter
 import com.nivesh.production.bajajfd.api.ApiClient
 import com.nivesh.production.bajajfd.databinding.ActivityBajajFdBinding
 import com.nivesh.production.bajajfd.interfaces.BajajFDInterface
-import com.nivesh.production.bajajfd.model.GetCodeRequest
-import com.nivesh.production.bajajfd.model.GetCodeResponse
-import com.nivesh.production.bajajfd.model.GetCodes
+import com.nivesh.production.bajajfd.model.*
 import com.nivesh.production.bajajfd.repositories.MainRepository
 import com.nivesh.production.bajajfd.ui.fragment.*
 import com.nivesh.production.bajajfd.ui.providerfactory.FDModelProviderFactory
 import com.nivesh.production.bajajfd.ui.providerfactory.GetRatesModelProviderFactory
+import com.nivesh.production.bajajfd.util.Common
 import com.nivesh.production.bajajfd.util.Common.Companion.defaultShape
 import com.nivesh.production.bajajfd.util.Common.Companion.selectedShape
 import com.nivesh.production.bajajfd.util.Resource
@@ -30,9 +29,17 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
     private lateinit var binding: ActivityBajajFdBinding
 
     lateinit var stepOneBajajFDViewModel: StepOneBajajFDViewModel
-    lateinit var viewModel: BajajFDViewModel
+    private lateinit var viewModel: BajajFDViewModel
     lateinit var listOfFrequency: List<GetCodes>
+    lateinit var createFDRequest: CreateFDRequest
+    lateinit var createFDApplicantRequest: CreateFDApplicationRequest
 
+    lateinit var applicantDetails : ApplicantDetails
+    lateinit var fdInvestmentDetails: FDInvestmentDetails
+    lateinit var applicantRelationDetails: ApplicantRelationDetails
+    lateinit var fdBankDetails: FdBankDetails
+    lateinit var nomineeDetails: NomineeDetails
+    lateinit var nomineeGuardianDetails: NomineeGuardianDetails
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -44,6 +51,16 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
         binding = ActivityBajajFdBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+        createFDRequest = CreateFDRequest()
+        createFDApplicantRequest = CreateFDApplicationRequest()
+
+        fdInvestmentDetails = FDInvestmentDetails()
+        applicantDetails = ApplicantDetails()
+        applicantRelationDetails = ApplicantRelationDetails()
+        fdBankDetails = FdBankDetails()
+        nomineeDetails = NomineeDetails()
+        nomineeGuardianDetails = NomineeGuardianDetails()
+
         //start Repository
         val viewModelProviderFactory =
             GetRatesModelProviderFactory(MainRepository(ApiClient.getApiClient))
@@ -55,7 +72,9 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
         viewModel =
             ViewModelProvider(this, fdViewModelProviderFactory)[BajajFDViewModel::class.java]
         listOfFrequency = ArrayList()
-        getCodeApi()
+        if (Common.isNetworkAvailable(this)) {
+            getCodeApi()
+        }
 
         binding.imgBack.setOnClickListener {
             finish()
@@ -68,7 +87,7 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
         getCodeRequest.Category = "InterestPayoutFreq"
         getCodeRequest.Language = "EN"
         getCodeRequest.InputValue = ""
-        val codeRequest: String = Gson().toJson(getCodeRequest);
+        val codeRequest: String = Gson().toJson(getCodeRequest)
         val requestBody = codeRequest.toRequestBody("application/json".toMediaTypeOrNull())
         viewModel.getCode(requestBody)
         viewModel.getRatesMutableData.observe(this) { response ->
@@ -76,7 +95,7 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
                 is Resource.Success -> {
                     Log.e("response", "-->$response")
                     val getCodeResponse: GetCodeResponse =
-                        Gson().fromJson(response.data.toString(), GetCodeResponse::class.java)
+                        Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java)
                     getCodeResponse.Response.StatusCode.let { code ->
                         when (code) {
                             200 -> {
@@ -194,20 +213,25 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
     // step 1 response
     override fun stepOneApi(data: String?) {
         Log.e("stepOneApi", " response ---> $data")
+        binding.viewPager.currentItem = 1
     }
 
     // step 2 response
     override fun stepTwoApi(data: String?) {
         Log.e("stepTwoApi", " response ---> $data")
+        binding.viewPager.currentItem = 2
     }
 
     // step 3 response
     override fun stepThreeApi(data: String?) {
         Log.e("stepThreeApi", " response ---> $data")
+        binding.viewPager.currentItem = 3
     }
 
     // step 4 response
     override fun stepFourApi(data: String?) {
         Log.e("stepFourApi", " response ---> $data")
+        binding.viewPager.currentItem = 4
     }
+
 }

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

@@ -12,20 +12,17 @@ import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.RadioButton
 import androidx.fragment.app.Fragment
+import com.google.android.material.textfield.TextInputLayout
 import com.google.gson.Gson
 import com.nivesh.production.bajajfd.R
 import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepOneBinding
 import com.nivesh.production.bajajfd.interfaces.BajajFDInterface
-import com.nivesh.production.bajajfd.model.GetCodeRequest
-import com.nivesh.production.bajajfd.model.GetCodeResponse
-import com.nivesh.production.bajajfd.model.GetCodes
 import com.nivesh.production.bajajfd.model.GetRatesRequest
 import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity
 import com.nivesh.production.bajajfd.util.Common
+import com.nivesh.production.bajajfd.util.Common.Companion.removeError
 import com.nivesh.production.bajajfd.util.Resource
 import com.nivesh.production.bajajfd.viewModel.StepOneBajajFDViewModel
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.RequestBody.Companion.toRequestBody
 
 class StepOneBajajFDFragment : Fragment() {
     private var _binding: FragmentBajajfdStepOneBinding? = null
@@ -34,7 +31,9 @@ class StepOneBajajFDFragment : Fragment() {
     private lateinit var bajajFDInterface: BajajFDInterface
     private lateinit var stepOneBajajFDViewModel: StepOneBajajFDViewModel
     private lateinit var rgMaturity: RadioButton
-    private lateinit var listOfTenure: List<ROIDatalist>
+    private lateinit var listOfTenure: MutableList<ROIDatalist>
+    private var tenure :Int = 0
+    private var interest : Double = 0.0
 
     companion object {
         fun getInstance(fdInterface: BajajFDInterface): StepOneBajajFDFragment {
@@ -60,33 +59,23 @@ class StepOneBajajFDFragment : Fragment() {
 
         // Amount
         binding.edtAmount.addTextChangedListener(object : TextWatcher {
-            override fun afterTextChanged(s: Editable?) {
-            }
-
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-            }
-
+            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) {
-                if (binding.tlDepositAmount.error != null) {
-                    binding.tlDepositAmount.error = null
-                }
+                removeError(binding.tlDepositAmount)
             }
         })
 
         // Frequency
         if ((activity as BajajFdMainActivity).listOfFrequency.isNotEmpty()) {
-            //   val adapter = SpinnerAdapter( activity as BajajFdMainActivity,(activity as BajajFdMainActivity).listOfFrequency)
-
-            val adapter = ArrayAdapter<GetCodes>(
+            val adapter = ArrayAdapter(
                 activity as BajajFdMainActivity,
                 R.layout.spinner_dropdown,
                 (activity as BajajFdMainActivity).listOfFrequency
             )
             binding.spInterestPayout.setAdapter(adapter)
-            binding.spInterestPayout.setOnItemClickListener { parent, view, position, id ->
-                if (binding.tlInterestPayout.error != null) {
-                    binding.tlInterestPayout.error = null
-                }
+            binding.spInterestPayout.setOnItemClickListener { _, _, position, _ ->
+                removeError(binding.tlInterestPayout)
                 binding.tvFrequency.text =
                     (activity as BajajFdMainActivity).listOfFrequency[position].Value
                 getRatesApi()
@@ -95,40 +84,60 @@ class StepOneBajajFDFragment : Fragment() {
 
         // Tenure
         if (listOfTenure.isNotEmpty()) {
-            binding.spTenure.setOnItemClickListener { parent, view, position, id ->
+            binding.spTenure.setOnItemClickListener { _, _, position, _ ->
+                removeError(binding.tlInterestTenure)
                 Log.e("Tenure", "--->".plus(listOfTenure[position].Tenure))
+                tenure = listOfTenure[position].Tenure.toInt()
+                interest = listOfTenure[position].ROI
             }
         }
-
-
-        binding.swSeniorCitizen.setOnCheckedChangeListener { compoundButton, b ->
-            binding.swSeniorCitizen.isChecked = !b
+        // Senior / Non Senior Citizen
+        binding.swSeniorCitizen.setOnCheckedChangeListener { _, _ ->
+            getRatesApi()
         }
 
         // Maturity Options
         binding.radioGroup.setOnCheckedChangeListener { group, checkedId ->
             rgMaturity = group.findViewById(checkedId)
-            Log.e("rgMaturity", "-->" + rgMaturity.text)
+            Log.e("Maturity", "-->" + rgMaturity.text)
         }
 
         // TAX Deduct
-        binding.rbDeductTax.setOnCheckedChangeListener { compoundButton, b ->
-            binding.rbDeductTax.isChecked = !b
+        binding.rbDeductTax.setOnCheckedChangeListener { _, _ ->
+            Log.e("DeductTax", "-->" + binding.rbDeductTax.isChecked)
         }
 
-
         binding.tvROI.text = ""
         binding.tvMaturityAmount.text = ""
 
         // Next Button
         binding.btnNext.setOnClickListener {
             if (validation()) {
+                (activity as BajajFdMainActivity).fdInvestmentDetails.FDAmount = binding.edtAmount.text.toString().toDouble()
+                (activity as BajajFdMainActivity).fdInvestmentDetails.Frequency = binding.spInterestPayout.text.toString()
+                (activity as BajajFdMainActivity).fdInvestmentDetails.Tenure = tenure
+                (activity as BajajFdMainActivity).fdInvestmentDetails.Interest = interest
+                (activity as BajajFdMainActivity).fdInvestmentDetails.NiveshClientCode = "8872"
+                (activity as BajajFdMainActivity).fdInvestmentDetails.Provider = "Bajaj"
+                (activity as BajajFdMainActivity).fdInvestmentDetails.IPAddress = ""
+                (activity as BajajFdMainActivity).fdInvestmentDetails.Device = "App"
+                (activity as BajajFdMainActivity).fdInvestmentDetails.Source = "nivesh"
+                if (binding.swSeniorCitizen.isChecked){
+                (activity as BajajFdMainActivity).fdInvestmentDetails.CitizenType = getString(R.string.seniorCitizen)
+                }else{
+                    (activity as BajajFdMainActivity).fdInvestmentDetails.CitizenType = getString(R.string.nonSeniorCitizen)
+                }
+                (activity as BajajFdMainActivity).fdInvestmentDetails.CustomerType = ""
+                (activity as BajajFdMainActivity).fdInvestmentDetails.CKYCNumber = ""
+
                 bajajFDInterface.stepOneApi("stepOneResponse")
             }
         }
         return root
     }
 
+
+
     private fun validation(): Boolean {
         return if (binding.edtAmount.text.toString().isEmpty()) {
             Common.commonErrorMethod(binding.edtAmount, binding.tlDepositAmount, "")
@@ -145,99 +154,56 @@ class StepOneBajajFDFragment : Fragment() {
         }
     }
 
-    private fun getCodeApi() {
-        val getCodeRequest = GetCodeRequest()
-        getCodeRequest.ProductName = "BajajFD"
-        getCodeRequest.Category = "InterestPayoutFreq"
-        getCodeRequest.Language = "EN"
-        getCodeRequest.InputValue = ""
-        val codeRequest: String = Gson().toJson(getCodeRequest)
-        val requestBody = codeRequest.toRequestBody("application/json".toMediaTypeOrNull())
-        stepOneBajajFDViewModel.getCode(requestBody)
-        stepOneBajajFDViewModel.getRatesMutableData.observe(this) { response ->
-            when (response) {
-                is Resource.Success -> {
-                    val getCodeResponse: GetCodeResponse =
-                        Gson().fromJson(response.toString(), GetCodeResponse::class.java)
-                    getCodeResponse.Response.StatusCode.let { code ->
-                        when (code) {
-                            200 -> {
-
+    private fun getRatesApi() {
+        if (Common.isNetworkAvailable(activity as BajajFdMainActivity)) {
+            val getRatesRequest = GetRatesRequest()
+            getRatesRequest.fdProvider = "Bajaj"
+            getRatesRequest.frequency = binding.spInterestPayout.text.toString()
+            if (binding.swSeniorCitizen.isChecked) {
+                getRatesRequest.type = getString(R.string.seniorCitizen)
+            } else {
+                getRatesRequest.type = getString(R.string.nonSeniorCitizen)
+            }
+            stepOneBajajFDViewModel.getRates(getRatesRequest)
+            stepOneBajajFDViewModel.getRatesMutableData.observe(viewLifecycleOwner) { response ->
+                when (response) {
+                    is Resource.Success -> {
+                        val getRatesResponse: GetRatesResponse =
+                            Gson().fromJson(response.data?.toString(), GetRatesResponse::class.java)
+                        getRatesResponse.Response.StatusCode.let { code ->
+                            when (code) {
+                                200 -> {
+                                    if (listOfTenure.isNotEmpty()) {
+                                        listOfTenure.clear()
+                                    }
+                                    listOfTenure = getRatesResponse.Response.ROIDatalist
+                                    val adapter =
+                                        ArrayAdapter(
+                                            activity as BajajFdMainActivity,
+                                            R.layout.spinner_dropdown,
+                                            listOfTenure
+                                        )
+                                    binding.spTenure.setAdapter(adapter)
+                                }
+                                //   650 -> refreshToken()
+                                else -> {}
                             }
-                            //  650 -> refreshToken()
-                            else -> {}
                         }
                     }
-                }
 
-                is Resource.Error -> {
-                    response.message?.let { message ->
-                        Log.e(" ", "An error occurred:$message")
-                    }
-                }
-                is Resource.Loading -> {
-
-                }
-            }
-        }
-    }
-
-
-    private fun getRatesApi() {
-        val getRatesRequest = GetRatesRequest()
-        getRatesRequest.fdProvider = "Bajaj"
-        getRatesRequest.frequency = binding.spInterestPayout.text.toString()
-        if (binding.swSeniorCitizen.isChecked) {
-            getRatesRequest.type = "Non Senior Citizen"
-        } else {
-            getRatesRequest.type = "Senior Citizen"
-        }
-        stepOneBajajFDViewModel.getRates(getRatesRequest)
-        stepOneBajajFDViewModel.getRatesMutableData.observe(viewLifecycleOwner) { response ->
-            when (response) {
-                is Resource.Success -> {
-                    val getRatesResponse: GetRatesResponse =
-                        Gson().fromJson(response.data.toString(), GetRatesResponse::class.java)
-                    getRatesResponse.Response.StatusCode.let { code ->
-                        when (code) {
-                            200 -> getRatesData(getRatesResponse)
-                            //   650 -> refreshToken()
-                            else -> {}
+                    is Resource.Error -> {
+                        response.message?.let { message ->
+                            Log.e(" ", "An error occurred:$message")
                         }
                     }
-                }
+                    is Resource.Loading -> {
 
-                is Resource.Error -> {
-                    response.message?.let { message ->
-                        Log.e(" ", "An error occurred:$message")
                     }
                 }
-                is Resource.Loading -> {
-
-                }
             }
         }
     }
 
-
-    private fun refreshToken() {
-
-
-    }
-
-
-    private fun getRatesData(getRatesResponse: GetRatesResponse) {
-        listOfTenure = getRatesResponse.Response.ROIDatalist
-        val adapter =
-            ArrayAdapter<ROIDatalist>(
-                activity as BajajFdMainActivity,
-                R.layout.spinner_dropdown,
-                listOfTenure
-            )
-        binding.spTenure.setAdapter(adapter)
-
-    }
-
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null

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

@@ -20,7 +20,7 @@ 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
 import com.nivesh.production.bajajfd.util.Common.Companion.isValidPan
-import com.nivesh.production.bajajfd.viewModel.StepTwoBajajFDViewModel
+import com.nivesh.production.bajajfd.util.Common.Companion.removeError
 
 
 class StepTwoBajajFDFragment : Fragment() {
@@ -29,7 +29,6 @@ class StepTwoBajajFDFragment : Fragment() {
     private val binding get() = _binding!!
 
     private lateinit var bajajFDInterface: BajajFDInterface
-    private lateinit var stepTwoBajajFDViewModel: StepTwoBajajFDViewModel
 
     companion object {
         fun getInstance(fdInterface: BajajFDInterface): StepTwoBajajFDFragment {
@@ -64,11 +63,11 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlMobileNumber.error = null
+                removeError(binding.tlMobileNumber)
             }
         })
         binding.edtDOB.setOnClickListener {
-
+            removeError(binding.tlDOB)
         }
         binding.edtPANNumber.addTextChangedListener(object : TextWatcher {
 
@@ -79,7 +78,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlPanNumber.error = null
+                removeError(binding.tlPanNumber)
             }
         })
 
@@ -91,8 +90,8 @@ class StepTwoBajajFDFragment : Fragment() {
             )
         )
         binding.spTitle.setAdapter(titleAdapter)
-        binding.spTitle.setOnItemClickListener { parent, view, position, id ->
-            binding.tlTitle.error = null
+        binding.spTitle.setOnItemClickListener { _, _, _, _ ->
+            removeError(binding.tlTitle)
         }
 
         binding.edtFirstName.addTextChangedListener(object : TextWatcher {
@@ -104,7 +103,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlFirstName.error = null
+                removeError(binding.tlFirstName)
             }
         })
         binding.edtMiddleName.addTextChangedListener(object : TextWatcher {
@@ -116,7 +115,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlMiddleName.error = null
+                removeError(binding.tlMiddleName)
             }
         })
         binding.edtLastName.addTextChangedListener(object : TextWatcher {
@@ -128,7 +127,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlLastName.error = null
+                removeError(binding.tlLastName)
             }
         })
 
@@ -140,8 +139,8 @@ class StepTwoBajajFDFragment : Fragment() {
             )
         )
         binding.spGender.setAdapter(genderAdapter)
-        binding.spGender.setOnItemClickListener { parent, view, position, id ->
-            binding.tlGender.error = null
+        binding.spGender.setOnItemClickListener { _, _, _, _ ->
+            removeError(binding.tlGender)
         }
 
         binding.edtEmail.addTextChangedListener(object : TextWatcher {
@@ -153,7 +152,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlEmail.error = null
+                removeError(binding.tlEmail)
             }
         })
         binding.edtOccupation.addTextChangedListener(object : TextWatcher {
@@ -165,7 +164,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlOccupation.error = null
+                removeError(binding.tlOccupation)
             }
         })
         binding.edtQualification.addTextChangedListener(object : TextWatcher {
@@ -177,7 +176,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlQualification.error = null
+                removeError(binding.tlQualification)
             }
         })
 
@@ -189,8 +188,8 @@ class StepTwoBajajFDFragment : Fragment() {
             )
         )
         binding.spMarital.setAdapter(maritalAdapter)
-        binding.spMarital.setOnItemClickListener { parent, view, position, id ->
-            binding.tlMarital.error = null
+        binding.spMarital.setOnItemClickListener { _, _, _, _ ->
+            removeError(binding.tlMarital)
         }
 
         val relationShipAdapter = ArrayAdapter(
@@ -201,8 +200,8 @@ class StepTwoBajajFDFragment : Fragment() {
             )
         )
         binding.spRelation.setAdapter(relationShipAdapter)
-        binding.spRelation.setOnItemClickListener { parent, view, position, id ->
-            binding.tlRelation.error = null
+        binding.spRelation.setOnItemClickListener { _, _, _, _ ->
+            removeError(binding.tlRelation)
         }
 
         binding.edtRelationName.addTextChangedListener(object : TextWatcher {
@@ -214,7 +213,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlRelationName.error = null
+                removeError(binding.tlRelationName)
             }
         })
         binding.edtAddressLine1.addTextChangedListener(object : TextWatcher {
@@ -226,7 +225,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlAddressLine1.error = null
+                removeError(binding.tlAddressLine1)
             }
         })
         binding.edtAddressLine2.addTextChangedListener(object : TextWatcher {
@@ -238,7 +237,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlAddressLine2.error = null
+                removeError(binding.tlAddressLine2)
             }
         })
         binding.edtState.addTextChangedListener(object : TextWatcher {
@@ -250,7 +249,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlState.error = null
+                removeError(binding.tlState)
             }
         })
         binding.edtCity.addTextChangedListener(object : TextWatcher {
@@ -262,7 +261,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlCity.error = null
+                removeError(binding.tlCity)
             }
         })
         binding.edtPinCode.addTextChangedListener(object : TextWatcher {
@@ -274,13 +273,13 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlPinCode.error = null
+                removeError(binding.tlPinCode)
             }
         })
 
         // Nominee Details
         binding.spNomineeTitle.setAdapter(titleAdapter)
-        binding.spNomineeTitle.setOnItemClickListener { parent, view, position, id ->
+        binding.spNomineeTitle.setOnItemClickListener { _, _, _, _ ->
             binding.tlNomineeTitle.error = null
         }
 
@@ -293,7 +292,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlNomineeFirstName.error = null
+                removeError(binding.tlNomineeFirstName)
             }
         })
         binding.edtNomineeMiddleName.addTextChangedListener(object : TextWatcher {
@@ -305,7 +304,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlNomineeMiddleName.error = null
+                removeError(binding.tlNomineeMiddleName)
             }
         })
         binding.edtNomineeLastName.addTextChangedListener(object : TextWatcher {
@@ -317,20 +316,20 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlNomineeLastName.error = null
+                removeError(binding.tlNomineeLastName)
             }
         })
 
         binding.edtNomineeDOB.setOnClickListener {
-
+            removeError(binding.tlNomineeDOB)
         }
 
         binding.spNomineeRelation.setAdapter(relationShipAdapter)
-        binding.spNomineeRelation.setOnItemClickListener { parent, view, position, id ->
-            binding.tlNomineeRelation.error = null
+        binding.spNomineeRelation.setOnItemClickListener { _, _, _, _ ->
+            removeError(binding.tlNomineeRelation)
         }
 
-        binding.cbNomineeSameAddress.setOnCheckedChangeListener { compoundButton, b ->
+        binding.cbNomineeSameAddress.setOnCheckedChangeListener { _, _ ->
 
         }
 
@@ -344,7 +343,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlGuardianName.error = null
+                removeError(binding.tlGuardianName)
             }
         })
         binding.edtGuardianAge.addTextChangedListener(object : TextWatcher {
@@ -356,13 +355,13 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlGuardianAge.error = null
+                removeError(binding.tlGuardianAge)
             }
         })
 
         binding.spGuardianRelation.setAdapter(relationShipAdapter)
-        binding.spGuardianRelation.setOnItemClickListener { parent, view, position, id ->
-            binding.tlGuardianRelation.error = null
+        binding.spGuardianRelation.setOnItemClickListener { _, _, _, _ ->
+            removeError(binding.tlGuardianRelation)
         }
 
         binding.edtGuardianAddress.addTextChangedListener(object : TextWatcher {
@@ -374,7 +373,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlGuardianAddress.error = null
+                removeError(binding.tlGuardianAddress)
             }
         })
         binding.edtGuardianPinCode.addTextChangedListener(object : TextWatcher {
@@ -386,7 +385,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.edtGuardianPinCode.error = null
+                removeError(binding.tlGuardianPinCode)
             }
         })
 
@@ -400,7 +399,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlIFSC.error = null
+                removeError(binding.tlIFSC)
             }
         })
         binding.edtAccountNumber.addTextChangedListener(object : TextWatcher {
@@ -412,7 +411,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlAccountNumber.error = null
+                removeError(binding.tlAccountNumber)
             }
         })
         binding.edtBankName.addTextChangedListener(object : TextWatcher {
@@ -424,7 +423,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlBankName.error = null
+                removeError(binding.tlBankName)
             }
         })
         binding.edtBankBranch.addTextChangedListener(object : TextWatcher {
@@ -436,31 +435,110 @@ class StepTwoBajajFDFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                binding.tlBankBranchName.error = null
+                removeError(binding.tlBankBranchName)
             }
         })
 
 
         binding.tvPersonalDetails.setOnClickListener {
-
+          if (binding.llPersonalDetail.visibility == View.VISIBLE){
+              binding.llPersonalDetail.visibility = View.GONE
+          }else{
+              binding.llPersonalDetail.visibility = View.VISIBLE
+          }
         }
 
         binding.tvNomineeDetails.setOnClickListener {
-
+            if (binding.llNomineeDetail.visibility == View.VISIBLE){
+                binding.llNomineeDetail.visibility = View.GONE
+            }else{
+                binding.llNomineeDetail.visibility = View.VISIBLE
+            }
         }
 
         binding.tvBankDetails.setOnClickListener {
-
+            if (binding.llBankDetails.visibility == View.VISIBLE){
+                binding.llBankDetails.visibility = View.GONE
+            }else{
+                binding.llBankDetails.visibility = View.VISIBLE
+            }
         }
 
         binding.btnNext.setOnClickListener {
             if (validation()) {
-
+                // Applicant Details
+                (activity as BajajFdMainActivity).applicantDetails.ApplicantSalutation = ""
+                (activity as BajajFdMainActivity).applicantDetails.ApplicantGender = ""
+                (activity as BajajFdMainActivity).applicantDetails.ApplicantFirstName = ""
+                (activity as BajajFdMainActivity).applicantDetails.ApplicantMiddleName = ""
+                (activity as BajajFdMainActivity).applicantDetails.ApplicantLastName= ""
+                (activity as BajajFdMainActivity).applicantDetails.ApplicantDOB= ""
+                (activity as BajajFdMainActivity).applicantDetails.ApplicantPAN= ""
+                (activity as BajajFdMainActivity).applicantDetails.ApplicantMobile= ""
+                (activity as BajajFdMainActivity).applicantDetails.ApplicantOccupation= ""
+                (activity as BajajFdMainActivity).applicantDetails.ApplicantQualification= ""
+                (activity as BajajFdMainActivity).applicantDetails.ApplicantMaritalStatus= ""
+                (activity as BajajFdMainActivity).applicantDetails.ApplicantEmail= ""
+                (activity as BajajFdMainActivity).applicantDetails.ApplicantAddress1= ""
+                (activity as BajajFdMainActivity).applicantDetails.ApplicantAddress2= ""
+                (activity as BajajFdMainActivity).applicantDetails.ApplicantAddress3= ""
+                (activity as BajajFdMainActivity).applicantDetails.ApplicantCity= ""
+                (activity as BajajFdMainActivity).applicantDetails.ApplicantState= ""
+                (activity as BajajFdMainActivity).applicantDetails.ApplicantCountry= ""
+                (activity as BajajFdMainActivity).applicantDetails.ApplicantPincode= 0
+                (activity as BajajFdMainActivity).applicantDetails.AnnualIncome= ""
+
+                // Applicant Relation Details
+                (activity as BajajFdMainActivity).applicantRelationDetails.ApplicantRelation= ""
+                (activity as BajajFdMainActivity).applicantRelationDetails.ApplicantRelationSalutation= ""
+                (activity as BajajFdMainActivity).applicantRelationDetails.ApplicantRelationFirstName= ""
+                (activity as BajajFdMainActivity).applicantRelationDetails.ApplicantRelationLastName= ""
+                (activity as BajajFdMainActivity).applicantRelationDetails.ApplicantMotherFirstName= ""
+                (activity as BajajFdMainActivity).applicantRelationDetails.ApplicantMotherLastName= ""
+
+                // Applicant Nominee Details
+                (activity as BajajFdMainActivity).nomineeDetails.NomineeSalutation= ""
+                (activity as BajajFdMainActivity).nomineeDetails.NomineeGender= ""
+                (activity as BajajFdMainActivity).nomineeDetails.NomineeFirstName= ""
+                (activity as BajajFdMainActivity).nomineeDetails.NomineeMiddleName= ""
+                (activity as BajajFdMainActivity).nomineeDetails.NomineeLastName= ""
+                (activity as BajajFdMainActivity).nomineeDetails.NomineeDOB= ""
+                (activity as BajajFdMainActivity).nomineeDetails.NomineeRelation= ""
+                (activity as BajajFdMainActivity).nomineeDetails.NomineeAddress1= ""
+                (activity as BajajFdMainActivity).nomineeDetails.NomineeAddress2= ""
+                (activity as BajajFdMainActivity).nomineeDetails.NomineeAddress3= ""
+                (activity as BajajFdMainActivity).nomineeDetails.NomineeCity= ""
+                (activity as BajajFdMainActivity).nomineeDetails.NomineeState = ""
+                (activity as BajajFdMainActivity).nomineeDetails.NomineeCountry = "india"
+                (activity as BajajFdMainActivity).nomineeDetails.NomineePincode = 0
+
+                // Applicant Nominee Guardian Details
+                (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianSalutation = ""
+                (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianName = ""
+                (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAge = 0
+                (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianCountry = ""
+                (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianCity = ""
+                (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianState = ""
+                (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianPincode = 0
+                (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress1 = ""
+                (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress2 = ""
+                (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress3 = ""
+
+                // Applicant Bank Details
+                (activity as BajajFdMainActivity).fdBankDetails.AccountType = ""
+                (activity as BajajFdMainActivity).fdBankDetails.BankBranch = ""
+                (activity as BajajFdMainActivity).fdBankDetails.IFSCCode = ""
+                (activity as BajajFdMainActivity).fdBankDetails.AccountNumber = ""
+                (activity as BajajFdMainActivity).fdBankDetails.BankName = ""
+                (activity as BajajFdMainActivity).fdBankDetails.PaymentMode = ""
+
+                bajajFDInterface.stepTwoApi("stepTwoResponse")
             }
         }
         return root
     }
 
+    // validations
     private fun validation(): Boolean {
         return if (binding.edtMobileNumber.text.toString().isEmpty()) { // EditText
             commonErrorMethod(binding.edtMobileNumber, binding.tlMobileNumber, "")

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

@@ -14,6 +14,7 @@ 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 com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 
@@ -28,8 +29,8 @@ class Common {
         val connectivityManager = getApplication<NewsApplication>().getSystemService(....
          **/
         //internet check
-        private fun isNetworkAvailable(): Boolean {
-            val connectivityManager = BajajApplication().getSystemService(
+         fun isNetworkAvailable(activity: Activity): Boolean {
+            val connectivityManager = activity.getSystemService(
                 Context.CONNECTIVITY_SERVICE
             ) as ConnectivityManager
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
@@ -87,10 +88,16 @@ class Common {
             return match.matches()
         }
 
+        fun removeError(textInputLayout: TextInputLayout) {
+            if (textInputLayout.error != null) {
+                textInputLayout.error = null
+            }
+        }
+
         fun showDialogValidation(activity: Activity?, message: CharSequence?) {
             val builder = AlertDialog.Builder(activity)
             builder.setMessage(message)
-            builder.setPositiveButton("OK") { dialogInterface, i ->
+            builder.setPositiveButton("OK") { dialogInterface, _ ->
                 dialogInterface.dismiss()
             }
             builder.show()
@@ -99,10 +106,10 @@ class Common {
         fun showDialogWithTwoButtons(activity: Activity?, message: CharSequence?) {
             val builder = AlertDialog.Builder(activity)
             builder.setMessage(message)
-            builder.setPositiveButton("OK") { dialogInterface, i ->
+            builder.setPositiveButton("OK") { dialogInterface, _ ->
                 dialogInterface.dismiss()
             }
-            builder.setNegativeButton("Cancel") { dialogInterface, i ->
+            builder.setNegativeButton("Cancel") { dialogInterface, _ ->
                 dialogInterface.dismiss()
             }
             builder.show()

app/src/main/res/drawable/cursor_color.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
     <size android:width="1dp" />
-    <solid android:color="@color/color_790023"  />
+    <solid android:color="@color/colorPrimary"  />
 </shape>

app/src/main/res/drawable/rounded_corner_with_line.xml

@@ -1,6 +1,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/transparent"/>
-    <stroke android:width="1dp" android:color="@color/purple_500" />
-    <corners android:radius="5dp"/>
+    <stroke android:width="@dimen/margin_1" android:color="@color/greyColor2" />
+    <corners android:radius="@dimen/margin_5"/>
     <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
 </shape>

app/src/main/res/font/font.xml

@@ -3,21 +3,21 @@
     <font
         android:fontStyle="normal"
         android:fontWeight="400"
-        android:font="@font/robotoblack" />
+        android:font="@font/roboto_black" />
     <font
         android:fontStyle="normal"
         android:fontWeight="400"
-        android:font="@font/robotobold" />
+        android:font="@font/roboto_bold" />
     <font
         android:fontStyle="normal"
         android:fontWeight="400"
-        android:font="@font/robotolight" />
+        android:font="@font/roboto_light" />
     <font
         android:fontStyle="normal"
         android:fontWeight="400"
-        android:font="@font/robotomedium" />
+        android:font="@font/roboto_medium" />
     <font
         android:fontStyle="normal"
         android:fontWeight="400"
-        android:font="@font/robotoregular" />
+        android:font="@font/roboto_regular" />
 </font-family>

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

@@ -19,9 +19,9 @@
 
             <ImageView
                 android:id="@+id/imgBack"
-                android:layout_marginStart="15dp"
-                android:layout_marginEnd="15dp"
-                android:padding="10dp"
+                android:layout_marginStart="@dimen/margin_15"
+                android:layout_marginEnd="@dimen/margin_15"
+                android:padding="@dimen/margin_10"
                 android:layout_gravity="center_vertical"
                 android:src="@drawable/svg_back"
                 android:layout_width="wrap_content"
@@ -34,9 +34,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textColor="@color/white"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_14"
                 android:minHeight="?actionBarSize"
-                android:padding="@dimen/appbar_padding"
+                android:padding="@dimen/margin_16"
                 android:text="@string/fd"
                 android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title" />
 
@@ -49,90 +49,90 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:orientation="horizontal"
-            android:background="@color/color_EFEFEF"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp">
+            android:background="@color/greyColor4"
+            android:paddingTop="@dimen/margin_10"
+            android:paddingBottom="@dimen/margin_10">
 
             <ImageView
                 android:id="@+id/stepOne"
-                android:layout_width="19dp"
-                android:layout_height="19dp"
+                android:layout_width="@dimen/margin_19"
+                android:layout_height="@dimen/margin_19"
                 android:contentDescription="@string/step1"
                 android:gravity="center" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="3dp"
+                android:layout_marginStart="@dimen/margin_3"
                 android:text="@string/step1"
                 android:textColor="@color/black"
-                android:textSize="12sp" />
+                android:textSize="@dimen/text_size_12" />
 
             <View
-                android:layout_width="22dp"
-                android:layout_height="2dp"
-                android:layout_marginStart="5dp"
-                android:layout_marginEnd="5dp"
-                android:background="@color/color_green" />
+                android:layout_width="@dimen/margin_22"
+                android:layout_height="@dimen/margin_2"
+                android:layout_marginStart="@dimen/margin_5"
+                android:layout_marginEnd="@dimen/margin_5"
+                android:background="@color/green" />
 
             <ImageView
                 android:id="@+id/stepTwo"
-                android:layout_width="19dp"
-                android:layout_height="19dp"
+                android:layout_width="@dimen/margin_19"
+                android:layout_height="@dimen/margin_19"
                 android:contentDescription="@string/step2"
                 android:gravity="center" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="3dp"
+                android:layout_marginStart="@dimen/margin_3"
                 android:text="@string/step2"
                 android:textColor="@color/black"
-                android:textSize="11sp" />
+                android:textSize="@dimen/text_size_12" />
 
             <View
-                android:layout_width="22dp"
-                android:layout_height="2dp"
-                android:layout_marginStart="5dp"
-                android:layout_marginEnd="5dp"
-                android:background="@color/color_green" />
+                android:layout_width="@dimen/margin_22"
+                android:layout_height="@dimen/margin_2"
+                android:layout_marginStart="@dimen/margin_5"
+                android:layout_marginEnd="@dimen/margin_5"
+                android:background="@color/green" />
 
             <ImageView
                 android:id="@+id/stepThree"
-                android:layout_width="19dp"
-                android:layout_height="19dp"
+                android:layout_width="@dimen/margin_19"
+                android:layout_height="@dimen/margin_19"
                 android:contentDescription="@string/step3"
                 android:gravity="center" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="3dp"
+                android:layout_marginStart="@dimen/margin_3"
                 android:text="@string/step3"
                 android:textColor="@color/black"
-                android:textSize="11sp" />
+                android:textSize="@dimen/text_size_12" />
 
             <View
-                android:layout_width="22dp"
-                android:layout_height="2dp"
-                android:layout_marginStart="5dp"
-                android:layout_marginEnd="5dp"
-                android:background="@color/color_green" />
+                android:layout_width="@dimen/margin_22"
+                android:layout_height="@dimen/margin_2"
+                android:layout_marginStart="@dimen/margin_5"
+                android:layout_marginEnd="@dimen/margin_5"
+                android:background="@color/green" />
 
             <ImageView
                 android:id="@+id/stepFour"
-                android:layout_width="19dp"
-                android:layout_height="19dp"
+                android:layout_width="@dimen/margin_19"
+                android:layout_height="@dimen/margin_19"
                 android:contentDescription="@string/step4"
                 android:gravity="center" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="3dp"
+                android:layout_marginStart="@dimen/margin_3"
                 android:text="@string/step4"
                 android:textColor="@color/black"
-                android:textSize="11sp" />
+                android:textSize="@dimen/text_size_12" />
 
         </LinearLayout>
     </com.google.android.material.appbar.AppBarLayout>

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

@@ -12,7 +12,7 @@
         style="@style/semiBoldStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/grey_bg"
+        android:background="@color/greyColor3"
         android:drawablePadding="@dimen/margin_5"
         android:padding="@dimen/margin_3"
         android:text="@string/bankDetails"
@@ -91,7 +91,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="28dp"
-        android:background="@color/grey_bg"
+        android:background="@color/greyColor3"
         android:padding="@dimen/margin_5"
         app:layout_constraintBottom_toTopOf="@+id/radioGroup"
         app:layout_constraintEnd_toEndOf="parent"
@@ -119,7 +119,7 @@
             android:layout_alignParentEnd="true"
             android:gravity="center_vertical"
             android:text="@string/viewAvailablePaymentModes"
-            android:textColor="@color/blue_text_color"
+            android:textColor="@color/blue"
             android:textSize="@dimen/text_size_10"
             tools:layout_editor_absoluteX="5dp"
             tools:layout_editor_absoluteY="312dp" />

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

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_margin="@dimen/margin_10"
-    android:background="@color/color_EFEFEF"
+    android:background="@color/greyColor4"
     tools:context="com.nivesh.production.bajajfd.ui.fragment.StepFiveBajajFDFragment">
 
     <LinearLayout
@@ -45,7 +45,7 @@
                     android:id="@+id/logo"
                     android:layout_width="@dimen/margin_150"
                     android:layout_height="18dp"
-                    android:contentDescription="@string/content_description"
+                    android:contentDescription="@string/contentDescription"
                     android:src="@drawable/bajaj_logo"
                     app:layout_constraintBottom_toTopOf="@+id/tvFdRating"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -59,7 +59,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/schemeRating"
-                    android:textColor="@color/light_text"
+                    android:textColor="@color/greyColor2"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="0.0"
@@ -80,7 +80,7 @@
             android:layout_marginRight="@dimen/margin_5"
             android:layout_marginBottom="@dimen/margin_5"
             android:padding="@dimen/margin_10"
-            app:cardBackgroundColor="@color/bg_color"
+            app:cardBackgroundColor="@color/greyColor4"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="1.0"

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

@@ -5,7 +5,7 @@
     android:id="@+id/constraintLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/Nivesh_color_AppBg"
+    android:background="@color/NiveshColorAppBg"
     tools:context="com.nivesh.production.bajajfd.ui.fragment.StepFourBajajFDFragment">
 
     <androidx.core.widget.NestedScrollView
@@ -43,7 +43,7 @@
                     android:layout_width="@dimen/margin_150"
                     android:layout_height="@dimen/margin_18"
                     android:layout_marginTop="@dimen/margin_15"
-                    android:contentDescription="@string/content_description"
+                    android:contentDescription="@string/contentDescription"
                     android:src="@drawable/bajaj_logo"
                     app:layout_constraintHorizontal_bias="0.065"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -59,7 +59,7 @@
                     android:paddingStart="@dimen/margin_15"
                     android:paddingEnd="@dimen/margin_10"
                     android:text="@string/schemeRating"
-                    android:textColor="@color/light_text"
+                    android:textColor="@color/greyColor2"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/logo" />
@@ -70,7 +70,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/margin_15"
-                    android:background="@color/grey_bg"
+                    android:background="@color/greyColor3"
                     android:paddingStart="@dimen/margin_15"
                     android:paddingTop="@dimen/margin_2"
                     android:paddingEnd="@dimen/margin_10"
@@ -197,7 +197,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/margin_5"
-                    android:background="@color/grey_bg"
+                    android:background="@color/greyColor3"
                     android:paddingStart="@dimen/margin_15"
                     android:paddingTop="@dimen/margin_2"
                     android:paddingEnd="0dp"
@@ -297,7 +297,7 @@
                     android:layout_height="74dp"
                     android:layout_marginTop="@dimen/margin_15"
                     android:layout_marginEnd="@dimen/margin_10"
-                    android:text="@string/terms_condition"
+                    android:text="@string/termsCondition"
                     android:textColor="@color/black"
                     android:textSize="@dimen/text_size_10"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -348,7 +348,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:text="@string/once_you_click"
+        android:text="@string/onceYouClick"
         android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/btnBack"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -6,7 +6,7 @@
     android:id="@+id/constraintLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_EFEFEF"
+    android:background="@color/greyColor4"
     tool:context=".ui.fragment.StepTwoBajajFDFragment">
 
     <ScrollView
@@ -52,7 +52,7 @@
                             android:layout_height="@dimen/margin_18"
                             android:layout_marginStart="@dimen/margin_10"
                             android:layout_marginTop="@dimen/margin_5"
-                            android:contentDescription="@string/content_description"
+                            android:contentDescription="@string/contentDescription"
                             android:src="@drawable/bajaj_logo"
                             app:layout_constraintBottom_toBottomOf="@+id/tvFdRating"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -68,7 +68,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/margin_10"
                             android:text="@string/schemeRating"
-                            android:textColor="@color/light_text"
+                            android:textColor="@color/greyColor2"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="0.0"
                             app:layout_constraintStart_toStartOf="parent"
@@ -93,7 +93,7 @@
                                 android:drawableStart="@drawable/svg_rs"
                                 android:inputType="number"
                                 android:maxLength="12"
-                                android:textColorHint="@color/light_text"
+                                android:textColorHint="@color/greyColor2"
                                 android:textSize="@dimen/text_size_14"
                                  />
 
@@ -113,10 +113,10 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:background="@drawable/rounded_corner_with_line"
-                                android:hint="@string/select_interest_payout"
+                                android:hint="@string/selectInterestPayout"
                                 android:inputType="none"
                                 android:labelFor="@+id/spInterestPayout"
-                                android:textColorHint="#757575"
+                                android:textColorHint="@color/greyColor2"
                                 android:textSize="@dimen/text_size_14"
                                 tool:ignore="DuplicateSpeakableTextCheck,LabelFor,TextContrastCheck" />
                         </com.google.android.material.textfield.TextInputLayout>
@@ -135,12 +135,12 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:background="@drawable/rounded_corner_with_line"
-                                android:hint="@string/select_interest_tenure"
+                                android:hint="@string/selectInterestTenure"
                                 android:inputType="none"
                                 android:labelFor="@+id/spInterestTenure"
-                                android:textColorHint="@color/light_text"
+                                android:textColorHint="@color/greyColor2"
                                 android:textSize="@dimen/text_size_14"
-                                tool:ignore="LabelFor,TextContrastCheck" />
+                                tool:ignore="DuplicateSpeakableTextCheck,LabelFor,TextContrastCheck" />
                         </com.google.android.material.textfield.TextInputLayout>
 
                         <TextView
@@ -150,7 +150,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/margin_10"
                             android:layout_marginTop="@dimen/margin_15"
-                            android:text="@string/upto_0.25"
+                            android:text="@string/upto0.25"
                             android:textColor="@color/black"
                             app:layout_constraintBottom_toBottomOf="@+id/swSeniorCitizen"
                             app:layout_constraintHorizontal_bias="0.0"
@@ -158,13 +158,14 @@
                             app:layout_constraintTop_toBottomOf="@+id/tlInterestTenure"
                             app:layout_constraintVertical_bias="0.018" />
 
-                        <androidx.appcompat.widget.SwitchCompat
+                        <com.google.android.material.switchmaterial.SwitchMaterial
                             android:id="@+id/swSeniorCitizen"
+                            style="@style/regularStyle"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/margin_5"
                             android:layout_marginEnd="@dimen/margin_10"
-                            android:text="@string/upto_0.25_next"
+                            android:text="@string/upto0.25next"
                             android:textColor="@color/black"
                             android:textSize="@dimen/text_size_12"
                             app:layout_constraintBottom_toBottomOf="parent"
@@ -181,13 +182,13 @@
                         style="@style/regularStyle"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:background="@color/grey_bg"
+                        android:background="@color/greyColor3"
                         android:paddingStart="@dimen/margin_20"
                         android:paddingTop="@dimen/margin_3"
                         android:paddingEnd="@dimen/margin_1"
                         android:paddingBottom="@dimen/margin_3"
-                        android:text="@string/maturity_instructions"
-                        android:textColor="@color/text_color_dark"
+                        android:text="@string/maturityInstructions"
+                        android:textColor="@color/black"
                         android:textSize="@dimen/text_size_12" />
 
                     <androidx.constraintlayout.widget.ConstraintLayout
@@ -209,7 +210,7 @@
                                 android:layout_height="wrap_content"
                                 android:buttonTint="@color/black"
                                 android:checked="true"
-                                android:text="@string/additional_detail_one"
+                                android:text="@string/additionalDetailOne"
                                 android:textSize="@dimen/text_size_12" />
 
                             <RadioButton
@@ -217,7 +218,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:buttonTint="@color/black"
-                                android:text="@string/additional_detail_two"
+                                android:text="@string/additionalDetailTwo"
                                 android:textSize="@dimen/text_size_12" />
 
                             <RadioButton
@@ -225,7 +226,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:buttonTint="@color/black"
-                                android:text="@string/additional_detail_three"
+                                android:text="@string/additionalDetailThree"
                                 android:textSize="@dimen/text_size_12" />
 
 
@@ -237,8 +238,8 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/margin_10"
-                            android:text="@string/tax_deducted_at_source_tds"
-                            android:textColor="@color/text_color_dark"
+                            android:text="@string/taxDeductedAtSourceTds"
+                            android:textColor="@color/black"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="0.0"
                             app:layout_constraintStart_toStartOf="parent"
@@ -253,7 +254,7 @@
                             android:drawablePadding="@dimen/margin_10"
                             android:padding="@dimen/margin_5"
                             android:text="@string/TDSForm"
-                            android:textColor="@color/text_color_dark"
+                            android:textColor="@color/black"
                             android:textSize="@dimen/text_size_12"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="0.0"
@@ -268,7 +269,7 @@
                             android:buttonTint="@color/black"
                             android:checked="true"
                             android:orientation="horizontal"
-                            android:text="@string/deduct_tds"
+                            android:text="@string/deductTds"
                             android:textSize="@dimen/text_size_12"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/tvUploadFormLabel" />
@@ -280,7 +281,7 @@
                             android:layout_height="wrap_content"
                             android:padding="@dimen/margin_5"
                             android:text="@string/nonDeductTDS"
-                            android:textColor="@color/text_color_dark"
+                            android:textColor="@color/black"
                             android:textSize="@dimen/text_size_12"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="0.0"
@@ -302,7 +303,7 @@
                 android:background="@drawable/bajaj_logo"
                 android:foreground="?android:attr/selectableItemBackground"
                 android:padding="@dimen/margin_10"
-                app:cardBackgroundColor="@color/bg_color_info"
+                app:cardBackgroundColor="@color/greyColor4"
                 app:cardPreventCornerOverlap="true"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="1.0"
@@ -329,7 +330,7 @@
                             android:layout_height="wrap_content"
                             android:drawablePadding="@dimen/margin_10"
                             android:text="@string/nonCumulativeROI"
-                            android:textColor="@color/text_color_dark"
+                            android:textColor="@color/black"
                             android:textSize="@dimen/text_size_14" />
 
                         <TextView
@@ -339,7 +340,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/margin_2"
                             android:text=""
-                            android:textColor="@color/text_color_blue"
+                            android:textColor="@color/lightBlue"
                             android:textSize="@dimen/text_size_14" />
 
                     </LinearLayout>
@@ -356,7 +357,7 @@
                             android:layout_height="wrap_content"
                             android:drawablePadding="@dimen/margin_10"
                             android:text="@string/regularInterestPayment"
-                            android:textColor="@color/text_color_dark"
+                            android:textColor="@color/black"
                             android:textSize="@dimen/text_size_14" />
 
                         <TextView
@@ -366,7 +367,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/margin_2"
                             android:text=""
-                            android:textColor="@color/text_color_blue"
+                            android:textColor="@color/lightBlue"
                             android:textSize="@dimen/text_size_14" />
 
                     </LinearLayout>
@@ -383,7 +384,7 @@
                             android:layout_height="wrap_content"
                             android:drawablePadding="@dimen/margin_10"
                             android:text="@string/maturityAmount"
-                            android:textColor="@color/text_color_dark"
+                            android:textColor="@color/black"
                             android:textSize="@dimen/text_size_14" />
 
                         <TextView
@@ -393,7 +394,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/margin_2"
                             android:text=""
-                            android:textColor="@color/text_color_blue"
+                            android:textColor="@color/lightBlue"
                             android:textSize="@dimen/text_size_14" />
 
                     </LinearLayout>

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

@@ -5,7 +5,7 @@
     android:id="@+id/constraintLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/Nivesh_color_AppBg"
+    android:background="@color/NiveshColorAppBg"
     tools:context=".ui.fragment.StepFourBajajFDFragment">
 
     <androidx.core.widget.NestedScrollView
@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="@dimen/margin_80"
-        android:background="@color/Nivesh_color_AppBg"
+        android:background="@color/NiveshColorAppBg"
         android:fillViewport="true"
         android:visibility="visible"
         app:layout_constraintBottom_toTopOf="@+id/btnNext"
@@ -51,7 +51,7 @@
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    android:contentDescription="@string/content_description"/>
+                    android:contentDescription="@string/contentDescription"/>
 
                 <TextView
                     android:id="@+id/tvFDRating"
@@ -61,7 +61,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/schemeRating"
-                    android:textColor="@color/light_text"
+                    android:textColor="@color/greyColor2"
                     android:textSize="@dimen/text_size_12"
                     app:layout_constraintBottom_toTopOf="@+id/tvUploadKYCDocument"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -76,7 +76,7 @@
                     android:layout_marginTop="@dimen/margin_7"
                     android:paddingStart="@dimen/margin_20"
                     android:paddingEnd="@dimen/margin_20"
-                    android:background="@color/grey_text_bg"
+                    android:background="@color/greyColor3"
                     android:text="@string/uploadKycDocuments"
                     android:textColor="@color/black"
                     app:drawableEndCompat="@drawable/svg_down_arrow"
@@ -84,21 +84,6 @@
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent" />
 
-<!--                <TextView-->
-<!--                    android:id="@+id/tvAddressProofType"-->
-<!--                    style="@style/regularStyle"-->
-<!--                    android:layout_width="match_parent"-->
-<!--                    android:layout_height="wrap_content"-->
-<!--                    android:paddingStart="@dimen/margin_20"-->
-<!--                    android:paddingEnd="@dimen/margin_20"-->
-<!--                    android:layout_marginTop="@dimen/margin_12"-->
-<!--                    android:text="@string/addressProofType"-->
-<!--                    android:textColor="@color/text_default"-->
-<!--                    android:textSize="@dimen/text_size_12"-->
-<!--                    app:layout_constraintTop_toBottomOf="@+id/tvUploadKYCDocument"-->
-<!--                    app:layout_constraintLeft_toLeftOf="parent"-->
-<!--                    app:layout_constraintRight_toRightOf="parent" />-->
-
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/spAddressType"
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
@@ -130,8 +115,8 @@
                     style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/aadhaar_front"
-                    android:textColor="@color/text_default"
+                    android:text="@string/aadhaarFront"
+                    android:textColor="@color/black"
                     android:textSize="@dimen/text_size_12"
                     app:layout_constraintBottom_toBottomOf="@+id/btnAadhaarFrontUpload"
                     app:layout_constraintStart_toStartOf="@+id/spAddressType"
@@ -145,7 +130,7 @@
                     android:layout_alignParentEnd="true"
                     android:layout_marginTop="@dimen/margin_16"
                     android:layout_marginBottom="@dimen/margin_8"
-                    android:backgroundTint="@color/color_EFEFEF"
+                    android:backgroundTint="@color/greyColor4"
                     android:paddingLeft="@dimen/margin_30"
                     android:paddingRight="@dimen/margin_30"
                     android:text="@string/uploadFile"
@@ -164,8 +149,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:text="@string/aadhaar_back"
-                    android:textColor="@color/text_default"
+                    android:text="@string/aadhaarBack"
+                    android:textColor="@color/black"
                     android:textSize="@dimen/text_size_12"
                     app:layout_constraintBottom_toBottomOf="@+id/btnAadhaarBackUpload"
                     app:layout_constraintStart_toStartOf="@+id/tvAadhaarFront"
@@ -178,7 +163,7 @@
                     android:layout_alignParentEnd="true"
                     android:layout_marginTop="@dimen/margin_6"
                     android:layout_marginBottom="@dimen/margin_8"
-                    android:backgroundTint="@color/color_EFEFEF"
+                    android:backgroundTint="@color/greyColor4"
                     android:paddingLeft="@dimen/margin_30"
                     android:paddingRight="@dimen/margin_30"
                     android:text="@string/uploadFile"
@@ -196,8 +181,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:text="@string/pan_upload"
-                    android:textColor="@color/text_default"
+                    android:text="@string/panUpload"
+                    android:textColor="@color/black"
                     android:textSize="@dimen/text_size_12"
                     app:layout_constraintBottom_toBottomOf="@+id/btnPANUpload"
                     app:layout_constraintEnd_toStartOf="@+id/btnAadhaarBackUpload"
@@ -213,7 +198,7 @@
                     android:layout_alignParentEnd="true"
                     android:layout_marginTop="@dimen/margin_6"
                     android:layout_marginBottom="@dimen/margin_8"
-                    android:backgroundTint="@color/color_EFEFEF"
+                    android:backgroundTint="@color/greyColor4"
                     android:paddingLeft="@dimen/margin_30"
                     android:paddingRight="@dimen/margin_30"
                     android:text="@string/uploadFile"
@@ -231,8 +216,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:text="@string/photo_upload"
-                    android:textColor="@color/text_default"
+                    android:text="@string/photoUpload"
+                    android:textColor="@color/black"
                     android:textSize="@dimen/text_size_12"
                     app:layout_constraintBottom_toBottomOf="@+id/btnPhotoUpload"
                     app:layout_constraintStart_toStartOf="@+id/tvPAN"
@@ -244,7 +229,7 @@
                     android:layout_height="@dimen/margin_48"
                     android:layout_alignParentEnd="true"
                     android:layout_marginTop="@dimen/margin_10"
-                    android:backgroundTint="@color/color_EFEFEF"
+                    android:backgroundTint="@color/greyColor4"
                     android:paddingLeft="@dimen/margin_30"
                     android:paddingRight="@dimen/margin_30"
                     android:text="@string/uploadFile"

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

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center_vertical"
-    android:background="@color/Nivesh_color_AppBg"
+    android:background="@color/NiveshColorAppBg"
     tools:context=".ui.fragment.StepThreeBajajFDFragment">
 
     <androidx.core.widget.NestedScrollView
@@ -14,7 +14,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="@dimen/margin_80"
-        android:background="@color/Nivesh_color_AppBg"
+        android:background="@color/NiveshColorAppBg"
         android:fillViewport="true"
         android:visibility="visible"
         app:layout_constraintBottom_toTopOf="@+id/btnNext"
@@ -45,7 +45,7 @@
                         android:id="@+id/logo"
                         android:layout_width="@dimen/margin_150"
                         android:layout_height="@dimen/margin_18"
-                        android:contentDescription="@string/content_description"
+                        android:contentDescription="@string/contentDescription"
                         android:src="@drawable/bajaj_logo"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -61,7 +61,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="@dimen/margin_1"
                         android:text="@string/schemeRating"
-                        android:textColor="@color/light_text"
+                        android:textColor="@color/greyColor2"
                         android:textSize="@dimen/text_size_12" />
 
                     <TextView
@@ -72,7 +72,7 @@
                         android:layout_marginTop="@dimen/margin_15"
                         android:layout_marginBottom="@dimen/margin_1"
                         android:text="@string/mandatoryField"
-                        android:textColor="@color/light_text"
+                        android:textColor="@color/greyColor2"
                         android:textSize="@dimen/text_size_14" />
 
                 </LinearLayout>
@@ -83,7 +83,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:background="@color/grey_bg"
+                    android:background="@color/greyColor3"
                     android:paddingStart="@dimen/margin_18"
                     android:paddingEnd="@dimen/margin_15"
                     android:text="@string/personalDetails"
@@ -201,7 +201,7 @@
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
                         android:layout_marginTop="@dimen/margin_5"
-                        android:hint="@string/middle_name">
+                        android:hint="@string/middleName">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtMiddleName"
@@ -484,6 +484,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="text"
+                            android:textSize="@dimen/text_size_14"
                             android:maxEms="6" />
 
                     </com.google.android.material.textfield.TextInputLayout>
@@ -495,10 +496,10 @@
                     style="@style/semiBoldStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/grey_bg"
+                    android:background="@color/greyColor3"
                     android:paddingStart="@dimen/margin_18"
                     android:paddingEnd="@dimen/margin_10"
-                    android:text="@string/nominee_details_optional"
+                    android:text="@string/nomineeDetailsOptional"
                     android:textColor="@color/black"
                     android:textSize="@dimen/text_size_14"
                     app:drawableEndCompat="@drawable/svg_down_arrow" />
@@ -563,7 +564,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="@string/nominee_middle_name">
+                        android:hint="@string/nomineeMiddleName">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtNomineeMiddleName"
@@ -652,7 +653,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="@string/guardian_name_optional">
+                        android:hint="@string/guardianNameOptional">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtGuardianName"
@@ -670,7 +671,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="@string/guardian_age_optional">
+                        android:hint="@string/guardianAgeOptional">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtGuardianAge"
@@ -715,7 +716,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="@string/guardian_address_optional">
+                        android:hint="@string/guardianAddressOptional">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtGuardianAddress"
@@ -733,7 +734,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="@string/guardian_pinCode_optional">
+                        android:hint="@string/guardianPinCodeOptional">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtGuardianPinCode"
@@ -752,7 +753,7 @@
                     style="@style/semiBoldStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/grey_bg"
+                    android:background="@color/greyColor3"
                     android:padding="@dimen/margin_3"
                     android:text="@string/bankDetails"
                     android:textColor="@color/black"
@@ -866,38 +867,36 @@
 
                 </LinearLayout>
 
-                <RelativeLayout
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/grey_bg">
+                    android:orientation="horizontal"
+                    android:background="@color/greyColor3">
 
                     <TextView
                         android:id="@+id/tvPaymentMode"
                         style="@style/semiBoldStyle"
-                        android:layout_width="wrap_content"
+                        android:layout_weight="0.4"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_marginTop="12dp"
                         android:padding="@dimen/margin_3"
                         android:text="@string/paymentMode"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/text_size_14"
-                        tools:layout_editor_absoluteX="5dp" />
+                        android:textSize="@dimen/text_size_14" />
 
                     <TextView
                         style="@style/regularStyle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_centerVertical="true"
-                        android:layout_marginTop="12dp"
+                        android:gravity="end"
+                        android:layout_gravity="end"
                         android:padding="@dimen/margin_3"
                         android:text="@string/eligibleBankOption"
-                        android:textColor="@color/blue_text_color"
+                        android:textColor="@color/blue"
                         android:textSize="@dimen/text_size_14"
-                        tools:layout_editor_absoluteX="5dp" />
+                        />
 
-                </RelativeLayout>
+                </LinearLayout>
 
                 <RadioGroup
                     android:layout_width="match_parent"
@@ -930,7 +929,7 @@
                     android:layout_marginBottom="@dimen/margin_20"
                     android:padding="@dimen/margin_3"
                     android:text="@string/upto1LakhOnly"
-                    android:textColor="@color/gray_text_color"
+                    android:textColor="@color/black"
                     android:textSize="@dimen/text_size_14"
                     tools:layout_editor_absoluteX="5dp" />
 

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

@@ -42,7 +42,7 @@
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                android:contentDescription="@string/content_description"/>
+                android:contentDescription="@string/contentDescription"/>
 
             <TextView
                 android:id="@+id/tvFdRatingTwo"
@@ -50,7 +50,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/schemeRating"
-                android:textColor="@color/light_text"
+                android:textColor="@color/greyColor2"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.0"
@@ -71,7 +71,7 @@
         android:layout_marginRight="@dimen/margin_5"
         android:layout_marginBottom="@dimen/margin_5"
         android:padding="@dimen/margin_10"
-        app:cardBackgroundColor="@color/bg_color"
+        app:cardBackgroundColor="@color/greyColor4"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1.0"

app/src/main/res/values-hi-rIN/strings.xml

@@ -1,4 +1,135 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">BajajFdLib</string>
+    <string name="appName">BajajFdLib</string>
+
+    <string name="step1">Step 1</string>
+    <string name="step2">Step 2</string>
+    <string name="step3">Step 3</string>
+    <string name="step4">Step 4</string>
+
+    <!-- Step 1 -->
+    <string name="fd">Corporate Fixed Deposits</string>
+    <string name="schemeRating"><![CDATA[Ratings: CRISIL AAA/Stable & ICRA AAA/Stable]]></string>
+    <string name="rs">Rs.</string>
+    <string name="investmentAmount">Select Investment Amount</string>
+    <string name="selectInterestPayout">Select Interest Payout</string>
+    <string name="selectInterestTenure">Select Investment Tenure</string>
+    <string name="upto0.25">Up to 0.25% p.a for </string>
+    <string name="upto0.25next">Senior Citizens, 60+</string>
+    <string name="maturityInstructions">Maturity Instructions:</string>
+    <string name="additionalDetailOne">Automatically credit to my bank account</string>
+    <string name="additionalDetailTwo">Automatically renew principal amount</string>
+    <string name="additionalDetailThree">Automatically renew both principal and interest amount</string>
+    <string name="taxDeductedAtSourceTds">Tax Deducted at Source (TDS):</string>
+    <string name="TDSForm">Please ensure to upload the Form 15 G / H, when you receive a mail from the Company for the same</string>
+    <string name="deductTds">Deduct TDS (Income is taxable)</string>
+    <string name="nonDeductTDS">In case you are eligible for non deduction of TDS then please submit 15G/H form to Bajaj or Nivesh team</string>
+    <string name="nonCumulativeROI">Non- Cumulative ROI:</string>
+    <string name="regularInterestPayment">Regular Interest Payment:</string>
+    <string name="maturityAmount">Maturity Amount:</string>
+
+
+    <!--  Step 2   -->
+    <string name="mandatoryField">All fields are mandatory other then optional</string>
+    <string name="personalDetails">Personal Details</string>
+    <string name="enterMobileNumber">Enter Mobile Number</string>
+    <string name="enterDateOfBirth">Enter Date Of Birth</string>
+    <string name="enterPanNumber">Enter PAN Number</string>
+    <string name="selectTitle">Select Title</string>
+    <string name="enterFirstName">Enter First Name</string>
+    <string name="middleName">Enter Middle Name <font color='#33000000'>(Optional)</font></string>
+    <string name="enterLastName">Enter Last Name</string>
+    <string name="selectGender">Select Gender</string>
+    <string name="enterEmailAddress">Enter Email Address</string>
+    <string name="enterOccupation">Enter Occupation</string>
+    <string name="enterQualification">Enter Qualification</string>
+    <string name="selectMaritalStatus">Select Marital Status</string>
+    <string name="selectRelation">Select Relationship</string>
+    <string name="relationName">Relation Name</string>
+    <string name="enterAddress1">Enter Address 1</string>
+    <string name="enterAddress2">Enter Address 2</string>
+    <string name="state">State</string>
+    <string name="city">City</string>
+    <string name="pinCode">PinCode</string>
+
+    <!-- Nominee Details   -->
+    <string name="nomineeDetailsOptional">Nominee Details (Optional)</string>
+    <string name="nomineeFirstName">Nominee First Name</string>
+    <string name="nomineeMiddleName">Nominee Middle Name <font color='#33000000'>(Optional)</font></string>
+    <string name="nomineeLastName">Nominee Last Name</string>
+    <string name="nomineeDateOfBirth">Nominee Date Of Birth</string>
+    <string name="nomineeAddressSameAsPrimaryApplicantAddress">Nominee address is same as Primary Applicant’s address</string>
+
+    <!-- Guardian Details  -->
+    <string name="guardianNameOptional">Guardian name <font color='#33000000'>(Optional)</font></string>
+    <string name="guardianAgeOptional">Guardian Age <font color='#33000000'>(Optional)</font></string>
+    <string name="guardianAddressOptional">Guardian Address <font color='#33000000'>(Optional)</font></string>
+    <string name="guardianPinCodeOptional">Guardian PinCode <font color='#33000000'>(Optional)</font></string>
+
+    <!-- Bank Details  -->
+    <string name="bankDetails">Bank Details</string>
+    <string name="addNewAccount">+ Add New Account</string>
+    <string name="accountType">Account type *</string>
+    <string name="savingsAccount">Savings account</string>
+    <string name="currentAccount">Current account</string>
+    <string name="enterIfscCode">Enter IFSC Code</string>
+    <string name="enterAccountNumber">Enter Account Number</string>
+    <string name="enterBankName">Enter Bank Name</string>
+    <string name="enterBranchName">Enter Branch Name</string>
+
+    <!-- Payment Mode   -->
+    <string name="paymentMode">Payment Mode</string>
+    <string name="Upi">UPI</string>
+    <string name="netBanking">NetBanking</string>
+    <string name="upto1LakhOnly">Upto Rs. 1 Lakh Only</string>
+    <string name="eligibleBankOption">Eligible Bank Option</string>
+
+
+    <!--  Step Three  -->
+    <string name="uploadKycDocuments">Upload KYC Documents</string>
+    <string name="addressProofType">Address Proof Type <font color='#E9161E'>*</font></string>
+    <string name="aadhaarFront">Aadhaar front <font color='#E9161E'>*</font></string>
+    <string name="aadhaarBack">Aadhaar Back <font color='#E9161E'>*</font></string>
+    <string name="panUpload">PAN Upload <font color='#E9161E'>*</font></string>
+    <string name="photoUpload">Photo Upload <font color='#E9161E'>*</font></string>
+    <string name="uploadFile">Upload File</string>
+
+
+    <!--  Step Four  -->
+    <string name="makePayment">Make Payment</string>
+    <string name="investedAmount">Invested Amount</string>
+    <string name="tenure">Tenure</string>
+    <string name="interestPayout">Interest Payout</string>
+    <string name="rateOfInterest">Rate of Interest</string>
+    <string name="termsAndCondition"><![CDATA[Terms & condition]]></string>
+    <string name="directorOfBajajFinance">Director of Bajaj Finance Ltd.</string>
+    <string name="promoterOfBajajFinanceLtd">Promoter of Bajaj Finance Ltd.</string>
+    <string name="relativeOfBajajFinanceLtd">Relative of director or promoter of Bajaj Finance Ltd.</string>
+    <string name="shareholderOfBajajFinanceLtd">Shareholder of Bajaj Finance Ltd.</string>
+    <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>
+
+
+    <!-- Step Five   -->
+    <string name="viewOrder">View Order</string>
+    <string name="congratulations">Congratulations</string>
+    <string name="transactionIsSuccessful">Your transaction is successful.</string>
+    <string name="certificateOnEmail">You will receive fixed deposit certificate\nwithin 3 working days on email</string>
+    <string name="downloadInvoice">Download Invoice</string>
+    <string name="sorry">Sorry!</string>
+    <string name="TransactionIsUnsuccessful">Your transaction is unsuccessful.</string>
+    <string name="tryAgainLater">Sorry for the inconvenience please try again later</string>
+    <string name="retry">Retry</string>
+
+
+    <!-- Others -->
+    <string name="next">Next</string>
+    <string name="back">Back</string>
+    <string name="click">click</string>
+    <string name="viewpager">viewpager</string>
+    <string name="contentDescription">content description</string>
+    <string name="viewAvailablePaymentModes">View available payment modes</string>
+    <string name="onceYouClick">Once you click on PAY, your order will be placed and you will be redirected to payment gateway.</string>
+    <string name="seniorCitizen">Senior Citizen</string>
+    <string name="nonSeniorCitizen">Non Senior Citizen</string>
 </resources>

app/src/main/res/values-night/themes.xml

@@ -2,8 +2,8 @@
     <!-- Base application theme. -->
     <style name="Theme.BajajFdLib" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">#FFBB86FC</item>
+        <item name="colorPrimaryVariant">@color/colorPrimary</item>
         <item name="colorOnPrimary">@color/black</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>

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

@@ -1,111 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <attr name="theme_Primary" format="reference" />
+    <attr name="theme_TextBlackColor" format="reference" />
     <attr name="theme_PrimaryDark" format="reference" />
     <attr name="theme_Accent" format="reference" />
-    <attr name="theme_Toolbarbg" format="reference" />
-    <attr name="theme_color_AppBg" format="reference" />
-    <attr name="theme_LoginBtn_bg" format="reference" />
-    <attr name="theme_WhiteColor_1" format="reference" />
-    <attr name="theme_WhiteColor_2" format="reference" />
-    <attr name="theme_WhiteColor_3" format="reference" />
-    <attr name="theme_TextWhiteColor" format="reference" />
-    <attr name="theme_TextBlackColor" format="reference" />
-    <attr name="theme_TextForgotColor" format="reference" />
-    <attr name="theme_TextColorVersion" format="reference" />
-    <attr name="theme_TextColorFacebook" format="reference" />
-    <attr name="theme_ColorFacebook_Blue" format="reference" />
-    <attr name="theme_TextColorGooglePlus" format="reference" />
-    <attr name="theme_TextColorEdtCusrsor" format="reference" />
-    <attr name="theme_EdtTextHintColor" format="reference" />
-    <attr name="theme_YellowColor_1" format="reference" />
-    <attr name="theme_BgColorDark_1" format="reference" />
-    <attr name="theme_RedColor_1" format="reference" />
-    <attr name="theme_RedColor_2" format="reference" />
-    <attr name="theme_RedColor_3" format="reference" />
-    <attr name="theme_RedColor_4" format="reference" />
-    <attr name="theme_RedColor_5" format="reference" />
-    <attr name="theme_RedColor_6" format="reference" />
-    <attr name="theme_RedColor_7" format="reference" />
-    <attr name="theme_RedColor_8" format="reference" />
-    <attr name="theme_BlueColor_1" format="reference" />
-    <attr name="theme_BlueColor_2" format="reference" />
-    <attr name="theme_BlueColor_3" format="reference" />
-    <attr name="theme_BlueColor_4" format="reference" />
-    <attr name="theme_BlueColor_5" format="reference" />
-    <attr name="theme_BlueColor_6" format="reference" />
-    <attr name="theme_BlueColor_7" format="reference" />
-    <attr name="theme_BlueColor_8" format="reference" />
-    <attr name="theme_BlueColor_9" format="reference" />
-    <attr name="theme_BlueColor_10" format="reference" />
-    <attr name="theme_BlueColor_11" format="reference" />
-    <attr name="theme_BlueColor_12" format="reference" />
-    <attr name="theme_BlueColor_13" format="reference" />
-    <attr name="theme_BlueColor_14" format="reference" />
-    <attr name="theme_BlueColor_15" format="reference" />
-    <attr name="theme_BlueColor_16" format="reference" />
-    <attr name="theme_BlueColor_17" format="reference" />
-    <attr name="theme_BlueColor_18" format="reference" />
-    <attr name="theme_BlueColor_19" format="reference" />
-    <attr name="theme_BlackColor_1" format="reference" />
-    <attr name="theme_BlackColor_0" format="reference" />
-    <attr name="theme_BlackColor_2" format="reference" />
-    <attr name="theme_BlackColor_3" format="reference" />
-    <attr name="theme_BlackColor_4" format="reference" />
-    <attr name="theme_BlackColor_5" format="reference" />
-    <attr name="theme_BlackColor_6" format="reference" />
-    <attr name="theme_BlackColor_7" format="reference" />
-    <attr name="theme_BlackColor_8" format="reference" />
-    <attr name="theme_BlackColor_9" format="reference" />
-    <attr name="theme_BlackColor_10" format="reference" />
-    <attr name="theme_BlackColor_11" format="reference" />
-    <attr name="theme_BlackColor_12" format="reference" />
-    <attr name="theme_BlackColor_13" format="reference" />
-    <attr name="theme_BlackColor_14" format="reference" />
-    <attr name="theme_BlackColor_15" format="reference" />
-    <attr name="theme_BlackColor_16" format="reference" />
-    <attr name="theme_BlackColor_17" format="reference" />
-    <attr name="theme_BlackColor_18" format="reference" />
-    <attr name="theme_BlackColor_19" format="reference" />
-    <attr name="theme_BlackColor_20" format="reference" />
-    <attr name="theme_BlackColor_21" format="reference" />
-    <attr name="theme_BlackColor_22" format="reference" />
-    <attr name="theme_BlackColor_23" format="reference" />
-    <attr name="theme_BlackColor_24" format="reference" />
-    <attr name="theme_BlackColor_25" format="reference" />
-    <attr name="theme_BlackColor_26" format="reference" />
-    <attr name="theme_BlackColor_27" format="reference" />
-    <attr name="theme_BlackColor_28" format="reference" />
-    <attr name="theme_BlackColor_29" format="reference" />
-    <attr name="theme_BlackColor_30" format="reference" />
-    <attr name="theme_BlackColor_31" format="reference" />
-    <attr name="theme_BlackColor_32" format="reference" />
-    <attr name="theme_BlackColor_33" format="reference" />
-    <attr name="theme_BlackColor_34" format="reference" />
-    <attr name="theme_BlackColor_35" format="reference" />
-    <attr name="theme_BlackColor_36" format="reference" />
-    <attr name="theme_BlackColor_37" format="reference" />
-    <attr name="theme_BlackColor_38" format="reference" />
-    <attr name="theme_BlackColor_39" format="reference" />
-    <attr name="theme_BlackColor_40" format="reference" />
-    <attr name="theme_BlackColor_41" format="reference" />
-    <attr name="theme_GreenColor_1" format="reference" />
-    <attr name="theme_GreenColor_2" format="reference" />
-    <attr name="theme_GreenColor_3" format="reference" />
-    <attr name="theme_GreenColor_4" format="reference" />
-    <attr name="theme_GreenColor_5" format="reference" />
-    <attr name="theme_GreenColor_6" format="reference" />
-    <attr name="theme_GreenColor_7" format="reference" />
-    <attr name="theme_GreenColor_8" format="reference" />
-    <attr name="theme_Goal_Blue" format="reference" />
-    <attr name="theme_Goal_Header" format="reference" />
-    <attr name="theme_Goal_Child_Header" format="reference" />
-    <attr name="theme_Goal_Progress" format="reference" />
-    <attr name="theme_Goal_Background" format="reference" />
-    <attr name="theme_Goal_Light_Blue" format="reference" />
-    <attr name="theme_Goal_Light_Text_Blue" format="reference" />
-    <attr name="theme_Goal_Light_Text_Blue_Gray" format="reference" />
-
-    <attr name="theme_Primary_color" format="reference" />
 
 </resources>

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

@@ -45,6 +45,7 @@
     <dimen name="margin_15">15dp</dimen>
     <dimen name="margin_16">16dp</dimen>
     <dimen name="margin_18">18dp</dimen>
+    <dimen name="margin_19">19dp</dimen>
     <dimen name="margin_20">20dp</dimen>
     <dimen name="margin_22">22dp</dimen>
     <dimen name="margin_25">25dp</dimen>
@@ -69,6 +70,4 @@
     <dimen name="margin_290">290dp</dimen>
     <dimen name="margin_300">300dp</dimen>
 
-    <dimen name="appbar_padding">16dp</dimen>
-
 </resources>

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

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">BajajFdLib</string>
+    <string name="appName">BajajFdLib</string>
 
     <string name="step1">Step 1</string>
     <string name="step2">Step 2</string>
@@ -11,17 +11,17 @@
     <string name="schemeRating"><![CDATA[Ratings: CRISIL AAA/Stable & ICRA AAA/Stable]]></string>
     <string name="rs">Rs.</string>
     <string name="investmentAmount">Select Investment Amount</string>
-    <string name="select_interest_payout">Select Interest Payout</string>
-    <string name="select_interest_tenure">Select Investment Tenure</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="maturity_instructions">Maturity Instructions:</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="tax_deducted_at_source_tds">Tax Deducted at Source (TDS):</string>
+    <string name="selectInterestPayout">Select Interest Payout</string>
+    <string name="selectInterestTenure">Select Investment Tenure</string>
+    <string name="upto0.25">Up to 0.25% p.a for </string>
+    <string name="upto0.25next">Senior Citizens, 60+</string>
+    <string name="maturityInstructions">Maturity Instructions:</string>
+    <string name="additionalDetailOne">Automatically credit to my bank account</string>
+    <string name="additionalDetailTwo">Automatically renew principal amount</string>
+    <string name="additionalDetailThree">Automatically renew both principal and interest amount</string>
+    <string name="taxDeductedAtSourceTds">Tax Deducted at Source (TDS):</string>
     <string name="TDSForm">Please ensure to upload the Form 15 G / H, when you receive a mail from the Company for the same</string>
-    <string name="deduct_tds">Deduct TDS (Income is taxable)</string>
+    <string name="deductTds">Deduct TDS (Income is taxable)</string>
     <string name="nonDeductTDS">In case you are eligible for non deduction of TDS then please submit 15G/H form to Bajaj or Nivesh team</string>
     <string name="nonCumulativeROI">Non- Cumulative ROI:</string>
     <string name="regularInterestPayment">Regular Interest Payment:</string>
@@ -36,7 +36,7 @@
     <string name="enterPanNumber">Enter PAN Number</string>
     <string name="selectTitle">Select Title</string>
     <string name="enterFirstName">Enter First Name</string>
-    <string name="middle_name">Enter Middle Name <font color='#33000000'>(Optional)</font></string>
+    <string name="middleName">Enter Middle Name <font color='#33000000'>(Optional)</font></string>
     <string name="enterLastName">Enter Last Name</string>
     <string name="selectGender">Select Gender</string>
     <string name="enterEmailAddress">Enter Email Address</string>
@@ -52,18 +52,18 @@
     <string name="pinCode">PinCode</string>
 
     <!-- Nominee Details   -->
-    <string name="nominee_details_optional">Nominee Details (Optional)</string>
+    <string name="nomineeDetailsOptional">Nominee Details (Optional)</string>
     <string name="nomineeFirstName">Nominee First Name</string>
-    <string name="nominee_middle_name">Nominee Middle Name <font color='#33000000'>(Optional)</font></string>
+    <string name="nomineeMiddleName">Nominee Middle Name <font color='#33000000'>(Optional)</font></string>
     <string name="nomineeLastName">Nominee Last Name</string>
     <string name="nomineeDateOfBirth">Nominee Date Of Birth</string>
     <string name="nomineeAddressSameAsPrimaryApplicantAddress">Nominee address is same as Primary Applicant’s address</string>
 
     <!-- Guardian Details  -->
-    <string name="guardian_name_optional">Guardian name <font color='#33000000'>(Optional)</font></string>
-    <string name="guardian_age_optional">Guardian Age <font color='#33000000'>(Optional)</font></string>
-    <string name="guardian_address_optional">Guardian Address <font color='#33000000'>(Optional)</font></string>
-    <string name="guardian_pinCode_optional">Guardian PinCode <font color='#33000000'>(Optional)</font></string>
+    <string name="guardianNameOptional">Guardian name <font color='#33000000'>(Optional)</font></string>
+    <string name="guardianAgeOptional">Guardian Age <font color='#33000000'>(Optional)</font></string>
+    <string name="guardianAddressOptional">Guardian Address <font color='#33000000'>(Optional)</font></string>
+    <string name="guardianPinCodeOptional">Guardian PinCode <font color='#33000000'>(Optional)</font></string>
 
     <!-- Bank Details  -->
     <string name="bankDetails">Bank Details</string>
@@ -87,10 +87,10 @@
     <!--  Step Three  -->
     <string name="uploadKycDocuments">Upload KYC Documents</string>
     <string name="addressProofType">Address Proof Type <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="aadhaarFront">Aadhaar front <font color='#E9161E'>*</font></string>
+    <string name="aadhaarBack">Aadhaar Back <font color='#E9161E'>*</font></string>
+    <string name="panUpload">PAN Upload <font color='#E9161E'>*</font></string>
+    <string name="photoUpload">Photo Upload <font color='#E9161E'>*</font></string>
     <string name="uploadFile">Upload File</string>
 
 
@@ -107,7 +107,7 @@
     <string name="shareholderOfBajajFinanceLtd">Shareholder of Bajaj Finance Ltd.</string>
     <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="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>
+    <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>
 
 
     <!-- Step Five   -->
@@ -127,9 +127,11 @@
     <string name="back">Back</string>
     <string name="click">click</string>
     <string name="viewpager">viewpager</string>
-    <string name="content_description">content description</string>
+    <string name="contentDescription">content description</string>
     <string name="viewAvailablePaymentModes">View available payment modes</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>
+    <string name="onceYouClick">Once you click on PAY, your order will be placed and you will be redirected to payment gateway.</string>
+    <string name="seniorCitizen">Senior Citizen</string>
+    <string name="nonSeniorCitizen">Non Senior Citizen</string>
 
     <string-array name="interestPayoutList">
         <item>On Maturity</item>
@@ -170,7 +172,7 @@
         <item>Unmarried</item>
     </array>
 
-    <array name="interest_payout_list">
+    <array name="interestPayoutLists">
         <item>Interest Payout</item>
         <item>On Maturity</item>
         <item>Monthly</item>

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

@@ -7,33 +7,33 @@
         <item name="colorAccent">?theme_Accent</item>
         <item name="colorControlNormal">?theme_TextBlackColor</item>
         <item name="colorControlActivated">?theme_TextBlackColor</item>
-        <item name="colorControlHighlight">@color/myTextPrimaryColor</item>
+        <item name="colorControlHighlight">@color/white</item>
         <item name="android:windowDisablePreview">true</item>
     </style>
 
     <style name="regularStyle">
-        <item name="android:fontFamily">@font/robotoregular</item>
+        <item name="android:fontFamily">@font/roboto_regular</item>
         <item name="android:textSize">@dimen/margin_12</item>
-        <item name="android:textColor">@color/step_text_color</item>
+        <item name="android:textColor">@color/greyColor1</item>
     </style>
 
     <style name="semiBoldStyle">
-        <item name="android:fontFamily">@font/robotobold</item>
+        <item name="android:fontFamily">@font/roboto_bold</item>
         <item name="android:textSize">@dimen/margin_14</item>
-        <item name="android:textColor">@color/red_title</item>
+        <item name="android:textColor">@color/red</item>
     </style>
 
     <style name="BoldStyle">
-        <item name="android:fontFamily">@font/robotobold</item>
+        <item name="android:fontFamily">@font/roboto_bold</item>
         <item name="android:textSize">@dimen/margin_16</item>
-        <item name="android:textColor">@color/text_default</item>
+        <item name="android:textColor">@color/black</item>
     </style>
 
     <style name="EditTextTheme" parent="Widget.AppCompat.EditText">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/Black</item>
+        <item name="colorAccent">@color/black</item>
         <item name="android:textCursorDrawable">?theme_TextBlackColor</item>
         <item name="colorControlNormal">?theme_TextBlackColor</item>
         <item name="colorControlActivated">?theme_TextBlackColor</item>
@@ -42,19 +42,19 @@
 
     <style name="ErrorTextAppearance" parent="TextAppearance.AppCompat">
         <item name="android:textColor">@android:color/holo_orange_dark</item>
-        <item name="android:textSize">16sp</item>
+        <item name="android:textSize">@dimen/text_size_16</item>
         <item name="android:textStyle">bold|italic</item>
     </style>
 
     <style name="HelperTextAppearance" parent="TextAppearance.AppCompat">
         <item name="android:textColor">@android:color/holo_green_dark</item>
-        <item name="android:textSize">16sp</item>
+        <item name="android:textSize">@dimen/text_size_16</item>
         <item name="android:textStyle">bold|italic</item>
     </style>
 
     <style name="HintTextAppearance" parent="TextAppearance.AppCompat">
         <item name="android:textColor">@android:color/holo_green_dark</item>
-        <item name="android:textSize">10sp</item>
+        <item name="android:textSize">@dimen/text_size_14</item>
     </style>
 
     <style name="EditTextThemeOverlay" parent="ThemeOverlay.AppCompat">
@@ -76,27 +76,27 @@
 
     <style name="ShapeAppearanceOverlay_card_custom_corners" parent="">
         <item name="cornerFamily">rounded</item>
-        <item name="cornerSizeTopRight">10dp</item>
-        <item name="cornerSizeTopLeft">10dp</item>
-        <item name="cornerSizeBottomRight">10dp</item>
-        <item name="cornerSizeBottomLeft">10dp</item>
+        <item name="cornerSizeTopRight">@dimen/margin_10</item>
+        <item name="cornerSizeTopLeft">@dimen/margin_10</item>
+        <item name="cornerSizeBottomRight">@dimen/margin_10</item>
+        <item name="cornerSizeBottomLeft">@dimen/margin_10</item>
     </style>
 
     <style name="ShapeAppearanceOverlay_card_top_custom_corners" parent="">
         <item name="cornerFamily">rounded</item>
-        <item name="cornerSizeTopRight">10dp</item>
-        <item name="cornerSizeTopLeft">10dp</item>
+        <item name="cornerSizeTopRight">@dimen/margin_10</item>
+        <item name="cornerSizeTopLeft">@dimen/margin_10</item>
         <item name="cornerSizeBottomRight">0dp</item>
         <item name="cornerSizeBottomLeft">0dp</item>
-        <item name="backgroundColor">@color/color_EFEFEF</item>
+        <item name="backgroundColor">@color/greyColor4</item>
     </style>
 
     <style name="ShapeAppearanceOverlay_card_bottom_custom_corners" parent="">
         <item name="cornerFamily">rounded</item>
         <item name="cornerSizeTopRight">0dp</item>
         <item name="cornerSizeTopLeft">0dp</item>
-        <item name="cornerSizeBottomRight">10dp</item>
-        <item name="cornerSizeBottomLeft">10dp</item>
+        <item name="cornerSizeBottomRight">@dimen/margin_10</item>
+        <item name="cornerSizeBottomLeft">@dimen/margin_10</item>
     </style>
 
 </resources>

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

@@ -2,8 +2,8 @@
     <!-- Base application theme. -->
     <style name="Theme.BajajFdLib" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">#898989</item>
+        <item name="colorPrimaryVariant">@color/colorPrimary</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
@@ -16,10 +16,10 @@
 
     <style name="SCBSwitch" parent="Theme.AppCompat.Light">
         <!-- active thumb & track color (30% transparency) -->
-        <item name="colorControlActivated">#E9161E</item>
+        <item name="colorControlActivated">@color/red</item>
 
         <!-- inactive thumb color -->
-        <item name="colorSwitchThumbNormal">#E9161E</item>
+        <item name="colorSwitchThumbNormal">@color/red</item>
 
         <!-- inactive track color (30% transparency) -->
         <item name="android:colorForeground">#C68D8D</item>