From c169200566ba69aac1cd976e28060d1250f7555b Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Tue, 3 Jan 2023 15:08:33 +0530 Subject: [PATCH 1/2] missing code --- .../ui/fragment/StepFourBajajFDFragment.kt | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 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 86aad67..4d8bc94 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 @@ -70,12 +70,11 @@ class StepFourBajajFDFragment : Fragment() { } fun getFDData( - createFDApplicationResponse: CreateFDApplicationResponse, - activity: BajajFdMainActivity + createFDApplicationResponse: CreateFDApplicationResponse ) { - uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId + this.uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId // - getFDDetailsApi(createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId, activity) + getFDDetailsApi(createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId) customerListApi() } @@ -86,8 +85,8 @@ class StepFourBajajFDFragment : Fragment() { getCodeRequest.Category = getString(R.string.customerCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - stepFourBajajFDViewModel.paymentModeApi(getCodeRequest, Constants.token) - stepFourBajajFDViewModel.getPaymentModeMutableData.observe(viewLifecycleOwner) { response -> + this.stepFourBajajFDViewModel.paymentModeApi(getCodeRequest, Constants.token) + this.stepFourBajajFDViewModel.getPaymentModeMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("response", "-->$response") @@ -129,12 +128,11 @@ class StepFourBajajFDFragment : Fragment() { } - private fun getFDDetailsApi(uniqueId: String, activity: BajajFdMainActivity) { - if (Common.isNetworkAvailable(activity)) { + private fun getFDDetailsApi(uniqueId: String) { + if (Common.isNetworkAvailable(activity as BajajFdMainActivity)) { val getFDDetailsRequest = GetFDDetailsRequest() - getFDDetailsRequest.FDProvider = activity.resources.getString(R.string.bajaj) - getFDDetailsRequest.NiveshClientCode = - activity.getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + getFDDetailsRequest.FDProvider = resources.getString(R.string.bajaj) + getFDDetailsRequest.NiveshClientCode = (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE getFDDetailsRequest.UniqueId = uniqueId stepFourBajajFDViewModel.getFDDetails(getFDDetailsRequest, Constants.token) stepFourBajajFDViewModel.getFDDetailsMutableData.observe(viewLifecycleOwner) { response -> From c7d116916013125b0e67b46971f90214563b3a8a Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Tue, 3 Jan 2023 16:46:57 +0530 Subject: [PATCH 2/2] changes --- .../nivesh/production/bajajfd/BajajApplication.kt | 12 ++++++++++++ .../bajajfd/ui/activity/BajajFdMainActivity.kt | 4 ++-- .../bajajfd/ui/fragment/StepFourBajajFDFragment.kt | 6 +++--- 3 files changed, 17 insertions(+), 5 deletions(-) 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 4245071..22e3de5 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/BajajApplication.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/BajajApplication.kt @@ -3,4 +3,16 @@ package com.nivesh.production.bajajfd import android.app.Application class BajajApplication : Application() { + private var mInstance: BajajApplication? = null + // private val mRequestQueue: RequestQueue? = null + + override fun onCreate() { + super.onCreate() + mInstance = this; + } + + @Synchronized + fun getInstanceApp(): BajajApplication? { + return mInstance + } } \ 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 7490f83..47cca5f 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 @@ -47,8 +47,8 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface { var getClientDetailsResponse: getClientDetailsResponse private var stepCount: Int = 0 - lateinit var sectionsPagerAdapter : SectionsPagerAdapter - lateinit var fragments: Array + private lateinit var sectionsPagerAdapter : SectionsPagerAdapter + private lateinit var fragments: Array override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) 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 3a9865b..160da45 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 @@ -130,10 +130,10 @@ class StepFourBajajFDFragment : Fragment() { } private fun getFDDetailsApi(uniqueId: String) { - if (Common.isNetworkAvailable(activity as BajajFdMainActivity)) { + if (Common.isNetworkAvailable(requireActivity())) { val getFDDetailsRequest = GetFDDetailsRequest() - getFDDetailsRequest.FDProvider = getString(R.string.bajaj) - getFDDetailsRequest.NiveshClientCode = (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + getFDDetailsRequest.FDProvider = requireActivity().getString(R.string.bajaj) + getFDDetailsRequest.NiveshClientCode = (requireContext().applicationContext as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE getFDDetailsRequest.UniqueId = uniqueId stepFourBajajFDViewModel.getFDDetails(getFDDetailsRequest, Constants.token) stepFourBajajFDViewModel.getFDDetailsMutableData.observe(viewLifecycleOwner) { response ->