wroking on step one api integration

app/src/GetAllRates.kt

@@ -1,3 +0,0 @@
-data class GetAllRates(
-    val Response: Response
-)

app/src/ROIDatalist.kt

@@ -1,7 +0,0 @@
-data class ROIDatalist(
-    val Frequency: String,
-    val Provider: String,
-    val ROI: Double,
-    val Tenure: String,
-    val Type: String
-)

app/src/Response.kt

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

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

@@ -1,45 +1,59 @@
 package com.nivesh.production.bajajfd.interfaces
 
 import com.google.gson.JsonObject
+import com.nivesh.production.bajajfd.model.GetCodeRequest
 import com.nivesh.production.bajajfd.model.GetRatesRequest
 import okhttp3.RequestBody
 import retrofit2.Response
 import retrofit2.http.Body
+import retrofit2.http.Header
+import retrofit2.http.Headers
 import retrofit2.http.POST
 
 interface ApiInterface {
 
     @POST("GetRates")
+    @Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
     suspend fun getRates(@Body getRatesRequest: GetRatesRequest): Response<JsonObject>
 
     @POST("CheckFDCKYC")
+    @Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
     suspend fun checkFDKYC(@Body requestBody: RequestBody): Response<JsonObject>
 
     @POST("CreateFDApplication")
+    @Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
     suspend fun createFDApp(@Body requestBody: RequestBody): Response<JsonObject>
 
     @POST("DocumentsUpload")
+    @Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
     suspend fun documentsUpload(@Body requestBody: RequestBody): Response<JsonObject>
 
     @POST("SaveFDOtherData")
+    @Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
     suspend fun saveFDOtherData(@Body requestBody: RequestBody): Response<JsonObject>
 
     @POST("GetFDDetails")
+    @Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
     suspend fun getFDDetails(@Body requestBody: RequestBody): Response<JsonObject>
 
     @POST("UpdateFDPaymentStatus")
+    @Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
     suspend fun updateFDPaymentStatus(@Body requestBody: RequestBody): Response<JsonObject>
 
     @POST("FinaliseFD")
+    @Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
     suspend fun finaliseFD(@Body requestBody: RequestBody): Response<JsonObject>
 
     @POST("FinaliseKYC")
+    @Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
     suspend fun finaliseKYC(@Body requestBody: RequestBody): Response<JsonObject>
 
     @POST("PaymentRequery")
+    @Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
     suspend fun paymentReQuery(@Body requestBody: RequestBody): Response<JsonObject>
 
     @POST("GetCodes")
-    suspend fun getCodes(@Body requestBody: RequestBody): Response<JsonObject>
+    @Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
+    suspend fun getCodes(@Body requestBody: GetCodeRequest): Response<JsonObject>
 
 }

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

@@ -0,0 +1,8 @@
+package com.nivesh.production.bajajfd.model
+
+data class GetCodeRequest(
+    var Category: String ? = null,
+    var InputValue: String? = null,
+    var Language: String ? = null,
+    var ProductName: String? = null
+)

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

@@ -0,0 +1,5 @@
+package com.nivesh.production.bajajfd.model
+
+data class GetCodeResponse(
+    val Response: ResponseX
+)

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

@@ -0,0 +1,6 @@
+package com.nivesh.production.bajajfd.model
+
+data class GetCodes(
+    val Label: String,
+    val Value: String
+)

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

@@ -0,0 +1,9 @@
+package com.nivesh.production.bajajfd.model
+
+data class ResponseX(
+    val Errors: List<Any>,
+    val GetCodesList: List<GetCodes>,
+    val Message: String,
+    val Status: String,
+    val StatusCode: Int
+)

app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt

@@ -1,6 +1,7 @@
 package com.nivesh.production.bajajfd.repositories
 
 import com.nivesh.production.bajajfd.interfaces.ApiInterface
+import com.nivesh.production.bajajfd.model.GetCodeRequest
 import com.nivesh.production.bajajfd.model.GetRatesRequest
 
 class MainRepository constructor(private val apiInterface: ApiInterface) {
@@ -34,7 +35,7 @@ class MainRepository constructor(private val apiInterface: ApiInterface) {
     suspend fun paymentReQueryResponse(getRatesRequest: GetRatesRequest) =
         apiInterface.getRates(getRatesRequest)
 
-    suspend fun getCodesResponse(getRatesRequest: GetRatesRequest) =
-        apiInterface.getRates(getRatesRequest)
+    suspend fun getCodesResponse(getCodeRequest: GetCodeRequest) =
+        apiInterface.getCodes(getCodeRequest)
 
 }

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

@@ -8,20 +8,26 @@ import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
 import androidx.viewpager.widget.ViewPager
+import com.google.gson.Gson
 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.repositories.MainRepository
 import com.nivesh.production.bajajfd.ui.fragment.*
 import com.nivesh.production.bajajfd.ui.providerfactory.GetRatesModelProviderFactory
 import com.nivesh.production.bajajfd.util.Colors
+import com.nivesh.production.bajajfd.util.Resource
+import com.nivesh.production.bajajfd.viewModel.BajajFDViewModel
 import com.nivesh.production.bajajfd.viewModel.StepOneBajajFDViewModel
 
 class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
     private lateinit var binding: ActivityBajajFdBinding
 
-    lateinit var viewModel: StepOneBajajFDViewModel
+    lateinit var stepOneBajajFDViewModel: StepOneBajajFDViewModel
+    lateinit var viewModel: BajajFDViewModel
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -35,8 +41,17 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
         setContentView(binding.root)
 
         //start Repository
-        val viewModelProviderFactory = GetRatesModelProviderFactory(MainRepository(ApiClient.getApiClient))
-        viewModel = ViewModelProvider(this, viewModelProviderFactory)[StepOneBajajFDViewModel::class.java]
+        val viewModelProviderFactory =
+            GetRatesModelProviderFactory(MainRepository(ApiClient.getApiClient))
+        stepOneBajajFDViewModel =
+            ViewModelProvider(this, viewModelProviderFactory)[StepOneBajajFDViewModel::class.java]
+
+        viewModel = ViewModelProvider(this, viewModelProviderFactory)[viewModel::class.java]
+        getCodeApi()
+
+
+
+
 
         binding.imgBack.setOnClickListener {
             finish()
@@ -117,6 +132,43 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
         })
     }
 
+    private fun getCodeApi() {
+        val getCodeRequest = GetCodeRequest()
+        getCodeRequest.ProductName = "BajajFD"
+        getCodeRequest.Category = "InterestPayoutFreq"
+        getCodeRequest.Language = "EN"
+        getCodeRequest.InputValue = ""
+        viewModel.getCode(getCodeRequest)
+        viewModel.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 -> getCodeData(getCodeResponse)
+                          //  650 -> refreshToken()
+                            else -> {}
+                        }
+                    }
+                }
+
+                is Resource.Error -> {
+                    response.message?.let { message ->
+                        Log.e(" ", "An error occurred:$message")
+                    }
+                }
+                is Resource.Loading -> {
+
+                }
+            }
+        }
+    }
+
+    private fun getCodeData(codeResponse: GetCodeResponse) {
+
+    }
+
     // set Default Step
     private fun defaultShape(): GradientDrawable {
         val shape = GradientDrawable()

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

@@ -17,7 +17,7 @@ import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepOneBinding
 import com.nivesh.production.bajajfd.interfaces.BajajFDInterface
 import com.nivesh.production.bajajfd.model.GetRatesRequest
 import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity
-import com.nivesh.production.bajajfd.util.Common.Companion.showDialogValidation
+import com.nivesh.production.bajajfd.util.Common
 import com.nivesh.production.bajajfd.util.Resource
 import com.nivesh.production.bajajfd.viewModel.StepOneBajajFDViewModel
 
@@ -47,7 +47,7 @@ class StepOneBajajFDFragment : Fragment() {
         _binding = FragmentBajajfdStepOneBinding.inflate(inflater, container, false)
         val root = binding.root
 
-        stepOneBajajFDViewModel = (activity as BajajFdMainActivity).viewModel
+        stepOneBajajFDViewModel = (activity as BajajFdMainActivity).stepOneBajajFDViewModel
 
         // Amount
         binding.edtAmount.addTextChangedListener(object : TextWatcher {
@@ -70,15 +70,15 @@ class StepOneBajajFDFragment : Fragment() {
                 R.array.interestPayoutList
             )
         )
-        binding.tvInterestPayout.setAdapter(adapter)
-        binding.tvInterestPayout.setOnItemClickListener { parent, view, position, id ->
+        binding.spInterestPayout.setAdapter(adapter)
+        binding.spInterestPayout.setOnItemClickListener { parent, view, position, id ->
             binding.spInterestPayout.error = null
-            binding.tvFrequency.text = binding.tvInterestPayout.text
+            binding.tvFrequency.text = binding.spInterestPayout.text
         }
 
         // Tenure
-        binding.tvTenure.setAdapter(adapter)
-        binding.tvTenure.setOnItemClickListener { parent, view, position, id ->
+        binding.spTenure.setAdapter(adapter)
+        binding.spTenure.setOnItemClickListener { parent, view, position, id ->
             //  getRatesApi()
         }
 
@@ -112,17 +112,18 @@ class StepOneBajajFDFragment : Fragment() {
     }
 
     private fun validation(): Boolean {
-        if (binding.edtAmount.text?.isEmpty()!!) {
-            return false
-            binding.tlDepositAmount.error = ""
-        } else if (binding.tvInterestPayout.text.isEmpty()) {
-            return false
-            binding.spInterestPayout.error = ""
-        } else if (binding.tvTenure.text.isEmpty()) {
-            return false
-            binding.spInterestTenure.error = ""
+        return if (binding.edtAmount.text.toString().isEmpty()) {
+            Common.commonErrorMethod(binding.edtAmount, binding.tlDepositAmount, "")
+        } else if (binding.spInterestPayout.text.isEmpty()) {
+            Common.commonSpinnerErrorMethod(
+                binding.spInterestPayout,
+                binding.tlInterestPayout,
+                ""
+            )
+        } else if (binding.spTenure.text.isEmpty()) {
+            Common.commonSpinnerErrorMethod(binding.spTenure, binding.tlInterestTenure, "")
         } else {
-            return true
+            true
         }
     }
 

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

@@ -67,7 +67,7 @@ class StepTwoBajajFDFragment : Fragment() {
                 binding.tlMobileNumber.error = null
             }
         })
-        binding.edtDOB.setOnClickListener{
+        binding.edtDOB.setOnClickListener {
 
         }
         binding.edtPANNumber.addTextChangedListener(object : TextWatcher {
@@ -321,7 +321,7 @@ class StepTwoBajajFDFragment : Fragment() {
             }
         })
 
-        binding.edtNomineeDOB.setOnClickListener{
+        binding.edtNomineeDOB.setOnClickListener {
 
         }
 
@@ -427,7 +427,7 @@ class StepTwoBajajFDFragment : Fragment() {
                 binding.tlBankName.error = null
             }
         })
-        binding.edtbankBranch.addTextChangedListener(object : TextWatcher {
+        binding.edtBankBranch.addTextChangedListener(object : TextWatcher {
 
             override fun afterTextChanged(s: Editable?) {
             }
@@ -452,71 +452,76 @@ class StepTwoBajajFDFragment : Fragment() {
         binding.tvBankDetails.setOnClickListener {
 
         }
-        // if ( validation())
+
+        binding.btnNext.setOnClickListener {
+            if (validation()) {
+
+            }
+        }
         return root
     }
 
     private fun validation(): Boolean {
-        if (binding.edtMobileNumber.text.toString().isEmpty()) { // EditText
-            return commonErrorMethod(binding.edtMobileNumber, binding.tlMobileNumber, "")
+        return if (binding.edtMobileNumber.text.toString().isEmpty()) { // EditText
+            commonErrorMethod(binding.edtMobileNumber, binding.tlMobileNumber, "")
         } else if (binding.edtMobileNumber.text?.length != 10) { // EditText
-            return commonErrorMethod(binding.edtMobileNumber, binding.tlMobileNumber, "")
+            commonErrorMethod(binding.edtMobileNumber, binding.tlMobileNumber, "")
         } else if (binding.edtMobileNumber.text?.length == 10 && !isIndianMobileNo(binding.edtMobileNumber.text.toString())) { // EditText
-            return commonErrorMethod(binding.edtMobileNumber, binding.tlMobileNumber, "")
+            commonErrorMethod(binding.edtMobileNumber, binding.tlMobileNumber, "")
         } else if (binding.edtDOB.text.toString().isEmpty()) { // EditText
-            return commonErrorMethod(binding.edtDOB, binding.tlDOB, "")
+            commonErrorMethod(binding.edtDOB, binding.tlDOB, "")
         } else if (binding.edtPANNumber.text.toString().isEmpty()) { // EditText
-            return commonErrorMethod(binding.edtPANNumber, binding.tlPanNumber, "")
+            commonErrorMethod(binding.edtPANNumber, binding.tlPanNumber, "")
         } else if (isValidPan(binding.edtPANNumber.text.toString())) { // EditText
-            return commonErrorMethod(binding.edtPANNumber, binding.tlPanNumber, "")
+            commonErrorMethod(binding.edtPANNumber, binding.tlPanNumber, "")
         } else if (binding.spTitle.text.isEmpty()) { // Spinner
-            return commonSpinnerErrorMethod(binding.spTitle, binding.tlTitle, "")
+            commonSpinnerErrorMethod(binding.spTitle, binding.tlTitle, "")
         } else if (binding.edtFirstName.text.toString().isEmpty()) { // EditText
-            return commonErrorMethod(binding.edtFirstName, binding.tlFirstName, "")
+            commonErrorMethod(binding.edtFirstName, binding.tlFirstName, "")
         } else if (isValidName(binding.edtFirstName.text.toString())) { // EditText
-            return commonErrorMethod(binding.edtFirstName, binding.tlFirstName, "")
+            commonErrorMethod(binding.edtFirstName, binding.tlFirstName, "")
         } else if (binding.edtMiddleName.text.toString().isEmpty()) { // EditText
-            return commonErrorMethod(binding.edtMiddleName, binding.tlMiddleName, "")
+            commonErrorMethod(binding.edtMiddleName, binding.tlMiddleName, "")
         } else if (isValidName(binding.edtMiddleName.text.toString())) { // EditText
-            return commonErrorMethod(binding.edtMiddleName, binding.tlMiddleName, "")
+            commonErrorMethod(binding.edtMiddleName, binding.tlMiddleName, "")
         } else if (binding.edtLastName.text.toString().isEmpty()) { // EditText
-            return commonErrorMethod(binding.edtLastName, binding.tlLastName, "")
+            commonErrorMethod(binding.edtLastName, binding.tlLastName, "")
         } else if (isValidName(binding.edtLastName.text.toString())) { // EditText
-            return commonErrorMethod(binding.edtLastName, binding.tlLastName, "")
+            commonErrorMethod(binding.edtLastName, binding.tlLastName, "")
         } else if (binding.spGender.text.toString().isEmpty()) { // Spinner
-            return commonSpinnerErrorMethod(binding.spGender, binding.tlGender, "")
+            commonSpinnerErrorMethod(binding.spGender, binding.tlGender, "")
         } else if (binding.edtEmail.text.toString().isEmpty()) { // EditText
-            return commonErrorMethod(binding.edtEmail, binding.tlEmail, "")
+            commonErrorMethod(binding.edtEmail, binding.tlEmail, "")
         } else if (isValidEmail(binding.edtEmail.text.toString())) { // EditText
-            return commonErrorMethod(binding.edtEmail, binding.tlEmail, "")
+            commonErrorMethod(binding.edtEmail, binding.tlEmail, "")
         } else if (binding.edtOccupation.text.toString().isEmpty()) { // EditText
-            return commonErrorMethod(binding.edtOccupation, binding.tlOccupation, "")
+            commonErrorMethod(binding.edtOccupation, binding.tlOccupation, "")
         } else if (binding.edtQualification.text.toString().isEmpty()) { // EditText
-            return commonErrorMethod(binding.edtQualification, binding.tlQualification, "")
+            commonErrorMethod(binding.edtQualification, binding.tlQualification, "")
         } else if (binding.spMarital.text.toString().isEmpty()) {  // Spinner
-            return commonSpinnerErrorMethod(binding.spMarital, binding.tlMarital, "")
+            commonSpinnerErrorMethod(binding.spMarital, binding.tlMarital, "")
         } else if (binding.spRelation.text.toString().isEmpty()) { // Spinner
-            return commonSpinnerErrorMethod(binding.spRelation, binding.tlRelation, "")
+            commonSpinnerErrorMethod(binding.spRelation, binding.tlRelation, "")
         } else if (binding.edtRelationName.text.toString().isEmpty()) {  // EditText
-            return commonErrorMethod(binding.edtRelationName, binding.tlRelationName, "")
+            commonErrorMethod(binding.edtRelationName, binding.tlRelationName, "")
         } else if (binding.edtAddressLine1.text.toString().isEmpty()) {  // EditText
-            return commonErrorMethod(binding.edtAddressLine1, binding.tlAddressLine1, "")
+            commonErrorMethod(binding.edtAddressLine1, binding.tlAddressLine1, "")
         } else if (binding.edtAddressLine2.text.toString().isEmpty()) {  // EditText
-            return commonErrorMethod(binding.edtAddressLine2, binding.tlAddressLine2, "")
+            commonErrorMethod(binding.edtAddressLine2, binding.tlAddressLine2, "")
         } else if (binding.edtState.text.toString().isEmpty()) {   // EditText
-            return commonErrorMethod(binding.edtState, binding.tlState, "")
+            commonErrorMethod(binding.edtState, binding.tlState, "")
         } else if (binding.edtCity.text.toString().isEmpty()) { // EditText
-            return commonErrorMethod(binding.edtCity, binding.tlCity, "")
+            commonErrorMethod(binding.edtCity, binding.tlCity, "")
         } else if (binding.edtPinCode.text.toString().isEmpty()) { // EditText
-            return commonErrorMethod(binding.edtPinCode, binding.tlPinCode, "")
+            commonErrorMethod(binding.edtPinCode, binding.tlPinCode, "")
         } else if (binding.edtIFSC.text.toString().isEmpty()) { // EditText
-            return commonErrorMethod(binding.edtIFSC, binding.tlIFSC, "")
+            commonErrorMethod(binding.edtIFSC, binding.tlIFSC, "")
         } else if (binding.edtAccountNumber.text.toString().isEmpty()) { // EditText
-            return commonErrorMethod(binding.edtAccountNumber, binding.tlAccountNumber, "")
+            commonErrorMethod(binding.edtAccountNumber, binding.tlAccountNumber, "")
         } else if (binding.edtBankName.text.toString().isEmpty()) { // EditText
-            return commonErrorMethod(binding.edtBankName, binding.tlBankName, "")
-        } else if (binding.edtbankBranch.text.toString().isEmpty()) { // EditText
-            return commonErrorMethod(binding.edtbankBranch, binding.tlBankBranchName, "")
+            commonErrorMethod(binding.edtBankName, binding.tlBankName, "")
+        } else if (binding.edtBankBranch.text.toString().isEmpty()) { // EditText
+            commonErrorMethod(binding.edtBankBranch, binding.tlBankBranchName, "")
         } else {
             return true
         }

app/src/main/java/com/nivesh/production/bajajfd/viewModel/BajajFDViewModel.kt

@@ -0,0 +1,32 @@
+package com.nivesh.production.bajajfd.viewModel
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.google.gson.JsonObject
+import com.nivesh.production.bajajfd.model.GetCodeRequest
+import com.nivesh.production.bajajfd.model.GetRatesRequest
+import com.nivesh.production.bajajfd.repositories.MainRepository
+import com.nivesh.production.bajajfd.util.Resource
+import kotlinx.coroutines.launch
+
+class BajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() {
+    // TODO: Implement the ViewModel
+    val getRatesMutableData: MutableLiveData<Resource<JsonObject>> = MutableLiveData()
+
+    fun getCode(getCodeRequest: GetCodeRequest) = viewModelScope.launch {
+        getRatesMutableData.postValue(Resource.Loading())
+        val response = mainRepository.getCodesResponse(getCodeRequest)
+        getRatesMutableData.postValue(handleRatesResponse(response))
+    }
+
+    private fun handleRatesResponse(response: retrofit2.Response<JsonObject>): Resource<JsonObject> {
+        if (response.isSuccessful) {
+            response.body()?.let { resultResponse ->
+                return Resource.Success(resultResponse)
+            }
+        }
+        return Resource.Error(response.message())
+    }
+
+}

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

@@ -15,7 +15,7 @@
         android:background="@color/grey_bg"
         android:drawablePadding="@dimen/margin_5"
         android:padding="@dimen/margin_3"
-        android:text="Bank Details"
+        android:text="@string/bankDetails"
         android:textColor="@color/black"
         app:layout_constraintBottom_toTopOf="@+id/rVBankList"
         app:layout_constraintEnd_toEndOf="parent"
@@ -42,9 +42,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:text="+ Add New Account"
+        android:text="@string/addNewAccount"
         android:textColor="@color/black"
         android:paddingStart="@dimen/margin_5"
+        android:paddingEnd="@dimen/margin_1"
         app:layout_constraintBottom_toTopOf="@+id/rlPaymentMode"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
@@ -67,7 +68,7 @@
             style="@style/regularStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="UPI"
+            android:text="@string/Upi"
             android:textSize="@dimen/text_size_14"
             tools:layout_editor_absoluteX="11dp"
             tools:layout_editor_absoluteY="355dp" />
@@ -78,7 +79,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/margin_150"
-            android:text="NetBanking"
+            android:text="@string/netBanking"
             android:textSize="@dimen/text_size_14"
             tools:layout_editor_absoluteX="11dp"
             tools:layout_editor_absoluteY="355dp" />
@@ -104,7 +105,7 @@
             style="@style/semiBoldStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Payment mode"
+            android:text="@string/paymentMode"
             android:textColor="@color/black"
             android:textSize="@dimen/text_size_14"
             tools:layout_editor_absoluteX="5dp"
@@ -117,7 +118,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:gravity="center_vertical"
-            android:text="View available payment modes"
+            android:text="@string/viewAvailablePaymentModes"
             android:textColor="@color/blue_text_color"
             android:textSize="@dimen/text_size_10"
             tools:layout_editor_absoluteX="5dp"

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

@@ -24,16 +24,15 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/margin_5"
-            android:layout_marginTop="@dimen/margin_5"
             android:layout_marginRight="@dimen/margin_5"
             android:padding="@dimen/margin_10">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="70dp"
-                android:layout_marginTop="16dp"
                 android:layout_marginBottom="12dp"
                 android:background="@color/white"
+                android:layout_marginStart="@dimen/margin_5"
                 android:padding="@dimen/margin_5"
                 app:layout_constraintBottom_toTopOf="@+id/tvCongrats"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -46,7 +45,6 @@
                     android:id="@+id/logo"
                     android:layout_width="@dimen/margin_150"
                     android:layout_height="18dp"
-                    android:layout_marginTop="8dp"
                     android:contentDescription="@string/content_description"
                     android:src="@drawable/bajaj_logo"
                     app:layout_constraintBottom_toTopOf="@+id/tvFdRating"
@@ -60,7 +58,7 @@
                     style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Ratings: CRISIL AAA/Stable &amp; ICRA AAA/Stable"
+                    android:text="@string/schemeRating"
                     android:textColor="@color/light_text"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -102,7 +100,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="12dp"
-                    android:text="Congratulations"
+                    android:text="@string/congratulations"
                     android:textColor="@color/black"
                     android:textSize="@dimen/text_size_17"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -116,7 +114,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
-                    android:text="Your transaction is successful."
+                    android:text="@string/transactionIsSuccessful"
                     android:textColor="@color/black"
                     android:textSize="@dimen/text_size_16"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -131,7 +129,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="10dp"
                     android:gravity="center"
-                    android:text="You will receive fixed deposit certificate\nwithin 3 working days on email"
+                    android:text="@string/certificateOnEmail"
                     android:textColor="@color/black"
                     android:textSize="@dimen/text_size_14"
                     app:layout_constraintBottom_toBottomOf="parent"
@@ -146,7 +144,7 @@
 
         <include
             android:id="@+id/fragmentStepFail"
-            layout="@layout/fragmnet_step_fail"
+            layout="@layout/fragment_step_fail"
             android:visibility="gone" />
 
     </LinearLayout>
@@ -156,7 +154,7 @@
         style="@style/semiBoldStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Download Invoice"
+        android:text="@string/downloadInvoice"
         android:textColor="@color/blue"
         android:textSize="@dimen/text_size_16"
         app:layout_constraintBottom_toBottomOf="@+id/btnNext"
@@ -172,7 +170,7 @@
         android:layout_gravity="center_vertical"
         android:layout_marginStart="16dp"
         android:backgroundTint="@color/colorPrimary"
-        android:text="View order"
+        android:text="@string/viewOrder"
         android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -187,7 +185,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:backgroundTint="@color/blue"
-        android:text="Retry"
+        android:text="@string/retry"
         android:textColor="@color/white"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"

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

@@ -41,24 +41,24 @@
                 <ImageView
                     android:id="@+id/logo"
                     android:layout_width="@dimen/margin_150"
-                    android:layout_height="18dp"
-                    android:layout_marginTop="8dp"
+                    android:layout_height="@dimen/margin_18"
+                    android:layout_marginTop="@dimen/margin_15"
+                    android:contentDescription="@string/content_description"
                     android:src="@drawable/bajaj_logo"
                     app:layout_constraintHorizontal_bias="0.065"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    android:contentDescription="@string/content_description"/>
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
                     android:id="@+id/tvFDRating"
                     style="@style/regularStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:paddingStart="@dimen/margin_10"
+                    android:layout_marginTop="@dimen/margin_5"
+                    android:paddingStart="@dimen/margin_15"
                     android:paddingEnd="@dimen/margin_10"
-                    android:text="Rating: FAAA by CRISIL"
+                    android:text="@string/schemeRating"
                     android:textColor="@color/light_text"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
@@ -69,12 +69,15 @@
                     style="@style/semiBoldStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
+                    android:layout_marginTop="@dimen/margin_15"
                     android:background="@color/grey_bg"
-                    android:paddingStart="@dimen/margin_10"
+                    android:paddingStart="@dimen/margin_15"
+                    android:paddingTop="@dimen/margin_2"
                     android:paddingEnd="@dimen/margin_10"
-                    android:text="Make payment"
+                    android:paddingBottom="@dimen/margin_2"
+                    android:text="@string/makePayment"
                     android:textColor="@color/black"
+                    android:textSize="@dimen/text_size_14"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/tvFDRating" />
@@ -84,15 +87,14 @@
                     style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/margin_10"
-                    android:paddingEnd="@dimen/margin_10"
-                    android:paddingStart="0dp"
-                    android:text="Invested Amount"
+                    android:layout_marginStart="@dimen/margin_15"
+                    android:layout_marginTop="@dimen/margin_10"
+                    android:padding="@dimen/margin_5"
+                    android:text="@string/investedAmount"
                     android:textSize="@dimen/text_size_14"
                     app:layout_constraintBottom_toTopOf="@id/lblTenure"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvMakePayment"
-                    app:layout_constraintVertical_bias="0.0" />
+                    app:layout_constraintTop_toBottomOf="@+id/tvMakePayment" />
 
                 <TextView
                     android:id="@+id/tvInvestedAmount"
@@ -101,188 +103,157 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/margin_10"
                     android:layout_marginEnd="@dimen/margin_15"
-                    android:paddingStart="@dimen/margin_10"
-                    android:paddingEnd="@dimen/margin_10"
-                    android:text="Rs. 50,000"
+                    android:padding="@dimen/margin_5"
                     android:textColor="@color/black"
                     android:textSize="@dimen/text_size_14"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="1.0"
                     app:layout_constraintStart_toEndOf="@+id/lblMakePayment"
-                    app:layout_constraintTop_toBottomOf="@+id/tvMakePayment"
-                    app:layout_constraintVertical_bias="0.0" />
+                    app:layout_constraintTop_toBottomOf="@+id/tvMakePayment" />
 
                 <TextView
                     android:id="@+id/lblTenure"
                     style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/margin_10"
-                    android:paddingEnd="@dimen/margin_10"
-                    android:paddingStart="0dp"
-                    android:text="Tenure"
+                    android:layout_marginStart="@dimen/margin_15"
+                    android:padding="@dimen/margin_5"
+                    android:text="@string/tenure"
                     android:textSize="@dimen/text_size_14"
                     app:layout_constraintBottom_toTopOf="@+id/lblInterestPayout"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/lblMakePayment"
-                    app:layout_constraintVertical_bias="0.0" />
+                    app:layout_constraintTop_toBottomOf="@+id/lblMakePayment" />
 
                 <TextView
                     android:id="@+id/tvTenure"
                     style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="2 Years"
-                    android:paddingStart="@dimen/margin_10"
-                    android:paddingEnd="@dimen/margin_10"
-                    android:layout_marginTop="@dimen/margin_10"
                     android:layout_marginEnd="@dimen/margin_15"
-                    android:layout_marginStart="@dimen/margin_10"
+                    android:padding="@dimen/margin_5"
                     android:textColor="@color/black"
                     android:textSize="@dimen/text_size_14"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="1.0"
                     app:layout_constraintStart_toEndOf="@+id/lblTenure"
-                    app:layout_constraintTop_toBottomOf="@+id/tvInvestedAmount"
-                    app:layout_constraintVertical_bias="0.0" />
+                    app:layout_constraintTop_toBottomOf="@+id/tvInvestedAmount" />
 
                 <TextView
                     android:id="@+id/lblInterestPayout"
                     style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/margin_10"
-                    android:paddingEnd="@dimen/margin_10"
-                    android:paddingStart="0dp"
-                    android:text="Interest Payout"
+                    android:layout_marginStart="@dimen/margin_15"
+                    android:padding="@dimen/margin_5"
+                    android:text="@string/interestPayout"
                     android:textSize="@dimen/text_size_14"
                     app:layout_constraintBottom_toTopOf="@+id/lblRateOfInterest"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/lblTenure"
-                    app:layout_constraintVertical_bias="0.0" />
+                    app:layout_constraintTop_toBottomOf="@+id/lblTenure" />
 
                 <TextView
                     android:id="@+id/tvInterestPayout"
                     style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginEnd="8dp"
-                    android:paddingStart="@dimen/margin_10"
-                    android:paddingEnd="@dimen/margin_10"
-                    android:text="Monthly"
+                    android:layout_marginEnd="@dimen/margin_15"
+                    android:padding="@dimen/margin_5"
                     android:textSize="@dimen/text_size_14"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.9"
+                    app:layout_constraintHorizontal_bias="1.0"
                     app:layout_constraintStart_toEndOf="@+id/lblInterestPayout"
-                    app:layout_constraintTop_toBottomOf="@+id/tvTenure"
-                    app:layout_constraintVertical_bias="0.0" />
+                    app:layout_constraintTop_toBottomOf="@+id/tvTenure" />
 
                 <TextView
                     android:id="@+id/lblRateOfInterest"
                     style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/margin_10"
-                    android:paddingEnd="@dimen/margin_10"
-                    android:paddingStart="0dp"
-                    android:text="Rate of Interest"
+                    android:layout_marginStart="@dimen/margin_15"
+                    android:padding="@dimen/margin_5"
+                    android:text="@string/rateOfInterest"
                     android:textSize="@dimen/text_size_14"
                     app:layout_constraintBottom_toTopOf="@+id/tvTermsCondition"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/lblInterestPayout"
-                    app:layout_constraintVertical_bias="0.0" />
+                    app:layout_constraintTop_toBottomOf="@+id/lblInterestPayout" />
 
                 <TextView
                     android:id="@+id/tvRateOfInterest"
                     style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginEnd="8dp"
-                    android:paddingStart="@dimen/margin_10"
-                    android:paddingEnd="@dimen/margin_10"
+                    android:layout_marginEnd="@dimen/margin_15"
+                    android:padding="@dimen/margin_5"
                     android:textSize="@dimen/text_size_14"
-                    android:text="6.75%"
+                    app:layout_constraintBottom_toTopOf="@+id/tvTermsCondition"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.9"
+                    app:layout_constraintHorizontal_bias="1.0"
                     app:layout_constraintStart_toEndOf="@+id/lblRateOfInterest"
-                    app:layout_constraintTop_toBottomOf="@+id/tvInterestPayout"
-                    app:layout_constraintBottom_toTopOf="@+id/tvTermsCondition"
-                    app:layout_constraintVertical_bias="0.0" />
+                    app:layout_constraintTop_toBottomOf="@+id/tvInterestPayout" />
 
                 <TextView
                     android:id="@+id/tvTermsCondition"
                     style="@style/semiBoldStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="196dp"
+                    android:layout_marginTop="@dimen/margin_5"
                     android:background="@color/grey_bg"
-                    android:paddingStart="@dimen/margin_10"
-                    android:paddingTop="@dimen/margin_3"
+                    android:paddingStart="@dimen/margin_15"
+                    android:paddingTop="@dimen/margin_2"
                     android:paddingEnd="0dp"
-                    android:paddingBottom="@dimen/margin_3"
-                    android:text="Terms &amp; condition"
+                    android:paddingBottom="@dimen/margin_2"
+                    android:text="@string/termsAndCondition"
                     android:textColor="@color/black"
+                    android:textSize="@dimen/text_size_14"
                     app:layout_constraintBottom_toTopOf="@+id/swDirectorBajajFinance"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvFDRating" />
+                    app:layout_constraintTop_toBottomOf="@+id/lblRateOfInterest" />
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/swDirectorBajajFinance"
                     style="@style/regularStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginEnd="5dp"
-                    android:text="Director of Bajaj Finance Ltd."
+                    android:layout_marginStart="@dimen/margin_15"
+                    android:layout_marginEnd="@dimen/margin_15"
+                    android:text="@string/directorOfBajajFinance"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvTermsCondition"
-                    app:layout_constraintVertical_bias="0.018" />
+                    app:layout_constraintTop_toBottomOf="@+id/tvTermsCondition" />
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
-                    style="@style/regularStyle"
                     android:id="@+id/swPromoterBajajFinance"
+                    style="@style/regularStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="5dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_marginBottom="8dp"
-                    android:text="Promoter of Bajaj Finance Ltd."
+                    android:layout_marginStart="@dimen/margin_15"
+                    android:layout_marginEnd="@dimen/margin_15"
+                    android:text="@string/promoterOfBajajFinanceLtd"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/swDirectorBajajFinance"
-                    app:layout_constraintVertical_bias="0.0" />
+                    app:layout_constraintTop_toBottomOf="@+id/swDirectorBajajFinance" />
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/swRelativeDirector"
                     style="@style/regularStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_marginBottom="8dp"
-                    android:text="Relative of director or promotor of Bajaj Finance Ltd."
+                    android:layout_marginStart="@dimen/margin_15"
+                    android:layout_marginEnd="@dimen/margin_15"
+                    android:text="@string/relativeOfBajajFinanceLtd"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.0"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/swPromoterBajajFinance"
-                    app:layout_constraintVertical_bias="0.0" />
+                    app:layout_constraintTop_toBottomOf="@+id/swPromoterBajajFinance" />
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/swShareholder"
                     style="@style/regularStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_marginBottom="8dp"
-                    android:text="Shareholder of Bajaj Finance Ltd."
+                    android:layout_marginStart="@dimen/margin_15"
+                    android:layout_marginEnd="@dimen/margin_15"
+                    android:text="@string/shareholderOfBajajFinanceLtd"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/swRelativeDirector" />
@@ -292,11 +263,9 @@
                     style="@style/regularStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_marginBottom="8dp"
-                    android:text="Are you a politicallly exposed person"
+                    android:layout_marginStart="@dimen/margin_15"
+                    android:layout_marginEnd="@dimen/margin_15"
+                    android:text="@string/politicallyExposedPerson"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/swShareholder" />
@@ -306,21 +275,19 @@
                     style="@style/regularStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_marginBottom="8dp"
-                    android:text="I am not a citizen, national or tax resident of any country outside of India"
+                    android:layout_marginStart="@dimen/margin_15"
+                    android:layout_marginEnd="@dimen/margin_15"
+                    android:text="@string/outsideOfIndia"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/swPoliticallyExposed"
-                    app:layout_constraintVertical_bias="0.0" />
+                    app:layout_constraintTop_toBottomOf="@+id/swPoliticallyExposed" />
 
                 <CheckBox
                     android:id="@+id/checkBox"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
+                    android:layout_marginStart="@dimen/margin_8"
+                    android:layout_marginTop="@dimen/margin_20"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/swCitizen" />
 
@@ -328,8 +295,8 @@
                     android:id="@+id/tvTermsAndCondition"
                     android:layout_width="322dp"
                     android:layout_height="74dp"
-                    android:layout_marginTop="15dp"
-                    android:layout_marginEnd="10dp"
+                    android:layout_marginTop="@dimen/margin_15"
+                    android:layout_marginEnd="@dimen/margin_10"
                     android:text="@string/terms_condition"
                     android:textColor="@color/black"
                     android:textSize="@dimen/text_size_10"
@@ -367,7 +334,7 @@
         android:layout_marginTop="10dp"
         android:layout_marginBottom="10dp"
         android:backgroundTint="@color/colorPrimary"
-        android:text="View Order"
+        android:text="@string/viewOrder"
         android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -100,7 +100,7 @@
                         </com.google.android.material.textfield.TextInputLayout>
 
                         <com.google.android.material.textfield.TextInputLayout
-                            android:id="@+id/spInterestPayout"
+                            android:id="@+id/tlInterestPayout"
                             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/margin_48"
@@ -111,7 +111,7 @@
                             app:layout_constraintTop_toBottomOf="@+id/tlDepositAmount">
 
                             <com.google.android.material.textfield.MaterialAutoCompleteTextView
-                                android:id="@+id/tvInterestPayout"
+                                android:id="@+id/spInterestPayout"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:background="@drawable/rounded_corner_with_line"
@@ -124,7 +124,7 @@
                         </com.google.android.material.textfield.TextInputLayout>
 
                         <com.google.android.material.textfield.TextInputLayout
-                            android:id="@+id/spInterestTenure"
+                            android:id="@+id/tlInterestTenure"
                             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/margin_48"
@@ -132,10 +132,10 @@
                             app:hintEnabled="false"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/spInterestPayout">
+                            app:layout_constraintTop_toBottomOf="@+id/tlInterestPayout">
 
-                            <AutoCompleteTextView
-                                android:id="@+id/tvTenure"
+                            <com.google.android.material.textfield.MaterialAutoCompleteTextView
+                                android:id="@+id/spTenure"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:background="@drawable/rounded_corner_with_line"
@@ -159,7 +159,7 @@
                             app:layout_constraintBottom_toBottomOf="@+id/swSeniorCitizen"
                             app:layout_constraintHorizontal_bias="0.0"
                             app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/spInterestTenure"
+                            app:layout_constraintTop_toBottomOf="@+id/tlInterestTenure"
                             app:layout_constraintVertical_bias="0.018" />
 
                         <androidx.appcompat.widget.SwitchCompat
@@ -175,7 +175,7 @@
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="0.0"
                             app:layout_constraintStart_toEndOf="@+id/tvSwitchLabel"
-                            app:layout_constraintTop_toBottomOf="@+id/spInterestTenure"
+                            app:layout_constraintTop_toBottomOf="@+id/tlInterestTenure"
                             app:layout_constraintVertical_bias="0.018" />
 
                     </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -6,20 +6,20 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/Nivesh_color_AppBg"
-    tools:context="com.nivesh.production.bajajfd.ui.fragment.StepFourBajajFDFragment">
+    tools:context=".ui.fragment.StepFourBajajFDFragment">
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/scrollView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="80dp"
+        android:layout_marginBottom="@dimen/margin_80"
         android:background="@color/Nivesh_color_AppBg"
         android:fillViewport="true"
         android:visibility="visible"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/btnNext"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btnNext">
+        app:layout_constraintTop_toTopOf="parent">
 
         <com.google.android.material.card.MaterialCardView
             style="@style/CustomCardViewStyle"
@@ -27,7 +27,7 @@
             android:layout_height="wrap_content"
             android:foreground="?android:attr/selectableItemBackground"
             android:padding="@dimen/margin_10"
-            app:cardElevation="1dp"
+            app:cardElevation="@dimen/margin_1"
             app:cardUseCompatPadding="true"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -37,14 +37,14 @@
                 android:id="@+id/childConstraint"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="@dimen/margin_10"
                 android:paddingBottom="@dimen/margin_30">
 
                 <ImageView
+                    android:layout_marginStart="@dimen/margin_20"
                     android:id="@+id/logo"
                     android:layout_width="@dimen/margin_150"
-                    android:layout_height="18dp"
-                    android:layout_marginTop="4dp"
+                    android:layout_height="@dimen/margin_22"
+                    android:layout_marginTop="@dimen/margin_10"
                     android:src="@drawable/bajaj_logo"
                     app:layout_constraintBottom_toTopOf="@+id/tvFDRating"
                     app:layout_constraintHorizontal_bias="0.0"
@@ -56,9 +56,11 @@
                 <TextView
                     android:id="@+id/tvFDRating"
                     style="@style/regularStyle"
+                    android:paddingStart="@dimen/margin_20"
+                    android:paddingEnd="@dimen/margin_1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="Rating: FAAA by CRISIL"
+                    android:text="@string/schemeRating"
                     android:textColor="@color/light_text"
                     android:textSize="@dimen/text_size_12"
                     app:layout_constraintBottom_toTopOf="@+id/tvUploadKYCDocument"
@@ -71,47 +73,57 @@
                     style="@style/semiBoldStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="7dp"
-                    android:paddingStart="10dp"
-                    android:paddingEnd="10dp"
+                    android:layout_marginTop="@dimen/margin_7"
+                    android:paddingStart="@dimen/margin_20"
+                    android:paddingEnd="@dimen/margin_20"
                     android:background="@color/grey_text_bg"
-                    android:padding="@dimen/margin_1"
-                    android:text="upload KYC Documents"
+                    android:text="@string/uploadKycDocuments"
                     android:textColor="@color/black"
                     app:drawableEndCompat="@drawable/svg_down_arrow"
                     app:layout_constraintTop_toBottomOf="@+id/tvFDRating"
                     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="20dp"
-                    android:paddingEnd="20dp"
-                    android:layout_marginTop="12dp"
-                    android:text="@string/address_proof_type"
-                    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" />
+<!--                <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" />-->
 
-                <Spinner
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/spAddressType"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/margin_45"
-                    android:paddingStart="10dp"
-                    android:paddingEnd="10dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginStart="20dp"
-                    android:layout_marginEnd="20dp"
-                    android:background="@drawable/rounded_corner_with_line"
-                    android:entries="@array/address_type"
-                    app:layout_constraintTop_toBottomOf="@+id/tvAddressProofType"
+                    android:layout_height="@dimen/margin_48"
+                    android:layout_marginTop="@dimen/margin_15"
+                    android:layout_marginBottom="@dimen/margin_5"
+                    android:layout_marginStart="@dimen/margin_20"
+                    android:layout_marginEnd="@dimen/margin_20"
+                    app:hintEnabled="false"
+                    app:layout_constraintTop_toBottomOf="@+id/tvUploadKYCDocument"
                     app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent" />
+                    app:layout_constraintRight_toRightOf="parent">
+
+                    <com.google.android.material.textfield.MaterialAutoCompleteTextView
+                        android:id="@+id/spTitle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/rounded_corner_with_line"
+                        android:hint="@string/addressProofType"
+                        android:inputType="none"
+                        android:labelFor="@+id/spInterestPayout"
+                        android:textColorHint="#757575"
+                        android:textSize="@dimen/text_size_14" />
+                </com.google.android.material.textfield.TextInputLayout>
 
                 <TextView
                     android:id="@+id/tvAadhaarFront"
@@ -129,14 +141,14 @@
                 <Button
                     android:id="@+id/btnAadhaarFrontUpload"
                     android:layout_width="wrap_content"
-                    android:layout_height="48dp"
+                    android:layout_height="@dimen/margin_48"
                     android:layout_alignParentEnd="true"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginBottom="8dp"
+                    android:layout_marginTop="@dimen/margin_16"
+                    android:layout_marginBottom="@dimen/margin_8"
                     android:backgroundTint="@color/color_EFEFEF"
                     android:paddingLeft="@dimen/margin_30"
                     android:paddingRight="@dimen/margin_30"
-                    android:text="Upload File"
+                    android:text="@string/uploadFile"
                     android:textAllCaps="false"
                     android:textColor="@color/black"
                     app:layout_constraintBottom_toTopOf="@+id/btnAadhaarBackUpload"
@@ -162,14 +174,14 @@
                 <Button
                     android:id="@+id/btnAadhaarBackUpload"
                     android:layout_width="wrap_content"
-                    android:layout_height="48dp"
+                    android:layout_height="@dimen/margin_48"
                     android:layout_alignParentEnd="true"
-                    android:layout_marginTop="6dp"
-                    android:layout_marginBottom="8dp"
+                    android:layout_marginTop="@dimen/margin_6"
+                    android:layout_marginBottom="@dimen/margin_8"
                     android:backgroundTint="@color/color_EFEFEF"
                     android:paddingLeft="@dimen/margin_30"
                     android:paddingRight="@dimen/margin_30"
-                    android:text="Upload File"
+                    android:text="@string/uploadFile"
                     android:textAllCaps="false"
                     android:textColor="@color/black"
                     app:layout_constraintBottom_toTopOf="@+id/btnPANUpload"
@@ -197,14 +209,14 @@
                 <Button
                     android:id="@+id/btnPANUpload"
                     android:layout_width="wrap_content"
-                    android:layout_height="48dp"
+                    android:layout_height="@dimen/margin_48"
                     android:layout_alignParentEnd="true"
-                    android:layout_marginTop="6dp"
-                    android:layout_marginBottom="8dp"
+                    android:layout_marginTop="@dimen/margin_6"
+                    android:layout_marginBottom="@dimen/margin_8"
                     android:backgroundTint="@color/color_EFEFEF"
                     android:paddingLeft="@dimen/margin_30"
                     android:paddingRight="@dimen/margin_30"
-                    android:text="Upload File"
+                    android:text="@string/uploadFile"
                     android:textAllCaps="false"
                     android:textColor="@color/black"
                     app:layout_constraintBottom_toTopOf="@+id/btnPhotoUpload"
@@ -229,13 +241,13 @@
                 <Button
                     android:id="@+id/btnPhotoUpload"
                     android:layout_width="wrap_content"
-                    android:layout_height="48dp"
+                    android:layout_height="@dimen/margin_48"
                     android:layout_alignParentEnd="true"
-                    android:layout_marginTop="10dp"
+                    android:layout_marginTop="@dimen/margin_10"
                     android:backgroundTint="@color/color_EFEFEF"
                     android:paddingLeft="@dimen/margin_30"
                     android:paddingRight="@dimen/margin_30"
-                    android:text="Upload File"
+                    android:text="@string/uploadFile"
                     android:textAllCaps="false"
                     android:textColor="@color/black"
                     app:layout_constraintEnd_toEndOf="@+id/btnPANUpload"
@@ -254,30 +266,28 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="15dp"
+        android:layout_marginTop="@dimen/margin_20"
+        android:layout_marginBottom="@dimen/margin_15"
         android:backgroundTint="@color/blue"
         android:text="@string/back"
         android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/btnNext"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/scrollView"/>
+        app:layout_constraintStart_toStartOf="parent"/>
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btnNext"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="15dp"
+        android:layout_marginStart="@dimen/margin_16"
+        android:layout_marginTop="@dimen/margin_20"
+        android:layout_marginBottom="@dimen/margin_15"
         android:backgroundTint="@color/colorPrimary"
         android:text="@string/next"
         android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/btnBack"
-        app:layout_constraintTop_toBottomOf="@+id/scrollView" />
+        app:layout_constraintStart_toEndOf="@+id/btnBack" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -60,7 +60,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="@dimen/margin_1"
-                        android:text="Ratings: CRISIL AAA/Stable & ICRA AAA/Stable"
+                        android:text="@string/schemeRating"
                         android:textColor="@color/light_text"
                         android:textSize="@dimen/text_size_12" />
 
@@ -71,7 +71,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/margin_15"
                         android:layout_marginBottom="@dimen/margin_1"
-                        android:text="All fields are mandatory other then optional"
+                        android:text="@string/mandatoryField"
                         android:textColor="@color/light_text"
                         android:textSize="@dimen/text_size_14" />
 
@@ -86,7 +86,7 @@
                     android:background="@color/grey_bg"
                     android:paddingStart="@dimen/margin_18"
                     android:paddingEnd="@dimen/margin_15"
-                    android:text="Personal Details"
+                    android:text="@string/personalDetails"
                     android:textColor="@color/black"
                     app:drawableEndCompat="@drawable/svg_down_arrow" />
 
@@ -103,7 +103,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="Enter Mobile Number">
+                        android:hint="@string/enterMobileNumber">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtMobileNumber"
@@ -121,7 +121,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="Date Of Birth">
+                        android:hint="@string/enterDateOfBirth">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtDOB"
@@ -139,7 +139,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="Enter PAN Number">
+                        android:hint="@string/enterPanNumber">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtPANNumber"
@@ -155,7 +155,10 @@
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/margin_48"
-                        android:layout_margin="@dimen/margin_5"
+                        android:layout_marginTop="@dimen/margin_10"
+                        android:layout_marginBottom="@dimen/margin_5"
+                        android:layout_marginStart="@dimen/margin_5"
+                        android:layout_marginEnd="@dimen/margin_5"
                         app:hintEnabled="false"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -179,7 +182,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="Enter First Name">
+                        android:hint="@string/enterFirstName">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtFirstName"
@@ -216,7 +219,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="Enter Last Name"
+                        android:hint="@string/enterLastName"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent">
 
@@ -247,7 +250,10 @@
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/margin_48"
-                        android:layout_margin="@dimen/margin_5"
+                        android:layout_marginTop="@dimen/margin_10"
+                        android:layout_marginBottom="@dimen/margin_5"
+                        android:layout_marginStart="@dimen/margin_5"
+                        android:layout_marginEnd="@dimen/margin_5"
                         app:hintEnabled="false"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -271,7 +277,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="Enter Email Address">
+                        android:hint="@string/enterEmailAddress">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtEmail"
@@ -289,7 +295,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="Enter Occupation">
+                        android:hint="@string/enterOccupation">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtOccupation"
@@ -307,7 +313,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="Enter Qualification">
+                        android:hint="@string/enterQualification">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtQualification"
@@ -319,24 +325,15 @@
 
                     </com.google.android.material.textfield.TextInputLayout>
 
-                    <!--                    <Spinner-->
-                    <!--                        android:id="@+id/spMarital"-->
-                    <!--                        android:layout_width="match_parent"-->
-                    <!--                        android:layout_height="wrap_content"-->
-                    <!--                        android:layout_margin="@dimen/margin_5"-->
-                    <!--                        android:background="@drawable/rounded_corner_with_line"-->
-                    <!--                        android:minHeight="@dimen/margin_48"-->
-                    <!--                        android:paddingStart="@dimen/margin_10"-->
-                    <!--                        android:textSize="@dimen/text_size_14"-->
-                    <!--                        android:paddingEnd="0dp"-->
-                    <!--                        android:entries="@array/maritalStatus"/>-->
-
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/tlMarital"
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/margin_48"
-                        android:layout_margin="@dimen/margin_5"
+                        android:layout_marginTop="@dimen/margin_10"
+                        android:layout_marginBottom="@dimen/margin_5"
+                        android:layout_marginStart="@dimen/margin_5"
+                        android:layout_marginEnd="@dimen/margin_5"
                         app:hintEnabled="false"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -355,21 +352,16 @@
                     </com.google.android.material.textfield.TextInputLayout>
 
 
-                    <!--                    <Spinner-->
-                    <!--                        android:id="@+id/spRelation"-->
-                    <!--                        android:layout_width="match_parent"-->
-                    <!--                        android:layout_height="wrap_content"-->
-                    <!--                        android:layout_margin="@dimen/margin_5"-->
-                    <!--                        android:background="@drawable/rounded_corner_with_line"-->
-                    <!--                        android:minHeight="@dimen/margin_48"-->
-                    <!--                        android:entries="@array/interestPayoutList" />-->
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/tlRelation"
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/margin_48"
-                        android:layout_margin="@dimen/margin_5"
+                        android:layout_marginTop="@dimen/margin_10"
+                        android:layout_marginBottom="@dimen/margin_5"
+                        android:layout_marginStart="@dimen/margin_5"
+                        android:layout_marginEnd="@dimen/margin_5"
                         app:hintEnabled="false"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -394,7 +386,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="Relation Name">
+                        android:hint="@string/relationName">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtRelationName"
@@ -412,7 +404,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="Enter Address 1">
+                        android:hint="@string/enterAddress1">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtAddressLine1"
@@ -430,7 +422,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="Enter Address 2">
+                        android:hint="@string/enterAddress2">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtAddressLine2"
@@ -442,47 +434,13 @@
 
                     </com.google.android.material.textfield.TextInputLayout>
 
-                    <!--                    <com.google.android.material.textfield.TextInputLayout-->
-                    <!--                        android:id="@+id/tlArea"-->
-                    <!--                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"-->
-                    <!--                        android:layout_width="match_parent"-->
-                    <!--                        android:layout_height="wrap_content"-->
-                    <!--                        android:layout_margin="@dimen/margin_5"-->
-                    <!--                        android:hint="Area">-->
-
-                    <!--                        <com.google.android.material.textfield.TextInputEditText-->
-                    <!--                            android:layout_width="match_parent"-->
-                    <!--                            android:layout_height="wrap_content"-->
-                    <!--                            android:inputType="text"-->
-                    <!--                            android:textSize="@dimen/text_size_14"-->
-                    <!--                            android:maxEms="200" />-->
-
-                    <!--                    </com.google.android.material.textfield.TextInputLayout>-->
-
-                    <!--                    <com.google.android.material.textfield.TextInputLayout-->
-                    <!--                        android:id="@+id/tlCountry"-->
-                    <!--                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"-->
-                    <!--                        android:layout_width="match_parent"-->
-                    <!--                        android:layout_height="wrap_content"-->
-                    <!--                        android:layout_margin="@dimen/margin_5"-->
-                    <!--                        android:hint="Country">-->
-
-                    <!--                        <com.google.android.material.textfield.TextInputEditText-->
-                    <!--                            android:layout_width="match_parent"-->
-                    <!--                            android:layout_height="wrap_content"-->
-                    <!--                            android:inputType="text"-->
-                    <!--                            android:textSize="@dimen/text_size_14"-->
-                    <!--                            android:maxEms="200" />-->
-
-                    <!--                    </com.google.android.material.textfield.TextInputLayout>-->
-
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/tlState"
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="State">
+                        android:hint="@string/state">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtState"
@@ -500,7 +458,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="City">
+                        android:hint="@string/city">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtCity"
@@ -518,7 +476,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="PinCode"
+                        android:hint="@string/pinCode"
                         android:textSize="@dimen/text_size_14">
 
                         <com.google.android.material.textfield.TextInputEditText
@@ -540,40 +498,12 @@
                     android:background="@color/grey_bg"
                     android:paddingStart="@dimen/margin_18"
                     android:paddingEnd="@dimen/margin_10"
-                    android:text="Nominee Details (Optional)"
+                    android:text="@string/nominee_details_optional"
                     android:textColor="@color/black"
                     android:textSize="@dimen/text_size_14"
                     app:drawableEndCompat="@drawable/svg_down_arrow" />
 
-                <!--                <RelativeLayout-->
-                <!--                    android:layout_width="match_parent"-->
-                <!--                    android:layout_height="wrap_content"-->
-                <!--                    android:paddingTop="@dimen/margin_5"-->
-                <!--                    android:paddingBottom="@dimen/margin_5"-->
-                <!--                    android:paddingStart="@dimen/margin_15"-->
-                <!--                    android:paddingEnd="@dimen/margin_15"-->
-                <!--                    android:background="@color/grey_bg">-->
-
-                <!--                    <TextView-->
-                <!--                        android:id="@+id/tvNomineeDetails"-->
-                <!--                        style="@style/semiBoldStyle"-->
-                <!--                        android:layout_width="match_parent"-->
-                <!--                        android:layout_height="wrap_content"-->
-                <!--                        android:padding="@dimen/margin_3"-->
-                <!--                        android:layout_centerVertical="true"-->
-                <!--                        android:textSize="@dimen/text_size_14"-->
-                <!--                        android:text="Nominee Details (Optional)"-->
-                <!--                        android:textColor="@color/black" />-->
-
-                <!--                    <androidx.appcompat.widget.SwitchCompat-->
-                <!--                        android:theme="@style/SCBSwitch"-->
-                <!--                        android:layout_width="wrap_content"-->
-                <!--                        android:layout_height="wrap_content"-->
-                <!--                        android:layout_alignParentEnd="true"-->
-                <!--                        android:textSize="@dimen/text_size_14"-->
-                <!--                        android:layout_marginEnd="@dimen/margin_5"/>-->
-
-                <!--                </RelativeLayout>-->
+
 
                 <LinearLayout
                     android:id="@+id/llNomineeDetail"
@@ -582,21 +512,15 @@
                     android:orientation="vertical"
                     android:padding="@dimen/margin_10">
 
-                    <!--                    <Spinner-->
-                    <!--                        android:id="@+id/spTitle"-->
-                    <!--                        android:layout_width="match_parent"-->
-                    <!--                        android:layout_height="wrap_content"-->
-                    <!--                        android:background="@drawable/rounded_corner_with_line"-->
-                    <!--                        android:minHeight="@dimen/margin_48"-->
-                    <!--                        android:textSize="@dimen/text_size_14"-->
-                    <!--                        android:entries="@array/interestPayoutList" />-->
-
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/tlNomineeTitle"
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/margin_48"
-                        android:layout_margin="@dimen/margin_5"
+                        android:layout_marginTop="@dimen/margin_10"
+                        android:layout_marginBottom="@dimen/margin_5"
+                        android:layout_marginStart="@dimen/margin_5"
+                        android:layout_marginEnd="@dimen/margin_5"
                         app:hintEnabled="false"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -621,7 +545,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="Nominee First Name">
+                        android:hint="@string/nomineeFirstName">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtNomineeFirstName"
@@ -657,7 +581,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="Nominee Last Name">
+                        android:hint="@string/nomineeLastName">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtNomineeLastName"
@@ -675,7 +599,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/margin_5"
-                        android:hint="Nominee Date Of Birth">
+                        android:hint="@string/nomineeDateOfBirth">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtNomineeDOB"
@@ -692,7 +616,10 @@
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/margin_48"
-                        android:layout_margin="@dimen/margin_5"
+                        android:layout_marginTop="@dimen/margin_10"
+                        android:layout_marginBottom="@dimen/margin_5"
+                        android:layout_marginStart="@dimen/margin_5"
+                        android:layout_marginEnd="@dimen/margin_5"
                         app:hintEnabled="false"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -716,7 +643,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/margin_5"
-                        android:text="Nominee address is same as Primary Applicant’s address"
+                        android:text="@string/nomineeAddressSameAsPrimaryApplicantAddress"
                         android:textSize="@dimen/text_size_10" />
 
                     <com.google.android.material.textfield.TextInputLayout
@@ -760,7 +687,10 @@
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/margin_48"
-                        android:layout_margin="@dimen/margin_5"
+                        android:layout_marginTop="@dimen/margin_10"
+                        android:layout_marginBottom="@dimen/margin_5"
+                        android:layout_marginStart="@dimen/margin_5"
+                        android:layout_marginEnd="@dimen/margin_5"
                         app:hintEnabled="false"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -824,7 +754,7 @@
                     android:layout_height="wrap_content"
                     android:background="@color/grey_bg"
                     android:padding="@dimen/margin_3"
-                    android:text="Bank Details"
+                    android:text="@string/bankDetails"
                     android:textColor="@color/black"
                     android:textSize="@dimen/text_size_14"
                     app:drawableRightCompat="@drawable/svg_down_arrow" />
@@ -833,7 +763,6 @@
                     android:id="@+id/llBankDetails"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_margin="@dimen/margin_5"
                     android:orientation="vertical"
                     android:padding="@dimen/margin_10">
 
@@ -842,8 +771,8 @@
                         style="@style/regularStyle"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:padding="@dimen/margin_3"
-                        android:text="Account type *"
+                        android:padding="@dimen/margin_5"
+                        android:text="@string/accountType"
                         android:textColor="@color/black"
                         android:textSize="@dimen/text_size_14"
                         app:layout_constraintTop_toBottomOf="@+id/tvFdRating"
@@ -859,14 +788,14 @@
                             android:layout_height="wrap_content"
                             android:buttonTint="@color/black"
                             android:checked="true"
-                            android:text="Savings account" />
+                            android:text="@string/savingsAccount" />
 
                         <RadioButton
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="50dp"
                             android:buttonTint="@color/black"
-                            android:text="Current account" />
+                            android:text="@string/currentAccount" />
 
                     </RadioGroup>
 
@@ -875,7 +804,8 @@
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:hint="Enter IFSC Code">
+                        android:layout_margin="@dimen/margin_5"
+                        android:hint="@string/enterIfscCode">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtIFSC"
@@ -890,14 +820,14 @@
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_8"
-                        android:layout_marginBottom="@dimen/margin_8"
-                        android:hint="Enter Account Number">
+                        android:layout_margin="@dimen/margin_5"
+                        android:hint="@string/enterAccountNumber">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtAccountNumber"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
+                            android:layout_height="wrap_content"
+                            android:textSize="@dimen/text_size_14"/>
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -906,9 +836,8 @@
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_8"
-                        android:layout_marginBottom="@dimen/margin_8"
-                        android:hint="Enter Bank Name">
+                        android:layout_margin="@dimen/margin_5"
+                        android:hint="@string/enterBankName">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/edtBankName"
@@ -923,12 +852,11 @@
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_8"
-                        android:layout_marginBottom="@dimen/margin_8"
-                        android:hint="Enter Branch Name">
+                        android:layout_margin="@dimen/margin_5"
+                        android:hint="@string/enterBranchName">
 
                         <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/edtbankBranch"
+                            android:id="@+id/edtBankBranch"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:textSize="@dimen/text_size_14" />
@@ -951,7 +879,7 @@
                         android:layout_centerVertical="true"
                         android:layout_marginTop="12dp"
                         android:padding="@dimen/margin_3"
-                        android:text="Payment mode"
+                        android:text="@string/paymentMode"
                         android:textColor="@color/black"
                         android:textSize="@dimen/text_size_14"
                         tools:layout_editor_absoluteX="5dp" />
@@ -964,7 +892,7 @@
                         android:layout_centerVertical="true"
                         android:layout_marginTop="12dp"
                         android:padding="@dimen/margin_3"
-                        android:text="Eligible bank option"
+                        android:text="@string/eligibleBankOption"
                         android:textColor="@color/blue_text_color"
                         android:textSize="@dimen/text_size_14"
                         tools:layout_editor_absoluteX="5dp" />
@@ -982,14 +910,14 @@
                         android:layout_height="wrap_content"
                         android:buttonTint="@color/black"
                         android:checked="true"
-                        android:text="UPI" />
+                        android:text="@string/Upi" />
 
                     <RadioButton
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="50dp"
                         android:buttonTint="@color/black"
-                        android:text="NetBanking" />
+                        android:text="@string/netBanking" />
 
                 </RadioGroup>
 
@@ -1001,7 +929,7 @@
                     android:layout_marginTop="12dp"
                     android:layout_marginBottom="@dimen/margin_20"
                     android:padding="@dimen/margin_3"
-                    android:text="Upto Rs. 1 lakh only"
+                    android:text="@string/upto1LakhOnly"
                     android:textColor="@color/gray_text_color"
                     android:textSize="@dimen/text_size_14"
                     tools:layout_editor_absoluteX="5dp" />

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

@@ -49,7 +49,7 @@
                 style="@style/regularStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Ratings: CRISIL AAA/Stable & ICRA AAA/Stable"
+                android:text="@string/schemeRating"
                 android:textColor="@color/light_text"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -91,7 +91,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
-                android:text="Sorry!"
+                android:text="@string/sorry"
                 android:textColor="@color/black"
                 android:textSize="@dimen/text_size_16"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -105,7 +105,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:text="Your transaction is unsuccessful."
+                android:text="@string/TransactionIsUnsuccessful"
                 android:textColor="@color/black"
                 android:textSize="@dimen/text_size_16"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -120,7 +120,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:gravity="center"
-                android:text="Sorry for the inconvenience please try again later"
+                android:text="@string/tryAgainLater"
                 android:textColor="@color/black"
                 android:textSize="@dimen/text_size_14"
                 app:layout_constraintBottom_toBottomOf="parent"

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">BajajFdLib</string>
+</resources>

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

@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Theme.BajajFdLib" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->

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

@@ -1,73 +1,135 @@
 <resources>
     <string name="app_name">BajajFdLib</string>
 
-    <string name="step_1">Step 1</string>
-    <string name="step_2">Step 2</string>
-    <string name="step_3">Step 3</string>
-    <string name="step_4">Step 4</string>
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
-    <string name="bajaj_finance">Bajaj Finance</string>
-    <string name="investment_amount_fd">Select Investment Amount</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="select_interest_payout">Select Interest Payout</string>
     <string name="select_interest_tenure">Select Investment Tenure</string>
-    <string name="tv_select_hint">Select</string>
     <string name="upto_0.25">Up to 0.25% p.a for </string>
     <string name="upto_0.25_next">Senior Citizens, 60+</string>
-    <string name="following_option">Additional Details</string>
+    <string name="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="maturity_instructions">Maturity Instructions:</string>
-    <string name="deduct_tds">Deduct TDS (Income is taxable)</string>
-    <string name="next">Next</string>
-    <string name="once_you_click">Once you click on PAY, your order will be placed and you will be redirected to payment gateway.</string>
-
-    <string name="tab_text_1">Tab 1</string>
-    <string name="tab_text_2">Tab 2</string>
-    <string name="tab_text_3">Tab 3</string>
-    <string name="tab_text_4">Tab 4</string>
-    <string name="tab_text_5">Tab 5</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>
-    <string name="fd">Corporate Fixed Deposits</string>
-    <string name="back">Back</string>
-    <string name="stepFour">StepFour</string>
-    <string name="stepOne">StepOne</string>
-    <string name="click">click</string>
-    <string name="stepTwo">StepTwo</string>
-    <string name="stepThree">StepThree</string>
-    <string name="viewpager">viewpager</string>
     <string name="tax_deducted_at_source_tds">Tax Deducted at Source (TDS):</string>
-    <string name="address_proof_type">Address Proof Type <font color='#E9161E'>*</font></string>
-    <string name="aadhaar_front">Aadhaar front <font color='#E9161E'>*</font></string>
-    <string name="aadhaar_back">Aadhaar Back <font color='#E9161E'>*</font></string>
-    <string name="pan_upload">PAN Upload <font color='#E9161E'>*</font></string>
-    <string name="photo_upload">Photo Upload <font color='#E9161E'>*</font></string>
-    <string name="terms_condition">I undertake to inform company any change in status of my nationality or tax residence. I am making investment from my Indian resident Individual Savings bank account. I/ We confirm that 1/we have read and understood the detailed terms and conditions annexed to this Application including the interest rate and other charges. I have gone through the financials and other statements/particulars representations furnished/made by the company and after careful consideration I am making the deposit with the company at my own risk and volition. I have read and agree to the <font color='#5077FF'>Terms &amp; conditions</font></string>
-    <string name="middle_name">Enter Middle Name <font color='#33000000'>(Optional)</font></string>
-    <string name="nominee_middle_name">Nominee Middle Name <font color='#33000000'>(Optional)</font></string>
-    <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="content_description">content description</string>
-    <string name="select">Select</string>
-    <string name="schemeRating"><![CDATA[Ratings: CRISIL AAA/Stable & ICRA AAA/Stable]]></string>
-    <string name="investmentAmount">Select Investment Amount</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="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="middle_name">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="nominee_details_optional">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="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>
+
+    <!-- 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="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="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="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>
+
+
+    <!-- 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="content_description">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-array name="interestPayoutList">
         <item>On Maturity</item>
@@ -85,7 +147,7 @@
         <item>Yearly</item>
     </string-array>
 
-    <array name="address_type">
+    <array name="addressType">
         <item>Aadhaar Card</item>
         <item>PAN</item>
         <item>Voter Id</item>

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

@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Theme.BajajFdLib" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->