From cceedf2d2c03f7e17a28294ec2f10ace0e8b19c1 Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Wed, 28 Dec 2022 12:58:42 +0530 Subject: [PATCH] working on 4th step --- .../bajajfd/interfaces/ApiInterface.kt | 82 +----- .../bajajfd/repositories/MainRepository.kt | 48 ++-- .../ui/activity/BajajFdMainActivity.kt | 19 +- .../ui/fragment/StepFourBajajFDFragment.kt | 3 + .../ui/fragment/StepOneBajajFDFragment.kt | 7 +- .../ui/fragment/StepTwoBajajFDFragment.kt | 6 +- .../StepFiveModelProviderFactory.kt | 15 + .../StepFourModelProviderFactory.kt | 15 + .../StepThreeModelProviderFactory.kt | 17 ++ .../production/bajajfd/util/Constants.kt | 2 +- .../bajajfd/viewModel/BajajFDViewModel.kt | 4 +- .../viewModel/StepFiveBajajFDViewModel.kt | 13 +- .../viewModel/StepFourBajajFDViewModel.kt | 24 +- .../viewModel/StepOneBajajFDViewModel.kt | 9 +- .../viewModel/StepThreeBajajFDViewModel.kt | 4 +- .../viewModel/StepTwoBajajFDViewModel.kt | 8 +- .../res/layout/fragment_bajajfd_step_five.xml | 257 +++++++++--------- .../res/layout/fragment_bajajfd_step_four.xml | 24 +- .../layout/fragment_bajajfd_step_three.xml | 9 +- .../res/layout/fragment_bajajfd_step_two.xml | 4 +- 20 files changed, 276 insertions(+), 294 deletions(-) create mode 100644 app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepFiveModelProviderFactory.kt create mode 100644 app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepFourModelProviderFactory.kt create mode 100644 app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepThreeModelProviderFactory.kt diff --git a/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt b/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt index 42e538b..07370db 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt @@ -11,97 +11,43 @@ import retrofit2.http.* interface ApiInterface { - // @FormUrlEncoded @POST("GetRates") - @Headers( - "token: 636F8F63-06C4-4D95-8562-392B34025FB0", - "Content-Type: application/json", "charset: UTF-8" - ) - suspend fun getRates(@Body getRatesRequest: GetRatesRequest): Response + suspend fun getRates(@Body getRatesRequest: GetRatesRequest, @Header("token") token: String): Response @POST("CheckFDCKYC") - @Headers( - "token: 636F8F63-06C4-4D95-8562-392B34025FB0", - "Content-Type: application/json", "charset: UTF-8" - ) - suspend fun checkFDKYC(@Body requestBody: RequestBody): Response + suspend fun checkFDKYC(@Body requestBody: RequestBody, @Header("token") token: String): Response @POST("CreateFDApplication") - @Headers( - "token: 636F8F63-06C4-4D95-8562-392B34025FB0", - "Content-Type: application/json", "charset: UTF-8" - ) - suspend fun createFDApp(@Body requestBody: RequestBody): Response + suspend fun createFDApp(@Body requestBody: RequestBody, @Header("token") token: String): Response @POST("DocumentsUpload") - @Headers( - "token: 636F8F63-06C4-4D95-8562-392B34025FB0", - "Content-Type: application/json", "charset: UTF-8" - ) - suspend fun documentsUpload(@Body requestBody: RequestBody): Response + suspend fun documentsUpload(@Body requestBody: RequestBody, @Header("token") token: String): Response @POST("SaveFDOtherData") - @Headers( - "token: 636F8F63-06C4-4D95-8562-392B34025FB0", - "Content-Type: application/json", "charset: UTF-8" - ) - suspend fun saveFDOtherData(@Body requestBody: RequestBody): Response + suspend fun saveFDOtherData(@Body requestBody: RequestBody, @Header("token") token: String): Response @POST("GetFDDetails") - @Headers( - "token: 636F8F63-06C4-4D95-8562-392B34025FB0", - "Content-Type: application/json", "charset: UTF-8" - ) - suspend fun getFDDetails(@Body requestBody: RequestBody): Response + suspend fun getFDDetails(@Body requestBody: RequestBody, @Header("token") token: String): Response @POST("UpdateFDPaymentStatus") - @Headers( - "token: 636F8F63-06C4-4D95-8562-392B34025FB0", - "Content-Type: application/json", "charset: UTF-8" - ) - suspend fun updateFDPaymentStatus(@Body requestBody: RequestBody): Response + suspend fun updateFDPaymentStatus(@Body requestBody: RequestBody, @Header("token") token: String): Response @POST("FinaliseFD") - @Headers( - "token: 636F8F63-06C4-4D95-8562-392B34025FB0", - "Content-Type: application/json", "charset: UTF-8" - ) - suspend fun finaliseFD(@Body requestBody: RequestBody): Response + suspend fun finaliseFD(@Body requestBody: RequestBody, @Header("token") token: String): Response @POST("FinaliseKYC") - @Headers( - "token: 636F8F63-06C4-4D95-8562-392B34025FB0", - "Content-Type: application/json", "charset: UTF-8" - ) - suspend fun finaliseKYC(@Body requestBody: RequestBody): Response + suspend fun finaliseKYC(@Body requestBody: RequestBody, @Header("token") token: String): Response @POST("PaymentRequery") - @Headers( - "token: 636F8F63-06C4-4D95-8562-392B34025FB0", - "Content-Type: application/json", "charset: UTF-8" - ) - suspend fun paymentReQuery(@Body requestBody: RequestBody): Response + suspend fun paymentReQuery(@Body requestBody: RequestBody, @Header("token") token: String): Response // @FormUrlEncoded @POST("GetCodes") - @Headers( - "token: 636F8F63-06C4-4D95-8562-392B34025FB0", - "Content-Type: application/json", "charset: UTF-8" - ) - suspend fun getCodes(@Body requestBody: GetCodeRequest): Response + suspend fun getCodes(@Body requestBody: GetCodeRequest, @Header("token") token: String): Response @POST("CalculateFDMaturityAmount") - @Headers( - "token: 636F8F63-06C4-4D95-8562-392B34025FB0", - "Content-Type: application/json", "charset: UTF-8" - ) - suspend fun getCalculateFDMaturityAmount(@Body requestBody: GetMaturityAmountRequest): Response + suspend fun getCalculateFDMaturityAmount(@Body requestBody: GetMaturityAmountRequest, @Header("token") token: String): Response - @POST("PanCheck_S") -// @Headers( -// "token: 636F8F63-06C4-4D95-8562-392B34025FB0", -// "Content-Type: application/json", "charset: UTF-8" -// ) - @Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0") - suspend fun panCheckApi(@Body panCheck: PanCheckRequest): Response + @POST("api/PanCheck_S") + suspend fun panCheckApi(@Body panCheck: PanCheckRequest, @Header("token") token: String): Response } \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt b/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt index a49288a..06d5007 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt @@ -7,41 +7,41 @@ import com.nivesh.production.bajajfd.model.GetRatesRequest import com.nivesh.production.bajajfd.model.PanCheckRequest class MainRepository constructor(private val apiInterface: ApiInterface) { - suspend fun getRatesResponse(getRatesRequest: GetRatesRequest) = - apiInterface.getRates(getRatesRequest) + suspend fun getRatesResponse(getRatesRequest: GetRatesRequest, token: String) = + apiInterface.getRates(getRatesRequest, token) - suspend fun getCodesResponse(requestBody: GetCodeRequest) = - apiInterface.getCodes(requestBody) + suspend fun getCodesResponse(requestBody: GetCodeRequest , token: String) = + apiInterface.getCodes(requestBody, token) - suspend fun createCalculateFDMaturityAmount(requestBody: GetMaturityAmountRequest) = - apiInterface.getCalculateFDMaturityAmount(requestBody) + suspend fun createCalculateFDMaturityAmount(requestBody: GetMaturityAmountRequest, token: String) = + apiInterface.getCalculateFDMaturityAmount(requestBody, token) - suspend fun checkFDKYCResponse(getRatesRequest: GetRatesRequest) = - apiInterface.getRates(getRatesRequest) + suspend fun checkFDKYCResponse(getRatesRequest: GetRatesRequest, token: String) = + apiInterface.getRates(getRatesRequest, token) - suspend fun documentsUploadResponse(getRatesRequest: GetRatesRequest) = - apiInterface.getRates(getRatesRequest) + suspend fun documentsUploadResponse(getRatesRequest: GetRatesRequest, token: String) = + apiInterface.getRates(getRatesRequest, token) - suspend fun saveFDOtherDataResponse(getRatesRequest: GetRatesRequest) = - apiInterface.getRates(getRatesRequest) + suspend fun saveFDOtherDataResponse(getRatesRequest: GetRatesRequest, token: String) = + apiInterface.getRates(getRatesRequest, token) - suspend fun getFDDetailsResponse(getRatesRequest: GetRatesRequest) = - apiInterface.getRates(getRatesRequest) + suspend fun getFDDetailsResponse(getRatesRequest: GetRatesRequest, token: String) = + apiInterface.getRates(getRatesRequest, token) - suspend fun updateFDPaymentStatusResponse(getRatesRequest: GetRatesRequest) = - apiInterface.getRates(getRatesRequest) + suspend fun updateFDPaymentStatusResponse(getRatesRequest: GetRatesRequest, token: String) = + apiInterface.getRates(getRatesRequest, token) - suspend fun finaliseFDResponse(getRatesRequest: GetRatesRequest) = - apiInterface.getRates(getRatesRequest) + suspend fun finaliseFDResponse(getRatesRequest: GetRatesRequest, token: String) = + apiInterface.getRates(getRatesRequest, token) - suspend fun finaliseKYCResponse(getRatesRequest: GetRatesRequest) = - apiInterface.getRates(getRatesRequest) + suspend fun finaliseKYCResponse(getRatesRequest: GetRatesRequest, token: String) = + apiInterface.getRates(getRatesRequest, token) - suspend fun paymentReQueryResponse(getRatesRequest: GetRatesRequest) = - apiInterface.getRates(getRatesRequest) + suspend fun paymentReQueryResponse(getRatesRequest: GetRatesRequest, token: String) = + apiInterface.getRates(getRatesRequest, token) - suspend fun panCheck(panCheck: PanCheckRequest) = - apiInterface.panCheckApi(panCheck) + suspend fun panCheck(panCheck: PanCheckRequest, token: String) = + apiInterface.panCheckApi(panCheck, token) } \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt index c952bb1..517f7ca 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt @@ -15,16 +15,13 @@ import com.nivesh.production.bajajfd.interfaces.BajajFDInterface import com.nivesh.production.bajajfd.model.* import com.nivesh.production.bajajfd.repositories.MainRepository import com.nivesh.production.bajajfd.ui.fragment.* -import com.nivesh.production.bajajfd.ui.providerfactory.FDModelProviderFactory -import com.nivesh.production.bajajfd.ui.providerfactory.StepOneModelProviderFactory -import com.nivesh.production.bajajfd.ui.providerfactory.StepTwoModelProviderFactory +import com.nivesh.production.bajajfd.ui.providerfactory.* import com.nivesh.production.bajajfd.util.Common import com.nivesh.production.bajajfd.util.Common.Companion.defaultShape import com.nivesh.production.bajajfd.util.Common.Companion.selectedShape +import com.nivesh.production.bajajfd.util.Constants.Companion.token import com.nivesh.production.bajajfd.util.Resource -import com.nivesh.production.bajajfd.viewModel.BajajFDViewModel -import com.nivesh.production.bajajfd.viewModel.StepOneBajajFDViewModel -import com.nivesh.production.bajajfd.viewModel.StepTwoBajajFDViewModel +import com.nivesh.production.bajajfd.viewModel.* class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface { lateinit var binding: ActivityBajajFdBinding @@ -32,6 +29,9 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface { lateinit var stepOneBajajFDViewModel: StepOneBajajFDViewModel lateinit var stepTwoBajajFDViewModel: StepTwoBajajFDViewModel + lateinit var stepThreeBajajFDViewModel: StepThreeBajajFDViewModel + lateinit var stepFourBajajFDViewModel: StepFourBajajFDViewModel + lateinit var stepFiveBajajFDViewModel: StepFiveBajajFDViewModel lateinit var listOfFrequency: List lateinit var createFDRequest: CreateFDRequest @@ -42,7 +42,6 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface { lateinit var fdBankDetails: FdBankDetails lateinit var nomineeDetails: NomineeDetails lateinit var nomineeGuardianDetails: NomineeGuardianDetails - // lateinit var viewModelProviderFactory override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -68,7 +67,9 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface { viewModel = ViewModelProvider(this, FDModelProviderFactory(MainRepository(ApiClient.getApiClient)))[BajajFDViewModel::class.java] stepOneBajajFDViewModel = ViewModelProvider(this, StepOneModelProviderFactory(MainRepository(ApiClient.getApiClient)))[StepOneBajajFDViewModel::class.java] stepTwoBajajFDViewModel = ViewModelProvider(this, StepTwoModelProviderFactory(MainRepository(ApiClient.getApiClient)))[StepTwoBajajFDViewModel::class.java] - + stepThreeBajajFDViewModel = ViewModelProvider(this, StepThreeModelProviderFactory(MainRepository(ApiClient.getApiClient)))[StepThreeBajajFDViewModel::class.java] + stepFourBajajFDViewModel = ViewModelProvider(this, StepFourModelProviderFactory(MainRepository(ApiClient.getApiClient)))[StepFourBajajFDViewModel::class.java] + stepFiveBajajFDViewModel = ViewModelProvider(this, StepFiveModelProviderFactory(MainRepository(ApiClient.getApiClient)))[StepFiveBajajFDViewModel::class.java] listOfFrequency = ArrayList() if (Common.isNetworkAvailable(this)) { @@ -86,7 +87,7 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface { getCodeRequest.Category = getString(R.string.category) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - viewModel.getCode(getCodeRequest) + viewModel.getCode(getCodeRequest, token) viewModel.getRatesMutableData.observe(this) { response -> when (response) { is Resource.Success -> { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt index f7463ef..a07a592 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt @@ -7,6 +7,7 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepFourBinding import com.nivesh.production.bajajfd.interfaces.BajajFDInterface +import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity import com.nivesh.production.bajajfd.viewModel.StepFourBajajFDViewModel class StepFourBajajFDFragment : Fragment() { @@ -38,6 +39,8 @@ class StepFourBajajFDFragment : Fragment() { _binding = FragmentBajajfdStepFourBinding.inflate(inflater, container, false) val root = binding.root + stepFourBajajFDViewModel = (activity as BajajFdMainActivity).stepFourBajajFDViewModel + binding.btnNext.setOnClickListener { if (validate()) { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt index e4f6c18..c355b21 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt @@ -28,6 +28,7 @@ import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity import com.nivesh.production.bajajfd.util.Common import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorMethod import com.nivesh.production.bajajfd.util.Common.Companion.removeError +import com.nivesh.production.bajajfd.util.Constants.Companion.token import com.nivesh.production.bajajfd.util.Resource import com.nivesh.production.bajajfd.viewModel.StepOneBajajFDViewModel @@ -222,7 +223,9 @@ class StepOneBajajFDFragment : Fragment() { ) } // 650 -> refreshToken() - else -> {} + else -> { + + } } } } @@ -289,7 +292,7 @@ class StepOneBajajFDFragment : Fragment() { } else { getRatesRequest.type = getString(R.string.nonSeniorCitizen) } - stepOneBajajFDViewModel.getRates(getRatesRequest) + stepOneBajajFDViewModel.getRates(getRatesRequest, token) stepOneBajajFDViewModel.getRatesMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt index 3219cd8..e7bea72 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt @@ -28,6 +28,7 @@ import com.nivesh.production.bajajfd.util.Common.Companion.isValidEmail import com.nivesh.production.bajajfd.util.Common.Companion.isValidName import com.nivesh.production.bajajfd.util.Common.Companion.isValidPan import com.nivesh.production.bajajfd.util.Common.Companion.removeError +import com.nivesh.production.bajajfd.util.Constants.Companion.token import com.nivesh.production.bajajfd.util.Resource import com.nivesh.production.bajajfd.viewModel.StepTwoBajajFDViewModel @@ -619,10 +620,7 @@ class StepTwoBajajFDFragment : Fragment() { panCheck.subBrokerCode = "0" panCheck.panNumber = binding.edtPANNumber.text.toString() panCheck.mobileNumber = "" - // val string :String = Gson().toJson(panCheck) - // val requestBody = string.toRequestBody("application/json".toMediaTypeOrNull()) - // stepTwoBajajFDViewModel.panCheck(requestBody) - stepTwoBajajFDViewModel.panCheck(panCheck) + stepTwoBajajFDViewModel.panCheck(panCheck, token) stepTwoBajajFDViewModel.getPanCheckMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepFiveModelProviderFactory.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepFiveModelProviderFactory.kt new file mode 100644 index 0000000..c04ac03 --- /dev/null +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepFiveModelProviderFactory.kt @@ -0,0 +1,15 @@ +package com.nivesh.production.bajajfd.ui.providerfactory + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import com.nivesh.production.bajajfd.repositories.MainRepository +import com.nivesh.production.bajajfd.viewModel.StepFiveBajajFDViewModel + +class StepFiveModelProviderFactory(private val mainRepository: MainRepository) : + ViewModelProvider.Factory { + + override fun create(modelClass: Class): T { + return StepFiveBajajFDViewModel(mainRepository) as T + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepFourModelProviderFactory.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepFourModelProviderFactory.kt new file mode 100644 index 0000000..851343b --- /dev/null +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepFourModelProviderFactory.kt @@ -0,0 +1,15 @@ +package com.nivesh.production.bajajfd.ui.providerfactory + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import com.nivesh.production.bajajfd.repositories.MainRepository +import com.nivesh.production.bajajfd.viewModel.StepFourBajajFDViewModel + +class StepFourModelProviderFactory(private val mainRepository: MainRepository) : + ViewModelProvider.Factory { + + override fun create(modelClass: Class): T { + return StepFourBajajFDViewModel(mainRepository) as T + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepThreeModelProviderFactory.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepThreeModelProviderFactory.kt new file mode 100644 index 0000000..7e60bf4 --- /dev/null +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepThreeModelProviderFactory.kt @@ -0,0 +1,17 @@ +package com.nivesh.production.bajajfd.ui.providerfactory + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import com.nivesh.production.bajajfd.repositories.MainRepository +import com.nivesh.production.bajajfd.viewModel.BajajFDViewModel +import com.nivesh.production.bajajfd.viewModel.StepOneBajajFDViewModel +import com.nivesh.production.bajajfd.viewModel.StepThreeBajajFDViewModel +import com.nivesh.production.bajajfd.viewModel.StepTwoBajajFDViewModel + +class StepThreeModelProviderFactory (private val mainRepository: MainRepository) : ViewModelProvider.Factory { + + override fun create(modelClass: Class): T { + return StepThreeBajajFDViewModel(mainRepository) as T + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/util/Constants.kt b/app/src/main/java/com/nivesh/production/bajajfd/util/Constants.kt index 9495592..53c0d20 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/util/Constants.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/util/Constants.kt @@ -4,6 +4,6 @@ class Constants() { companion object { const val BASE_URL = "https://providential.in/WebApi_Bajaj/" - + const val token = "636F8F63-06C4-4D95-8562-392B34025FB0" } } \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/BajajFDViewModel.kt b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/BajajFDViewModel.kt index a4d30de..d0d622a 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/BajajFDViewModel.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/BajajFDViewModel.kt @@ -14,9 +14,9 @@ class BajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() // TODO: Implement the ViewModel val getRatesMutableData: MutableLiveData> = MutableLiveData() - fun getCode(requestBody: GetCodeRequest) = viewModelScope.launch { + fun getCode(requestBody: GetCodeRequest, token : String) = viewModelScope.launch { getRatesMutableData.postValue(Resource.Loading()) - val response = mainRepository.getCodesResponse(requestBody) + val response = mainRepository.getCodesResponse(requestBody, token) getRatesMutableData.postValue(handleRatesResponse(response)) } diff --git a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFiveBajajFDViewModel.kt b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFiveBajajFDViewModel.kt index 1ff30eb..509c598 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFiveBajajFDViewModel.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFiveBajajFDViewModel.kt @@ -1,18 +1,9 @@ package com.nivesh.production.bajajfd.viewModel -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations import androidx.lifecycle.ViewModel +import com.nivesh.production.bajajfd.repositories.MainRepository -class StepFiveBajajFDViewModel : ViewModel() { +class StepFiveBajajFDViewModel (private val mainRepository: MainRepository) : ViewModel() { - private val _index = MutableLiveData() - val text: LiveData = Transformations.map(_index) { - "Step : $it" - } - fun setIndex(index: Int) { - _index.value = index - } } \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFourBajajFDViewModel.kt b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFourBajajFDViewModel.kt index fa40f96..c1d13a1 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFourBajajFDViewModel.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFourBajajFDViewModel.kt @@ -13,9 +13,9 @@ class StepFourBajajFDViewModel(private val mainRepository: MainRepository) : Vie private val getRatesMutableData: MutableLiveData> = MutableLiveData() - fun saveFDOtherData(getRatesRequest: GetRatesRequest) = viewModelScope.launch { + fun saveFDOtherData(getRatesRequest: GetRatesRequest, token : String) = viewModelScope.launch { getRatesMutableData.postValue(Resource.Loading()) - val response = mainRepository.saveFDOtherDataResponse(getRatesRequest) + val response = mainRepository.saveFDOtherDataResponse(getRatesRequest, token) getRatesMutableData.postValue(handleRatesResponse(response)) } @@ -29,33 +29,33 @@ class StepFourBajajFDViewModel(private val mainRepository: MainRepository) : Vie } - fun getFDDetails(getRatesRequest: GetRatesRequest) = viewModelScope.launch { + fun getFDDetails(getRatesRequest: GetRatesRequest, token : String) = viewModelScope.launch { getRatesMutableData.postValue(Resource.Loading()) - val response = mainRepository.getFDDetailsResponse(getRatesRequest) + val response = mainRepository.getFDDetailsResponse(getRatesRequest, token) getRatesMutableData.postValue(handleRatesResponse(response)) } - fun updateFDPaymentStatus(getRatesRequest: GetRatesRequest) = viewModelScope.launch { + fun updateFDPaymentStatus(getRatesRequest: GetRatesRequest, token : String) = viewModelScope.launch { getRatesMutableData.postValue(Resource.Loading()) - val response = mainRepository.updateFDPaymentStatusResponse(getRatesRequest) + val response = mainRepository.updateFDPaymentStatusResponse(getRatesRequest, token) getRatesMutableData.postValue(handleRatesResponse(response)) } - fun finaliseFD(getRatesRequest: GetRatesRequest) = viewModelScope.launch { + fun finaliseFD(getRatesRequest: GetRatesRequest, token : String) = viewModelScope.launch { getRatesMutableData.postValue(Resource.Loading()) - val response = mainRepository.finaliseFDResponse(getRatesRequest) + val response = mainRepository.finaliseFDResponse(getRatesRequest, token) getRatesMutableData.postValue(handleRatesResponse(response)) } - fun finaliseKYC(getRatesRequest: GetRatesRequest) = viewModelScope.launch { + fun finaliseKYC(getRatesRequest: GetRatesRequest, token : String) = viewModelScope.launch { getRatesMutableData.postValue(Resource.Loading()) - val response = mainRepository.finaliseKYCResponse(getRatesRequest) + val response = mainRepository.finaliseKYCResponse(getRatesRequest, token) getRatesMutableData.postValue(handleRatesResponse(response)) } - fun paymentReQuery(getRatesRequest: GetRatesRequest) = viewModelScope.launch { + fun paymentReQuery(getRatesRequest: GetRatesRequest, token: String) = viewModelScope.launch { getRatesMutableData.postValue(Resource.Loading()) - val response = mainRepository.paymentReQueryResponse(getRatesRequest) + val response = mainRepository.paymentReQueryResponse(getRatesRequest, token) getRatesMutableData.postValue(handleRatesResponse(response)) } } \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepOneBajajFDViewModel.kt b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepOneBajajFDViewModel.kt index 2479303..29eca04 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepOneBajajFDViewModel.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepOneBajajFDViewModel.kt @@ -4,28 +4,27 @@ 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.GetMaturityAmountRequest import com.nivesh.production.bajajfd.model.GetRatesRequest import com.nivesh.production.bajajfd.repositories.MainRepository +import com.nivesh.production.bajajfd.util.Constants.Companion.token import com.nivesh.production.bajajfd.util.Resource import kotlinx.coroutines.launch -import okhttp3.RequestBody class StepOneBajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() { // TODO: Implement the ViewModel val getRatesMutableData: MutableLiveData> = MutableLiveData() val getMaturityAmountMutableData: MutableLiveData> = MutableLiveData() - fun getRates(getRatesRequest: GetRatesRequest) = viewModelScope.launch { + fun getRates(getRatesRequest: GetRatesRequest, token: String) = viewModelScope.launch { getRatesMutableData.postValue(Resource.Loading()) - val response = mainRepository.getRatesResponse(getRatesRequest) + val response = mainRepository.getRatesResponse(getRatesRequest, token) getRatesMutableData.postValue(handleRatesResponse(response)) } fun getMaturityAmount(requestBody: GetMaturityAmountRequest) = viewModelScope.launch { getMaturityAmountMutableData.postValue(Resource.Loading()) - val response = mainRepository.createCalculateFDMaturityAmount(requestBody) + val response = mainRepository.createCalculateFDMaturityAmount(requestBody, token) getMaturityAmountMutableData.postValue(handleRatesResponse(response)) } diff --git a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepThreeBajajFDViewModel.kt b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepThreeBajajFDViewModel.kt index 548614f..74522d4 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepThreeBajajFDViewModel.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepThreeBajajFDViewModel.kt @@ -11,9 +11,9 @@ class StepThreeBajajFDViewModel(private val mainRepository: MainRepository) : Vi private val getRatesMutableData: MutableLiveData> = MutableLiveData() - fun documentsUpload(getRatesRequest: GetRatesRequest) = viewModelScope.launch { + fun documentsUpload(getRatesRequest: GetRatesRequest, token: String) = viewModelScope.launch { getRatesMutableData.postValue(Resource.Loading()) - val response = mainRepository.documentsUploadResponse(getRatesRequest) + val response = mainRepository.documentsUploadResponse(getRatesRequest, token) getRatesMutableData.postValue(handleRatesResponse(response)) } diff --git a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoBajajFDViewModel.kt b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoBajajFDViewModel.kt index cbb9da4..0719aaa 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoBajajFDViewModel.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoBajajFDViewModel.kt @@ -17,9 +17,9 @@ class StepTwoBajajFDViewModel(private val mainRepository: MainRepository) : View val getPanCheckMutableData: MutableLiveData> = MutableLiveData() - fun checkFDKYC(getRatesRequest: GetRatesRequest) = viewModelScope.launch { + fun checkFDKYC(getRatesRequest: GetRatesRequest, token : String) = viewModelScope.launch { getRatesMutableData.postValue(Resource.Loading()) - val response = mainRepository.checkFDKYCResponse(getRatesRequest) + val response = mainRepository.checkFDKYCResponse(getRatesRequest, token) getRatesMutableData.postValue(handleRatesResponse(response)) } @@ -39,9 +39,9 @@ class StepTwoBajajFDViewModel(private val mainRepository: MainRepository) : View // getRatesMutableData.postValue(handleRatesResponse(response)) // } - fun panCheck(panCheck: PanCheckRequest) = viewModelScope.launch { + fun panCheck(panCheck: PanCheckRequest, token: String) = viewModelScope.launch { getPanCheckMutableData.postValue(Resource.Loading()) - val response = mainRepository.panCheck(panCheck) + val response = mainRepository.panCheck(panCheck, token) getPanCheckMutableData.postValue(handleRatesResponse(response)) } diff --git a/app/src/main/res/layout/fragment_bajajfd_step_five.xml b/app/src/main/res/layout/fragment_bajajfd_step_five.xml index 916f39d..4fe62f0 100644 --- a/app/src/main/res/layout/fragment_bajajfd_step_five.xml +++ b/app/src/main/res/layout/fragment_bajajfd_step_five.xml @@ -5,179 +5,174 @@ android:id="@+id/constraintLayout" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_margin="@dimen/margin_10" - android:background="@color/greyColor4" + android:background="@color/NiveshColorAppBg" tools:context="com.nivesh.production.bajajfd.ui.fragment.StepFiveBajajFDFragment"> - - - - - - - - - - - - - + app:layout_constraintTop_toTopOf="parent"> - - - - - - - + android:layout_height="match_parent" + android:paddingBottom="@dimen/margin_10"> + + + + + + + + + + + + + + + + + + + + + + - - + - + app:layout_constraintTop_toBottomOf="@+id/linearLayoutTwo" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/btnNext" + app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintStart_toEndOf="@+id/tvDownloadInvoice" /> + app:layout_constraintTop_toTopOf="parent"> + app:layout_constraintStart_toStartOf="parent"/> + app:layout_constraintStart_toEndOf="@+id/btnBack" /> @@ -265,11 +266,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginStart="@dimen/margin_16" - android:layout_marginTop="@dimen/margin_20" android:layout_marginBottom="@dimen/margin_15" + android:layout_marginTop="@dimen/margin_10" android:backgroundTint="@color/colorPrimary" android:text="@string/next" + android:textSize="@dimen/text_size_14" android:textColor="@color/white" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_bajajfd_step_two.xml b/app/src/main/res/layout/fragment_bajajfd_step_two.xml index 4dd8039..27a05e7 100644 --- a/app/src/main/res/layout/fragment_bajajfd_step_two.xml +++ b/app/src/main/res/layout/fragment_bajajfd_step_two.xml @@ -13,7 +13,7 @@ android:id="@+id/scrollView" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginBottom="@dimen/margin_80" + android:layout_marginBottom="@dimen/margin_70" android:background="@color/NiveshColorAppBg" android:fillViewport="true" android:visibility="visible" @@ -968,7 +968,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginTop="@dimen/margin_20" + android:layout_marginTop="@dimen/margin_15" android:layout_marginBottom="@dimen/margin_15" android:backgroundTint="@color/blue" android:text="@string/back"