From f3429340f1ef73e59647b1d9ae64ca0bd28b6099 Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Tue, 3 Jan 2023 13:32:25 +0530 Subject: [PATCH 1/2] added missing changes --- .../ui/fragment/StepFourBajajFDFragment.kt | 7 +----- .../ui/fragment/StepThreeBajajFDFragment.kt | 6 ++--- .../res/layout/fragment_bajajfd_step_two.xml | 23 ------------------- 3 files changed, 4 insertions(+), 32 deletions(-) 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 b6358b6..9007a20 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 @@ -25,7 +25,7 @@ class StepFourBajajFDFragment : Fragment() { private lateinit var stepFourBajajFDViewModel: StepFourBajajFDViewModel private var _binding: FragmentBajajfdStepFourBinding? = null private val binding get() = _binding!! - var uniqueId: String? = "" + private var uniqueId: String? = "" private lateinit var bajajFDInterface: BajajFDInterface @@ -52,11 +52,6 @@ class StepFourBajajFDFragment : Fragment() { stepFourBajajFDViewModel = (activity as BajajFdMainActivity).stepFourBajajFDViewModel - binding.tvInvestedAmount.text = "" - binding.tvTenure.text = "" - binding.tvInterestPayout.text = "" - binding.tvRateOfInterest.text = "" - binding.checkBox.setOnCheckedChangeListener { _, _ -> } 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 45290d2..a40a798 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 @@ -97,10 +97,10 @@ class StepThreeBajajFDFragment : Fragment() { stepThreeBajajFDViewModel = (activity as BajajFdMainActivity).stepThreeBajajFDViewModel binding.btnNext.setOnClickListener { - if (validate()) { + // if (validate()) { // - // bajajFDInterface.stepThreeApi((activity as BajajFdMainActivity).createFDRequest) - } + bajajFDInterface.stepThreeApi((activity as BajajFdMainActivity).createFDRequest) + // } } binding.btnBack.setOnClickListener { (activity as BajajFdMainActivity).binding.viewPager.currentItem = 1 diff --git a/app/src/main/res/layout/fragment_bajajfd_step_two.xml b/app/src/main/res/layout/fragment_bajajfd_step_two.xml index 314daf8..d10b0e2 100644 --- a/app/src/main/res/layout/fragment_bajajfd_step_two.xml +++ b/app/src/main/res/layout/fragment_bajajfd_step_two.xml @@ -1023,29 +1023,6 @@ - - - - - - - - - - - - - - - - - - - - - - - Date: Tue, 3 Jan 2023 14:43:25 +0530 Subject: [PATCH 2/2] resolving issue --- .../bajajfd/ui/activity/BajajFdMainActivity.kt | 2 +- .../ui/fragment/StepFourBajajFDFragment.kt | 15 +++++++++------ .../bajajfd/ui/fragment/StepOneBajajFDFragment.kt | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) 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 88b6ba0..cbcd933 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 @@ -412,7 +412,7 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface { 200 -> { binding.viewPager.currentItem = currentItem StepFourBajajFDFragment.getInstance(this) - .getFDData(createFDApplicationResponse) + .getFDData(createFDApplicationResponse ,this) } // 650 -> refreshToken() else -> { 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 9007a20..86aad67 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 @@ -69,10 +69,13 @@ class StepFourBajajFDFragment : Fragment() { return root } - fun getFDData(createFDApplicationResponse: CreateFDApplicationResponse) { + fun getFDData( + createFDApplicationResponse: CreateFDApplicationResponse, + activity: BajajFdMainActivity + ) { uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId // - getFDDetailsApi(uniqueId!!) + getFDDetailsApi(createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId, activity) customerListApi() } @@ -126,12 +129,12 @@ class StepFourBajajFDFragment : Fragment() { } - private fun getFDDetailsApi(uniqueId: String) { - if (Common.isNetworkAvailable(activity as BajajFdMainActivity)) { + private fun getFDDetailsApi(uniqueId: String, activity: BajajFdMainActivity) { + if (Common.isNetworkAvailable(activity)) { val getFDDetailsRequest = GetFDDetailsRequest() - getFDDetailsRequest.FDProvider = getString(R.string.bajaj) + getFDDetailsRequest.FDProvider = activity.resources.getString(R.string.bajaj) getFDDetailsRequest.NiveshClientCode = - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + activity.getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE getFDDetailsRequest.UniqueId = uniqueId stepFourBajajFDViewModel.getFDDetails(getFDDetailsRequest, Constants.token) stepFourBajajFDViewModel.getFDDetailsMutableData.observe(viewLifecycleOwner) { 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 fbe5465..44be1be 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 @@ -145,7 +145,7 @@ class StepOneBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).fdInvestmentDetails.NiveshClientCode = "8872" (activity as BajajFdMainActivity).fdInvestmentDetails.Provider = getString(R.string.bajaj) - (activity as BajajFdMainActivity).fdInvestmentDetails.IPAddress = "" + (activity as BajajFdMainActivity).fdInvestmentDetails.IPAddress = "192.168.1.23" (activity as BajajFdMainActivity).fdInvestmentDetails.Device = getString(R.string.app) (activity as BajajFdMainActivity).fdInvestmentDetails.Source =