From 52ef29d06dfc48e59c8cb04032a8553aa23a30ee Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Sat, 7 Jan 2023 19:40:07 +0530 Subject: [PATCH 1/3] modified code --- .../bajajfd/adapter/SectionsPagerAdapter.kt | 35 +- .../adapter/SmartFragmentStatePagerAdapter.kt | 25 -- .../ui/activity/BajajFdMainActivity.kt | 25 +- .../ui/fragment/StepFourBajajFDFragment.kt | 47 ++- .../ui/fragment/StepOneBajajFDFragment.kt | 52 +-- .../ui/fragment/StepThreeBajajFDFragment.kt | 16 +- .../ui/fragment/StepTwoBajajFDFragment.kt | 60 +-- .../bajajfd/viewModel/BajajFDViewModel.kt | 306 ++++++++++++++- .../viewModel/StepFourBajajFDViewModel.kt | 143 ++++---- .../viewModel/StepOneBajajFDViewModel.kt | 122 +++--- .../viewModel/StepThreeBajajFDViewModel.kt | 76 ++-- .../viewModel/StepTwoBajajFDViewModel.kt | 347 +++++++++--------- 12 files changed, 759 insertions(+), 495 deletions(-) delete mode 100644 app/src/main/java/com/nivesh/production/bajajfd/adapter/SmartFragmentStatePagerAdapter.kt diff --git a/app/src/main/java/com/nivesh/production/bajajfd/adapter/SectionsPagerAdapter.kt b/app/src/main/java/com/nivesh/production/bajajfd/adapter/SectionsPagerAdapter.kt index a576253..9267a21 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/adapter/SectionsPagerAdapter.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/adapter/SectionsPagerAdapter.kt @@ -2,18 +2,31 @@ package com.nivesh.production.bajajfd.adapter import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter -class SectionsPagerAdapter(private val fm: FragmentManager, private val fragments: Array, private val NumberOfTabs: Int) : SmartFragmentStatePagerAdapter(fm) { - override fun getItem(position: Int): Fragment { - return fragments[position] - } +class SectionsPagerAdapter(manager: FragmentManager,private val fragments: Array, private val NumberOfTabs: Int) : FragmentPagerAdapter(manager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getPageTitle(position: Int): CharSequence? { - return null - } + private val titles = ArrayList() - override fun getCount(): Int { - return NumberOfTabs - } -} \ No newline at end of file + override fun getItem(position: Int): Fragment = fragments[position] + + override fun getCount(): Int = NumberOfTabs + + override fun getPageTitle(position: Int): CharSequence = titles[position] + +} +//class SectionsPagerAdapter(private val fm: FragmentManager, private val fragments: Array, private val NumberOfTabs: Int) : SmartFragmentStatePagerAdapter(fm) { +// +// override fun getItem(position: Int): Fragment { +// return fragments[position] +// } +// +// override fun getPageTitle(position: Int): CharSequence? { +// return null +// } +// +// override fun getCount(): Int { +// return NumberOfTabs +// } +//} \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/adapter/SmartFragmentStatePagerAdapter.kt b/app/src/main/java/com/nivesh/production/bajajfd/adapter/SmartFragmentStatePagerAdapter.kt deleted file mode 100644 index 9bf3033..0000000 --- a/app/src/main/java/com/nivesh/production/bajajfd/adapter/SmartFragmentStatePagerAdapter.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.nivesh.production.bajajfd.adapter - -import android.util.SparseArray -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentManager -import androidx.fragment.app.FragmentPagerAdapter -import androidx.fragment.app.FragmentStatePagerAdapter -import androidx.viewpager2.adapter.FragmentStateAdapter - -abstract class SmartFragmentStatePagerAdapter(fragmentManager: FragmentManager) : FragmentPagerAdapter(fragmentManager) { - private val registeredFragments = SparseArray() - - override fun instantiateItem(container: ViewGroup, position: Int): Any { - val fragment = super.instantiateItem(container, position) as Fragment - registeredFragments.put(position, fragment) - return fragment - } - - // Returns the fragment for the position (if instantiated) - fun getRegisteredFragment(position: Int): Fragment? { - return registeredFragments[position] - } -} 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 8281066..83b36fd 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 @@ -35,7 +35,7 @@ import com.nivesh.production.bajajfd.viewModel.* class BajajFdMainActivity : BaseActivity() { lateinit var binding: ActivityBajajFdBinding - private lateinit var viewModel: BajajFDViewModel + lateinit var viewModel: BajajFDViewModel private val stepOneBajajFDFragment = StepOneBajajFDFragment() private val stepTwoBajajFDFragment = StepTwoBajajFDFragment() @@ -89,13 +89,12 @@ class BajajFdMainActivity : BaseActivity() { if (Common.isNetworkAvailable(this)) { val fdStepsCount = FDStepsCountRequest() fdStepsCount.FDProvider = getString(R.string.bajaj) - fdStepsCount.NiveshClientCode = "8872" - // client code =8872 /60476 + fdStepsCount.NiveshClientCode = "8872" // 60476 viewModel.getStepsCount(fdStepsCount, token, this) viewModel.getStepsCountMutableData.observe(this) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->$response") + Log.e("response", "-->${response.data.toString()}") val stepsCountResponse: StepsCountResponse = Gson().fromJson( response.data?.toString(), @@ -144,7 +143,6 @@ class BajajFdMainActivity : BaseActivity() { getClientDetailsRequest.client_code = "8872" getClientDetailsRequest.AppOrWeb = getString(R.string.app) getClientDetailsRequest.sub_broker_code = "1038" - // 8872/1038 val userRequest = UserRequest() userRequest.UID = 0 userRequest.IPAddress = "" @@ -168,7 +166,7 @@ class BajajFdMainActivity : BaseActivity() { viewModel.getClientDetailsMutableData.observe(this) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->$response") + Log.e("response", "-->${response.data.toString()}") getClientDetailsResponse = Gson().fromJson( response.data?.toString(), @@ -230,17 +228,19 @@ class BajajFdMainActivity : BaseActivity() { val viewPager: DisableAdapter = binding.viewPager viewPager.setPagingEnabled(false) viewPager.adapter = sectionsPagerAdapter + if (sectionsPagerAdapter.getCount() > 1){ + viewPager.offscreenPageLimit = sectionsPagerAdapter.count - 1 + }else{ + viewPager.offscreenPageLimit = 1 + } viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled( position: Int, positionOffset: Float, positionOffsetPixels: Int - ) { - Log.e("onPageScrolled", "-->".plus(position)) - } + ) {} override fun onPageSelected(position: Int) { - Log.e("onPageSelected", "-->".plus(position)) when (position) { 0 -> { setBackground( @@ -308,7 +308,7 @@ class BajajFdMainActivity : BaseActivity() { viewModel.getFDKYCMutableData.observe(this) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->$response") + Log.e("response", "-->${response.data.toString()}") val getCodeResponse: GetCodeResponse = Gson().fromJson( response.data?.toString(), @@ -363,8 +363,7 @@ class BajajFdMainActivity : BaseActivity() { } // step 1 response - fun stepOneApi(data: String?) { - Log.e("stepOneApi", " response ---> $data") + fun stepOneApi() { binding.viewPager.currentItem = 1 } 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 8c31288..c7da25a 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 @@ -19,7 +19,6 @@ import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity import com.nivesh.production.bajajfd.ui.providerfactory.StepFourModelProviderFactory import com.nivesh.production.bajajfd.util.Common import com.nivesh.production.bajajfd.util.Common.Companion.showDialogValidation -import com.nivesh.production.bajajfd.util.Constants import com.nivesh.production.bajajfd.util.Constants.Companion.token import com.nivesh.production.bajajfd.util.Resource import com.nivesh.production.bajajfd.viewModel.StepFourBajajFDViewModel @@ -55,11 +54,23 @@ class StepFourBajajFDFragment : BaseFragment() { } if ((activity as BajajFdMainActivity).loginRole == 5) { - binding.btnNext.text = getString(R.string.pay) - binding.btnNext.setBackgroundColor(ResourcesCompat.getColor(resources, R.color.green, null)) - }else{ + binding.btnNext.text = getString(R.string.pay) + binding.btnNext.setBackgroundColor( + ResourcesCompat.getColor( + resources, + R.color.green, + null + ) + ) + } else { binding.btnNext.text = getString(R.string.viewOrder) - binding.btnNext.setBackgroundColor(ResourcesCompat.getColor(resources, R.color.red, null)) + binding.btnNext.setBackgroundColor( + ResourcesCompat.getColor( + resources, + R.color.red, + null + ) + ) } binding.btnNext.setOnClickListener { @@ -89,7 +100,7 @@ class StepFourBajajFDFragment : BaseFragment() { resources.getString(R.string.validTermsConditions) ) } - }else{ + } else { // go to view order } } @@ -100,8 +111,12 @@ class StepFourBajajFDFragment : BaseFragment() { } private fun saveFDOtherData(data: SaveFDOtherDataRequest, payUrl: String, value: String) { - stepFourBajajFDViewModel.saveFDOtherData(data, token, activity as BajajFdMainActivity) - stepFourBajajFDViewModel.getFDOtherMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.saveFDOtherData( + data, + token, + activity as BajajFdMainActivity + ) + (activity as BajajFdMainActivity).viewModel.getFDOtherMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("response", "-->" + response.data.toString()) @@ -153,12 +168,14 @@ class StepFourBajajFDFragment : BaseFragment() { getCodeRequest.Category = getString(R.string.customerCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - stepFourBajajFDViewModel.paymentModeApi( + (activity as BajajFdMainActivity).viewModel.paymentModeApi( getCodeRequest, - Constants.token, + token, activity as BajajFdMainActivity ) - stepFourBajajFDViewModel.getPaymentModeMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getPaymentModeMutableData.observe( + viewLifecycleOwner + ) { response -> when (response) { is Resource.Success -> { Log.e("response", "-->$response") @@ -213,12 +230,14 @@ class StepFourBajajFDFragment : BaseFragment() { getFDDetailsRequest.NiveshClientCode = (mActivity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE getFDDetailsRequest.UniqueId = (activity as BajajFdMainActivity).uniqueId - stepFourBajajFDViewModel.getFDDetails( + (activity as BajajFdMainActivity).viewModel.getFDDetails( getFDDetailsRequest, - Constants.token, + token, activity as BajajFdMainActivity ) - stepFourBajajFDViewModel.getFDDetailsMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getFDDetailsMutableData.observe( + viewLifecycleOwner + ) { response -> when (response) { is Resource.Success -> { Log.e("response", "-->$response") 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 d5a4ad5..7dcec78 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 @@ -24,12 +24,14 @@ import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepOneBinding import com.nivesh.production.bajajfd.model.* import com.nivesh.production.bajajfd.repositories.MainRepository import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity +import com.nivesh.production.bajajfd.ui.providerfactory.FDModelProviderFactory import com.nivesh.production.bajajfd.ui.providerfactory.StepOneModelProviderFactory 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.BajajFDViewModel import com.nivesh.production.bajajfd.viewModel.StepOneBajajFDViewModel @@ -38,6 +40,7 @@ class StepOneBajajFDFragment : BaseFragment() { private val binding get() = _binding!! private lateinit var stepOneBajajFDViewModel: StepOneBajajFDViewModel + private lateinit var stepOneBajajFDViewModel1:BajajFDViewModel private lateinit var rgMaturity: RadioButton private lateinit var listOfTenure: MutableList private lateinit var recyclerViewDropDownAdapter: HorizontalRecyclerViewAdapter @@ -57,10 +60,16 @@ class StepOneBajajFDFragment : BaseFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - stepOneBajajFDViewModel = ViewModelProvider( + + stepOneBajajFDViewModel = ViewModelProvider( + this, + StepOneModelProviderFactory(MainRepository(ApiClient.getApiClient)) + )[StepOneBajajFDViewModel::class.java] + stepOneBajajFDViewModel1 = ViewModelProvider( this, - StepOneModelProviderFactory(MainRepository(ApiClient.getApiClient)) - )[StepOneBajajFDViewModel::class.java] + FDModelProviderFactory(MainRepository(ApiClient.getApiClient)) + )[BajajFDViewModel::class.java] + listOfTenure = ArrayList() binding.edtAmount.filters = arrayOf(InputFilter.LengthFilter(8)) // upto 1 Cr @@ -92,7 +101,6 @@ class StepOneBajajFDFragment : BaseFragment() { } else { binding.txtCumulativeNon.text = getString(R.string.cumulativeROI) } - if (binding.edtAmount.text.toString().trim().isNotEmpty()) { maturityAmountApi(tenure, interest) } @@ -123,11 +131,6 @@ class StepOneBajajFDFragment : BaseFragment() { Log.e("Maturity", "-->" + rgMaturity.text) } - // TAX Deduct - binding.rbDeductTax.setOnCheckedChangeListener { _, _ -> - Log.e("DeductTax", "-->" + binding.rbDeductTax.isChecked) - } - // Next Button binding.btnNext.setOnClickListener { if (validation()) { @@ -162,13 +165,12 @@ class StepOneBajajFDFragment : BaseFragment() { "StepOneData", "-->" + Gson().toJson((activity as BajajFdMainActivity).fdInvestmentDetails) ) - (activity as BajajFdMainActivity).stepOneApi("stepOneResponse") + (activity as BajajFdMainActivity).stepOneApi() } } minAmountApi() interestPayoutApi() - } private fun interestPayoutApi() { @@ -177,11 +179,11 @@ class StepOneBajajFDFragment : BaseFragment() { getCodeRequest.Category = getString(R.string.category) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - stepOneBajajFDViewModel.getCode(getCodeRequest, token, activity as BajajFdMainActivity) - stepOneBajajFDViewModel.getCodeMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getCode(getCodeRequest, token, activity as BajajFdMainActivity) + (activity as BajajFdMainActivity).viewModel.getCodeMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->$response") + Log.e("response", "-->${response.data.toString()}") val getCodeResponse: GetCodeResponse = Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java) getCodeResponse.Response.StatusCode.let { code -> @@ -236,11 +238,11 @@ class StepOneBajajFDFragment : BaseFragment() { getCodeRequest.Category = getString(R.string.minAmountCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - stepOneBajajFDViewModel.getMinAmount(getCodeRequest, token, activity as BajajFdMainActivity) - stepOneBajajFDViewModel.getMinAmountMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getMinAmount(getCodeRequest, token, activity as BajajFdMainActivity) + (activity as BajajFdMainActivity).viewModel.getMinAmountMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->$response") + Log.e("response", "-->${response.data.toString()}") val getCodeResponse: GetCodeResponse = Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java) getCodeResponse.Response.StatusCode.let { code -> @@ -286,11 +288,11 @@ class StepOneBajajFDFragment : BaseFragment() { getCodeRequest.Category = getString(R.string.MaxAmountCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - stepOneBajajFDViewModel.getMaxAmount(getCodeRequest, token, activity as BajajFdMainActivity) - stepOneBajajFDViewModel.getMaxAmountMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getMaxAmount(getCodeRequest, token, activity as BajajFdMainActivity) + (activity as BajajFdMainActivity).viewModel.getMaxAmountMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->$response") + Log.e("response", "-->${response.data.toString()}") val getCodeResponse: GetCodeResponse = Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java) getCodeResponse.Response.StatusCode.let { code -> @@ -353,11 +355,11 @@ class StepOneBajajFDFragment : BaseFragment() { maturityAmountRequest.Frequency = binding.spInterestPayout.text.toString() maturityAmountRequest.Tenure = tenure maturityAmountRequest.Interest = interest - stepOneBajajFDViewModel.getMaturityAmount( + (activity as BajajFdMainActivity).viewModel.getMaturityAmount( maturityAmountRequest, activity as BajajFdMainActivity ) - stepOneBajajFDViewModel.getMaturityAmountMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getMaturityAmountMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { val getMaturityAmountResponse = @@ -452,8 +454,8 @@ class StepOneBajajFDFragment : BaseFragment() { } else { getRatesRequest.type = getString(R.string.nonSeniorCitizen) } - stepOneBajajFDViewModel.getRates(getRatesRequest, token, activity as BajajFdMainActivity) - stepOneBajajFDViewModel.getRatesMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getRates(getRatesRequest, token, activity as BajajFdMainActivity) + (activity as BajajFdMainActivity).viewModel.getRatesMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { val getRatesResponse: GetRatesResponse = @@ -523,6 +525,6 @@ class StepOneBajajFDFragment : BaseFragment() { override fun onDestroyView() { super.onDestroyView() - _binding = null + // _binding = null } } \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt index 455916a..df3a61f 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt @@ -397,12 +397,14 @@ class StepThreeBajajFDFragment : BaseFragment() { du.NiveshClientCode = (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE du.UniqueId = (activity as BajajFdMainActivity).uniqueId - stepThreeBajajFDViewModel.documentsUpload( + (activity as BajajFdMainActivity).viewModel.documentsUpload( du, Constants.token, activity as BajajFdMainActivity ) - stepThreeBajajFDViewModel.getDocumentUploadMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getDocumentUploadMutableData.observe( + viewLifecycleOwner + ) { response -> when (response) { is Resource.Success -> { Log.e("UploadImage", "Response-->" + response.data.toString()) @@ -448,12 +450,14 @@ class StepThreeBajajFDFragment : BaseFragment() { } private fun createFDApi(data: CreateFDRequest) { - stepThreeBajajFDViewModel.createFDApi( + (activity as BajajFdMainActivity).viewModel.createFDApi( data, Constants.token, activity as BajajFdMainActivity ) - stepThreeBajajFDViewModel.getFDResponseMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getFDResponseMutableData.observe( + viewLifecycleOwner + ) { response -> when (response) { is Resource.Success -> { Log.e("createFDApi", "response--> " + response.data.toString()) @@ -499,12 +503,12 @@ class StepThreeBajajFDFragment : BaseFragment() { getCodeRequest.Category = getString(R.string.docType) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - stepThreeBajajFDViewModel.titleApi( + (activity as BajajFdMainActivity).viewModel.titleApi( getCodeRequest, Constants.token, activity as BajajFdMainActivity ) - stepThreeBajajFDViewModel.getTitleMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getTitleMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("response", "-->$response") 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 7faae89..2ec88d1 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 @@ -728,8 +728,8 @@ class StepTwoBajajFDFragment : BaseFragment() { } private fun createFDApi(data: CreateFDRequest) { - stepTwoBajajFDViewModel.createFDApi(data, token, activity as BajajFdMainActivity) - stepTwoBajajFDViewModel.getFDResponseMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.createFDApi(data, token, activity as BajajFdMainActivity) + (activity as BajajFdMainActivity).viewModel.getFDResponseMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("response", "-->$response") @@ -773,8 +773,8 @@ class StepTwoBajajFDFragment : BaseFragment() { private fun ifscCodeCheckApi(ifsc: String) { if (ifsc.length >= 10) { - stepTwoBajajFDViewModel.ifscCodeApi(ifsc, activity as BajajFdMainActivity) - stepTwoBajajFDViewModel.getIfscCodeCheckMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.ifscCodeApi(ifsc, activity as BajajFdMainActivity) + (activity as BajajFdMainActivity).viewModel.getIfscCodeCheckMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { val getIFSCCodeListResponse = @@ -839,11 +839,11 @@ class StepTwoBajajFDFragment : BaseFragment() { private fun getIFSCDetailsApi(ifscCode: String) { - stepTwoBajajFDViewModel.ifscCodeDetailsApi( + (activity as BajajFdMainActivity).viewModel.ifscCodeDetailsApi( ifscCode, activity as BajajFdMainActivity ) - stepTwoBajajFDViewModel.getIfscCodeDetailsCheckMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getIfscCodeDetailsCheckMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { if (response.data.toString().isNotEmpty()) { @@ -885,12 +885,12 @@ class StepTwoBajajFDFragment : BaseFragment() { bankValidationApiRequest.PhoneNo = phoneNumber bankValidationApiRequest.RoleId = loginRole bankValidationApiRequest.BankNo = bankNo - stepTwoBajajFDViewModel.bankValidationApi( + (activity as BajajFdMainActivity).viewModel.bankValidationApi( bankValidationApiRequest, token, activity as BajajFdMainActivity ) - stepTwoBajajFDViewModel.bankValidationApiMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.bankValidationApiMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { val getBankValidationApiResponse = @@ -1061,8 +1061,8 @@ class StepTwoBajajFDFragment : BaseFragment() { (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.sub_broker_code panCheck.panNumber = binding.edtPANNumber.text.toString() panCheck.mobileNumber = "" - stepTwoBajajFDViewModel.panCheck(panCheck, token, activity as BajajFdMainActivity) - stepTwoBajajFDViewModel.getPanCheckMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.panCheck(panCheck, token, activity as BajajFdMainActivity) + (activity as BajajFdMainActivity).viewModel.getPanCheckMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { val panCheckResponse = @@ -1119,8 +1119,8 @@ class StepTwoBajajFDFragment : BaseFragment() { getCodeRequest.Category = getString(R.string.salutationCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - stepTwoBajajFDViewModel.titleApi(getCodeRequest, token, activity as BajajFdMainActivity) - stepTwoBajajFDViewModel.getTitleMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.titleApi(getCodeRequest, token, activity as BajajFdMainActivity) + (activity as BajajFdMainActivity).viewModel.getTitleMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("response", "-->$response") @@ -1202,12 +1202,12 @@ class StepTwoBajajFDFragment : BaseFragment() { getCodeRequest.Category = getString(R.string.paymentModeCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - stepTwoBajajFDViewModel.paymentModeApi( + (activity as BajajFdMainActivity).viewModel.paymentModeApi( getCodeRequest, token, activity as BajajFdMainActivity ) - stepTwoBajajFDViewModel.getPaymentModeMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getPaymentModeMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("response", "-->$response") @@ -1264,12 +1264,12 @@ class StepTwoBajajFDFragment : BaseFragment() { getCodeRequest.Category = getString(R.string.genderCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - stepTwoBajajFDViewModel.genderApi( + (activity as BajajFdMainActivity).viewModel.genderApi( getCodeRequest, token, activity as BajajFdMainActivity ) - stepTwoBajajFDViewModel.getGenderMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getGenderMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("response", "-->$response") @@ -1324,12 +1324,12 @@ class StepTwoBajajFDFragment : BaseFragment() { getCodeRequest.Category = getString(R.string.relationshipCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - stepTwoBajajFDViewModel.relationShipApi( + (activity as BajajFdMainActivity).viewModel.relationShipApi( getCodeRequest, token, activity as BajajFdMainActivity ) - stepTwoBajajFDViewModel.getRelationShipMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getRelationShipMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("response", "-->$response") @@ -1392,12 +1392,12 @@ class StepTwoBajajFDFragment : BaseFragment() { getCodeRequest.Category = getString(R.string.maritalCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - stepTwoBajajFDViewModel.maritalStatusApi( + (activity as BajajFdMainActivity).viewModel.maritalStatusApi( getCodeRequest, token, activity as BajajFdMainActivity ) - stepTwoBajajFDViewModel.getMaritalStatusMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getMaritalStatusMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("response", "-->$response") @@ -1452,12 +1452,12 @@ class StepTwoBajajFDFragment : BaseFragment() { getCodeRequest.Category = getString(R.string.occupationCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - stepTwoBajajFDViewModel.occupationApi( + (activity as BajajFdMainActivity).viewModel.occupationApi( getCodeRequest, token, activity as BajajFdMainActivity ) - stepTwoBajajFDViewModel.getOccupationMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getOccupationMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("response", "-->$response") @@ -1512,12 +1512,12 @@ class StepTwoBajajFDFragment : BaseFragment() { getCodeRequest.Category = getString(R.string.annualIncome) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - stepTwoBajajFDViewModel.annualIncomeApi( + (activity as BajajFdMainActivity).viewModel.annualIncomeApi( getCodeRequest, token, activity as BajajFdMainActivity ) - stepTwoBajajFDViewModel.getAnnualIncomeMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getAnnualIncomeMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("response", "-->$response") @@ -1567,8 +1567,8 @@ class StepTwoBajajFDFragment : BaseFragment() { } private fun stateListApi() { - stepTwoBajajFDViewModel.stateApi(token, activity as BajajFdMainActivity) - stepTwoBajajFDViewModel.getStateMasterMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.stateApi(token, activity as BajajFdMainActivity) + (activity as BajajFdMainActivity).viewModel.getStateMasterMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("response", "-->$response") @@ -1654,8 +1654,8 @@ class StepTwoBajajFDFragment : BaseFragment() { cityRequest.HOCode = "" cityRequest.Source = getString(R.string.source) cityRequest.APP_Web = getString(R.string.app) - stepTwoBajajFDViewModel.cityListApi(cityRequest, token, activity as BajajFdMainActivity) - stepTwoBajajFDViewModel.getCityListMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.cityListApi(cityRequest, token, activity as BajajFdMainActivity) + (activity as BajajFdMainActivity).viewModel.getCityListMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("response", "-->$response") @@ -1717,8 +1717,8 @@ class StepTwoBajajFDFragment : BaseFragment() { } private fun apiForEligibleBankList() { - stepTwoBajajFDViewModel.bankListApi(token,getString(R.string.language), activity as BajajFdMainActivity) - stepTwoBajajFDViewModel.getFDBankListMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.bankListApi(token,getString(R.string.language), activity as BajajFdMainActivity) + (activity as BajajFdMainActivity).viewModel.getFDBankListMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("response", "-->$response") 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 732aba4..d0ba214 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 @@ -7,14 +7,14 @@ import androidx.lifecycle.viewModelScope import com.google.gson.JsonObject import com.nivesh.production.bajajfd.model.* import com.nivesh.production.bajajfd.repositories.MainRepository -import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity import com.nivesh.production.bajajfd.util.Common import com.nivesh.production.bajajfd.util.Common.Companion.handleError import com.nivesh.production.bajajfd.util.Common.Companion.handleResponse +import com.nivesh.production.bajajfd.util.Constants import com.nivesh.production.bajajfd.util.Resource import kotlinx.coroutines.launch -class BajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() { +open class BajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() { val getStepsCountMutableData: MutableLiveData> = MutableLiveData() fun getStepsCount( @@ -49,7 +49,6 @@ class BajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() } } - val getPaymentReQueryMutableData: MutableLiveData> = MutableLiveData() fun getPaymentReQuery(requestBody: PaymentReQueryRequest, token : String, activity: Activity) = viewModelScope.launch(handleError(activity)) { if (Common.isNetworkAvailable(activity)) { @@ -60,4 +59,305 @@ class BajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() } + // Step 1 Api + val getMinAmountMutableData: MutableLiveData> = MutableLiveData() + fun getMinAmount(requestBody: GetCodeRequest, token: String, activity: Activity) = + viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getMinAmountMutableData.postValue(Resource.Loading()) + val response = mainRepository.getCodesResponse(requestBody, token) + getMinAmountMutableData.postValue(handleResponse(response)) + } + } + + val getMaxAmountMutableData: MutableLiveData> = MutableLiveData() + fun getMaxAmount(requestBody: GetCodeRequest, token: String, activity: Activity) = + viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getMaxAmountMutableData.postValue(Resource.Loading()) + val response = mainRepository.getCodesResponse(requestBody, token) + getMaxAmountMutableData.postValue(handleResponse(response)) + } + } + + val getMaturityAmountMutableData: MutableLiveData> = MutableLiveData() + fun getMaturityAmount(requestBody: GetMaturityAmountRequest, activity: Activity) = + viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getMaturityAmountMutableData.postValue(Resource.Loading()) + val response = mainRepository.createCalculateFDMaturityAmount(requestBody, + Constants.token + ) + getMaturityAmountMutableData.postValue(handleResponse(response)) + } + } + + val getRatesMutableData: MutableLiveData> = MutableLiveData() + fun getRates(getRatesRequest: GetRatesRequest, token: String, activity: Activity) = + viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getRatesMutableData.postValue(Resource.Loading()) + val response = mainRepository.getRatesResponse(getRatesRequest, token) + getRatesMutableData.postValue(handleResponse(response)) + } + } + + val getCodeMutableData: MutableLiveData> = MutableLiveData() + fun getCode(requestBody: GetCodeRequest, token: String, activity: Activity) = + viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getCodeMutableData.postValue(Resource.Loading()) + val response = mainRepository.getCodesResponse(requestBody, token) + getCodeMutableData.postValue(handleResponse(response)) + } + } + + + // Step 2 + val getPanCheckMutableData: MutableLiveData> = MutableLiveData() + fun panCheck(panCheck: PanCheckRequest, token: String, activity : Activity) = viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getPanCheckMutableData.postValue(Resource.Loading()) + val response = mainRepository.panCheck(panCheck, token) + getPanCheckMutableData.postValue(handleResponse(response)) + } + } + + val getTitleMutableData: MutableLiveData> = MutableLiveData() + fun titleApi(getCodeRequest: GetCodeRequest, token: String, activity : Activity) = viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getTitleMutableData.postValue(Resource.Loading()) + val response = mainRepository.titleCheck(getCodeRequest, token) + getTitleMutableData.postValue(handleResponse(response)) + } + } + + val getGenderMutableData: MutableLiveData> = MutableLiveData() + fun genderApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getGenderMutableData.postValue(Resource.Loading()) + val response = mainRepository.genderCheck(getCodeRequest, token) + getGenderMutableData.postValue(handleResponse(response)) + } + } + + val getAnnualIncomeMutableData: MutableLiveData> = MutableLiveData() + fun annualIncomeApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getAnnualIncomeMutableData.postValue(Resource.Loading()) + val response = mainRepository.annualIncomeCheck(getCodeRequest, token) + getAnnualIncomeMutableData.postValue(handleResponse(response)) + } + } + + val getRelationShipMutableData: MutableLiveData> = MutableLiveData() + fun relationShipApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getRelationShipMutableData.postValue(Resource.Loading()) + val response = mainRepository.relationShipCheck(getCodeRequest, token) + getRelationShipMutableData.postValue(handleResponse(response)) + } + } + + val getMaritalStatusMutableData: MutableLiveData> = MutableLiveData() + fun maritalStatusApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getMaritalStatusMutableData.postValue(Resource.Loading()) + val response = mainRepository.maritalStatusCheck(getCodeRequest, token) + getMaritalStatusMutableData.postValue(handleResponse(response)) + } + } + + val getOccupationMutableData: MutableLiveData> = MutableLiveData() + fun occupationApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getOccupationMutableData.postValue(Resource.Loading()) + val response = mainRepository.occupationCheck(getCodeRequest, token) + getOccupationMutableData.postValue(handleResponse(response)) + } + } + + + val getStateMasterMutableData: MutableLiveData> = MutableLiveData() + fun stateApi(token: String,activity : Activity) = viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getStateMasterMutableData.postValue(Resource.Loading()) + val response = mainRepository.stateCheck(token) + getStateMasterMutableData.postValue(handleResponse(response)) + } + } + + val getCityListMutableData: MutableLiveData> = MutableLiveData() + fun cityListApi(cityRequest: CityRequest, token: String,activity : Activity) = viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getCityListMutableData.postValue(Resource.Loading()) + val response = mainRepository.cityCheck(cityRequest, token) + getCityListMutableData.postValue(handleResponse(response)) + } + } + + val getFDBankListMutableData: MutableLiveData> = MutableLiveData() + fun bankListApi( token: String,language: String, activity : Activity) = viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getFDBankListMutableData.postValue(Resource.Loading()) + val response = mainRepository.bankListCheck(token, language) + getFDBankListMutableData.postValue(handleResponse(response)) + } + } + + val getIfscCodeCheckMutableData: MutableLiveData> = MutableLiveData() + fun ifscCodeApi(ifsc : String,activity : Activity) = viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getIfscCodeCheckMutableData.postValue(Resource.Loading()) + val response = mainRepository.ifscCodeCheck(ifsc) + getIfscCodeCheckMutableData.postValue(handleResponse(response)) + } + } + + val getIfscCodeDetailsCheckMutableData: MutableLiveData> = MutableLiveData() + fun ifscCodeDetailsApi(ifsc : String,activity : Activity) = viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getIfscCodeDetailsCheckMutableData.postValue(Resource.Loading()) + val response = mainRepository.ifscCodeBankDetailsCheck(ifsc, Constants.token) + getIfscCodeDetailsCheckMutableData.postValue(Common.handleResponse1(response)) + } + } + + val getPaymentModeMutableData: MutableLiveData> = MutableLiveData() + fun paymentModeApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getPaymentModeMutableData.postValue(Resource.Loading()) + val response = mainRepository.payModeCheck(getCodeRequest, token) + getPaymentModeMutableData.postValue(handleResponse(response)) + } + } + + val getFDResponseMutableData: MutableLiveData> = MutableLiveData() + fun createFDApi(getRatesRequest: CreateFDRequest, token: String,activity : Activity) = viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getFDResponseMutableData.postValue(Resource.Loading()) + val response = mainRepository.createFDKYCResponse(getRatesRequest, token) + getFDResponseMutableData.postValue(handleResponse(response)) + } + } + + val bankValidationApiMutableData: MutableLiveData> = MutableLiveData() + fun bankValidationApi(bankValidationApiRequest : BankValidationApiRequest,token:String,activity : Activity) = viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + bankValidationApiMutableData.postValue(Resource.Loading()) + val response = mainRepository.bankValidationApiRequest(bankValidationApiRequest,token) + bankValidationApiMutableData.postValue(handleResponse(response)) + } + } + + // Step 3 + + val getDocumentUploadMutableData: MutableLiveData> = MutableLiveData() + fun documentsUpload(documentUpload: DocumentUpload, token: String, activity: Activity) = viewModelScope.launch( + Common.handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getDocumentUploadMutableData.postValue(Resource.Loading()) + val response = mainRepository.documentsUploadResponse(documentUpload, token) + getDocumentUploadMutableData.postValue(handleResponse(response)) + } + } + + // Step 4 + val getFDDetailsMutableData: MutableLiveData> = MutableLiveData() + fun getFDDetails(getRatesRequest: GetFDDetailsRequest, token: String, + activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { + if (Common.isNetworkAvailable(activity)) { + getFDDetailsMutableData.postValue(Resource.Loading()) + val response = mainRepository.getFDDetailsResponse(getRatesRequest, token) + getFDDetailsMutableData.postValue(handleResponse(response)) + } + } + + val getFDOtherMutableData: MutableLiveData> = MutableLiveData() + fun saveFDOtherData(getRatesRequest: SaveFDOtherDataRequest, token: String, + activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { + if (Common.isNetworkAvailable(activity)) { + getFDOtherMutableData.postValue(Resource.Loading()) + val response = mainRepository.saveFDOtherDataResponse(getRatesRequest, token) + getFDOtherMutableData.postValue(handleResponse(response)) + } + } + + fun updateFDPaymentStatus(getRatesRequest: GetRatesRequest, token: String, + activity: Activity) = + viewModelScope.launch(Common.handleError(activity)) { + if (Common.isNetworkAvailable(activity)) { + getRatesMutableData.postValue(Resource.Loading()) + val response = mainRepository.updateFDPaymentStatusResponse(getRatesRequest, token) + getRatesMutableData.postValue(handleResponse(response)) + } + } + + fun finaliseFD(getRatesRequest: GetRatesRequest, token: String, + activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { + if (Common.isNetworkAvailable(activity)) { + getRatesMutableData.postValue(Resource.Loading()) + val response = mainRepository.finaliseFDResponse(getRatesRequest, token) + getRatesMutableData.postValue(handleResponse(response)) + } + } + + fun finaliseKYC(getRatesRequest: GetRatesRequest, token: String, + activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { + if (Common.isNetworkAvailable(activity)) { + getRatesMutableData.postValue(Resource.Loading()) + val response = mainRepository.finaliseKYCResponse(getRatesRequest, token) + getRatesMutableData.postValue(handleResponse(response)) + } + } + + fun paymentReQuery(getRatesRequest: PaymentReQueryRequest, token: String, + activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { + if (Common.isNetworkAvailable(activity)) { + getRatesMutableData.postValue(Resource.Loading()) + val response = mainRepository.paymentReQueryResponse(getRatesRequest, token) + getRatesMutableData.postValue(handleResponse(response)) + } + } } \ 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 74af264..cc00cdb 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 @@ -1,85 +1,78 @@ package com.nivesh.production.bajajfd.viewModel -import android.app.Activity -import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope -import com.google.gson.JsonObject -import com.nivesh.production.bajajfd.model.* import com.nivesh.production.bajajfd.repositories.MainRepository -import com.nivesh.production.bajajfd.util.Common -import com.nivesh.production.bajajfd.util.Common.Companion.handleResponse -import com.nivesh.production.bajajfd.util.Resource -import kotlinx.coroutines.launch class StepFourBajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() { - val getPaymentModeMutableData: MutableLiveData> = MutableLiveData() - fun paymentModeApi(getCodeRequest: GetCodeRequest, token: String, - activity: Activity - ) = viewModelScope.launch(Common.handleError(activity)) { - if (Common.isNetworkAvailable(activity)) { - getPaymentModeMutableData.postValue(Resource.Loading()) - val response = mainRepository.payModeCheck(getCodeRequest, token) - getPaymentModeMutableData.postValue(handleResponse(response)) - } - } +// val getPaymentModeMutableData: MutableLiveData> = MutableLiveData() +// fun paymentModeApi(getCodeRequest: GetCodeRequest, token: String, +// activity: Activity +// ) = viewModelScope.launch(Common.handleError(activity)) { +// if (Common.isNetworkAvailable(activity)) { +// getPaymentModeMutableData.postValue(Resource.Loading()) +// val response = mainRepository.payModeCheck(getCodeRequest, token) +// getPaymentModeMutableData.postValue(handleResponse(response)) +// } +// } +// +// val getFDDetailsMutableData: MutableLiveData> = MutableLiveData() +// fun getFDDetails(getRatesRequest: GetFDDetailsRequest, token: String, +// activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { +// if (Common.isNetworkAvailable(activity)) { +// getFDDetailsMutableData.postValue(Resource.Loading()) +// val response = mainRepository.getFDDetailsResponse(getRatesRequest, token) +// getFDDetailsMutableData.postValue(handleResponse(response)) +// } +// } +// +// val getFDOtherMutableData: MutableLiveData> = MutableLiveData() +// fun saveFDOtherData(getRatesRequest: SaveFDOtherDataRequest, token: String, +// activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { +// if (Common.isNetworkAvailable(activity)) { +// getFDOtherMutableData.postValue(Resource.Loading()) +// val response = mainRepository.saveFDOtherDataResponse(getRatesRequest, token) +// getFDOtherMutableData.postValue(handleResponse(response)) +// } +// } +// +// val getRatesMutableData: MutableLiveData> = MutableLiveData() +// fun updateFDPaymentStatus(getRatesRequest: GetRatesRequest, token: String, +// activity: Activity) = +// viewModelScope.launch(Common.handleError(activity)) { +// if (Common.isNetworkAvailable(activity)) { +// getRatesMutableData.postValue(Resource.Loading()) +// val response = mainRepository.updateFDPaymentStatusResponse(getRatesRequest, token) +// getRatesMutableData.postValue(handleResponse(response)) +// } +// } +// +// fun finaliseFD(getRatesRequest: GetRatesRequest, token: String, +// activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { +// if (Common.isNetworkAvailable(activity)) { +// getRatesMutableData.postValue(Resource.Loading()) +// val response = mainRepository.finaliseFDResponse(getRatesRequest, token) +// getRatesMutableData.postValue(handleResponse(response)) +// } +// } +// +// fun finaliseKYC(getRatesRequest: GetRatesRequest, token: String, +// activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { +// if (Common.isNetworkAvailable(activity)) { +// getRatesMutableData.postValue(Resource.Loading()) +// val response = mainRepository.finaliseKYCResponse(getRatesRequest, token) +// getRatesMutableData.postValue(handleResponse(response)) +// } +// } +// +// fun paymentReQuery(getRatesRequest: PaymentReQueryRequest, token: String, +// activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { +// if (Common.isNetworkAvailable(activity)) { +// getRatesMutableData.postValue(Resource.Loading()) +// val response = mainRepository.paymentReQueryResponse(getRatesRequest, token) +// getRatesMutableData.postValue(handleResponse(response)) +// } +// } - val getFDDetailsMutableData: MutableLiveData> = MutableLiveData() - fun getFDDetails(getRatesRequest: GetFDDetailsRequest, token: String, - activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { - if (Common.isNetworkAvailable(activity)) { - getFDDetailsMutableData.postValue(Resource.Loading()) - val response = mainRepository.getFDDetailsResponse(getRatesRequest, token) - getFDDetailsMutableData.postValue(handleResponse(response)) - } - } - val getRatesMutableData: MutableLiveData> = MutableLiveData() - fun updateFDPaymentStatus(getRatesRequest: GetRatesRequest, token: String, - activity: Activity) = - viewModelScope.launch(Common.handleError(activity)) { - if (Common.isNetworkAvailable(activity)) { - getRatesMutableData.postValue(Resource.Loading()) - val response = mainRepository.updateFDPaymentStatusResponse(getRatesRequest, token) - getRatesMutableData.postValue(handleResponse(response)) - } - } - - fun finaliseFD(getRatesRequest: GetRatesRequest, token: String, - activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { - if (Common.isNetworkAvailable(activity)) { - getRatesMutableData.postValue(Resource.Loading()) - val response = mainRepository.finaliseFDResponse(getRatesRequest, token) - getRatesMutableData.postValue(handleResponse(response)) - } - } - - fun finaliseKYC(getRatesRequest: GetRatesRequest, token: String, - activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { - if (Common.isNetworkAvailable(activity)) { - getRatesMutableData.postValue(Resource.Loading()) - val response = mainRepository.finaliseKYCResponse(getRatesRequest, token) - getRatesMutableData.postValue(handleResponse(response)) - } - } - - fun paymentReQuery(getRatesRequest: PaymentReQueryRequest, token: String, - activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { - if (Common.isNetworkAvailable(activity)) { - getRatesMutableData.postValue(Resource.Loading()) - val response = mainRepository.paymentReQueryResponse(getRatesRequest, token) - getRatesMutableData.postValue(handleResponse(response)) - } - } - - val getFDOtherMutableData: MutableLiveData> = MutableLiveData() - fun saveFDOtherData(getRatesRequest: SaveFDOtherDataRequest, token: String, - activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { - if (Common.isNetworkAvailable(activity)) { - getFDOtherMutableData.postValue(Resource.Loading()) - val response = mainRepository.saveFDOtherDataResponse(getRatesRequest, token) - getFDOtherMutableData.postValue(handleResponse(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 f9245ac..8397ec1 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 @@ -1,79 +1,67 @@ package com.nivesh.production.bajajfd.viewModel -import android.app.Activity -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.Common -import com.nivesh.production.bajajfd.util.Common.Companion.handleResponse -import com.nivesh.production.bajajfd.util.Constants.Companion.token -import com.nivesh.production.bajajfd.util.Resource -import kotlinx.coroutines.launch class StepOneBajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() { - val getCodeMutableData: MutableLiveData> = MutableLiveData() - fun getCode(requestBody: GetCodeRequest, token: String, activity: Activity) = - viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getCodeMutableData.postValue(Resource.Loading()) - val response = mainRepository.getCodesResponse(requestBody, token) - getCodeMutableData.postValue(handleResponse(response)) - } - } +// val getCodeMutableData: MutableLiveData> = MutableLiveData() +// fun getCode(requestBody: GetCodeRequest, token: String, activity: Activity) = +// viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getCodeMutableData.postValue(Resource.Loading()) +// val response = mainRepository.getCodesResponse(requestBody, token) +// getCodeMutableData.postValue(handleResponse(response)) +// } +// } - val getRatesMutableData: MutableLiveData> = MutableLiveData() - fun getRates(getRatesRequest: GetRatesRequest, token: String, activity: Activity) = - viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getRatesMutableData.postValue(Resource.Loading()) - val response = mainRepository.getRatesResponse(getRatesRequest, token) - getRatesMutableData.postValue(handleResponse(response)) - } - } +// val getRatesMutableData: MutableLiveData> = MutableLiveData() +// fun getRates(getRatesRequest: GetRatesRequest, token: String, activity: Activity) = +// viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getRatesMutableData.postValue(Resource.Loading()) +// val response = mainRepository.getRatesResponse(getRatesRequest, token) +// getRatesMutableData.postValue(handleResponse(response)) +// } +// } - val getMaturityAmountMutableData: MutableLiveData> = MutableLiveData() - fun getMaturityAmount(requestBody: GetMaturityAmountRequest, activity: Activity) = - viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getMaturityAmountMutableData.postValue(Resource.Loading()) - val response = mainRepository.createCalculateFDMaturityAmount(requestBody, token) - getMaturityAmountMutableData.postValue(handleResponse(response)) - } - } +// val getMaturityAmountMutableData: MutableLiveData> = MutableLiveData() +// fun getMaturityAmount(requestBody: GetMaturityAmountRequest, activity: Activity) = +// viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getMaturityAmountMutableData.postValue(Resource.Loading()) +// val response = mainRepository.createCalculateFDMaturityAmount(requestBody, token) +// getMaturityAmountMutableData.postValue(handleResponse(response)) +// } +// } - val getMinAmountMutableData: MutableLiveData> = MutableLiveData() - fun getMinAmount(requestBody: GetCodeRequest, token: String, activity: Activity) = - viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getMinAmountMutableData.postValue(Resource.Loading()) - val response = mainRepository.getCodesResponse(requestBody, token) - getMinAmountMutableData.postValue(handleResponse(response)) - } - } +// val getMinAmountMutableData: MutableLiveData> = MutableLiveData() +// fun getMinAmount(requestBody: GetCodeRequest, token: String, activity: Activity) = +// viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getMinAmountMutableData.postValue(Resource.Loading()) +// val response = mainRepository.getCodesResponse(requestBody, token) +// getMinAmountMutableData.postValue(handleResponse(response)) +// } +// } - val getMaxAmountMutableData: MutableLiveData> = MutableLiveData() - fun getMaxAmount(requestBody: GetCodeRequest, token: String, activity: Activity) = - viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getMaxAmountMutableData.postValue(Resource.Loading()) - val response = mainRepository.getCodesResponse(requestBody, token) - getMaxAmountMutableData.postValue(handleResponse(response)) - } - } +// val getMaxAmountMutableData: MutableLiveData> = MutableLiveData() +// fun getMaxAmount(requestBody: GetCodeRequest, token: String, activity: Activity) = +// viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getMaxAmountMutableData.postValue(Resource.Loading()) +// val response = mainRepository.getCodesResponse(requestBody, token) +// getMaxAmountMutableData.postValue(handleResponse(response)) +// } +// } } \ No newline at end of file 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 f65da9a..aa1a40d 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 @@ -1,53 +1,41 @@ package com.nivesh.production.bajajfd.viewModel -import android.app.Activity -import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope -import com.google.gson.JsonObject -import com.nivesh.production.bajajfd.model.CreateFDRequest -import com.nivesh.production.bajajfd.model.DocumentUpload -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.Common -import com.nivesh.production.bajajfd.util.Common.Companion.handleResponse -import com.nivesh.production.bajajfd.util.Resource -import kotlinx.coroutines.launch class StepThreeBajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() { - val getTitleMutableData: MutableLiveData> = MutableLiveData() - fun titleApi(getCodeRequest: GetCodeRequest, token: String, activity: Activity) = viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getTitleMutableData.postValue(Resource.Loading()) - val response = mainRepository.titleCheck(getCodeRequest, token) - getTitleMutableData.postValue(handleResponse(response)) - } - } - - val getDocumentUploadMutableData: MutableLiveData> = MutableLiveData() - fun documentsUpload(documentUpload: DocumentUpload, token: String, activity: Activity) = viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getDocumentUploadMutableData.postValue(Resource.Loading()) - val response = mainRepository.documentsUploadResponse(documentUpload, token) - getDocumentUploadMutableData.postValue(handleResponse(response)) - } - } - - val getFDResponseMutableData: MutableLiveData> = MutableLiveData() - fun createFDApi(getRatesRequest: CreateFDRequest, token: String, activity: Activity) = viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getFDResponseMutableData.postValue(Resource.Loading()) - val response = mainRepository.createFDKYCResponse(getRatesRequest, token) - getFDResponseMutableData.postValue(handleResponse(response)) - } - } +// val getTitleMutableData: MutableLiveData> = MutableLiveData() +// fun titleApi(getCodeRequest: GetCodeRequest, token: String, activity: Activity) = viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getTitleMutableData.postValue(Resource.Loading()) +// val response = mainRepository.titleCheck(getCodeRequest, token) +// getTitleMutableData.postValue(handleResponse(response)) +// } +// } +// +// val getDocumentUploadMutableData: MutableLiveData> = MutableLiveData() +// fun documentsUpload(documentUpload: DocumentUpload, token: String, activity: Activity) = viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getDocumentUploadMutableData.postValue(Resource.Loading()) +// val response = mainRepository.documentsUploadResponse(documentUpload, token) +// getDocumentUploadMutableData.postValue(handleResponse(response)) +// } +// } +// +// val getFDResponseMutableData: MutableLiveData> = MutableLiveData() +// fun createFDApi(getRatesRequest: CreateFDRequest, token: String, activity: Activity) = viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getFDResponseMutableData.postValue(Resource.Loading()) +// val response = mainRepository.createFDKYCResponse(getRatesRequest, token) +// getFDResponseMutableData.postValue(handleResponse(response)) +// } +// } } \ No newline at end of file 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 7a8d89a..c9093ee 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 @@ -1,191 +1,174 @@ package com.nivesh.production.bajajfd.viewModel -import android.app.Activity -import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope -import com.google.gson.JsonObject -import com.nivesh.production.bajajfd.model.* import com.nivesh.production.bajajfd.repositories.MainRepository -import com.nivesh.production.bajajfd.util.Common -import com.nivesh.production.bajajfd.util.Common.Companion.handleResponse -import com.nivesh.production.bajajfd.util.Common.Companion.handleResponse1 -import com.nivesh.production.bajajfd.util.Constants.Companion.token -import com.nivesh.production.bajajfd.util.Resource -import kotlinx.coroutines.launch -import org.intellij.lang.annotations.Language class StepTwoBajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() { - val getPanCheckMutableData: MutableLiveData> = MutableLiveData() - fun panCheck(panCheck: PanCheckRequest, token: String, activity : Activity) = viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getPanCheckMutableData.postValue(Resource.Loading()) - val response = mainRepository.panCheck(panCheck, token) - getPanCheckMutableData.postValue(handleResponse(response)) - } - } - - val getTitleMutableData: MutableLiveData> = MutableLiveData() - fun titleApi(getCodeRequest: GetCodeRequest, token: String, activity : Activity) = viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getTitleMutableData.postValue(Resource.Loading()) - val response = mainRepository.titleCheck(getCodeRequest, token) - getTitleMutableData.postValue(handleResponse(response)) - } - } - - val getGenderMutableData: MutableLiveData> = MutableLiveData() - fun genderApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getGenderMutableData.postValue(Resource.Loading()) - val response = mainRepository.genderCheck(getCodeRequest, token) - getGenderMutableData.postValue(handleResponse(response)) - } - } - - val getAnnualIncomeMutableData: MutableLiveData> = MutableLiveData() - fun annualIncomeApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getAnnualIncomeMutableData.postValue(Resource.Loading()) - val response = mainRepository.annualIncomeCheck(getCodeRequest, token) - getAnnualIncomeMutableData.postValue(handleResponse(response)) - } - } - - val getRelationShipMutableData: MutableLiveData> = MutableLiveData() - fun relationShipApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getRelationShipMutableData.postValue(Resource.Loading()) - val response = mainRepository.relationShipCheck(getCodeRequest, token) - getRelationShipMutableData.postValue(handleResponse(response)) - } - } - - val getMaritalStatusMutableData: MutableLiveData> = MutableLiveData() - fun maritalStatusApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getMaritalStatusMutableData.postValue(Resource.Loading()) - val response = mainRepository.maritalStatusCheck(getCodeRequest, token) - getMaritalStatusMutableData.postValue(handleResponse(response)) - } - } - - val getOccupationMutableData: MutableLiveData> = MutableLiveData() - fun occupationApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getOccupationMutableData.postValue(Resource.Loading()) - val response = mainRepository.occupationCheck(getCodeRequest, token) - getOccupationMutableData.postValue(handleResponse(response)) - } - } - - - val getStateMasterMutableData: MutableLiveData> = MutableLiveData() - fun stateApi(token: String,activity : Activity) = viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getStateMasterMutableData.postValue(Resource.Loading()) - val response = mainRepository.stateCheck(token) - getStateMasterMutableData.postValue(handleResponse(response)) - } - } - - val getCityListMutableData: MutableLiveData> = MutableLiveData() - fun cityListApi(cityRequest: CityRequest, token: String,activity : Activity) = viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getCityListMutableData.postValue(Resource.Loading()) - val response = mainRepository.cityCheck(cityRequest, token) - getCityListMutableData.postValue(handleResponse(response)) - } - } - - val getFDBankListMutableData: MutableLiveData> = MutableLiveData() - fun bankListApi( token: String,language: String, activity : Activity) = viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getFDBankListMutableData.postValue(Resource.Loading()) - val response = mainRepository.bankListCheck(token, language) - getFDBankListMutableData.postValue(handleResponse(response)) - } - } - - val getIfscCodeCheckMutableData: MutableLiveData> = MutableLiveData() - fun ifscCodeApi(ifsc : String,activity : Activity) = viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getIfscCodeCheckMutableData.postValue(Resource.Loading()) - val response = mainRepository.ifscCodeCheck(ifsc) - getIfscCodeCheckMutableData.postValue(handleResponse(response)) - } - } - - val getIfscCodeDetailsCheckMutableData: MutableLiveData> = MutableLiveData() - fun ifscCodeDetailsApi(ifsc : String,activity : Activity) = viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getIfscCodeDetailsCheckMutableData.postValue(Resource.Loading()) - val response = mainRepository.ifscCodeBankDetailsCheck(ifsc, token) - getIfscCodeDetailsCheckMutableData.postValue(handleResponse1(response)) - } - } - - - val getPaymentModeMutableData: MutableLiveData> = MutableLiveData() - fun paymentModeApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getPaymentModeMutableData.postValue(Resource.Loading()) - val response = mainRepository.payModeCheck(getCodeRequest, token) - getPaymentModeMutableData.postValue(handleResponse(response)) - } - } - - val getFDResponseMutableData: MutableLiveData> = MutableLiveData() - fun createFDApi(getRatesRequest: CreateFDRequest, token: String,activity : Activity) = viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - getFDResponseMutableData.postValue(Resource.Loading()) - val response = mainRepository.createFDKYCResponse(getRatesRequest, token) - getFDResponseMutableData.postValue(handleResponse(response)) - } - } - - - - - val bankValidationApiMutableData: MutableLiveData> = MutableLiveData() - - fun bankValidationApi(bankValidationApiRequest : BankValidationApiRequest,token:String,activity : Activity) = viewModelScope.launch( - Common.handleError(activity) - ) { - if (Common.isNetworkAvailable(activity)) { - bankValidationApiMutableData.postValue(Resource.Loading()) - val response = mainRepository.bankValidationApiRequest(bankValidationApiRequest,token) - bankValidationApiMutableData.postValue(handleResponse(response)) - } - } +// val getPanCheckMutableData: MutableLiveData> = MutableLiveData() +// fun panCheck(panCheck: PanCheckRequest, token: String, activity : Activity) = viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getPanCheckMutableData.postValue(Resource.Loading()) +// val response = mainRepository.panCheck(panCheck, token) +// getPanCheckMutableData.postValue(handleResponse(response)) +// } +// } +// +// val getTitleMutableData: MutableLiveData> = MutableLiveData() +// fun titleApi(getCodeRequest: GetCodeRequest, token: String, activity : Activity) = viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getTitleMutableData.postValue(Resource.Loading()) +// val response = mainRepository.titleCheck(getCodeRequest, token) +// getTitleMutableData.postValue(handleResponse(response)) +// } +// } +// +// val getGenderMutableData: MutableLiveData> = MutableLiveData() +// fun genderApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getGenderMutableData.postValue(Resource.Loading()) +// val response = mainRepository.genderCheck(getCodeRequest, token) +// getGenderMutableData.postValue(handleResponse(response)) +// } +// } +// +// val getAnnualIncomeMutableData: MutableLiveData> = MutableLiveData() +// fun annualIncomeApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getAnnualIncomeMutableData.postValue(Resource.Loading()) +// val response = mainRepository.annualIncomeCheck(getCodeRequest, token) +// getAnnualIncomeMutableData.postValue(handleResponse(response)) +// } +// } +// +// val getRelationShipMutableData: MutableLiveData> = MutableLiveData() +// fun relationShipApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getRelationShipMutableData.postValue(Resource.Loading()) +// val response = mainRepository.relationShipCheck(getCodeRequest, token) +// getRelationShipMutableData.postValue(handleResponse(response)) +// } +// } +// +// val getMaritalStatusMutableData: MutableLiveData> = MutableLiveData() +// fun maritalStatusApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getMaritalStatusMutableData.postValue(Resource.Loading()) +// val response = mainRepository.maritalStatusCheck(getCodeRequest, token) +// getMaritalStatusMutableData.postValue(handleResponse(response)) +// } +// } +// +// val getOccupationMutableData: MutableLiveData> = MutableLiveData() +// fun occupationApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getOccupationMutableData.postValue(Resource.Loading()) +// val response = mainRepository.occupationCheck(getCodeRequest, token) +// getOccupationMutableData.postValue(handleResponse(response)) +// } +// } +// +// +// val getStateMasterMutableData: MutableLiveData> = MutableLiveData() +// fun stateApi(token: String,activity : Activity) = viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getStateMasterMutableData.postValue(Resource.Loading()) +// val response = mainRepository.stateCheck(token) +// getStateMasterMutableData.postValue(handleResponse(response)) +// } +// } +// +// val getCityListMutableData: MutableLiveData> = MutableLiveData() +// fun cityListApi(cityRequest: CityRequest, token: String,activity : Activity) = viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getCityListMutableData.postValue(Resource.Loading()) +// val response = mainRepository.cityCheck(cityRequest, token) +// getCityListMutableData.postValue(handleResponse(response)) +// } +// } +// +// val getFDBankListMutableData: MutableLiveData> = MutableLiveData() +// fun bankListApi( token: String,language: String, activity : Activity) = viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getFDBankListMutableData.postValue(Resource.Loading()) +// val response = mainRepository.bankListCheck(token, language) +// getFDBankListMutableData.postValue(handleResponse(response)) +// } +// } +// +// val getIfscCodeCheckMutableData: MutableLiveData> = MutableLiveData() +// fun ifscCodeApi(ifsc : String,activity : Activity) = viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getIfscCodeCheckMutableData.postValue(Resource.Loading()) +// val response = mainRepository.ifscCodeCheck(ifsc) +// getIfscCodeCheckMutableData.postValue(handleResponse(response)) +// } +// } +// +// val getIfscCodeDetailsCheckMutableData: MutableLiveData> = MutableLiveData() +// fun ifscCodeDetailsApi(ifsc : String,activity : Activity) = viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getIfscCodeDetailsCheckMutableData.postValue(Resource.Loading()) +// val response = mainRepository.ifscCodeBankDetailsCheck(ifsc, token) +// getIfscCodeDetailsCheckMutableData.postValue(handleResponse1(response)) +// } +// } +// +// val getPaymentModeMutableData: MutableLiveData> = MutableLiveData() +// fun paymentModeApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getPaymentModeMutableData.postValue(Resource.Loading()) +// val response = mainRepository.payModeCheck(getCodeRequest, token) +// getPaymentModeMutableData.postValue(handleResponse(response)) +// } +// } +// +// val getFDResponseMutableData: MutableLiveData> = MutableLiveData() +// fun createFDApi(getRatesRequest: CreateFDRequest, token: String,activity : Activity) = viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// getFDResponseMutableData.postValue(Resource.Loading()) +// val response = mainRepository.createFDKYCResponse(getRatesRequest, token) +// getFDResponseMutableData.postValue(handleResponse(response)) +// } +// } +// +// val bankValidationApiMutableData: MutableLiveData> = MutableLiveData() +// fun bankValidationApi(bankValidationApiRequest : BankValidationApiRequest,token:String,activity : Activity) = viewModelScope.launch( +// Common.handleError(activity) +// ) { +// if (Common.isNetworkAvailable(activity)) { +// bankValidationApiMutableData.postValue(Resource.Loading()) +// val response = mainRepository.bankValidationApiRequest(bankValidationApiRequest,token) +// bankValidationApiMutableData.postValue(handleResponse(response)) +// } +// } } \ No newline at end of file From 28aaba634389c0064e5c79c39221b72e3e0d2d5f Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Sat, 7 Jan 2023 20:43:41 +0530 Subject: [PATCH 2/3] modified code --- .../ui/activity/BajajFdMainActivity.kt | 10 +- .../bajajfd/ui/fragment/BaseFragment.kt | 36 ---- .../ui/fragment/StepFiveBajajFDFragment.kt | 14 +- .../ui/fragment/StepFourBajajFDFragment.kt | 19 +- .../ui/fragment/StepOneBajajFDFragment.kt | 66 ++++--- .../ui/fragment/StepThreeBajajFDFragment.kt | 19 +- .../ui/fragment/StepTwoBajajFDFragment.kt | 18 +- .../providerfactory/FDModelProviderFactory.kt | 1 - .../StepFiveModelProviderFactory.kt | 15 -- .../StepFourModelProviderFactory.kt | 15 -- .../StepOneModelProviderFactory.kt | 14 -- .../StepThreeModelProviderFactory.kt | 17 -- .../StepTwoModelProviderFactory.kt | 16 -- .../bajajfd/viewModel/BajajFDViewModel.kt | 28 ++- .../viewModel/StepFiveBajajFDViewModel.kt | 9 - .../viewModel/StepFourBajajFDViewModel.kt | 78 -------- .../viewModel/StepOneBajajFDViewModel.kt | 67 ------- .../viewModel/StepThreeBajajFDViewModel.kt | 41 ----- .../viewModel/StepTwoBajajFDViewModel.kt | 174 ------------------ 19 files changed, 78 insertions(+), 579 deletions(-) delete mode 100644 app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/BaseFragment.kt delete mode 100644 app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepFiveModelProviderFactory.kt delete mode 100644 app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepFourModelProviderFactory.kt delete mode 100644 app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepOneModelProviderFactory.kt delete mode 100644 app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepThreeModelProviderFactory.kt delete mode 100644 app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepTwoModelProviderFactory.kt delete mode 100644 app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFiveBajajFDViewModel.kt delete mode 100644 app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFourBajajFDViewModel.kt delete mode 100644 app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepOneBajajFDViewModel.kt delete mode 100644 app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepThreeBajajFDViewModel.kt delete mode 100644 app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoBajajFDViewModel.kt 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 83b36fd..2c0fbf4 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 @@ -1,6 +1,7 @@ package com.nivesh.production.bajajfd.ui.activity import android.annotation.SuppressLint +import android.app.Activity import android.app.Dialog import android.graphics.Bitmap import android.graphics.drawable.Drawable @@ -71,7 +72,7 @@ class BajajFdMainActivity : BaseActivity() { //start Repository viewModel = ViewModelProvider( - this, + this@BajajFdMainActivity, FDModelProviderFactory(MainRepository(ApiClient.getApiClient)) )[BajajFDViewModel::class.java] @@ -228,9 +229,9 @@ class BajajFdMainActivity : BaseActivity() { val viewPager: DisableAdapter = binding.viewPager viewPager.setPagingEnabled(false) viewPager.adapter = sectionsPagerAdapter - if (sectionsPagerAdapter.getCount() > 1){ + if (sectionsPagerAdapter.getCount() > 1) { viewPager.offscreenPageLimit = sectionsPagerAdapter.count - 1 - }else{ + } else { viewPager.offscreenPageLimit = 1 } viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { @@ -238,7 +239,8 @@ class BajajFdMainActivity : BaseActivity() { position: Int, positionOffset: Float, positionOffsetPixels: Int - ) {} + ) { + } override fun onPageSelected(position: Int) { when (position) { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/BaseFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/BaseFragment.kt deleted file mode 100644 index e485989..0000000 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/BaseFragment.kt +++ /dev/null @@ -1,36 +0,0 @@ -package com.nivesh.production.bajajfd.ui.fragment - -import android.content.Context -import android.os.Bundle -import androidx.fragment.app.Fragment -import com.nivesh.production.bajajfd.ui.activity.BaseActivity - -open class BaseFragment : Fragment() { - protected var mActivity: BaseActivity? = null - - - - override fun onAttach(context: Context) { - super.onAttach(context) - if (context is BaseActivity) { - mActivity = context - } else try { - throw ClassCastException("You need to extend BaseActivity to calling activity.") - } catch (e: Exception) { - e.printStackTrace() - } - } - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - } - - override fun onStart() { - super.onStart() - } - - override fun onStop() { - super.onStop() - } - -} diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt index aba6808..5f9ea63 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt @@ -5,17 +5,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import androidx.lifecycle.ViewModelProvider -import com.nivesh.production.bajajfd.api.ApiClient import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepFiveBinding import com.nivesh.production.bajajfd.model.PaymentReQueryResponse -import com.nivesh.production.bajajfd.repositories.MainRepository -import com.nivesh.production.bajajfd.ui.providerfactory.StepFiveModelProviderFactory -import com.nivesh.production.bajajfd.viewModel.StepFiveBajajFDViewModel class StepFiveBajajFDFragment : Fragment() { - private lateinit var stepFiveBajajFDViewModel: StepFiveBajajFDViewModel private var _binding: FragmentBajajfdStepFiveBinding? = null private val binding get() = _binding!! @@ -27,17 +21,13 @@ class StepFiveBajajFDFragment : Fragment() { return binding.root } - fun getData(paymentReQueryResponse: PaymentReQueryResponse) { + fun getData(paymentReQueryResponse: PaymentReQueryResponse) { - } + } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - stepFiveBajajFDViewModel = ViewModelProvider( - this, - StepFiveModelProviderFactory(MainRepository(ApiClient.getApiClient)) - )[StepFiveBajajFDViewModel::class.java] binding.btnViewOrder.setOnClickListener { 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 c7da25a..a101888 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 @@ -6,26 +6,21 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.core.content.res.ResourcesCompat -import androidx.lifecycle.ViewModelProvider +import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager import com.google.gson.Gson import com.nivesh.production.bajajfd.R import com.nivesh.production.bajajfd.adapter.CustomerListAdapter -import com.nivesh.production.bajajfd.api.ApiClient import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepFourBinding import com.nivesh.production.bajajfd.model.* -import com.nivesh.production.bajajfd.repositories.MainRepository import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity -import com.nivesh.production.bajajfd.ui.providerfactory.StepFourModelProviderFactory import com.nivesh.production.bajajfd.util.Common import com.nivesh.production.bajajfd.util.Common.Companion.showDialogValidation import com.nivesh.production.bajajfd.util.Constants.Companion.token import com.nivesh.production.bajajfd.util.Resource -import com.nivesh.production.bajajfd.viewModel.StepFourBajajFDViewModel -class StepFourBajajFDFragment : BaseFragment() { +class StepFourBajajFDFragment : Fragment() { - private lateinit var stepFourBajajFDViewModel: StepFourBajajFDViewModel private var _binding: FragmentBajajfdStepFourBinding? = null private val binding get() = _binding!! private lateinit var listOfCustomer: MutableList @@ -44,10 +39,6 @@ class StepFourBajajFDFragment : BaseFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - stepFourBajajFDViewModel = ViewModelProvider( - this, - StepFourModelProviderFactory(MainRepository(ApiClient.getApiClient)) - )[StepFourBajajFDViewModel::class.java] binding.checkBox.setOnCheckedChangeListener { _, _ -> @@ -224,11 +215,11 @@ class StepFourBajajFDFragment : BaseFragment() { } private fun getFDDetailsApi() { - if (Common.isNetworkAvailable(mActivity!!)) { + if (Common.isNetworkAvailable(activity as BajajFdMainActivity)) { val getFDDetailsRequest = GetFDDetailsRequest() - getFDDetailsRequest.FDProvider = mActivity!!.getString(R.string.bajaj) + getFDDetailsRequest.FDProvider = getString(R.string.bajaj) getFDDetailsRequest.NiveshClientCode = - (mActivity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE getFDDetailsRequest.UniqueId = (activity as BajajFdMainActivity).uniqueId (activity as BajajFdMainActivity).viewModel.getFDDetails( getFDDetailsRequest, 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 7dcec78..7228ff9 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 @@ -12,35 +12,27 @@ import android.view.View import android.view.ViewGroup import android.widget.ArrayAdapter import android.widget.RadioButton -import androidx.lifecycle.ViewModelProvider +import androidx.fragment.app.Fragment import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView.LayoutManager import com.google.gson.Gson import com.nivesh.production.bajajfd.R import com.nivesh.production.bajajfd.adapter.HorizontalRecyclerViewAdapter -import com.nivesh.production.bajajfd.api.ApiClient import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepOneBinding import com.nivesh.production.bajajfd.model.* -import com.nivesh.production.bajajfd.repositories.MainRepository import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity -import com.nivesh.production.bajajfd.ui.providerfactory.FDModelProviderFactory -import com.nivesh.production.bajajfd.ui.providerfactory.StepOneModelProviderFactory 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.BajajFDViewModel -import com.nivesh.production.bajajfd.viewModel.StepOneBajajFDViewModel -class StepOneBajajFDFragment : BaseFragment() { +class StepOneBajajFDFragment : Fragment() { private var _binding: FragmentBajajfdStepOneBinding? = null private val binding get() = _binding!! - private lateinit var stepOneBajajFDViewModel: StepOneBajajFDViewModel - private lateinit var stepOneBajajFDViewModel1:BajajFDViewModel private lateinit var rgMaturity: RadioButton private lateinit var listOfTenure: MutableList private lateinit var recyclerViewDropDownAdapter: HorizontalRecyclerViewAdapter @@ -61,17 +53,7 @@ class StepOneBajajFDFragment : BaseFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - stepOneBajajFDViewModel = ViewModelProvider( - this, - StepOneModelProviderFactory(MainRepository(ApiClient.getApiClient)) - )[StepOneBajajFDViewModel::class.java] - stepOneBajajFDViewModel1 = ViewModelProvider( - this, - FDModelProviderFactory(MainRepository(ApiClient.getApiClient)) - )[BajajFDViewModel::class.java] - listOfTenure = ArrayList() - binding.edtAmount.filters = arrayOf(InputFilter.LengthFilter(8)) // upto 1 Cr listOfMinAmount = ArrayList() @@ -140,7 +122,8 @@ class StepOneBajajFDFragment : BaseFragment() { binding.spInterestPayout.text.toString() (activity as BajajFdMainActivity).fdInvestmentDetails.Tenure = tenure (activity as BajajFdMainActivity).fdInvestmentDetails.Interest = interest - (activity as BajajFdMainActivity).fdInvestmentDetails.NiveshClientCode = (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + (activity as BajajFdMainActivity).fdInvestmentDetails.NiveshClientCode = + (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE (activity as BajajFdMainActivity).fdInvestmentDetails.Provider = getString(R.string.bajaj) (activity as BajajFdMainActivity).fdInvestmentDetails.IPAddress = "192.168.1.23" @@ -157,7 +140,8 @@ class StepOneBajajFDFragment : BaseFragment() { } (activity as BajajFdMainActivity).fdInvestmentDetails.CustomerType = "" (activity as BajajFdMainActivity).fdInvestmentDetails.CKYCNumber = "" - (activity as BajajFdMainActivity).fdInvestmentDetails.UniqueId = (activity as BajajFdMainActivity).uniqueId + (activity as BajajFdMainActivity).fdInvestmentDetails.UniqueId = + (activity as BajajFdMainActivity).uniqueId (activity as BajajFdMainActivity).createFDApplicantRequest.FDInvestmentDetails = (activity as BajajFdMainActivity).fdInvestmentDetails @@ -179,7 +163,11 @@ class StepOneBajajFDFragment : BaseFragment() { getCodeRequest.Category = getString(R.string.category) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - (activity as BajajFdMainActivity).viewModel.getCode(getCodeRequest, token, activity as BajajFdMainActivity) + (activity as BajajFdMainActivity).viewModel.getCode( + getCodeRequest, + token, + activity as BajajFdMainActivity + ) (activity as BajajFdMainActivity).viewModel.getCodeMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { @@ -238,8 +226,14 @@ class StepOneBajajFDFragment : BaseFragment() { getCodeRequest.Category = getString(R.string.minAmountCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - (activity as BajajFdMainActivity).viewModel.getMinAmount(getCodeRequest, token, activity as BajajFdMainActivity) - (activity as BajajFdMainActivity).viewModel.getMinAmountMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getMinAmount( + getCodeRequest, + token, + activity as BajajFdMainActivity + ) + (activity as BajajFdMainActivity).viewModel.getMinAmountMutableData.observe( + viewLifecycleOwner + ) { response -> when (response) { is Resource.Success -> { Log.e("response", "-->${response.data.toString()}") @@ -288,8 +282,14 @@ class StepOneBajajFDFragment : BaseFragment() { getCodeRequest.Category = getString(R.string.MaxAmountCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - (activity as BajajFdMainActivity).viewModel.getMaxAmount(getCodeRequest, token, activity as BajajFdMainActivity) - (activity as BajajFdMainActivity).viewModel.getMaxAmountMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getMaxAmount( + getCodeRequest, + token, + activity as BajajFdMainActivity + ) + (activity as BajajFdMainActivity).viewModel.getMaxAmountMutableData.observe( + viewLifecycleOwner + ) { response -> when (response) { is Resource.Success -> { Log.e("response", "-->${response.data.toString()}") @@ -359,7 +359,9 @@ class StepOneBajajFDFragment : BaseFragment() { maturityAmountRequest, activity as BajajFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getMaturityAmountMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getMaturityAmountMutableData.observe( + viewLifecycleOwner + ) { response -> when (response) { is Resource.Success -> { val getMaturityAmountResponse = @@ -454,7 +456,11 @@ class StepOneBajajFDFragment : BaseFragment() { } else { getRatesRequest.type = getString(R.string.nonSeniorCitizen) } - (activity as BajajFdMainActivity).viewModel.getRates(getRatesRequest, token, activity as BajajFdMainActivity) + (activity as BajajFdMainActivity).viewModel.getRates( + getRatesRequest, + token, + activity as BajajFdMainActivity + ) (activity as BajajFdMainActivity).viewModel.getRatesMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { @@ -525,6 +531,6 @@ class StepOneBajajFDFragment : BaseFragment() { override fun onDestroyView() { super.onDestroyView() - // _binding = null + _binding = null } } \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt index df3a61f..b477808 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt @@ -21,34 +21,29 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AlertDialog import androidx.core.content.ContextCompat import androidx.core.content.FileProvider -import androidx.lifecycle.ViewModelProvider +import androidx.fragment.app.Fragment import androidx.lifecycle.lifecycleScope import com.google.gson.Gson import com.nivesh.production.bajajfd.BuildConfig import com.nivesh.production.bajajfd.R -import com.nivesh.production.bajajfd.api.ApiClient import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepThreeBinding import com.nivesh.production.bajajfd.model.* -import com.nivesh.production.bajajfd.repositories.MainRepository import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity -import com.nivesh.production.bajajfd.ui.providerfactory.StepThreeModelProviderFactory import com.nivesh.production.bajajfd.util.Common import com.nivesh.production.bajajfd.util.Common.Companion.getFileExtension import com.nivesh.production.bajajfd.util.Constants import com.nivesh.production.bajajfd.util.ImageUtil import com.nivesh.production.bajajfd.util.Resource -import com.nivesh.production.bajajfd.viewModel.StepThreeBajajFDViewModel import java.io.* -class StepThreeBajajFDFragment : BaseFragment() { +class StepThreeBajajFDFragment : Fragment() { private var bitmap: Bitmap? = null private var latestTmpUri: Uri? = null private var _binding: FragmentBajajfdStepThreeBinding? = null private val binding get() = _binding!! - private lateinit var stepThreeBajajFDViewModel: StepThreeBajajFDViewModel private var takeImageResult: ActivityResultLauncher? = null private var selectImageIntent: ActivityResultLauncher? = null @@ -93,10 +88,6 @@ class StepThreeBajajFDFragment : BaseFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - stepThreeBajajFDViewModel = ViewModelProvider( - this, - StepThreeModelProviderFactory(MainRepository(ApiClient.getApiClient)) - )[StepThreeBajajFDViewModel::class.java] selectImageIntent = registerForActivityResult(ActivityResultContracts.GetContent()) { uri: Uri? -> @@ -206,7 +197,7 @@ class StepThreeBajajFDFragment : BaseFragment() { private fun selectImage() { val builder = AlertDialog.Builder( - mActivity!! + activity as BajajFdMainActivity ) builder.setTitle("Add Photo!") builder.setItems( @@ -503,12 +494,12 @@ class StepThreeBajajFDFragment : BaseFragment() { getCodeRequest.Category = getString(R.string.docType) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - (activity as BajajFdMainActivity).viewModel.titleApi( + (activity as BajajFdMainActivity).viewModel.docTypeApi( getCodeRequest, Constants.token, activity as BajajFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getTitleMutableData.observe(viewLifecycleOwner) { response -> + (activity as BajajFdMainActivity).viewModel.getDocTypeMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("response", "-->$response") 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 2ec88d1..43a689e 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 @@ -17,7 +17,7 @@ import android.widget.ArrayAdapter import android.widget.RadioButton import android.widget.TextView import androidx.core.content.ContextCompat -import androidx.lifecycle.ViewModelProvider +import androidx.fragment.app.Fragment import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView @@ -27,13 +27,9 @@ import com.nivesh.production.bajajfd.R import com.nivesh.production.bajajfd.adapter.BankListAdapter import com.nivesh.production.bajajfd.adapter.PaymentModeAdapter import com.nivesh.production.bajajfd.adapter.RecommendedBankListAdapter -import com.nivesh.production.bajajfd.api.ApiClient import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepTwoBinding import com.nivesh.production.bajajfd.model.* -import com.nivesh.production.bajajfd.repositories.MainRepository import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity -import com.nivesh.production.bajajfd.ui.providerfactory.StepTwoModelProviderFactory -import com.nivesh.production.bajajfd.util.Common import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorAutoCompleteMethod import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorMethod import com.nivesh.production.bajajfd.util.Common.Companion.commonSpinnerErrorMethod @@ -47,11 +43,10 @@ import com.nivesh.production.bajajfd.util.Common.Companion.removeError import com.nivesh.production.bajajfd.util.Common.Companion.showDialogValidation import com.nivesh.production.bajajfd.util.Constants.Companion.token import com.nivesh.production.bajajfd.util.Resource -import com.nivesh.production.bajajfd.viewModel.StepTwoBajajFDViewModel import java.util.* -class StepTwoBajajFDFragment : BaseFragment() { +class StepTwoBajajFDFragment : Fragment() { private var _binding: FragmentBajajfdStepTwoBinding? = null private val binding get() = _binding!! @@ -71,7 +66,6 @@ class StepTwoBajajFDFragment : BaseFragment() { private lateinit var listOfCities: List private lateinit var listOfIFSC: MutableList - private lateinit var stepTwoBajajFDViewModel: StepTwoBajajFDViewModel private lateinit var bankListAdapter: BankListAdapter private lateinit var paymentModeAdapter: PaymentModeAdapter private lateinit var stateObject: DataObject @@ -89,10 +83,6 @@ class StepTwoBajajFDFragment : BaseFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - stepTwoBajajFDViewModel = ViewModelProvider( - this, - StepTwoModelProviderFactory(MainRepository(ApiClient.getApiClient)) - )[StepTwoBajajFDViewModel::class.java] listOfTitle = ArrayList() listOfGender = ArrayList() listOfAnnualIncome = ArrayList() @@ -547,7 +537,7 @@ class StepTwoBajajFDFragment : BaseFragment() { binding.addBankDetail.setOnClickListener { if (bankListAdapter.itemCount == 5) { - showDialogValidation(mActivity, getString(R.string.fiveAccountValidation)) + showDialogValidation(activity as BajajFdMainActivity, getString(R.string.fiveAccountValidation)) } else { showHideBankDetail() } @@ -1004,7 +994,7 @@ class StepTwoBajajFDFragment : BaseFragment() { requireActivity().windowManager.defaultDisplay.getMetrics(displayMetrics) val width = displayMetrics.widthPixels.toDouble() binding.rvClientBankList.layoutManager = LinearLayoutManager( - mActivity, + activity as BajajFdMainActivity, LinearLayoutManager.HORIZONTAL, false ) diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/FDModelProviderFactory.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/FDModelProviderFactory.kt index 6734313..40c35fc 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/FDModelProviderFactory.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/FDModelProviderFactory.kt @@ -4,7 +4,6 @@ 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 class FDModelProviderFactory (private val mainRepository: MainRepository) : ViewModelProvider.Factory { 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 deleted file mode 100644 index c04ac03..0000000 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepFiveModelProviderFactory.kt +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 851343b..0000000 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepFourModelProviderFactory.kt +++ /dev/null @@ -1,15 +0,0 @@ -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/StepOneModelProviderFactory.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepOneModelProviderFactory.kt deleted file mode 100644 index 6cf1db0..0000000 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepOneModelProviderFactory.kt +++ /dev/null @@ -1,14 +0,0 @@ -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.StepOneBajajFDViewModel - -class StepOneModelProviderFactory (private val mainRepository: MainRepository) : ViewModelProvider.Factory { - - override fun create(modelClass: Class): T { - return StepOneBajajFDViewModel(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 deleted file mode 100644 index 7e60bf4..0000000 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepThreeModelProviderFactory.kt +++ /dev/null @@ -1,17 +0,0 @@ -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/ui/providerfactory/StepTwoModelProviderFactory.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepTwoModelProviderFactory.kt deleted file mode 100644 index 847c8ca..0000000 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/StepTwoModelProviderFactory.kt +++ /dev/null @@ -1,16 +0,0 @@ -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.StepTwoBajajFDViewModel - -class StepTwoModelProviderFactory (private val mainRepository: MainRepository) : ViewModelProvider.Factory { - - override fun create(modelClass: Class): T { - return StepTwoBajajFDViewModel(mainRepository) as T - } - -} \ 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 d0ba214..6a2bafb 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 @@ -291,10 +291,21 @@ open class BajajFDViewModel(private val mainRepository: MainRepository) : ViewMo } // Step 3 + val getDocTypeMutableData: MutableLiveData> = MutableLiveData() + fun docTypeApi(getCodeRequest: GetCodeRequest, token: String, activity : Activity) = viewModelScope.launch( + handleError(activity) + ) { + if (Common.isNetworkAvailable(activity)) { + getDocTypeMutableData.postValue(Resource.Loading()) + val response = mainRepository.titleCheck(getCodeRequest, token) + getDocTypeMutableData.postValue(handleResponse(response)) + } + } + val getDocumentUploadMutableData: MutableLiveData> = MutableLiveData() fun documentsUpload(documentUpload: DocumentUpload, token: String, activity: Activity) = viewModelScope.launch( - Common.handleError(activity) + handleError(activity) ) { if (Common.isNetworkAvailable(activity)) { getDocumentUploadMutableData.postValue(Resource.Loading()) @@ -306,7 +317,7 @@ open class BajajFDViewModel(private val mainRepository: MainRepository) : ViewMo // Step 4 val getFDDetailsMutableData: MutableLiveData> = MutableLiveData() fun getFDDetails(getRatesRequest: GetFDDetailsRequest, token: String, - activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { + activity: Activity) = viewModelScope.launch(handleError(activity)) { if (Common.isNetworkAvailable(activity)) { getFDDetailsMutableData.postValue(Resource.Loading()) val response = mainRepository.getFDDetailsResponse(getRatesRequest, token) @@ -316,7 +327,7 @@ open class BajajFDViewModel(private val mainRepository: MainRepository) : ViewMo val getFDOtherMutableData: MutableLiveData> = MutableLiveData() fun saveFDOtherData(getRatesRequest: SaveFDOtherDataRequest, token: String, - activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { + activity: Activity) = viewModelScope.launch(handleError(activity)) { if (Common.isNetworkAvailable(activity)) { getFDOtherMutableData.postValue(Resource.Loading()) val response = mainRepository.saveFDOtherDataResponse(getRatesRequest, token) @@ -325,8 +336,9 @@ open class BajajFDViewModel(private val mainRepository: MainRepository) : ViewMo } fun updateFDPaymentStatus(getRatesRequest: GetRatesRequest, token: String, - activity: Activity) = - viewModelScope.launch(Common.handleError(activity)) { + activity: Activity + ) = + viewModelScope.launch(handleError(activity)) { if (Common.isNetworkAvailable(activity)) { getRatesMutableData.postValue(Resource.Loading()) val response = mainRepository.updateFDPaymentStatusResponse(getRatesRequest, token) @@ -335,7 +347,7 @@ open class BajajFDViewModel(private val mainRepository: MainRepository) : ViewMo } fun finaliseFD(getRatesRequest: GetRatesRequest, token: String, - activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { + activity: Activity) = viewModelScope.launch(handleError(activity)) { if (Common.isNetworkAvailable(activity)) { getRatesMutableData.postValue(Resource.Loading()) val response = mainRepository.finaliseFDResponse(getRatesRequest, token) @@ -344,7 +356,7 @@ open class BajajFDViewModel(private val mainRepository: MainRepository) : ViewMo } fun finaliseKYC(getRatesRequest: GetRatesRequest, token: String, - activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { + activity: Activity) = viewModelScope.launch(handleError(activity)) { if (Common.isNetworkAvailable(activity)) { getRatesMutableData.postValue(Resource.Loading()) val response = mainRepository.finaliseKYCResponse(getRatesRequest, token) @@ -353,7 +365,7 @@ open class BajajFDViewModel(private val mainRepository: MainRepository) : ViewMo } fun paymentReQuery(getRatesRequest: PaymentReQueryRequest, token: String, - activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { + activity: Activity) = viewModelScope.launch(handleError(activity)) { if (Common.isNetworkAvailable(activity)) { getRatesMutableData.postValue(Resource.Loading()) val response = mainRepository.paymentReQueryResponse(getRatesRequest, token) 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 deleted file mode 100644 index ca3c984..0000000 --- a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFiveBajajFDViewModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.nivesh.production.bajajfd.viewModel - -import androidx.lifecycle.ViewModel -import com.nivesh.production.bajajfd.repositories.MainRepository - -class StepFiveBajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() { - - -} \ 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 deleted file mode 100644 index cc00cdb..0000000 --- a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFourBajajFDViewModel.kt +++ /dev/null @@ -1,78 +0,0 @@ -package com.nivesh.production.bajajfd.viewModel - -import androidx.lifecycle.ViewModel -import com.nivesh.production.bajajfd.repositories.MainRepository - -class StepFourBajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() { - -// val getPaymentModeMutableData: MutableLiveData> = MutableLiveData() -// fun paymentModeApi(getCodeRequest: GetCodeRequest, token: String, -// activity: Activity -// ) = viewModelScope.launch(Common.handleError(activity)) { -// if (Common.isNetworkAvailable(activity)) { -// getPaymentModeMutableData.postValue(Resource.Loading()) -// val response = mainRepository.payModeCheck(getCodeRequest, token) -// getPaymentModeMutableData.postValue(handleResponse(response)) -// } -// } -// -// val getFDDetailsMutableData: MutableLiveData> = MutableLiveData() -// fun getFDDetails(getRatesRequest: GetFDDetailsRequest, token: String, -// activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { -// if (Common.isNetworkAvailable(activity)) { -// getFDDetailsMutableData.postValue(Resource.Loading()) -// val response = mainRepository.getFDDetailsResponse(getRatesRequest, token) -// getFDDetailsMutableData.postValue(handleResponse(response)) -// } -// } -// -// val getFDOtherMutableData: MutableLiveData> = MutableLiveData() -// fun saveFDOtherData(getRatesRequest: SaveFDOtherDataRequest, token: String, -// activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { -// if (Common.isNetworkAvailable(activity)) { -// getFDOtherMutableData.postValue(Resource.Loading()) -// val response = mainRepository.saveFDOtherDataResponse(getRatesRequest, token) -// getFDOtherMutableData.postValue(handleResponse(response)) -// } -// } -// -// val getRatesMutableData: MutableLiveData> = MutableLiveData() -// fun updateFDPaymentStatus(getRatesRequest: GetRatesRequest, token: String, -// activity: Activity) = -// viewModelScope.launch(Common.handleError(activity)) { -// if (Common.isNetworkAvailable(activity)) { -// getRatesMutableData.postValue(Resource.Loading()) -// val response = mainRepository.updateFDPaymentStatusResponse(getRatesRequest, token) -// getRatesMutableData.postValue(handleResponse(response)) -// } -// } -// -// fun finaliseFD(getRatesRequest: GetRatesRequest, token: String, -// activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { -// if (Common.isNetworkAvailable(activity)) { -// getRatesMutableData.postValue(Resource.Loading()) -// val response = mainRepository.finaliseFDResponse(getRatesRequest, token) -// getRatesMutableData.postValue(handleResponse(response)) -// } -// } -// -// fun finaliseKYC(getRatesRequest: GetRatesRequest, token: String, -// activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { -// if (Common.isNetworkAvailable(activity)) { -// getRatesMutableData.postValue(Resource.Loading()) -// val response = mainRepository.finaliseKYCResponse(getRatesRequest, token) -// getRatesMutableData.postValue(handleResponse(response)) -// } -// } -// -// fun paymentReQuery(getRatesRequest: PaymentReQueryRequest, token: String, -// activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { -// if (Common.isNetworkAvailable(activity)) { -// getRatesMutableData.postValue(Resource.Loading()) -// val response = mainRepository.paymentReQueryResponse(getRatesRequest, token) -// getRatesMutableData.postValue(handleResponse(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 deleted file mode 100644 index 8397ec1..0000000 --- a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepOneBajajFDViewModel.kt +++ /dev/null @@ -1,67 +0,0 @@ -package com.nivesh.production.bajajfd.viewModel - -import androidx.lifecycle.ViewModel -import com.nivesh.production.bajajfd.repositories.MainRepository - -class StepOneBajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() { - -// val getCodeMutableData: MutableLiveData> = MutableLiveData() -// fun getCode(requestBody: GetCodeRequest, token: String, activity: Activity) = -// viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getCodeMutableData.postValue(Resource.Loading()) -// val response = mainRepository.getCodesResponse(requestBody, token) -// getCodeMutableData.postValue(handleResponse(response)) -// } -// } - -// val getRatesMutableData: MutableLiveData> = MutableLiveData() -// fun getRates(getRatesRequest: GetRatesRequest, token: String, activity: Activity) = -// viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getRatesMutableData.postValue(Resource.Loading()) -// val response = mainRepository.getRatesResponse(getRatesRequest, token) -// getRatesMutableData.postValue(handleResponse(response)) -// } -// } - -// val getMaturityAmountMutableData: MutableLiveData> = MutableLiveData() -// fun getMaturityAmount(requestBody: GetMaturityAmountRequest, activity: Activity) = -// viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getMaturityAmountMutableData.postValue(Resource.Loading()) -// val response = mainRepository.createCalculateFDMaturityAmount(requestBody, token) -// getMaturityAmountMutableData.postValue(handleResponse(response)) -// } -// } - -// val getMinAmountMutableData: MutableLiveData> = MutableLiveData() -// fun getMinAmount(requestBody: GetCodeRequest, token: String, activity: Activity) = -// viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getMinAmountMutableData.postValue(Resource.Loading()) -// val response = mainRepository.getCodesResponse(requestBody, token) -// getMinAmountMutableData.postValue(handleResponse(response)) -// } -// } - -// val getMaxAmountMutableData: MutableLiveData> = MutableLiveData() -// fun getMaxAmount(requestBody: GetCodeRequest, token: String, activity: Activity) = -// viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getMaxAmountMutableData.postValue(Resource.Loading()) -// val response = mainRepository.getCodesResponse(requestBody, token) -// getMaxAmountMutableData.postValue(handleResponse(response)) -// } -// } -} \ No newline at end of file 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 deleted file mode 100644 index aa1a40d..0000000 --- a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepThreeBajajFDViewModel.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.nivesh.production.bajajfd.viewModel - -import androidx.lifecycle.ViewModel -import com.nivesh.production.bajajfd.repositories.MainRepository - -class StepThreeBajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() { - -// val getTitleMutableData: MutableLiveData> = MutableLiveData() -// fun titleApi(getCodeRequest: GetCodeRequest, token: String, activity: Activity) = viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getTitleMutableData.postValue(Resource.Loading()) -// val response = mainRepository.titleCheck(getCodeRequest, token) -// getTitleMutableData.postValue(handleResponse(response)) -// } -// } -// -// val getDocumentUploadMutableData: MutableLiveData> = MutableLiveData() -// fun documentsUpload(documentUpload: DocumentUpload, token: String, activity: Activity) = viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getDocumentUploadMutableData.postValue(Resource.Loading()) -// val response = mainRepository.documentsUploadResponse(documentUpload, token) -// getDocumentUploadMutableData.postValue(handleResponse(response)) -// } -// } -// -// val getFDResponseMutableData: MutableLiveData> = MutableLiveData() -// fun createFDApi(getRatesRequest: CreateFDRequest, token: String, activity: Activity) = viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getFDResponseMutableData.postValue(Resource.Loading()) -// val response = mainRepository.createFDKYCResponse(getRatesRequest, token) -// getFDResponseMutableData.postValue(handleResponse(response)) -// } -// } - -} \ No newline at end of file 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 deleted file mode 100644 index c9093ee..0000000 --- a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoBajajFDViewModel.kt +++ /dev/null @@ -1,174 +0,0 @@ -package com.nivesh.production.bajajfd.viewModel - -import androidx.lifecycle.ViewModel -import com.nivesh.production.bajajfd.repositories.MainRepository - -class StepTwoBajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() { - -// val getPanCheckMutableData: MutableLiveData> = MutableLiveData() -// fun panCheck(panCheck: PanCheckRequest, token: String, activity : Activity) = viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getPanCheckMutableData.postValue(Resource.Loading()) -// val response = mainRepository.panCheck(panCheck, token) -// getPanCheckMutableData.postValue(handleResponse(response)) -// } -// } -// -// val getTitleMutableData: MutableLiveData> = MutableLiveData() -// fun titleApi(getCodeRequest: GetCodeRequest, token: String, activity : Activity) = viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getTitleMutableData.postValue(Resource.Loading()) -// val response = mainRepository.titleCheck(getCodeRequest, token) -// getTitleMutableData.postValue(handleResponse(response)) -// } -// } -// -// val getGenderMutableData: MutableLiveData> = MutableLiveData() -// fun genderApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getGenderMutableData.postValue(Resource.Loading()) -// val response = mainRepository.genderCheck(getCodeRequest, token) -// getGenderMutableData.postValue(handleResponse(response)) -// } -// } -// -// val getAnnualIncomeMutableData: MutableLiveData> = MutableLiveData() -// fun annualIncomeApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getAnnualIncomeMutableData.postValue(Resource.Loading()) -// val response = mainRepository.annualIncomeCheck(getCodeRequest, token) -// getAnnualIncomeMutableData.postValue(handleResponse(response)) -// } -// } -// -// val getRelationShipMutableData: MutableLiveData> = MutableLiveData() -// fun relationShipApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getRelationShipMutableData.postValue(Resource.Loading()) -// val response = mainRepository.relationShipCheck(getCodeRequest, token) -// getRelationShipMutableData.postValue(handleResponse(response)) -// } -// } -// -// val getMaritalStatusMutableData: MutableLiveData> = MutableLiveData() -// fun maritalStatusApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getMaritalStatusMutableData.postValue(Resource.Loading()) -// val response = mainRepository.maritalStatusCheck(getCodeRequest, token) -// getMaritalStatusMutableData.postValue(handleResponse(response)) -// } -// } -// -// val getOccupationMutableData: MutableLiveData> = MutableLiveData() -// fun occupationApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getOccupationMutableData.postValue(Resource.Loading()) -// val response = mainRepository.occupationCheck(getCodeRequest, token) -// getOccupationMutableData.postValue(handleResponse(response)) -// } -// } -// -// -// val getStateMasterMutableData: MutableLiveData> = MutableLiveData() -// fun stateApi(token: String,activity : Activity) = viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getStateMasterMutableData.postValue(Resource.Loading()) -// val response = mainRepository.stateCheck(token) -// getStateMasterMutableData.postValue(handleResponse(response)) -// } -// } -// -// val getCityListMutableData: MutableLiveData> = MutableLiveData() -// fun cityListApi(cityRequest: CityRequest, token: String,activity : Activity) = viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getCityListMutableData.postValue(Resource.Loading()) -// val response = mainRepository.cityCheck(cityRequest, token) -// getCityListMutableData.postValue(handleResponse(response)) -// } -// } -// -// val getFDBankListMutableData: MutableLiveData> = MutableLiveData() -// fun bankListApi( token: String,language: String, activity : Activity) = viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getFDBankListMutableData.postValue(Resource.Loading()) -// val response = mainRepository.bankListCheck(token, language) -// getFDBankListMutableData.postValue(handleResponse(response)) -// } -// } -// -// val getIfscCodeCheckMutableData: MutableLiveData> = MutableLiveData() -// fun ifscCodeApi(ifsc : String,activity : Activity) = viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getIfscCodeCheckMutableData.postValue(Resource.Loading()) -// val response = mainRepository.ifscCodeCheck(ifsc) -// getIfscCodeCheckMutableData.postValue(handleResponse(response)) -// } -// } -// -// val getIfscCodeDetailsCheckMutableData: MutableLiveData> = MutableLiveData() -// fun ifscCodeDetailsApi(ifsc : String,activity : Activity) = viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getIfscCodeDetailsCheckMutableData.postValue(Resource.Loading()) -// val response = mainRepository.ifscCodeBankDetailsCheck(ifsc, token) -// getIfscCodeDetailsCheckMutableData.postValue(handleResponse1(response)) -// } -// } -// -// val getPaymentModeMutableData: MutableLiveData> = MutableLiveData() -// fun paymentModeApi(getCodeRequest: GetCodeRequest, token: String,activity : Activity) = viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getPaymentModeMutableData.postValue(Resource.Loading()) -// val response = mainRepository.payModeCheck(getCodeRequest, token) -// getPaymentModeMutableData.postValue(handleResponse(response)) -// } -// } -// -// val getFDResponseMutableData: MutableLiveData> = MutableLiveData() -// fun createFDApi(getRatesRequest: CreateFDRequest, token: String,activity : Activity) = viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// getFDResponseMutableData.postValue(Resource.Loading()) -// val response = mainRepository.createFDKYCResponse(getRatesRequest, token) -// getFDResponseMutableData.postValue(handleResponse(response)) -// } -// } -// -// val bankValidationApiMutableData: MutableLiveData> = MutableLiveData() -// fun bankValidationApi(bankValidationApiRequest : BankValidationApiRequest,token:String,activity : Activity) = viewModelScope.launch( -// Common.handleError(activity) -// ) { -// if (Common.isNetworkAvailable(activity)) { -// bankValidationApiMutableData.postValue(Resource.Loading()) -// val response = mainRepository.bankValidationApiRequest(bankValidationApiRequest,token) -// bankValidationApiMutableData.postValue(handleResponse(response)) -// } -// } - -} \ No newline at end of file From 81897ea9c10db1a7d180ff48c5d8ddaffcd0ec23 Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Mon, 9 Jan 2023 10:50:06 +0530 Subject: [PATCH 3/3] code modification done --- app/src/main/AndroidManifest.xml | 15 +++--- .../production/bajajfd/BajajApplication.kt | 5 -- .../bajajfd/adapter/SectionsPagerAdapter.kt | 16 +------ .../ui/activity/BajajFdMainActivity.kt | 16 ++----- .../ui/fragment/StepFourBajajFDFragment.kt | 12 ++--- .../ui/fragment/StepOneBajajFDFragment.kt | 23 +++++---- .../ui/fragment/StepThreeBajajFDFragment.kt | 27 +++++++---- .../ui/fragment/StepTwoBajajFDFragment.kt | 47 +++++++++---------- .../nivesh/production/bajajfd/util/Common.kt | 21 ++++----- .../production/bajajfd/util/Resource.kt | 12 +---- .../bajajfd/viewModel/BajajFDViewModel.kt | 8 ---- .../res/layout/fragment_bajajfd_step_one.xml | 3 +- app/src/main/res/values-hi-rIN/strings.xml | 21 +++++---- app/src/main/res/values-night/themes.xml | 2 +- app/src/main/res/values/strings.xml | 19 ++++---- app/src/main/res/values/themes.xml | 2 +- .../main/res/xml/data_extraction_rules.xml | 16 +------ settings.gradle | 2 +- 18 files changed, 112 insertions(+), 155 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3261d69..1e58ab2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,10 +3,13 @@ xmlns:tools="http://schemas.android.com/tools"> - - + + - + - + android:windowSoftInputMode="adjustPan"> diff --git a/app/src/main/java/com/nivesh/production/bajajfd/BajajApplication.kt b/app/src/main/java/com/nivesh/production/bajajfd/BajajApplication.kt index 50f4560..d7f71fe 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/BajajApplication.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/BajajApplication.kt @@ -5,7 +5,6 @@ import android.content.Context class BajajApplication : Application() { private var mInstance: BajajApplication? = null - // private val mRequestQueue: RequestQueue? = null companion object { var appContext: Context? = null } @@ -15,8 +14,4 @@ class BajajApplication : Application() { appContext = applicationContext } - @Synchronized - fun getInstanceApp(): BajajApplication? { - return mInstance - } } \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/adapter/SectionsPagerAdapter.kt b/app/src/main/java/com/nivesh/production/bajajfd/adapter/SectionsPagerAdapter.kt index 9267a21..6584a29 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/adapter/SectionsPagerAdapter.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/adapter/SectionsPagerAdapter.kt @@ -15,18 +15,4 @@ class SectionsPagerAdapter(manager: FragmentManager,private val fragments: Array override fun getPageTitle(position: Int): CharSequence = titles[position] -} -//class SectionsPagerAdapter(private val fm: FragmentManager, private val fragments: Array, private val NumberOfTabs: Int) : SmartFragmentStatePagerAdapter(fm) { -// -// override fun getItem(position: Int): Fragment { -// return fragments[position] -// } -// -// override fun getPageTitle(position: Int): CharSequence? { -// return null -// } -// -// override fun getCount(): Int { -// return NumberOfTabs -// } -//} \ No newline at end of file +} \ 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 2c0fbf4..c091d09 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 @@ -1,7 +1,6 @@ package com.nivesh.production.bajajfd.ui.activity import android.annotation.SuppressLint -import android.app.Activity import android.app.Dialog import android.graphics.Bitmap import android.graphics.drawable.Drawable @@ -107,7 +106,7 @@ class BajajFdMainActivity : BaseActivity() { stepCount = stepsCountResponse.Response.StepsCount getClientDetailsApi(stepsCountResponse.Response.StepsCount) } - 650 -> refreshToken("") + 650 -> "" else -> { showDialogValidation( this@BajajFdMainActivity, @@ -133,11 +132,6 @@ class BajajFdMainActivity : BaseActivity() { } } - - private fun refreshToken(fdStepsCount: String) { - - } - private fun getClientDetailsApi(stepsCount: Int) { if (Common.isNetworkAvailable(this@BajajFdMainActivity)) { val getClientDetailsRequest = getClientDetailsRequest() @@ -162,12 +156,12 @@ class BajajFdMainActivity : BaseActivity() { deviceInfo.device_os_version = "" userRequest.deviceInfo = deviceInfo getClientDetailsRequest.UserRequest = userRequest - Log.e("getClientDetailRequest", "-->" + Gson().toJson(getClientDetailsRequest)) + Log.e("getClientDetail ", " Request -->" + Gson().toJson(getClientDetailsRequest)) viewModel.getClientDetails(getClientDetailsRequest, token, this) viewModel.getClientDetailsMutableData.observe(this) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->${response.data.toString()}") + Log.e("getClientDetail ", " response -->${response.data.toString()}") getClientDetailsResponse = Gson().fromJson( response.data?.toString(), @@ -229,7 +223,7 @@ class BajajFdMainActivity : BaseActivity() { val viewPager: DisableAdapter = binding.viewPager viewPager.setPagingEnabled(false) viewPager.adapter = sectionsPagerAdapter - if (sectionsPagerAdapter.getCount() > 1) { + if (sectionsPagerAdapter.count > 1) { viewPager.offscreenPageLimit = sectionsPagerAdapter.count - 1 } else { viewPager.offscreenPageLimit = 1 @@ -451,7 +445,7 @@ class BajajFdMainActivity : BaseActivity() { } stepFiveBajajFDFragment.getData(paymentReQueryResponse) } - 650 -> refreshToken("") + 650 -> "" else -> { showDialogValidation( this@BajajFdMainActivity, 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 a101888..da2b9cc 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 @@ -23,6 +23,7 @@ class StepFourBajajFDFragment : Fragment() { private var _binding: FragmentBajajfdStepFourBinding? = null private val binding get() = _binding!! + private lateinit var listOfCustomer: MutableList private var selectedList: String = "" private var payUrl: String = "" @@ -40,10 +41,6 @@ class StepFourBajajFDFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - binding.checkBox.setOnCheckedChangeListener { _, _ -> - - } - if ((activity as BajajFdMainActivity).loginRole == 5) { binding.btnNext.text = getString(R.string.pay) binding.btnNext.setBackgroundColor( @@ -110,7 +107,7 @@ class StepFourBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).viewModel.getFDOtherMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->" + response.data.toString()) + Log.e("saveFDOtherData", " response -->${response.data.toString()}") val saveFDOtherDataResponse: SaveFDOtherDataResponse = Gson().fromJson( response.data?.toString(), @@ -153,7 +150,6 @@ class StepFourBajajFDFragment : Fragment() { } private fun customerListApi() { - val getCodeRequest = GetCodeRequest() getCodeRequest.ProductName = getString(R.string.bajajFD) getCodeRequest.Category = getString(R.string.customerCategory) @@ -169,7 +165,7 @@ class StepFourBajajFDFragment : Fragment() { ) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->$response") + Log.e("customerListApi", " response -->${response.data.toString()}") val getCodeResponse: GetCodeResponse = Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java) getCodeResponse.Response.StatusCode.let { code -> @@ -231,7 +227,7 @@ class StepFourBajajFDFragment : Fragment() { ) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->$response") + Log.e("getFDDetailsApi", " response -->${response.data.toString()}") val getFDDetailsResponse: GetFDDetailsResponse = Gson().fromJson( response.data?.toString(), 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 7228ff9..c5700bb 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 @@ -54,13 +54,12 @@ class StepOneBajajFDFragment : Fragment() { super.onViewCreated(view, savedInstanceState) listOfTenure = ArrayList() - binding.edtAmount.filters = arrayOf(InputFilter.LengthFilter(8)) // upto 1 Cr - listOfMinAmount = ArrayList() listOfMaxAmount = ArrayList() listOfFrequency = ArrayList() - rgMaturity = RadioButton(activity as BajajFdMainActivity) + rgMaturity = RadioButton(activity as BajajFdMainActivity) + binding.edtAmount.filters = arrayOf(InputFilter.LengthFilter(8)) // upto 1 Cr // Amount binding.edtAmount.addTextChangedListener(object : TextWatcher { override fun afterTextChanged(s: Editable?) {} @@ -171,7 +170,7 @@ class StepOneBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).viewModel.getCodeMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->${response.data.toString()}") + Log.e("interestPayoutApi", " response -->${response.data.toString()}") val getCodeResponse: GetCodeResponse = Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java) getCodeResponse.Response.StatusCode.let { code -> @@ -192,9 +191,14 @@ class StepOneBajajFDFragment : Fragment() { binding.tvFrequency.text = adapter.getItem(listOfFrequency.size - 1)?.Value getRatesApi() + }else{ + Common.showDialogValidation( + activity as BajajFdMainActivity, + "Interest Payout Frequency Data Is Missing." + ) } } - // 650 -> refreshToken() + 650 -> "" else -> { Common.showDialogValidation( activity as BajajFdMainActivity, @@ -236,7 +240,7 @@ class StepOneBajajFDFragment : Fragment() { ) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->${response.data.toString()}") + Log.e("minAmountApi ", " response-->${response.data.toString()}") val getCodeResponse: GetCodeResponse = Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java) getCodeResponse.Response.StatusCode.let { code -> @@ -250,7 +254,7 @@ class StepOneBajajFDFragment : Fragment() { } maxAmountApi() } - // 650 -> refreshToken() + 650 -> "" else -> { Common.showDialogValidation( activity as BajajFdMainActivity, @@ -292,7 +296,7 @@ class StepOneBajajFDFragment : Fragment() { ) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->${response.data.toString()}") + Log.e("maxAmountApi ", " response-->${response.data.toString()}") val getCodeResponse: GetCodeResponse = Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java) getCodeResponse.Response.StatusCode.let { code -> @@ -300,7 +304,7 @@ class StepOneBajajFDFragment : Fragment() { 200 -> { listOfMaxAmount = getCodeResponse.Response.GetCodesList } - // 650 -> refreshToken() + 650 -> "" else -> { Common.showDialogValidation( activity as BajajFdMainActivity, @@ -364,6 +368,7 @@ class StepOneBajajFDFragment : Fragment() { ) { response -> when (response) { is Resource.Success -> { + Log.e("maturityAmountApi ", " response-->${response.data.toString()}") val getMaturityAmountResponse = Gson().fromJson( response.data?.toString(), diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt index b477808..eccf074 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt @@ -39,13 +39,18 @@ import java.io.* class StepThreeBajajFDFragment : Fragment() { - private var bitmap: Bitmap? = null - private var latestTmpUri: Uri? = null + private var _binding: FragmentBajajfdStepThreeBinding? = null private val binding get() = _binding!! private var takeImageResult: ActivityResultLauncher? = null private var selectImageIntent: ActivityResultLauncher? = null + private var bitmap: Bitmap? = null + private var latestTmpUri: Uri? = null + + private val mapImage: HashMap = HashMap() + private lateinit var listOfDocType: List + private var check: Array? = null private var panString: String = "" private var photoString: String = "" @@ -62,10 +67,6 @@ class StepThreeBajajFDFragment : Fragment() { private val secondDocUpload: Int = 4 private var actionType: Int = -1 - private val mapImage: HashMap = HashMap() - private lateinit var listOfDocType: List - - private val check = arrayOf("Take Photo", "Choose from Gallery", "Cancel") private val requestPermission = registerForActivityResult( ActivityResultContracts.RequestPermission() @@ -89,6 +90,12 @@ class StepThreeBajajFDFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + check = arrayOf( + getString(R.string.takePhoto), + getString(R.string.chooseFromGallery), + getString(R.string.cancel) + ) + selectImageIntent = registerForActivityResult(ActivityResultContracts.GetContent()) { uri: Uri? -> if (uri != null) { @@ -199,11 +206,11 @@ class StepThreeBajajFDFragment : Fragment() { val builder = AlertDialog.Builder( activity as BajajFdMainActivity ) - builder.setTitle("Add Photo!") + builder.setTitle(getString(R.string.addPhoto)) builder.setItems( check ) { dialog: DialogInterface, item: Int -> - if (check[item] == "Take Photo") { + if (check!![item] == getString(R.string.takePhoto)) { val permission = ContextCompat.checkSelfPermission( activity as BajajFdMainActivity, Manifest.permission.CAMERA @@ -216,7 +223,7 @@ class StepThreeBajajFDFragment : Fragment() { ) } dialog.dismiss() - } else if (check[item] == "Choose from Gallery") { + } else if (check!![item] == getString(R.string.chooseFromGallery)) { val permission = ContextCompat.checkSelfPermission( activity as BajajFdMainActivity, Manifest.permission.READ_EXTERNAL_STORAGE @@ -228,7 +235,7 @@ class StepThreeBajajFDFragment : Fragment() { Manifest.permission.READ_EXTERNAL_STORAGE ) } - } else if (check[item] == "Cancel") { + } else if (check!![item] == getString(R.string.cancel)) { dialog.dismiss() } } 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 43a689e..fd2dfd1 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 @@ -51,10 +51,6 @@ class StepTwoBajajFDFragment : Fragment() { private var _binding: FragmentBajajfdStepTwoBinding? = null private val binding get() = _binding!! - private lateinit var rbBank: RadioButton - private lateinit var rbPaymentMode: RadioButton - private var cal = Calendar.getInstance() - private lateinit var listOfTitle: List private lateinit var listOfGender: List private lateinit var listOfAnnualIncome: List @@ -71,12 +67,14 @@ class StepTwoBajajFDFragment : Fragment() { private lateinit var stateObject: DataObject private val listOfBanks: MutableList = mutableListOf() + private lateinit var rbBank: RadioButton + private lateinit var rbPaymentMode: RadioButton + private var cal = Calendar.getInstance() override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { - _binding = FragmentBajajfdStepTwoBinding.inflate(inflater, container, false) return binding.root } @@ -92,9 +90,7 @@ class StepTwoBajajFDFragment : Fragment() { listOfStates = ArrayList() listOfIFSC = ArrayList() listOfPayMode = ArrayList() - stateObject = DataObject() - rbPaymentMode = RadioButton(activity as BajajFdMainActivity) // Personal Details @@ -519,8 +515,7 @@ class StepTwoBajajFDFragment : Fragment() { binding.edtFirstName.text.toString().plus(" ") .plus(binding.edtMiddleName.text.toString()).plus(" ") .plus(binding.edtLastName.text.toString()), - binding.edtMobileNumber.text.toString(), - 1 + binding.edtMobileNumber.text.toString() , (activity as BajajFdMainActivity).loginRole) } } @@ -722,7 +717,7 @@ class StepTwoBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).viewModel.getFDResponseMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->$response") + Log.e("createFDApi ", " response -->$response") val createFDApplicationResponse: CreateFDApplicationResponse = Gson().fromJson( response.data?.toString(), @@ -767,6 +762,7 @@ class StepTwoBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).viewModel.getIfscCodeCheckMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { + Log.e("ifscCodeCheckApi ", " response -->$response") val getIFSCCodeListResponse = Gson().fromJson( response.data?.toString(), @@ -837,6 +833,7 @@ class StepTwoBajajFDFragment : Fragment() { when (response) { is Resource.Success -> { if (response.data.toString().isNotEmpty()) { + Log.e("getIFSCDetailsApi ", " response -->$response") val getIFSCCodeResponse = Gson().fromJson( response.data.toString(), GetIFSCCodeResponse::class.java @@ -865,7 +862,7 @@ class StepTwoBajajFDFragment : Fragment() { } private fun verifyAccountNo( - bankAccount: String, Ifsc: String, name: String, phoneNumber: String, bankNo: Int + bankAccount: String, Ifsc: String, name: String, phoneNumber: String ,loginRole : Int) { val bankValidationApiRequest = BankValidationApiRequest() @@ -874,7 +871,7 @@ class StepTwoBajajFDFragment : Fragment() { bankValidationApiRequest.Name = name bankValidationApiRequest.PhoneNo = phoneNumber bankValidationApiRequest.RoleId = loginRole - bankValidationApiRequest.BankNo = bankNo + bankValidationApiRequest.BankNo = 1 (activity as BajajFdMainActivity).viewModel.bankValidationApi( bankValidationApiRequest, token, @@ -883,6 +880,7 @@ class StepTwoBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).viewModel.bankValidationApiMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { + Log.e("verifyAccountNo ", " response -->$response") val getBankValidationApiResponse = Gson().fromJson( response.data?.toString(), @@ -894,7 +892,7 @@ class StepTwoBajajFDFragment : Fragment() { } when (code) { 200 -> { - if (getBankValidationApiResponse.Message == "Account Verified") { + if (getBankValidationApiResponse.Message == getString(R.string.accountVerified)) { val clientBankList = ClientBanklist() clientBankList.AccountNumber = bankAccount clientBankList.AccountType = "sb" @@ -1055,6 +1053,7 @@ class StepTwoBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).viewModel.getPanCheckMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { + Log.e("panCheckApi ", " response -->$response") val panCheckResponse = Gson().fromJson( response.data?.toString(), @@ -1113,7 +1112,7 @@ class StepTwoBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).viewModel.getTitleMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->$response") + Log.e("titleApi ", " response -->$response") val getCodeResponse: GetCodeResponse = Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java) getCodeResponse.Response.StatusCode.let { code -> @@ -1200,7 +1199,7 @@ class StepTwoBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).viewModel.getPaymentModeMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->$response") + Log.e("paymentModeApi ", " response -->$response") val getCodeResponse: GetCodeResponse = Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java) getCodeResponse.Response.StatusCode.let { code -> @@ -1262,7 +1261,7 @@ class StepTwoBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).viewModel.getGenderMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->$response") + Log.e("genderApi ", " response -->$response") val getCodeResponse: GetCodeResponse = Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java) getCodeResponse.Response.StatusCode.let { code -> @@ -1322,7 +1321,7 @@ class StepTwoBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).viewModel.getRelationShipMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->$response") + Log.e("relationShipApi ", " response -->$response") val getCodeResponse: GetCodeResponse = Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java) getCodeResponse.Response.StatusCode.let { code -> @@ -1390,7 +1389,7 @@ class StepTwoBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).viewModel.getMaritalStatusMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->$response") + Log.e("maritalStatusApi ", " response -->$response") val getCodeResponse: GetCodeResponse = Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java) getCodeResponse.Response.StatusCode.let { code -> @@ -1450,7 +1449,7 @@ class StepTwoBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).viewModel.getOccupationMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->$response") + Log.e("occupationApi ", " response -->$response") val getCodeResponse: GetCodeResponse = Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java) getCodeResponse.Response.StatusCode.let { code -> @@ -1510,7 +1509,7 @@ class StepTwoBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).viewModel.getAnnualIncomeMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->$response") + Log.e("annualIncomeApi ", " response -->$response") val getCodeResponse: GetCodeResponse = Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java) getCodeResponse.Response.StatusCode.let { code -> @@ -1561,7 +1560,7 @@ class StepTwoBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).viewModel.getStateMasterMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->$response") + Log.e("stateListApi ", " response -->$response") val stateListResponse: StateListResponse = Gson().fromJson( response.data?.toString(), @@ -1637,7 +1636,7 @@ class StepTwoBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE cityRequest.RoleID = (activity as BajajFdMainActivity).loginRole cityRequest.APIName = "" - cityRequest.UID = 19060 + cityRequest.UID = 0 cityRequest.Subbroker_Code = (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.sub_broker_code cityRequest.RMCode = "" @@ -1648,7 +1647,7 @@ class StepTwoBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).viewModel.getCityListMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->$response") + Log.e("cityListApi ", " response -->$response") val cityListResponse: CityListResponse = Gson().fromJson(response.data?.toString(), CityListResponse::class.java) cityListResponse.response.status_code.let { code -> @@ -1711,7 +1710,7 @@ class StepTwoBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).viewModel.getFDBankListMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { - Log.e("response", "-->$response") + Log.e("apiForEligibleBankList ", " response -->$response") val getFDBankListResponse: GetFDBankListResponse = Gson().fromJson( response.data?.toString(), diff --git a/app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt b/app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt index 104dd0c..2a59ec3 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt @@ -8,7 +8,6 @@ import android.graphics.drawable.GradientDrawable import android.net.ConnectivityManager import android.net.NetworkCapabilities import android.os.Build -import android.provider.ContactsContract import android.text.format.DateFormat import android.util.Log import android.util.Patterns @@ -59,7 +58,7 @@ class Common { connectivityManager.activeNetworkInfo?.run { return when (type) { ConnectivityManager.TYPE_WIFI -> true - ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE -> true + ConnectivityManager.TYPE_MOBILE -> true ConnectivityManager.TYPE_ETHERNET -> true else -> false } @@ -82,7 +81,7 @@ class Common { //validPanCard fun isValidPan(pan: String?): Boolean { - val mPattern = Pattern.compile("[A-Z]{5}[0-9]{4}[A-Z]{1}") + val mPattern = Pattern.compile("[A-Z]{5}[0-9]{4}[A-Z]") val mMatcher = mPattern.matcher(pan.toString()) return mMatcher.matches() } @@ -103,7 +102,7 @@ class Common { if (textInputLayout.error != null) { textInputLayout.error = null if (textInputLayout.isErrorEnabled) { - textInputLayout.isErrorEnabled = false; + textInputLayout.isErrorEnabled = false } } } @@ -189,7 +188,7 @@ class Common { return simpleDateFormat.format(mDate as Date) } - fun handleResponse(response: retrofit2.Response): Resource { + fun handleResponse(response: Response): Resource { // try { if (response.isSuccessful && response.body() != null) { response.body()?.let { resultResponse -> @@ -210,15 +209,15 @@ class Common { fun handleResponse1(response: Response): Resource { if (response.isSuccessful && response.body() != null) { - if (response.body().toString().isNotEmpty()) { + return if (response.body().toString().isNotEmpty()) { Log.e("response", "-->$response") val str: String = response.body().toString().replace("\r\n", "") Log.e("str", "-->$str") val jsonObject = JSONObject(str) Log.e("jsonObject", "-->$jsonObject") - return Resource.Success(jsonObject.toString()) + Resource.Success(jsonObject.toString()) }else { - return Resource.Error(response.message()) + Resource.Error(response.message()) } } return Resource.Error(response.message()) @@ -243,8 +242,8 @@ class Common { } fun isMinor(date: String): Boolean { - val simpleDateFormat = SimpleDateFormat("yyyy-mm-dd") - val dt1: Date = simpleDateFormat.parse(date) + val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()) + val dt1: Date = simpleDateFormat.parse(date) as Date val year: Int = DateFormat.format("yyyy", dt1).toString().toInt() val month: Int = DateFormat.format("mm", dt1).toString().toInt() val day = DateFormat.format("dd", dt1).toString().toInt() @@ -254,7 +253,7 @@ class Common { return minAdultAge.before(userAge) } - /* this function is used for file size in readable formate(End)*/ + /* this function is used for file size in readable format(End)*/ fun getFileSizeInMB(length: Long): Double { // Get length of file in bytes val fileSizeInBytes = length.toDouble() diff --git a/app/src/main/java/com/nivesh/production/bajajfd/util/Resource.kt b/app/src/main/java/com/nivesh/production/bajajfd/util/Resource.kt index c59bd6a..69fe7d9 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/util/Resource.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/util/Resource.kt @@ -10,17 +10,7 @@ sealed class Resource( class Success(data: T) : Resource(data) class Error(message: String, data: T? = null) : Resource(data, message) class Loading : Resource() - class DataError(errorCode: Int, message: String, data: T? = null) : + class DataError(errorCode: Int, message: String) : Resource(null, message, errorCode) - - override fun toString(): String { - return when (this) { - is Success<*> -> "Success[data=$data]" - is DataError -> "ErrorCode[exception=$errorCode]" - is Loading -> "Loading" - is Error -> "Error[exception=${error(Any())}]" - } - - } } \ 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 6a2bafb..33f050f 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 @@ -364,12 +364,4 @@ open class BajajFDViewModel(private val mainRepository: MainRepository) : ViewMo } } - fun paymentReQuery(getRatesRequest: PaymentReQueryRequest, token: String, - activity: Activity) = viewModelScope.launch(handleError(activity)) { - if (Common.isNetworkAvailable(activity)) { - getRatesMutableData.postValue(Resource.Loading()) - val response = mainRepository.paymentReQueryResponse(getRatesRequest, token) - getRatesMutableData.postValue(handleResponse(response)) - } - } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_bajajfd_step_one.xml b/app/src/main/res/layout/fragment_bajajfd_step_one.xml index 7d1b421..194cff4 100644 --- a/app/src/main/res/layout/fragment_bajajfd_step_one.xml +++ b/app/src/main/res/layout/fragment_bajajfd_step_one.xml @@ -78,7 +78,8 @@ android:inputType="number" android:maxLength="12" android:textColorHint="@color/greyColor2" - android:textSize="@dimen/text_size_14" /> + android:textSize="@dimen/text_size_14" + tool:ignore="TextContrastCheck" /> diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 80af323..2ab4061 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -1,5 +1,5 @@ - BajajFdLib + NiveshSDK Bajaj App nivesh @@ -140,6 +140,7 @@ Please enter PAN number Invalid PAN + Account Verified Please select title @@ -198,7 +199,16 @@ Select Option Gallery Camera - + PAN + Upload PAN Document + Upload Photo Document + Upload Aadhar Back Document + You can not add more than five accounts + Take Photo + Choose from Gallery + Add Photo! + Cancel + Aadhar Make Payment @@ -238,13 +248,6 @@ Add New Account OK - Cancel - Aadhar - Upload PAN Document - Upload Photo Document - Upload Aadhar Back Document - You can not add more than five accounts - PAN \ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index 19b5ef4..e5a7f0c 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -1,6 +1,6 @@ -