Merge branch 'HemantBranch' of https://git.nivesh.com:443/hemant.khadase/BajajFDLib into ManojBranch

# Conflicts:
#	app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt
#	app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt
#	app/src/main/res/drawable/ic_baseline_check_24.xml
#	app/src/main/res/values/strings.xml

app/src/main/java/com/nivesh/production/bajajfd/adapter/DisableAdapter.kt

@@ -0,0 +1,24 @@
+package com.nivesh.production.bajajfd.adapter
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.AttributeSet
+import android.view.MotionEvent
+import androidx.viewpager.widget.ViewPager
+
+
+class DisableAdapter (context: Context, attrs: AttributeSet) : ViewPager(context, attrs) {
+    private var isPagingEnabled = true // change this value for enable and disable the viewpager swipe
+
+    @SuppressLint("ClickableViewAccessibility")
+    override fun onTouchEvent(event: MotionEvent?): Boolean {
+        return this.isPagingEnabled && super.onTouchEvent(event)
+    }
+
+    override fun onInterceptTouchEvent(event: MotionEvent?): Boolean {
+        return this.isPagingEnabled && super.onInterceptTouchEvent(event)
+    }
+
+    fun setPagingEnabled(b: Boolean) { isPagingEnabled = b
+    }
+}

app/src/main/java/com/nivesh/production/bajajfd/adapter/SmartFragmentStatePagerAdapter.kt

@@ -5,10 +5,12 @@ 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) : FragmentStatePagerAdapter(fragmentManager) {
-    val registeredFragments = SparseArray<Fragment>()
+abstract class SmartFragmentStatePagerAdapter(fragmentManager: FragmentManager) : FragmentPagerAdapter(fragmentManager) {
+    private val registeredFragments = SparseArray<Fragment>()
 
     override fun instantiateItem(container: ViewGroup, position: Int): Any {
         val fragment = super.instantiateItem(container, position) as Fragment
@@ -16,12 +18,6 @@ abstract class SmartFragmentStatePagerAdapter(fragmentManager: FragmentManager)
         return fragment
     }
 
-    // Unregister when the item is inactive
-    override fun destroyItem(container: View, position: Int, `object`: Any) {
-        registeredFragments.remove(position)
-        super.destroyItem(container, position, `object`)
-    }
-
     // Returns the fragment for the position (if instantiated)
     fun getRegisteredFragment(position: Int): Fragment? {
         return registeredFragments[position]

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

@@ -1,11 +0,0 @@
-package com.nivesh.production.bajajfd.interfaces
-
-import com.nivesh.production.bajajfd.model.CreateFDRequest
-import com.nivesh.production.bajajfd.model.SaveFDOtherDataRequest
-
-interface BajajFDInterface {
-    fun stepOneApi(data: String?)
-    fun stepTwoApi(data: CreateFDRequest)
-    fun stepThreeApi(data: CreateFDRequest)
-    fun stepFourApi(data: SaveFDOtherDataRequest, payUrl: String, value: String)
-}

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

@@ -3,6 +3,6 @@ package com.nivesh.production.bajajfd.interfaces
 import com.nivesh.production.bajajfd.model.CreateFDApplicationResponse
 
 interface SendData {
-    fun sendDataFragment(message: CreateFDApplicationResponse, currentItem: Int)
-
+    fun sendDataFragment(message: CreateFDApplicationResponse)
+    fun sendDataFragmentStepFour(message: CreateFDApplicationResponse)
 }

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

@@ -15,10 +15,10 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.viewpager.widget.ViewPager
 import com.google.gson.Gson
 import com.nivesh.production.bajajfd.R
+import com.nivesh.production.bajajfd.adapter.DisableAdapter
 import com.nivesh.production.bajajfd.adapter.SectionsPagerAdapter
 import com.nivesh.production.bajajfd.api.ApiClient
 import com.nivesh.production.bajajfd.databinding.ActivityBajajFdBinding
-import com.nivesh.production.bajajfd.interfaces.BajajFDInterface
 import com.nivesh.production.bajajfd.model.*
 import com.nivesh.production.bajajfd.repositories.MainRepository
 import com.nivesh.production.bajajfd.ui.fragment.*
@@ -32,25 +32,26 @@ import com.nivesh.production.bajajfd.util.Constants.Companion.token
 import com.nivesh.production.bajajfd.util.Resource
 import com.nivesh.production.bajajfd.viewModel.*
 
-class BajajFdMainActivity : BaseActivity(), BajajFDInterface {
+
+class BajajFdMainActivity : BaseActivity() {
     lateinit var binding: ActivityBajajFdBinding
     private lateinit var viewModel: BajajFDViewModel
 
-    lateinit var stepOneBajajFDViewModel: StepOneBajajFDViewModel
-    lateinit var stepTwoBajajFDViewModel: StepTwoBajajFDViewModel
-    lateinit var stepThreeBajajFDViewModel: StepThreeBajajFDViewModel
-    lateinit var stepFourBajajFDViewModel: StepFourBajajFDViewModel
-    lateinit var stepFiveBajajFDViewModel: StepFiveBajajFDViewModel
-
-    var createFDRequest: CreateFDRequest
-    var createFDApplicantRequest: CreateFDApplicationRequest
-    var applicantDetails: ApplicantDetails
-    var fdInvestmentDetails: FDInvestmentDetails
-    var applicantRelationDetails: ApplicantRelationDetails
-    var fdBankDetails: FdBankDetails
-    var nomineeDetails: NomineeDetails
-    var nomineeGuardianDetails: NomineeGuardianDetails
-    var getClientDetailsResponse: getClientDetailsResponse
+    private val stepOneBajajFDFragment = StepOneBajajFDFragment()
+    private val stepTwoBajajFDFragment = StepTwoBajajFDFragment()
+    private val stepThreeBajajFDFragment = StepThreeBajajFDFragment()
+    private val stepFourBajajFDFragment = StepFourBajajFDFragment()
+    private val stepFiveBajajFDFragment = StepFiveBajajFDFragment()
+
+    var createFDRequest: CreateFDRequest = CreateFDRequest()
+    var createFDApplicantRequest: CreateFDApplicationRequest = CreateFDApplicationRequest()
+    var applicantDetails: ApplicantDetails = ApplicantDetails()
+    var fdInvestmentDetails: FDInvestmentDetails = FDInvestmentDetails()
+    var applicantRelationDetails: ApplicantRelationDetails = ApplicantRelationDetails()
+    var fdBankDetails: FdBankDetails = FdBankDetails()
+    var nomineeDetails: NomineeDetails = NomineeDetails()
+    var nomineeGuardianDetails: NomineeGuardianDetails = NomineeGuardianDetails()
+    var getClientDetailsResponse: getClientDetailsResponse = getClientDetailsResponse()
 
     private var stepCount: Int = 0
     private lateinit var sectionsPagerAdapter: SectionsPagerAdapter
@@ -61,19 +62,6 @@ class BajajFdMainActivity : BaseActivity(), BajajFDInterface {
         init()
     }
 
-    init {
-        getClientDetailsResponse = getClientDetailsResponse()
-        createFDRequest = CreateFDRequest()
-        createFDApplicantRequest = CreateFDApplicationRequest()
-
-        fdInvestmentDetails = FDInvestmentDetails()
-        applicantDetails = ApplicantDetails()
-        applicantRelationDetails = ApplicantRelationDetails()
-        fdBankDetails = FdBankDetails()
-        nomineeDetails = NomineeDetails()
-        nomineeGuardianDetails = NomineeGuardianDetails()
-    }
-
     private fun init() {
 
         binding = ActivityBajajFdBinding.inflate(layoutInflater)
@@ -84,26 +72,6 @@ class BajajFdMainActivity : BaseActivity(), BajajFDInterface {
             this,
             FDModelProviderFactory(MainRepository(ApiClient.getApiClient))
         )[BajajFDViewModel::class.java]
-        stepOneBajajFDViewModel = ViewModelProvider(
-            this,
-            StepOneModelProviderFactory(MainRepository(ApiClient.getApiClient))
-        )[StepOneBajajFDViewModel::class.java]
-        stepTwoBajajFDViewModel = ViewModelProvider(
-            this,
-            StepTwoModelProviderFactory(MainRepository(ApiClient.getApiClient))
-        )[StepTwoBajajFDViewModel::class.java]
-        stepThreeBajajFDViewModel = ViewModelProvider(
-            this,
-            StepThreeModelProviderFactory(MainRepository(ApiClient.getApiClient))
-        )[StepThreeBajajFDViewModel::class.java]
-        stepFourBajajFDViewModel = ViewModelProvider(
-            this,
-            StepFourModelProviderFactory(MainRepository(ApiClient.getApiClient))
-        )[StepFourBajajFDViewModel::class.java]
-        stepFiveBajajFDViewModel = ViewModelProvider(
-            this,
-            StepFiveModelProviderFactory(MainRepository(ApiClient.getApiClient))
-        )[StepFiveBajajFDViewModel::class.java]
 
         if (Common.isNetworkAvailable(this)) {
             getStepsCountApi()
@@ -119,7 +87,7 @@ class BajajFdMainActivity : BaseActivity(), BajajFDInterface {
             val fdStepsCount = FDStepsCountRequest()
             fdStepsCount.FDProvider = getString(R.string.bajaj)
             fdStepsCount.NiveshClientCode = "8872"
-            viewModel.getStepsCount(fdStepsCount, token)
+            viewModel.getStepsCount(fdStepsCount, token, this)
             viewModel.getStepsCountMutableData.observe(this) { response ->
                 when (response) {
                     is Resource.Success -> {
@@ -152,6 +120,9 @@ class BajajFdMainActivity : BaseActivity(), BajajFDInterface {
                     }
                     is Resource.Loading -> {
 
+                    }
+                    is Resource.DataError -> {
+
                     }
                 }
             }
@@ -189,7 +160,7 @@ class BajajFdMainActivity : BaseActivity(), BajajFDInterface {
             userRequest.deviceInfo = deviceInfo
             getClientDetailsRequest.UserRequest = userRequest
             Log.e("getClientDetailRequest", "-->" + Gson().toJson(getClientDetailsRequest))
-            viewModel.getClientDetails(getClientDetailsRequest, token)
+            viewModel.getClientDetails(getClientDetailsRequest, token, this)
             viewModel.getClientDetailsMutableData.observe(this) { response ->
                 when (response) {
                     is Resource.Success -> {
@@ -220,6 +191,9 @@ class BajajFdMainActivity : BaseActivity(), BajajFDInterface {
                     }
                     is Resource.Loading -> {
 
+                    }
+                    is Resource.DataError -> {
+
                     }
                 }
             }
@@ -233,28 +207,26 @@ class BajajFdMainActivity : BaseActivity(), BajajFDInterface {
 
         if (stepCount == 3) {
             fragments = arrayOf(
-                StepOneBajajFDFragment.getInstance(this),
-                StepTwoBajajFDFragment.getInstance(this),
-                StepFourBajajFDFragment.getInstance(this),
-                StepFiveBajajFDFragment.getInstance(this)
+                stepOneBajajFDFragment,
+                stepTwoBajajFDFragment,
+                stepFourBajajFDFragment,
+                stepFiveBajajFDFragment
             )
         } else if (stepCount == 4) {
             fragments = arrayOf(
-                StepOneBajajFDFragment.getInstance(this),
-                StepTwoBajajFDFragment.getInstance(this),
-                StepThreeBajajFDFragment.getInstance(this),
-                StepFourBajajFDFragment.getInstance(this),
-                StepFiveBajajFDFragment.getInstance(this)
+                stepOneBajajFDFragment,
+                stepTwoBajajFDFragment,
+                stepThreeBajajFDFragment,
+                stepFourBajajFDFragment,
+                stepFiveBajajFDFragment
             )
         }
 
         // set viewPager
-        sectionsPagerAdapter =
-            SectionsPagerAdapter(supportFragmentManager, fragments, stepsCount)
-        val viewPager: ViewPager = binding.viewPager
-
+        sectionsPagerAdapter = SectionsPagerAdapter(supportFragmentManager, fragments, stepsCount)
+        val viewPager: DisableAdapter = binding.viewPager
+        viewPager.setPagingEnabled(false)
         viewPager.adapter = sectionsPagerAdapter
-
         viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
             override fun onPageScrolled(
                 position: Int,
@@ -329,8 +301,8 @@ class BajajFdMainActivity : BaseActivity(), BajajFDInterface {
                     getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_PAN
                 checkFDKYCRequest.NiveshClientCode =
                     getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE.toString()
-                stepOneBajajFDViewModel.checkFDKYC(checkFDKYCRequest, token)
-                stepOneBajajFDViewModel.getFDKYCMutableData.observe(this) { response ->
+                viewModel.checkFDKYC(checkFDKYCRequest, token, this)
+                viewModel.getFDKYCMutableData.observe(this) { response ->
                     when (response) {
                         is Resource.Success -> {
                             Log.e("response", "-->$response")
@@ -363,13 +335,18 @@ class BajajFdMainActivity : BaseActivity(), BajajFDInterface {
                         }
                         is Resource.Loading -> {
 
+                        }
+                        is Resource.DataError -> {
+
                         }
                     }
                 }
             }
         }
+
     }
 
+
     // set background for selected/ default step
     private fun setBackground(
         drawable: Drawable?,
@@ -384,130 +361,34 @@ class BajajFdMainActivity : BaseActivity(), BajajFDInterface {
     }
 
     // step 1 response
-    override fun stepOneApi(data: String?) {
+     fun stepOneApi(data: String?) {
         Log.e("stepOneApi", " response ---> $data")
         binding.viewPager.currentItem = 1
     }
 
     // step 2 response
-    override fun stepTwoApi(data: CreateFDRequest) {
+     fun stepTwoApi(data: CreateFDApplicationResponse) {
         Log.e("stepTwoApi", " response ---> " + Gson().toJson(data))
-        createFDApi(data, 2, "2")
+        binding.viewPager.currentItem = 2
+        stepThreeBajajFDFragment.displayReceivedData(data)
     }
 
 
     // step 3 response
-    override fun stepThreeApi(data: CreateFDRequest) {
+     fun stepThreeApi(data: CreateFDApplicationResponse) {
         Log.e("stepThreeApi", " response --->" + Gson().toJson(data))
         // call create fd api
-        createFDApi(data, 3, "3")
+        binding.viewPager.currentItem = 3
+        stepFourBajajFDFragment.displayReceivedData(data)
     }
 
     // step 4 response
-    override fun stepFourApi(data: SaveFDOtherDataRequest, payUrl: String, value: String) {
-        Log.e("stepFourApi", " response ---> " + Gson().toJson(data))
-        //  binding.viewPager.currentItem = 4
-        saveFDOtherData(data, payUrl, value)
-    }
-
-    private fun createFDApi(data: CreateFDRequest, currentItem: Int, step: String) {
-        if (Common.isNetworkAvailable(this@BajajFdMainActivity)) {
-
-            viewModel.createFDApi(data, token)
-            viewModel.getFDResponseMutableData.observe(this) { response ->
-                when (response) {
-                    is Resource.Success -> {
-                        Log.e("response", "-->$response")
-                        val createFDApplicationResponse: CreateFDApplicationResponse =
-                            Gson().fromJson(
-                                response.data?.toString(),
-                                CreateFDApplicationResponse::class.java
-                            )
-                        createFDApplicationResponse.Response.StatusCode.let { code ->
-                            when (code) {
-                                200 -> {
-                                    binding.viewPager.currentItem = currentItem
-                                    if (step == "2") {
-                                        val stepThreeBajajFDFragment: StepThreeBajajFDFragment =
-                                            sectionsPagerAdapter.getRegisteredFragment(currentItem) as StepThreeBajajFDFragment
-                                        stepThreeBajajFDFragment.displayReceivedData(
-                                            createFDApplicationResponse
-                                        )
-                                    } else {
-                                        val stepFourFDFragment: StepFourBajajFDFragment =
-                                            sectionsPagerAdapter.getRegisteredFragment(currentItem) as StepFourBajajFDFragment
-                                        stepFourFDFragment.displayReceivedData(
-                                            createFDApplicationResponse
-                                        )
-                                    }
-                                }
-                                //  650 -> refreshToken()
-                                else -> {
-                                    showDialogValidation(
-                                        this@BajajFdMainActivity,
-                                        createFDApplicationResponse.Response.Errors[0].ErrorMessage
-                                    )
-                                }
-                            }
-                        }
-                    }
-
-                    is Resource.Error -> {
-                        response.message?.let { message ->
-                            showDialogValidation(this@BajajFdMainActivity, message)
-                        }
-                    }
-                    is Resource.Loading -> {
-
-                    }
-                }
-            }
-        }
-    }
-
-    private fun saveFDOtherData(data: SaveFDOtherDataRequest, payUrl: String, value: String) {
-        if (Common.isNetworkAvailable(this)) {
-            viewModel.saveFDOtherData(data, token)
-            viewModel.getFDOtherMutableData.observe(this) { response ->
-                when (response) {
-                    is Resource.Success -> {
-                        Log.e("response", "-->" + response.data.toString())
-                        val saveFDOtherDataResponse: SaveFDOtherDataResponse =
-                            Gson().fromJson(
-                                response.data?.toString(),
-                                SaveFDOtherDataResponse::class.java
-                            )
-                        saveFDOtherDataResponse.Response.StatusCode.let { code ->
-                            when (code) {
-                                200 -> {
-                                    paymentDialog(payUrl, value)
-                                }
-                                //  650 -> refreshToken()
-                                else -> {
-                                    showDialogValidation(
-                                        this@BajajFdMainActivity,
-                                        saveFDOtherDataResponse.Response.Errors[0].ErrorMessage
-                                    )
-                                }
-                            }
-                        }
-                    }
-
-                    is Resource.Error -> {
-                        response.message?.let { message ->
-                            showDialogValidation(this@BajajFdMainActivity, message)
-                        }
-                    }
-                    is Resource.Loading -> {
-
-                    }
-                }
-            }
-        }
+     fun stepFourApi(payUrl: String, value: String) {
+        paymentDialog(payUrl, value)
     }
 
     @SuppressLint("SetJavaScriptEnabled")
-     fun paymentDialog(payUrl: String, value: String) {
+    fun paymentDialog(payUrl: String, value: String) {
         Log.e("payUrl", "-->$payUrl")
         Log.e("value", "-->$value")
         val dialogWebView = Dialog(this@BajajFdMainActivity)
@@ -544,5 +425,7 @@ class BajajFdMainActivity : BaseActivity(), BajajFDInterface {
         override fun onPageFinished(view: WebView, url: String) {
             super.onPageFinished(view, url)
         }
+
     }
+
 }

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

@@ -6,6 +6,7 @@ import androidx.appcompat.app.AppCompatActivity
 
 open class BaseActivity : AppCompatActivity() {
     private lateinit var mActivity: Activity
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         mActivity = this

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

@@ -7,6 +7,9 @@ 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) {
@@ -18,4 +21,16 @@ open class BaseFragment : Fragment() {
         }
     }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onStart() {
+        super.onStart()
+    }
+
+    override fun onStop() {
+        super.onStop()
+    }
+
 }

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

@@ -6,9 +6,10 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
-import com.nivesh.production.bajajfd.interfaces.BajajFDInterface
+import com.nivesh.production.bajajfd.api.ApiClient
 import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepFiveBinding
-import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity
+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() {
@@ -17,19 +18,6 @@ class StepFiveBajajFDFragment : Fragment() {
     private var _binding: FragmentBajajfdStepFiveBinding? = null
     private val binding get() = _binding!!
 
-    private lateinit var bajajFDInterface: BajajFDInterface
-    companion object {
-        fun getInstance(fdInterface: BajajFDInterface): StepFiveBajajFDFragment {
-            val stepFiveFragment = StepFiveBajajFDFragment()
-            stepFiveFragment.setApi(fdInterface)
-            return stepFiveFragment
-        }
-    }
-    fun setApi(bajajFDInterfaces: BajajFDInterface) {
-        bajajFDInterface = bajajFDInterfaces
-    }
-
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -37,7 +25,6 @@ class StepFiveBajajFDFragment : Fragment() {
 
         _binding = FragmentBajajfdStepFiveBinding.inflate(inflater, container, false)
         val root = binding.root
-        stepFiveBajajFDViewModel= (activity as BajajFdMainActivity).stepFiveBajajFDViewModel
 
 //        val textView: TextView = binding.sectionLabel
 //        stepFourViewModel.text.observe(viewLifecycleOwner) {
@@ -51,6 +38,14 @@ class StepFiveBajajFDFragment : Fragment() {
         return root
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        stepFiveBajajFDViewModel = ViewModelProvider(
+            this,
+            StepFiveModelProviderFactory(MainRepository(ApiClient.getApiClient))
+        )[StepFiveBajajFDViewModel::class.java]
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null

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

@@ -5,17 +5,21 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.lifecycle.ViewModelProvider
 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.interfaces.BajajFDInterface
 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
+import com.nivesh.production.bajajfd.util.Constants.Companion.token
 import com.nivesh.production.bajajfd.util.Resource
 import com.nivesh.production.bajajfd.viewModel.StepFourBajajFDViewModel
 
@@ -27,22 +31,8 @@ class StepFourBajajFDFragment : BaseFragment() {
     private lateinit var listOfCustomer: MutableList<GetCodes>
     private var selectedList: String = ""
     private var uniqueId: String = ""
-    private var payUrl : String = ""
-    private var Value : String = ""
-
-    private lateinit var bajajFDInterface: BajajFDInterface
-
-    companion object {
-        fun getInstance(fdInterface: BajajFDInterface): StepFourBajajFDFragment {
-            val stepThreeFragment = StepFourBajajFDFragment()
-            stepThreeFragment.setApi(fdInterface)
-            return stepThreeFragment
-        }
-    }
-
-    private fun setApi(bajajFDInterfaces: BajajFDInterface) {
-        bajajFDInterface = bajajFDInterfaces
-    }
+    private var payUrl: String = ""
+    private var value: String = ""
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -50,9 +40,15 @@ class StepFourBajajFDFragment : BaseFragment() {
     ): View {
 
         _binding = FragmentBajajfdStepFourBinding.inflate(inflater, container, false)
-        val root = binding.root
+        return binding.root
+    }
 
-        stepFourBajajFDViewModel = (activity as BajajFdMainActivity).stepFourBajajFDViewModel
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        stepFourBajajFDViewModel = ViewModelProvider(
+            this,
+            StepFourModelProviderFactory(MainRepository(ApiClient.getApiClient))
+        )[StepFourBajajFDViewModel::class.java]
 
         binding.checkBox.setOnCheckedChangeListener { _, _ ->
 
@@ -77,7 +73,8 @@ class StepFourBajajFDFragment : BaseFragment() {
                 saveFDOtherDataRequest.Values = selectedList
                 saveFDOtherDataRequest.NiveshClientCode =
                     (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
-                bajajFDInterface.stepFourApi(saveFDOtherDataRequest, payUrl, Value)
+                //    bajajFDInterface.stepFourApi(saveFDOtherDataRequest, payUrl, Value)
+                saveFDOtherData(saveFDOtherDataRequest, payUrl, value)
             } else {
                 showDialogValidation(
                     activity as BajajFdMainActivity,
@@ -89,7 +86,49 @@ class StepFourBajajFDFragment : BaseFragment() {
         binding.btnBack.setOnClickListener {
             (activity as BajajFdMainActivity).binding.viewPager.currentItem = 2
         }
-        return root
+    }
+
+    private fun saveFDOtherData(data: SaveFDOtherDataRequest, payUrl: String, value: String) {
+        stepFourBajajFDViewModel.saveFDOtherData(data, token, activity as BajajFdMainActivity)
+        stepFourBajajFDViewModel.getFDOtherMutableData.observe(viewLifecycleOwner) { response ->
+            when (response) {
+                is Resource.Success -> {
+                    Log.e("response", "-->" + response.data.toString())
+                    val saveFDOtherDataResponse: SaveFDOtherDataResponse =
+                        Gson().fromJson(
+                            response.data?.toString(),
+                            SaveFDOtherDataResponse::class.java
+                        )
+                    saveFDOtherDataResponse.Response.StatusCode.let { code ->
+                        when (code) {
+                            200 -> {
+                                (activity as BajajFdMainActivity).stepFourApi(payUrl, value)
+                                //  paymentDialog(payUrl, value)
+                            }
+                            //  650 -> refreshToken()
+                            else -> {
+                                showDialogValidation(
+                                    activity as BajajFdMainActivity,
+                                    saveFDOtherDataResponse.Response.Errors[0].ErrorMessage
+                                )
+                            }
+                        }
+                    }
+                }
+
+                is Resource.Error -> {
+                    response.message?.let { message ->
+                        showDialogValidation(activity as BajajFdMainActivity, message)
+                    }
+                }
+                is Resource.Loading -> {
+
+                }
+                is Resource.DataError -> {
+
+                }
+            }
+        }
     }
 
 
@@ -101,51 +140,55 @@ class StepFourBajajFDFragment : BaseFragment() {
 
 
     private fun customerListApi() {
-        if (Common.isNetworkAvailable(activity as BajajFdMainActivity)) {
-            val getCodeRequest = GetCodeRequest()
-            getCodeRequest.ProductName = getString(R.string.bajajFD)
-            getCodeRequest.Category = getString(R.string.customerCategory)
-            getCodeRequest.Language = getString(R.string.language)
-            getCodeRequest.InputValue = ""
-            stepFourBajajFDViewModel.paymentModeApi(getCodeRequest, Constants.token)
-            stepFourBajajFDViewModel.getPaymentModeMutableData.observe(viewLifecycleOwner) { response ->
-                when (response) {
-                    is Resource.Success -> {
-                        Log.e("response", "-->$response")
-                        val getCodeResponse: GetCodeResponse =
-                            Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java)
-                        getCodeResponse.Response.StatusCode.let { code ->
-                            when (code) {
-                                200 -> {
-                                    if (getCodeResponse.Response.GetCodesList.isNotEmpty()) {
-                                        listOfCustomer = getCodeResponse.Response.GetCodesList
-                                        setUpRecyclerView(listOfCustomer)
-                                    }
-                                }
-                                //  650 -> refreshToken()
-                                else -> {
-                                    showDialogValidation(
-                                        activity as BajajFdMainActivity,
-                                        getCodeResponse.Response.Message
-                                    )
+
+        val getCodeRequest = GetCodeRequest()
+        getCodeRequest.ProductName = getString(R.string.bajajFD)
+        getCodeRequest.Category = getString(R.string.customerCategory)
+        getCodeRequest.Language = getString(R.string.language)
+        getCodeRequest.InputValue = ""
+        stepFourBajajFDViewModel.paymentModeApi(
+            getCodeRequest,
+            Constants.token,
+            activity as BajajFdMainActivity
+        )
+        stepFourBajajFDViewModel.getPaymentModeMutableData.observe(viewLifecycleOwner) { response ->
+            when (response) {
+                is Resource.Success -> {
+                    Log.e("response", "-->$response")
+                    val getCodeResponse: GetCodeResponse =
+                        Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java)
+                    getCodeResponse.Response.StatusCode.let { code ->
+                        when (code) {
+                            200 -> {
+                                if (getCodeResponse.Response.GetCodesList.isNotEmpty()) {
+                                    listOfCustomer = getCodeResponse.Response.GetCodesList
+                                    setUpRecyclerView(listOfCustomer)
                                 }
                             }
+                            //  650 -> refreshToken()
+                            else -> {
+                                showDialogValidation(
+                                    activity as BajajFdMainActivity,
+                                    getCodeResponse.Response.Message
+                                )
+                            }
                         }
                     }
+                }
 
-                    is Resource.Error -> {
-                        response.message?.let { message ->
-                            showDialogValidation(activity as BajajFdMainActivity, message)
-                        }
+                is Resource.Error -> {
+                    response.message?.let { message ->
+                        showDialogValidation(activity as BajajFdMainActivity, message)
                     }
-                    is Resource.Loading -> {
+                }
+                is Resource.Loading -> {
 
-                    }
                 }
-            }
+                is Resource.DataError -> {
 
+                }
+            }
         }
-
     }
 
     private fun setUpRecyclerView(getCustomerList: MutableList<GetCodes>) {
@@ -163,7 +206,11 @@ class StepFourBajajFDFragment : BaseFragment() {
             getFDDetailsRequest.NiveshClientCode =
                 (mActivity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
             getFDDetailsRequest.UniqueId = uniqueId
-            stepFourBajajFDViewModel.getFDDetails(getFDDetailsRequest, Constants.token)
+            stepFourBajajFDViewModel.getFDDetails(
+                getFDDetailsRequest,
+                Constants.token,
+                activity as BajajFdMainActivity
+            )
             stepFourBajajFDViewModel.getFDDetailsMutableData.observe(viewLifecycleOwner) { response ->
                 when (response) {
                     is Resource.Success -> {
@@ -187,7 +234,7 @@ class StepFourBajajFDFragment : BaseFragment() {
                                         getFDDetailsResponse.Response.FDDataResponse.RateOfInterest.toString()
                                             .plus(" % p.a.")
                                     payUrl = getFDDetailsResponse.Response.FDDataResponse.PaymentUrl
-                                    Value = getFDDetailsResponse.Response.FDDataResponse.Value
+                                    value = getFDDetailsResponse.Response.FDDataResponse.Value
                                 }
                                 //  650 -> refreshToken()
                                 else -> {
@@ -207,6 +254,9 @@ class StepFourBajajFDFragment : BaseFragment() {
                     }
                     is Resource.Loading -> {
 
+                    }
+                    is Resource.DataError -> {
+
                     }
                 }
             }
@@ -216,6 +266,6 @@ class StepFourBajajFDFragment : BaseFragment() {
 
     override fun onDestroyView() {
         super.onDestroyView()
-      //  _binding = null
+        _binding = null
     }
 }

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

@@ -12,17 +12,19 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.RadioButton
-import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
 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.interfaces.BajajFDInterface
 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.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
@@ -35,7 +37,6 @@ class StepOneBajajFDFragment : BaseFragment() {
     private var _binding: FragmentBajajfdStepOneBinding? = null
     private val binding get() = _binding!!
 
-    private lateinit var bajajFDInterface: BajajFDInterface
     private lateinit var stepOneBajajFDViewModel: StepOneBajajFDViewModel
     private lateinit var rgMaturity: RadioButton
     private lateinit var listOfTenure: MutableList<ROIDataList>
@@ -47,25 +48,19 @@ class StepOneBajajFDFragment : BaseFragment() {
     private var tenure: Int = 0
     private var interest: Double = 0.0
 
-    companion object {
-        fun getInstance(fdInterface: BajajFDInterface): StepOneBajajFDFragment {
-            val stepStartFragment = StepOneBajajFDFragment()
-            stepStartFragment.setApi(fdInterface)
-            return stepStartFragment
-        }
-    }
-
-    private fun setApi(bajajFDInterfaces: BajajFDInterface) {
-        bajajFDInterface = bajajFDInterfaces
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View {
         _binding = FragmentBajajfdStepOneBinding.inflate(inflater, container, false)
-        val root = binding.root
+        return binding.root
+    }
 
-        stepOneBajajFDViewModel = (activity as BajajFdMainActivity).stepOneBajajFDViewModel
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        stepOneBajajFDViewModel = ViewModelProvider(
+            this,
+            StepOneModelProviderFactory(MainRepository(ApiClient.getApiClient))
+        )[StepOneBajajFDViewModel::class.java]
         listOfTenure = ArrayList()
 
         binding.edtAmount.filters = arrayOf<InputFilter>(InputFilter.LengthFilter(8)) // upto 1 Cr
@@ -142,7 +137,7 @@ class StepOneBajajFDFragment : BaseFragment() {
                     binding.spInterestPayout.text.toString()
                 (activity as BajajFdMainActivity).fdInvestmentDetails.Tenure = tenure
                 (activity as BajajFdMainActivity).fdInvestmentDetails.Interest = interest
-                (activity as BajajFdMainActivity).fdInvestmentDetails.NiveshClientCode = "8872"
+                (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"
@@ -160,16 +155,19 @@ class StepOneBajajFDFragment : BaseFragment() {
                 (activity as BajajFdMainActivity).fdInvestmentDetails.CustomerType = ""
                 (activity as BajajFdMainActivity).fdInvestmentDetails.CKYCNumber = ""
 
-                (activity as BajajFdMainActivity).createFDApplicantRequest.FDInvestmentDetails = (activity as BajajFdMainActivity).fdInvestmentDetails
-                Log.e("Maturity", "-->" + rgMaturity.text)
-                bajajFDInterface.stepOneApi("stepOneResponse")
+                (activity as BajajFdMainActivity).createFDApplicantRequest.FDInvestmentDetails =
+                    (activity as BajajFdMainActivity).fdInvestmentDetails
+                Log.e(
+                    "StepOneData",
+                    "-->" + Gson().toJson((activity as BajajFdMainActivity).fdInvestmentDetails)
+                )
+                (activity as BajajFdMainActivity).stepOneApi("stepOneResponse")
             }
         }
 
         minAmountApi()
         interestPayoutApi()
 
-        return root
     }
 
     private fun interestPayoutApi() {
@@ -178,7 +176,7 @@ class StepOneBajajFDFragment : BaseFragment() {
         getCodeRequest.Category = getString(R.string.category)
         getCodeRequest.Language = getString(R.string.language)
         getCodeRequest.InputValue = ""
-        stepOneBajajFDViewModel.getCode(getCodeRequest, token)
+        stepOneBajajFDViewModel.getCode(getCodeRequest, token, activity as BajajFdMainActivity)
         stepOneBajajFDViewModel.getCodeMutableData.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Resource.Success -> {
@@ -223,6 +221,9 @@ class StepOneBajajFDFragment : BaseFragment() {
                 }
                 is Resource.Loading -> {
 
+                }
+                is Resource.DataError -> {
+
                 }
             }
         }
@@ -234,7 +235,7 @@ class StepOneBajajFDFragment : BaseFragment() {
         getCodeRequest.Category = getString(R.string.minAmountCategory)
         getCodeRequest.Language = getString(R.string.language)
         getCodeRequest.InputValue = ""
-        stepOneBajajFDViewModel.getMinAmount(getCodeRequest, token)
+        stepOneBajajFDViewModel.getMinAmount(getCodeRequest, token, activity as BajajFdMainActivity)
         stepOneBajajFDViewModel.getMinAmountMutableData.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Resource.Success -> {
@@ -270,6 +271,9 @@ class StepOneBajajFDFragment : BaseFragment() {
                 }
                 is Resource.Loading -> {
 
+                }
+                is Resource.DataError -> {
+
                 }
             }
         }
@@ -281,7 +285,7 @@ class StepOneBajajFDFragment : BaseFragment() {
         getCodeRequest.Category = getString(R.string.MaxAmountCategory)
         getCodeRequest.Language = getString(R.string.language)
         getCodeRequest.InputValue = ""
-        stepOneBajajFDViewModel.getMaxAmount(getCodeRequest, token)
+        stepOneBajajFDViewModel.getMaxAmount(getCodeRequest, token, activity as BajajFdMainActivity)
         stepOneBajajFDViewModel.getMaxAmountMutableData.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Resource.Success -> {
@@ -311,6 +315,9 @@ class StepOneBajajFDFragment : BaseFragment() {
                 }
                 is Resource.Loading -> {
 
+                }
+                is Resource.DataError -> {
+
                 }
             }
         }
@@ -336,50 +343,59 @@ class StepOneBajajFDFragment : BaseFragment() {
     }
 
     private fun maturityAmountApi(tenure: Int, interest: Double) {
-        if (Common.isNetworkAvailable(activity as BajajFdMainActivity)) {
-            if (binding.edtAmount.text.toString().length >= 4 && interest != 0.0 && tenure != 0) {
-                val maturityAmountRequest = GetMaturityAmountRequest()
-                maturityAmountRequest.FDProvider = getString(R.string.bajaj)
-                maturityAmountRequest.FDAmount = binding.edtAmount.text.toString().toInt()
-                maturityAmountRequest.Frequency = binding.spInterestPayout.text.toString()
-                maturityAmountRequest.Tenure = tenure
-                maturityAmountRequest.Interest = interest
-                stepOneBajajFDViewModel.getMaturityAmount(maturityAmountRequest)
-                stepOneBajajFDViewModel.getMaturityAmountMutableData.observe(viewLifecycleOwner) { response ->
-                    when (response) {
-                        is Resource.Success -> {
-                            val getMaturityAmountResponse =
-                                Gson().fromJson(
-                                    response.data?.toString(),
-                                    GetCalculateMaturityAmountResponse::class.java
-                                )
-                            getMaturityAmountResponse.Response.StatusCode.let { code ->
-                                when (code) {
-                                    200 -> {
-                                        binding.tvMaturityAmount.text =
-                                            getString(R.string.rs).plus(" ").plus(
-                                                getMaturityAmountResponse.Response.MaturityAmount.toString()
-                                            )
-                                    }
-                                    //   650 -> refreshToken()
-                                    else -> {
-                                        Common.showDialogValidation(
-                                            activity as BajajFdMainActivity,
-                                            getMaturityAmountResponse.Response.Errors[0].ErrorMessage
+        if (binding.edtAmount.text.toString().length >= 4 && interest != 0.0 && tenure != 0 && binding.spInterestPayout.text.toString()
+                .isNotEmpty()
+        ) {
+            val maturityAmountRequest = GetMaturityAmountRequest()
+            maturityAmountRequest.FDProvider = getString(R.string.bajaj)
+            maturityAmountRequest.FDAmount = binding.edtAmount.text.toString().toInt()
+            maturityAmountRequest.Frequency = binding.spInterestPayout.text.toString()
+            maturityAmountRequest.Tenure = tenure
+            maturityAmountRequest.Interest = interest
+            stepOneBajajFDViewModel.getMaturityAmount(
+                maturityAmountRequest,
+                activity as BajajFdMainActivity
+            )
+            stepOneBajajFDViewModel.getMaturityAmountMutableData.observe(viewLifecycleOwner) { response ->
+                when (response) {
+                    is Resource.Success -> {
+                        val getMaturityAmountResponse =
+                            Gson().fromJson(
+                                response.data?.toString(),
+                                GetCalculateMaturityAmountResponse::class.java
+                            )
+                        getMaturityAmountResponse.Response.StatusCode.let { code ->
+                            when (code) {
+                                200 -> {
+                                    binding.tvMaturityAmount.text =
+                                        getString(R.string.rs).plus(" ").plus(
+                                            getMaturityAmountResponse.Response.MaturityAmount.toString()
                                         )
-                                    }
+                                }
+                                //   650 -> refreshToken()
+                                else -> {
+                                    Common.showDialogValidation(
+                                        activity as BajajFdMainActivity,
+                                        getMaturityAmountResponse.Response.Errors[0].ErrorMessage
+                                    )
                                 }
                             }
                         }
+                    }
 
-                        is Resource.Error -> {
-                            response.message?.let { message ->
-                                Common.showDialogValidation(activity as BajajFdMainActivity, message)
-                            }
+                    is Resource.Error -> {
+                        response.message?.let { message ->
+                            Common.showDialogValidation(
+                                activity as BajajFdMainActivity,
+                                message
+                            )
                         }
-                        is Resource.Loading -> {
+                    }
+                    is Resource.Loading -> {
+
+                    }
+                    is Resource.DataError -> {
 
-                        }
                     }
                 }
             }
@@ -427,77 +443,78 @@ class StepOneBajajFDFragment : BaseFragment() {
     }
 
     private fun getRatesApi() {
-        if (Common.isNetworkAvailable(activity as BajajFdMainActivity)) {
-            val getRatesRequest = GetRatesRequest()
-            getRatesRequest.fdProvider = getString(R.string.bajaj)
-            getRatesRequest.frequency = binding.spInterestPayout.text.toString()
-            if (binding.swSeniorCitizen.isChecked) {
-                getRatesRequest.type = getString(R.string.seniorCitizen)
-            } else {
-                getRatesRequest.type = getString(R.string.nonSeniorCitizen)
-            }
-            stepOneBajajFDViewModel.getRates(getRatesRequest, token)
-            stepOneBajajFDViewModel.getRatesMutableData.observe(viewLifecycleOwner) { response ->
-                when (response) {
-                    is Resource.Success -> {
-                        val getRatesResponse: GetRatesResponse =
-                            Gson().fromJson(response.data?.toString(), GetRatesResponse::class.java)
-                        getRatesResponse.Response.StatusCode.let { code ->
-                            when (code) {
-                                200 -> {
-                                    if (listOfTenure.isNotEmpty()) {
-                                        listOfTenure.clear()
-                                    }
-                                    listOfTenure = getRatesResponse.Response.ROIDatalist
-                                    // Tenure
-                                    if (listOfTenure.isNotEmpty()) {
-                                        listOfTenure.sortWith { lhs: ROIDataList, rhs: ROIDataList ->
-                                            rhs.Tenure.compareTo(
-                                                lhs.Tenure
-                                            )
-                                        }
-                                        binding.ORLayout.visibility = View.VISIBLE
-                                        val tenureAdapter =
-                                            ArrayAdapter(
-                                                activity as BajajFdMainActivity,
-                                                R.layout.spinner_dropdown,
-                                                listOfTenure
-                                            )
-                                        binding.spTenure.setAdapter(tenureAdapter)
-
-                                        binding.spTenure.setText(
-                                            tenureAdapter.getItem(0)?.Tenure.plus(
-                                                " Months  |  "
-                                            ).plus(tenureAdapter.getItem(0)?.ROI).plus(" %"), false
+        val getRatesRequest = GetRatesRequest()
+        getRatesRequest.fdProvider = getString(R.string.bajaj)
+        getRatesRequest.frequency = binding.spInterestPayout.text.toString()
+        if (binding.swSeniorCitizen.isChecked) {
+            getRatesRequest.type = getString(R.string.seniorCitizen)
+        } else {
+            getRatesRequest.type = getString(R.string.nonSeniorCitizen)
+        }
+        stepOneBajajFDViewModel.getRates(getRatesRequest, token, activity as BajajFdMainActivity)
+        stepOneBajajFDViewModel.getRatesMutableData.observe(viewLifecycleOwner) { response ->
+            when (response) {
+                is Resource.Success -> {
+                    val getRatesResponse: GetRatesResponse =
+                        Gson().fromJson(response.data?.toString(), GetRatesResponse::class.java)
+                    getRatesResponse.Response.StatusCode.let { code ->
+                        when (code) {
+                            200 -> {
+                                if (listOfTenure.isNotEmpty()) {
+                                    listOfTenure.clear()
+                                }
+                                listOfTenure = getRatesResponse.Response.ROIDatalist
+                                // Tenure
+                                if (listOfTenure.isNotEmpty()) {
+                                    listOfTenure.sortWith { lhs: ROIDataList, rhs: ROIDataList ->
+                                        rhs.Tenure.compareTo(
+                                            lhs.Tenure
                                         )
-                                        tenure = tenureAdapter.getItem(0)?.Tenure.toString().toInt()
-                                        interest = tenureAdapter.getItem(0)?.ROI ?: 0.0
-                                        binding.tvROI.text =
-                                            tenureAdapter.getItem(0)?.ROI.toString().plus(" %")
-                                        setUpRecyclerView()
-                                    } else {
-                                        binding.ORLayout.visibility = View.GONE
                                     }
-                                }
-                                //   650 -> refreshToken()
-                                else -> {
-                                    Common.showDialogValidation(
-                                        activity as BajajFdMainActivity,
-                                        getRatesResponse.Response.Errors[0].ErrorMessage
+                                    binding.ORLayout.visibility = View.VISIBLE
+                                    val tenureAdapter =
+                                        ArrayAdapter(
+                                            activity as BajajFdMainActivity,
+                                            R.layout.spinner_dropdown,
+                                            listOfTenure
+                                        )
+                                    binding.spTenure.setAdapter(tenureAdapter)
+
+                                    binding.spTenure.setText(
+                                        tenureAdapter.getItem(0)?.Tenure.plus(
+                                            " Months  |  "
+                                        ).plus(tenureAdapter.getItem(0)?.ROI).plus(" %"), false
                                     )
+                                    tenure = tenureAdapter.getItem(0)?.Tenure.toString().toInt()
+                                    interest = tenureAdapter.getItem(0)?.ROI ?: 0.0
+                                    binding.tvROI.text =
+                                        tenureAdapter.getItem(0)?.ROI.toString().plus(" %")
+                                    setUpRecyclerView()
+                                } else {
+                                    binding.ORLayout.visibility = View.GONE
                                 }
                             }
+                            //   650 -> refreshToken()
+                            else -> {
+                                Common.showDialogValidation(
+                                    activity as BajajFdMainActivity,
+                                    getRatesResponse.Response.Errors[0].ErrorMessage
+                                )
+                            }
                         }
                     }
+                }
 
-                    is Resource.Error -> {
-                        response.message?.let { message ->
-                            Common.showDialogValidation(activity as BajajFdMainActivity, message)
-                        }
+                is Resource.Error -> {
+                    response.message?.let { message ->
+                        Common.showDialogValidation(activity as BajajFdMainActivity, message)
                     }
-                    is Resource.Loading -> {
+                }
+                is Resource.Loading -> {
+
+                }
+                is Resource.DataError -> {
 
-                    }
                 }
             }
         }
@@ -505,6 +522,6 @@ class StepOneBajajFDFragment : BaseFragment() {
 
     override fun onDestroyView() {
         super.onDestroyView()
-      //  _binding = null
+        _binding = null
     }
 }

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

@@ -19,14 +19,17 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
+import androidx.lifecycle.ViewModelProvider
 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.interfaces.BajajFDInterface
 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.Constants
 import com.nivesh.production.bajajfd.util.Resource
@@ -43,7 +46,6 @@ class StepThreeBajajFDFragment : BaseFragment() {
     private val binding get() = _binding!!
     private lateinit var listOfDocType: List<GetCodes>
 
-    private lateinit var bajajFDInterface: BajajFDInterface
     private lateinit var stepThreeBajajFDViewModel: StepThreeBajajFDViewModel
 
     private lateinit var dialog: Dialog
@@ -57,25 +59,12 @@ class StepThreeBajajFDFragment : BaseFragment() {
     private var selectedImage: String? = ""
     private var checkPANUploadFile: Boolean? = false
     private var checkPhotoUploadFile: Boolean? = false
-
-    var actionType: AccountCaptureType? = null
+    private var actionType: AccountCaptureType? = null
 
     enum class AccountCaptureType {
         MAIN_PAN_UPLOAD,MAIN_PHOTO_UPLOAD,FIRST_UPLOAD,SECOND_UPLOAD
     }
 
-    companion object {
-        fun getInstance(fdInterface: BajajFDInterface): StepThreeBajajFDFragment {
-            val stepTwoFragment = StepThreeBajajFDFragment()
-            stepTwoFragment.setApi(fdInterface)
-            return stepTwoFragment
-        }
-    }
-
-    private fun setApi(bajajFDInterfaces: BajajFDInterface) {
-        bajajFDInterface = bajajFDInterfaces
-    }
-
     private val requestPermission = registerForActivityResult(
         ActivityResultContracts.RequestPermission()
     ) { isGranted: Boolean ->
@@ -92,8 +81,15 @@ class StepThreeBajajFDFragment : BaseFragment() {
     ): View {
 
         _binding = FragmentBajajfdStepThreeBinding.inflate(inflater, container, false)
-        val root = binding.root
-        stepThreeBajajFDViewModel = (activity as BajajFdMainActivity).stepThreeBajajFDViewModel
+        return binding.root
+    }
+
+    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? ->
@@ -170,10 +166,8 @@ class StepThreeBajajFDFragment : BaseFragment() {
             }
 
         docTypeApi()
-        return root
     }
 
-
     @SuppressLint("Range")
     fun getFileName(uri: Uri): String {
         var result = ""
@@ -262,25 +256,22 @@ class StepThreeBajajFDFragment : BaseFragment() {
     }
 
     private fun uploadDocument(uri: Uri) {
-        if (Common.isNetworkAvailable(activity as BajajFdMainActivity)) {
-            val fileDir: File = requireActivity().cacheDir
-            val fileExtension = File(fileDir.toString().plus("/").plus(getFileName(uri)))
-            fileExt = fileExtension.extension
-            encodedFileToBase64(fileExtension)
-            if (checkPANUploadFile == true || checkPhotoUploadFile == true) {
-                mapImage["Main ".plus(selectedImage)] = front
-            } else {
-                selectedImage?.let { mapImage.put(it, front) }
-            }
-
-            when(actionType){
+        val fileDir: File = requireActivity().cacheDir
+        val fileExtension = File(fileDir.toString().plus("/").plus(getFileName(uri)))
+        fileExt = fileExtension.extension
+        encodedFileToBase64(fileExtension)
+        if (checkPANUploadFile == true || checkPhotoUploadFile == true) {
+            mapImage["Main ".plus(selectedImage)] = front
+        } else {
+            selectedImage?.let { mapImage.put(it, front) }
+        }
+        when(actionType){
             AccountCaptureType.MAIN_PAN_UPLOAD -> binding.ivPan.visibility = View.VISIBLE
             AccountCaptureType.MAIN_PHOTO_UPLOAD -> binding.ivPhotograph.visibility = View.VISIBLE
             AccountCaptureType.FIRST_UPLOAD -> binding.ivAadharFront.visibility = View.VISIBLE
             else ->{
                 binding.ivAadharBack.visibility = View.VISIBLE
             }
-            }
         }
     }
 
@@ -315,43 +306,94 @@ class StepThreeBajajFDFragment : BaseFragment() {
     }
 
     private fun uploadDocApi(key: String, imageBase64: String, uploadPosition: Int) {
-        if (Common.isNetworkAvailable((activity as BajajFdMainActivity))) {
-            val du = DocumentUpload()
-            du.Description = key
-            du.DocumentType = key
-            du.FDProvider = getString(R.string.bajaj)
-            du.ImageEncodeToBase64 =
-                "data:image/" + "." + fileExt + ";base64,".plus(imageBase64) //"data:image/png;base64"
-            du.NiveshClientCode =
-                (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
-            du.UniqueId = uniqueId
-            stepThreeBajajFDViewModel.documentsUpload(du, Constants.token)
-
-            stepThreeBajajFDViewModel.getDocumentUploadMutableData.observe(viewLifecycleOwner) { response ->
+        val du = DocumentUpload()
+        du.Description = key
+        du.DocumentType = key
+        du.FDProvider = getString(R.string.bajaj)
+        du.ImageEncodeToBase64 =
+            "data:image/" + "." + fileExt + ";base64,".plus(imageBase64) //"data:image/png;base64"
+        du.NiveshClientCode =
+            (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
+        du.UniqueId = uniqueId
+        stepThreeBajajFDViewModel.documentsUpload(
+            du,
+            Constants.token,
+            activity as BajajFdMainActivity
+        )
+        stepThreeBajajFDViewModel.getDocumentUploadMutableData.observe(viewLifecycleOwner) { response ->
+            when (response) {
+                is Resource.Success -> {
+                    Log.e("UploadImage", "Response-->" + response.data.toString())
+                    val getUploadResponse: UploadResponse =
+                        Gson().fromJson(response.data?.toString(), UploadResponse::class.java)
+                    getUploadResponse.Response.StatusCode.let { code ->
+                        when (code) {
+                            200 -> {
+                                Log.e("check_upload_res", response.message.toString())
+                                if (uploadPosition == mapImage.size) {
+                                    Toast.makeText(
+                                        requireActivity(),
+                                        "".plus(mapImage.size.toString() + " Last Image Uploaded ") +
+                                                uploadPosition,
+                                        Toast.LENGTH_LONG
+                                    ).show()
+                                    //  bajajFDInterface.stepThreeApi((activity as BajajFdMainActivity).createFDRequest)
+                                    createFDApi((activity as BajajFdMainActivity).createFDRequest)
+                                }
+                            }
+                            //  650 -> refreshToken()
+                            else -> {
+                                Common.showDialogValidation(
+                                    activity as BajajFdMainActivity,
+                                    getUploadResponse.Response.Message
+                                )
+                            }
+                        }
+                    }
+                }
+
+                is Resource.Error -> {
+                    response.message?.let { message ->
+                        Common.showDialogValidation(activity as BajajFdMainActivity, message)
+                    }
+                }
+                is Resource.Loading -> {
+
+                }
+                is Resource.DataError -> {
+
+                }
+            }
+        }
+    }
+
+    private fun createFDApi(data: CreateFDRequest) {
+            stepThreeBajajFDViewModel.createFDApi(
+                data,
+                Constants.token,
+                activity as BajajFdMainActivity
+            )
+            stepThreeBajajFDViewModel.getFDResponseMutableData.observe(viewLifecycleOwner) { response ->
                 when (response) {
                     is Resource.Success -> {
-                        Log.e("UploadImage", "Response-->" + response.data.toString())
-                        val getUploadResponse: UploadResponse =
-                            Gson().fromJson(response.data?.toString(), UploadResponse::class.java)
-                        getUploadResponse.Response.StatusCode.let { code ->
+                        Log.e("createFDApi", "response--> " + response.data.toString())
+                        val createFDApplicationResponse: CreateFDApplicationResponse =
+                            Gson().fromJson(
+                                response.data?.toString(),
+                                CreateFDApplicationResponse::class.java
+                            )
+                        createFDApplicationResponse.Response.StatusCode.let { code ->
                             when (code) {
                                 200 -> {
-                                    Log.e("check_upload_res", response.message.toString())
-                                    if (uploadPosition == mapImage.size) {
-                                        Toast.makeText(
-                                            requireActivity(),
-                                            "".plus(mapImage.size.toString() + " Last Image Uploaded ") +
-                                                    uploadPosition,
-                                            Toast.LENGTH_LONG
-                                        ).show()
-                                        bajajFDInterface.stepThreeApi((activity as BajajFdMainActivity).createFDRequest)
-                                    }
+                                    (activity as BajajFdMainActivity).stepThreeApi(
+                                        createFDApplicationResponse
+                                    )
                                 }
                                 //  650 -> refreshToken()
                                 else -> {
                                     Common.showDialogValidation(
                                         activity as BajajFdMainActivity,
-                                        getUploadResponse.Response.Message
+                                        createFDApplicationResponse.Response.Errors[0].ErrorMessage
                                     )
                                 }
                             }
@@ -365,63 +407,73 @@ class StepThreeBajajFDFragment : BaseFragment() {
                     }
                     is Resource.Loading -> {
 
+                    }
+                    is Resource.DataError -> {
+
                     }
                 }
             }
-        }
     }
 
+
     private fun docTypeApi() {
-        if (Common.isNetworkAvailable(activity as BajajFdMainActivity)) {
-            val getCodeRequest = GetCodeRequest()
-            getCodeRequest.ProductName = getString(R.string.bajajFD)
-            getCodeRequest.Category = getString(R.string.docType)
-            getCodeRequest.Language = getString(R.string.language)
-            getCodeRequest.InputValue = ""
-            stepThreeBajajFDViewModel.titleApi(getCodeRequest, Constants.token)
-            stepThreeBajajFDViewModel.getTitleMutableData.observe(viewLifecycleOwner) { response ->
-                when (response) {
-                    is Resource.Success -> {
-                        Log.e("response", "-->$response")
-                        val getCodeResponse: GetCodeResponse =
-                            Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java)
-                        getCodeResponse.Response.StatusCode.let { code ->
-                            when (code) {
-                                200 -> {
-                                    listOfDocType = getCodeResponse.Response.GetCodesList
-                                    if (listOfDocType.isNotEmpty()) {
-                                        val adapter = ArrayAdapter(
-                                            activity as BajajFdMainActivity,
-                                            R.layout.spinner_dropdown,
-                                            listOfDocType
-                                        )
-                                        binding.spDocType.setAdapter(adapter)
-                                        binding.spDocType.setText(
-                                            adapter.getItem(0)?.Value,
-                                            false
-                                        )
-                                        setOtherUploadLayout(listOfDocType[0].Value)
-                                    }
-                                }
-                                //  650 -> refreshToken()
-                                else -> {
-                                    Common.showDialogValidation(
+
+        val getCodeRequest = GetCodeRequest()
+        getCodeRequest.ProductName = getString(R.string.bajajFD)
+        getCodeRequest.Category = getString(R.string.docType)
+        getCodeRequest.Language = getString(R.string.language)
+        getCodeRequest.InputValue = ""
+        stepThreeBajajFDViewModel.titleApi(
+            getCodeRequest,
+            Constants.token,
+            activity as BajajFdMainActivity
+        )
+        stepThreeBajajFDViewModel.getTitleMutableData.observe(viewLifecycleOwner) { response ->
+            when (response) {
+                is Resource.Success -> {
+                    Log.e("response", "-->$response")
+                    val getCodeResponse: GetCodeResponse =
+                        Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java)
+                    getCodeResponse.Response.StatusCode.let { code ->
+                        when (code) {
+                            200 -> {
+                                listOfDocType = getCodeResponse.Response.GetCodesList
+                                if (listOfDocType.isNotEmpty()) {
+                                    val adapter = ArrayAdapter(
                                         activity as BajajFdMainActivity,
-                                        getCodeResponse.Response.Message
+                                        R.layout.spinner_dropdown,
+                                        listOfDocType
                                     )
+                                    binding.spDocType.setAdapter(adapter)
+                                    binding.spDocType.setText(
+                                        adapter.getItem(0)?.Value,
+                                        false
+                                    )
+                                    setOtherUploadLayout(listOfDocType[0].Value)
                                 }
                             }
+                            //  650 -> refreshToken()
+                            else -> {
+                                Common.showDialogValidation(
+                                    activity as BajajFdMainActivity,
+                                    getCodeResponse.Response.Message
+                                )
+                            }
                         }
                     }
+                }
 
-                    is Resource.Error -> {
-                        response.message?.let { message ->
-                            Common.showDialogValidation(activity as BajajFdMainActivity, message)
-                        }
+                is Resource.Error -> {
+                    response.message?.let { message ->
+                        Common.showDialogValidation(activity as BajajFdMainActivity, message)
                     }
-                    is Resource.Loading -> {
+                }
+                is Resource.Loading -> {
+
+                }
+
+                is Resource.DataError -> {
 
-                    }
                 }
             }
         }
@@ -432,13 +484,13 @@ class StepThreeBajajFDFragment : BaseFragment() {
         if (binding.spDocType.text.equals(R.string.aadhar) && mapImage.size < 3) {
             Common.showDialogValidation(
                 activity as BajajFdMainActivity,
-                "Upload Aadhar Images"
+                "Upload Aadhaar Images"
             )
             return false
         } else if (!binding.spDocType.text.equals(R.string.aadhar) && mapImage.size == 3) {
             Common.showDialogValidation(
                 activity as BajajFdMainActivity,
-                "Upload Aadhar Images"
+                "Upload Aadhaar Images"
             )
             return false
         } else if (mapImage.size < 3) {

app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt

@@ -16,10 +16,9 @@ import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import com.google.gson.JsonObject
 import com.nivesh.production.bajajfd.R
-import com.nivesh.production.bajajfd.ui.activity.BaseActivity
+import kotlinx.coroutines.CoroutineExceptionHandler
 import retrofit2.HttpException
 import java.io.IOException
-import java.net.SocketTimeoutException
 import java.text.SimpleDateFormat
 import java.util.*
 import java.util.regex.Matcher
@@ -36,7 +35,7 @@ class Common {
         val connectivityManager = getApplication<NewsApplication>().getSystemService(....
          **/
         //internet check
-        fun isNetworkAvailable(activity: BaseActivity): Boolean {
+        fun isNetworkAvailable(activity: Activity): Boolean {
             val connectivityManager = activity.getSystemService(
                 Context.CONNECTIVITY_SERVICE
             ) as ConnectivityManager
@@ -111,7 +110,7 @@ class Common {
             builder.setMessage(message)
             builder.setCancelable(false)
             if (activity != null) {
-                builder.setPositiveButton(activity.getString(R.string.ok)) { dialogInterface, _ ->
+                builder.setPositiveButton(activity.getString(R.string.Ok)) { dialogInterface, _ ->
                     dialogInterface.dismiss()
                 }
             }
@@ -122,7 +121,7 @@ class Common {
             val builder = AlertDialog.Builder(activity)
             builder.setMessage(message)
             if (activity != null) {
-                builder.setPositiveButton(activity.getString(R.string.ok)) { dialogInterface, _ ->
+                builder.setPositiveButton(activity.getString(R.string.Ok)) { dialogInterface, _ ->
                     dialogInterface.dismiss()
                 }
                 builder.setNegativeButton(activity.getString(R.string.cancel)) { dialogInterface, _ ->
@@ -187,24 +186,42 @@ class Common {
             return simpleDateFormat.format(mDate as Date)
         }
 
-        fun handleRatesResponse(response: retrofit2.Response<JsonObject>): Resource<JsonObject> {
-            try {
-                if (response.isSuccessful && response.body() != null) {
-                    response.body()?.let { resultResponse ->
-                        return Resource.Success(resultResponse)
-                    }
-                }
-            } catch (t: Throwable) {
-                return when (t) {
-                    is IOException -> Resource.Error("Response : " + t.message.plus(" Cause: " + t.cause))
-                    is HttpException -> Resource.Error("Response : " + t.message.plus(" Cause: " + t.cause))
-                    is SocketTimeoutException -> Resource.Error("Response : " + t.message.plus(" Cause: " + t.cause))
-                    else -> Resource.Error(t.localizedMessage?.toString() ?: "")
+        fun handleResponse(response: retrofit2.Response<JsonObject>): Resource<JsonObject> {
+            //   try {
+            if (response.isSuccessful && response.body() != null) {
+                response.body()?.let { resultResponse ->
+                    return Resource.Success(resultResponse)
                 }
             }
+//            } catch (t: Throwable) {
+//                return when (t) {
+//                    is IOException -> Resource.Error("Response : " + t.message.plus(" Cause: " + t.cause))
+//                    is HttpException -> Resource.Error("Response : " + t.message.plus(" Cause: " + t.cause))
+//                    is SocketTimeoutException -> Resource.Error("Response : " + t.message.plus(" Cause: " + t.cause))
+//                    is UnknownHostException -> Resource.Error("Response : " + t.message.plus(" Cause: " + t.cause))
+//                    else -> Resource.Error(t.localizedMessage?.toString() ?: "")
+//                }
+//            }
             return Resource.Error(response.message())
         }
 
+        fun handleError(activity: Activity): CoroutineExceptionHandler {
+            val handler = CoroutineExceptionHandler { _, exception ->
+                if (exception is IOException || exception is HttpException) {
+                    showDialogValidation(
+                        activity,
+                        "Response : ".plus(exception.message).plus(" Cause: ").plus(exception.cause)
+                    )
+                } else {
+                    showDialogValidation(
+                        activity,
+                        "Response : ".plus(exception.localizedMessage?.toString())
+                    )
+                }
+            }
+            return handler
+        }
+
         fun isMinor(date: String): Boolean {
             val simpleDateFormat = SimpleDateFormat("yyyy-mm-dd")
             val dt1: Date = simpleDateFormat.parse(date)

app/src/main/java/com/nivesh/production/bajajfd/util/Resource.kt

@@ -1,10 +1,26 @@
 package com.nivesh.production.bajajfd.util
 
 sealed class Resource<T>(
-    val data:T?=null,
-    val message:String?=null)
-{
-    class Success<T>(data: T):Resource<T>(data)
-    class Error<T>(message: String,data: T?= null):Resource<T>(data,message)
-    class Loading<T>:Resource<T>()
+    val data: T? = null,
+    var message: String? = null,
+    val errorCode: Int? = null,
+    var status: Boolean = true
+
+) {
+    class Success<T>(data: T) : Resource<T>(data)
+    class Error<T>(message: String, data: T? = null) : Resource<T>(data, message)
+    class Loading<T> : Resource<T>()
+    class DataError<T>(errorCode: Int, message: String, data: T? = null) :
+        Resource<T>(null, message, errorCode)
+
+
+    override fun toString(): String {
+        return when (this) {
+            is Success<*> -> "Success[data=$data]"
+            is DataError -> "ErrorCode[exception=$errorCode]"
+            is Loading<T> -> "Loading"
+            is Error -> "Error[exception=${error(Any())}]"
+        }
+
+    }
 }

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

@@ -1,46 +1,52 @@
 package com.nivesh.production.bajajfd.viewModel
 
-import android.util.Log
+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.Companion.handleRatesResponse
+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.Resource
 import kotlinx.coroutines.launch
 
 class BajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() {
 
     val getStepsCountMutableData: MutableLiveData<Resource<JsonObject>> = MutableLiveData()
-    fun getStepsCount(requestBody: FDStepsCountRequest, token: String) = viewModelScope.launch {
-        getStepsCountMutableData.postValue(Resource.Loading())
-        val response = mainRepository.getStepsCountResponse(requestBody, token)
-        Log.e("response", "-->"+response)
-        getStepsCountMutableData.postValue(handleRatesResponse(response))
+    fun getStepsCount(
+        requestBody: FDStepsCountRequest,
+        token: String,
+        activity: Activity
+    ) = viewModelScope.launch(handleError(activity)) {
+        if (Common.isNetworkAvailable(activity)) {
+            getStepsCountMutableData.postValue(Resource.Loading())
+            val response = mainRepository.getStepsCountResponse(requestBody, token)
+            getStepsCountMutableData.postValue(handleResponse(response))
+        }
     }
 
     val getClientDetailsMutableData: MutableLiveData<Resource<JsonObject>> = MutableLiveData()
-    fun getClientDetails(getClientDetailsRequest: getClientDetailsRequest, token: String) =
-        viewModelScope.launch {
-            getClientDetailsMutableData.postValue(Resource.Loading())
-            val response = mainRepository.getClientDetailsResponse(getClientDetailsRequest, token)
-            getClientDetailsMutableData.postValue(handleRatesResponse(response))
+    fun getClientDetails(getClientDetailsRequest: getClientDetailsRequest, token: String, activity: Activity) =
+        viewModelScope.launch(handleError(activity)) {
+            if (Common.isNetworkAvailable(activity)) {
+                getClientDetailsMutableData.postValue(Resource.Loading())
+                val response =
+                    mainRepository.getClientDetailsResponse(getClientDetailsRequest, token)
+                getClientDetailsMutableData.postValue(handleResponse(response))
+            }
         }
 
-    val getFDResponseMutableData: MutableLiveData<Resource<JsonObject>> = MutableLiveData()
-    fun createFDApi(getRatesRequest: CreateFDRequest, token: String) = viewModelScope.launch {
-        getFDResponseMutableData.postValue(Resource.Loading())
-        val response = mainRepository.createFDKYCResponse(getRatesRequest, token)
-        getFDResponseMutableData.postValue(handleRatesResponse(response))
-    }
-
-    val getFDOtherMutableData: MutableLiveData<Resource<JsonObject>> = MutableLiveData()
-    fun saveFDOtherData(getRatesRequest: SaveFDOtherDataRequest, token: String) = viewModelScope.launch {
-        getFDOtherMutableData.postValue(Resource.Loading())
-        val response = mainRepository.saveFDOtherDataResponse(getRatesRequest, token)
-        getFDOtherMutableData.postValue(handleRatesResponse(response))
+    val getFDKYCMutableData: MutableLiveData<Resource<JsonObject>> = MutableLiveData()
+    fun checkFDKYC(requestBody: CheckFDKYCRequest, token : String, activity: Activity) = viewModelScope.launch(handleError(activity)) {
+        if (Common.isNetworkAvailable(activity)) {
+            getFDKYCMutableData.postValue(Resource.Loading())
+            val response = mainRepository.checkFDKYCRequest(requestBody, token)
+            getFDKYCMutableData.postValue(handleResponse(response))
+        }
     }
 
 }

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

@@ -1,19 +1,9 @@
 package com.nivesh.production.bajajfd.viewModel
 
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.lifecycle.ViewModel
-import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepFiveBinding
-import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepFourBinding
-import com.nivesh.production.bajajfd.interfaces.BajajFDInterface
 import com.nivesh.production.bajajfd.repositories.MainRepository
-import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity
-import com.nivesh.production.bajajfd.ui.fragment.StepFiveBajajFDFragment
-import com.nivesh.production.bajajfd.ui.fragment.StepFourBajajFDFragment
 
-class StepFiveBajajFDViewModel (private val mainRepository: MainRepository) : ViewModel() {
+class StepFiveBajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() {
 
 
 }

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

@@ -1,5 +1,6 @@
 package com.nivesh.production.bajajfd.viewModel
 
+import android.app.Activity
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -7,50 +8,81 @@ import com.google.gson.JsonObject
 import com.nivesh.production.bajajfd.model.GetCodeRequest
 import com.nivesh.production.bajajfd.model.GetFDDetailsRequest
 import com.nivesh.production.bajajfd.model.GetRatesRequest
+import com.nivesh.production.bajajfd.model.SaveFDOtherDataRequest
 import com.nivesh.production.bajajfd.repositories.MainRepository
-import com.nivesh.production.bajajfd.util.Common.Companion.handleRatesResponse
+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<Resource<JsonObject>> = MutableLiveData()
-    fun paymentModeApi(getCodeRequest: GetCodeRequest, token: String) = viewModelScope.launch {
-        getPaymentModeMutableData.postValue(Resource.Loading())
-        val response = mainRepository.payModeCheck(getCodeRequest, token)
-        getPaymentModeMutableData.postValue(handleRatesResponse(response))
+    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<Resource<JsonObject>> = MutableLiveData()
-    fun getFDDetails(getRatesRequest: GetFDDetailsRequest, token: String) = viewModelScope.launch {
-        getFDDetailsMutableData.postValue(Resource.Loading())
-        val response = mainRepository.getFDDetailsResponse(getRatesRequest, token)
-        getFDDetailsMutableData.postValue(handleRatesResponse(response))
+    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<Resource<JsonObject>> = MutableLiveData()
-    fun updateFDPaymentStatus(getRatesRequest: GetRatesRequest, token: String) =
-        viewModelScope.launch {
+    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.updateFDPaymentStatusResponse(getRatesRequest, token)
-            getRatesMutableData.postValue(handleRatesResponse(response))
+            val response = mainRepository.finaliseFDResponse(getRatesRequest, token)
+            getRatesMutableData.postValue(handleResponse(response))
         }
+    }
 
-    fun finaliseFD(getRatesRequest: GetRatesRequest, token: String) = viewModelScope.launch {
-        getRatesMutableData.postValue(Resource.Loading())
-        val response = mainRepository.finaliseFDResponse(getRatesRequest, token)
-        getRatesMutableData.postValue(handleRatesResponse(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 finaliseKYC(getRatesRequest: GetRatesRequest, token: String) = viewModelScope.launch {
-        getRatesMutableData.postValue(Resource.Loading())
-        val response = mainRepository.finaliseKYCResponse(getRatesRequest, token)
-        getRatesMutableData.postValue(handleRatesResponse(response))
+    fun paymentReQuery(getRatesRequest: GetRatesRequest, 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))
+        }
     }
 
-    fun paymentReQuery(getRatesRequest: GetRatesRequest, token: String) = viewModelScope.launch {
-        getRatesMutableData.postValue(Resource.Loading())
-        val response = mainRepository.paymentReQueryResponse(getRatesRequest, token)
-        getRatesMutableData.postValue(handleRatesResponse(response))
+    val getFDOtherMutableData: MutableLiveData<Resource<JsonObject>> = 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))
+        }
     }
 }

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

@@ -1,15 +1,16 @@
 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.CheckFDKYCRequest
 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.Companion.handleRatesResponse
+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
@@ -17,55 +18,62 @@ import kotlinx.coroutines.launch
 class StepOneBajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() {
 
     val getCodeMutableData: MutableLiveData<Resource<JsonObject>> = MutableLiveData()
-    fun getCode(requestBody: GetCodeRequest, token : String) = viewModelScope.launch {
-        getCodeMutableData.postValue(Resource.Loading())
-        val response = mainRepository.getCodesResponse(requestBody, token)
-        getCodeMutableData.postValue(handleRatesResponse(response))
-    }
+    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<Resource<JsonObject>> = MutableLiveData()
-    fun getRates(getRatesRequest: GetRatesRequest, token: String) = viewModelScope.launch {
-        getRatesMutableData.postValue(Resource.Loading())
-        val response = mainRepository.getRatesResponse(getRatesRequest, token)
-        getRatesMutableData.postValue(handleRatesResponse(response))
-    }
+    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<Resource<JsonObject>> = MutableLiveData()
-    fun getMaturityAmount(requestBody: GetMaturityAmountRequest) = viewModelScope.launch {
-        getMaturityAmountMutableData.postValue(Resource.Loading())
-        val response = mainRepository.createCalculateFDMaturityAmount(requestBody, token)
-        getMaturityAmountMutableData.postValue(handleRatesResponse(response))
-    }
+    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<Resource<JsonObject>> = MutableLiveData()
-    fun getMinAmount(requestBody: GetCodeRequest, token : String) = viewModelScope.launch {
-        getMinAmountMutableData.postValue(Resource.Loading())
-        val response = mainRepository.getCodesResponse(requestBody, token)
-        getMinAmountMutableData.postValue(handleRatesResponse(response))
-    }
+    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<Resource<JsonObject>> = MutableLiveData()
-    fun getMaxAmount(requestBody: GetCodeRequest, token : String) = viewModelScope.launch {
-        getMaxAmountMutableData.postValue(Resource.Loading())
-        val response = mainRepository.getCodesResponse(requestBody, token)
-        getMaxAmountMutableData.postValue(handleRatesResponse(response))
-    }
-
-    val getFDKYCMutableData: MutableLiveData<Resource<JsonObject>> = MutableLiveData()
-    fun checkFDKYC(requestBody: CheckFDKYCRequest, token : String) = viewModelScope.launch {
-        getFDKYCMutableData.postValue(Resource.Loading())
-        val response = mainRepository.checkFDKYCRequest(requestBody, token)
-        getFDKYCMutableData.postValue(handleRatesResponse(response))
-    }
-
-//    private fun handleRatesResponse(response: retrofit2.Response<JsonObject>): Resource<JsonObject> {
-//        if (response.isSuccessful) {
-//            response.body()?.let { resultResponse ->
-//                return Resource.Success(resultResponse)
-//            }
-//        }
-//        return Resource.Error(response.message())
-//
-//    }
-
+    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))
+            }
+        }
 }

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

@@ -1,32 +1,53 @@
 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.Companion.handleRatesResponse
+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<Resource<JsonObject>> = MutableLiveData()
-    fun titleApi(getCodeRequest: GetCodeRequest, token: String) = viewModelScope.launch {
-        getTitleMutableData.postValue(Resource.Loading())
-        val response = mainRepository.titleCheck(getCodeRequest, token)
-        getTitleMutableData.postValue(handleRatesResponse(response))
+    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<Resource<JsonObject>> = MutableLiveData()
-    fun documentsUpload(documentUpload: DocumentUpload, token: String) = viewModelScope.launch {
-        getDocumentUploadMutableData.postValue(Resource.Loading())
-        val response = mainRepository.documentsUploadResponse(documentUpload, token)
-        getDocumentUploadMutableData.postValue(handleRatesResponse(response))
+    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<Resource<JsonObject>> = 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))
+        }
+    }
 
 }

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

@@ -1,107 +1,172 @@
 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.Companion.handleRatesResponse
+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 StepTwoBajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() {
 
     val getPanCheckMutableData: MutableLiveData<Resource<JsonObject>> = MutableLiveData()
-    fun panCheck(panCheck: PanCheckRequest, token: String) = viewModelScope.launch {
-        getPanCheckMutableData.postValue(Resource.Loading())
-        val response = mainRepository.panCheck(panCheck, token)
-        getPanCheckMutableData.postValue(handleRatesResponse(response))
+    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<Resource<JsonObject>> = MutableLiveData()
-    fun titleApi(getCodeRequest: GetCodeRequest, token: String) = viewModelScope.launch {
-        getTitleMutableData.postValue(Resource.Loading())
-        val response = mainRepository.titleCheck(getCodeRequest, token)
-        getTitleMutableData.postValue(handleRatesResponse(response))
+    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<Resource<JsonObject>> = MutableLiveData()
-    fun genderApi(getCodeRequest: GetCodeRequest, token: String) = viewModelScope.launch {
-        getGenderMutableData.postValue(Resource.Loading())
-        val response = mainRepository.genderCheck(getCodeRequest, token)
-        getGenderMutableData.postValue(handleRatesResponse(response))
+    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<Resource<JsonObject>> = MutableLiveData()
-    fun annualIncomeApi(getCodeRequest: GetCodeRequest, token: String) = viewModelScope.launch {
-        getAnnualIncomeMutableData.postValue(Resource.Loading())
-        val response = mainRepository.annualIncomeCheck(getCodeRequest, token)
-        getAnnualIncomeMutableData.postValue(handleRatesResponse(response))
+    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<Resource<JsonObject>> = MutableLiveData()
-    fun relationShipApi(getCodeRequest: GetCodeRequest, token: String) = viewModelScope.launch {
-        getRelationShipMutableData.postValue(Resource.Loading())
-        val response = mainRepository.relationShipCheck(getCodeRequest, token)
-        getRelationShipMutableData.postValue(handleRatesResponse(response))
+    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<Resource<JsonObject>> = MutableLiveData()
-    fun maritalStatusApi(getCodeRequest: GetCodeRequest, token: String) = viewModelScope.launch {
-        getMaritalStatusMutableData.postValue(Resource.Loading())
-        val response = mainRepository.maritalStatusCheck(getCodeRequest, token)
-        getMaritalStatusMutableData.postValue(handleRatesResponse(response))
+    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<Resource<JsonObject>> = MutableLiveData()
-    fun occupationApi(getCodeRequest: GetCodeRequest, token: String) = viewModelScope.launch {
-        getOccupationMutableData.postValue(Resource.Loading())
-        val response = mainRepository.occupationCheck(getCodeRequest, token)
-        getOccupationMutableData.postValue(handleRatesResponse(response))
+    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<Resource<JsonObject>> = MutableLiveData()
-    fun stateApi(token: String) = viewModelScope.launch {
-        getStateMasterMutableData.postValue(Resource.Loading())
-        val response = mainRepository.stateCheck( token)
-        getStateMasterMutableData.postValue(handleRatesResponse(response))
+    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<Resource<JsonObject>> = MutableLiveData()
-    fun cityListApi(cityRequest: CityRequest, token: String) = viewModelScope.launch {
-        getCityListMutableData.postValue(Resource.Loading())
-        val response = mainRepository.cityCheck(cityRequest, token)
-        getCityListMutableData.postValue(handleRatesResponse(response))
+    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<Resource<JsonObject>> = MutableLiveData()
-    fun bankListApi( token: String) = viewModelScope.launch {
-        getFDBankListMutableData.postValue(Resource.Loading())
-        val response = mainRepository.bankListCheck( token)
-        getFDBankListMutableData.postValue(handleRatesResponse(response))
+    fun bankListApi( token: String,activity : Activity) = viewModelScope.launch(
+        Common.handleError(activity)
+    ) {
+        if (Common.isNetworkAvailable(activity)) {
+            getFDBankListMutableData.postValue(Resource.Loading())
+            val response = mainRepository.bankListCheck(token)
+            getFDBankListMutableData.postValue(handleResponse(response))
+        }
     }
 
     val getifscCodeCheckMutableData: MutableLiveData<Resource<JsonObject>> = MutableLiveData()
-    fun ifscCodeApi(ifsc : String) = viewModelScope.launch {
-        getifscCodeCheckMutableData.postValue(Resource.Loading())
-        val response = mainRepository.ifscCodeCheck(ifsc)
-        getifscCodeCheckMutableData.postValue(handleRatesResponse(response))
+    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<Resource<JsonObject>> = MutableLiveData()
-    fun ifscCodeDetailsApi(ifsc : String, token: String) = viewModelScope.launch {
-        getifscCodeDetailsCheckMutableData.postValue(Resource.Loading())
-        val response = mainRepository.ifscCodeDetailsCheck(ifsc, token)
-        getifscCodeDetailsCheckMutableData.postValue(handleRatesResponse(response))
+    fun ifscCodeDetailsApi(ifsc : String, token: String,activity : Activity) = viewModelScope.launch(
+        Common.handleError(activity)
+    ) {
+        if (Common.isNetworkAvailable(activity)) {
+            getifscCodeDetailsCheckMutableData.postValue(Resource.Loading())
+            val response = mainRepository.ifscCodeDetailsCheck(ifsc, token)
+            getifscCodeDetailsCheckMutableData.postValue(handleResponse(response))
+        }
     }
 
     val getPaymentModeMutableData: MutableLiveData<Resource<JsonObject>> = MutableLiveData()
-    fun paymentModeApi(getCodeRequest: GetCodeRequest, token: String) = viewModelScope.launch {
-        getPaymentModeMutableData.postValue(Resource.Loading())
-        val response = mainRepository.payModeCheck(getCodeRequest, token)
-        getPaymentModeMutableData.postValue(handleRatesResponse(response))
+    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<Resource<JsonObject>> = 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))
+        }
     }
 
 }

app/src/main/res/drawable/ic_baseline_check_24.xml

@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector android:height="24dp" android:tint="#64F50E"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
-</vector>
+</vector>

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

@@ -137,7 +137,7 @@
         </LinearLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.viewpager.widget.ViewPager
+    <com.nivesh.production.bajajfd.adapter.DisableAdapter
         android:id="@+id/viewPager"
         android:contentDescription="@string/viewpager"
         android:layout_width="match_parent"

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

@@ -193,8 +193,9 @@
                         android:background="@drawable/rounded_corner_with_line"
                         android:hint="@string/addressProofType"
                         android:inputType="none"
+                        android:padding="@dimen/margin_5"
                         android:labelFor="@+id/spInterestPayout"
-                        android:textColorHint="#757575"
+                        android:textColorHint="@color/greyColor2"
                         android:textSize="@dimen/text_size_14"
                         tools:layout_editor_absoluteY="230dp" />
 

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

@@ -193,11 +193,12 @@
                             android:id="@+id/spTitle"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:padding="@dimen/margin_5"
                             android:background="@drawable/rounded_corner_with_line"
                             android:hint="@string/selectTitle"
                             android:inputType="none"
                             android:labelFor="@+id/spInterestPayout"
-                            android:textColorHint="#757575"
+                            android:textColorHint="@color/greyColor2"
                             android:textSize="@dimen/text_size_14" />
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -222,8 +223,9 @@
                             android:background="@drawable/rounded_corner_with_line"
                             android:hint="@string/selectGender"
                             android:inputType="none"
+                            android:padding="@dimen/margin_5"
                             android:labelFor="@+id/spInterestPayout"
-                            android:textColorHint="#757575"
+                            android:textColorHint="@color/greyColor2"
                             android:textSize="@dimen/text_size_14" />
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -296,7 +298,10 @@
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
+                        android:layout_marginStart="@dimen/margin_5"
+                        android:layout_marginTop="@dimen/margin_10"
+                        android:layout_marginEnd="@dimen/margin_5"
+                        android:layout_marginBottom="@dimen/margin_5"
                         app:hintEnabled="false">
 
                         <com.google.android.material.textfield.MaterialAutoCompleteTextView
@@ -305,9 +310,10 @@
                             android:layout_height="wrap_content"
                             android:background="@drawable/rounded_corner_with_line"
                             android:hint="@string/enterOccupation"
+                            android:padding="@dimen/margin_5"
                             android:inputType="none"
                             android:labelFor="@+id/spInterestPayout"
-                            android:textColorHint="#757575"
+                            android:textColorHint="@color/greyColor2"
                             android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
@@ -317,7 +323,10 @@
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
+                        android:layout_marginStart="@dimen/margin_5"
+                        android:layout_marginTop="@dimen/margin_10"
+                        android:layout_marginEnd="@dimen/margin_5"
+                        android:layout_marginBottom="@dimen/margin_5"
                         app:hintEnabled="false">
 
                         <com.google.android.material.textfield.MaterialAutoCompleteTextView
@@ -326,9 +335,10 @@
                             android:layout_height="wrap_content"
                             android:background="@drawable/rounded_corner_with_line"
                             android:hint="@string/selectIncome"
+                            android:padding="@dimen/margin_5"
                             android:inputType="none"
                             android:labelFor="@+id/spInterestPayout"
-                            android:textColorHint="#757575"
+                            android:textColorHint="@color/greyColor2"
                             android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
@@ -374,8 +384,9 @@
                             android:background="@drawable/rounded_corner_with_line"
                             android:hint="@string/selectMaritalStatus"
                             android:inputType="none"
+                            android:padding="@dimen/margin_5"
                             android:labelFor="@+id/spInterestPayout"
-                            android:textColorHint="#757575"
+                            android:textColorHint="@color/greyColor2"
                             android:textSize="@dimen/text_size_14" />
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -465,7 +476,10 @@
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
+                        android:layout_marginStart="@dimen/margin_5"
+                        android:layout_marginTop="@dimen/margin_10"
+                        android:layout_marginEnd="@dimen/margin_5"
+                        android:layout_marginBottom="@dimen/margin_5"
                         app:hintEnabled="false">
 
                         <com.google.android.material.textfield.MaterialAutoCompleteTextView
@@ -474,9 +488,10 @@
                             android:layout_height="wrap_content"
                             android:background="@drawable/rounded_corner_with_line"
                             android:hint="@string/selectState"
+                            android:padding="@dimen/margin_5"
                             android:inputType="none"
                             android:labelFor="@+id/tlState"
-                            android:textColorHint="#757575"
+                            android:textColorHint="@color/greyColor2"
                             android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
@@ -486,7 +501,10 @@
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
+                        android:layout_marginStart="@dimen/margin_5"
+                        android:layout_marginTop="@dimen/margin_10"
+                        android:layout_marginEnd="@dimen/margin_5"
+                        android:layout_marginBottom="@dimen/margin_5"
                         app:hintEnabled="false">
 
                         <com.google.android.material.textfield.MaterialAutoCompleteTextView
@@ -495,9 +513,10 @@
                             android:layout_height="wrap_content"
                             android:background="@drawable/rounded_corner_with_line"
                             android:hint="@string/selectCity"
+                            android:padding="@dimen/margin_5"
                             android:inputType="none"
                             android:labelFor="@+id/tlCity"
-                            android:textColorHint="#757575"
+                            android:textColorHint="@color/greyColor2"
                             android:textSize="@dimen/text_size_14" />
 
                     </com.google.android.material.textfield.TextInputLayout>
@@ -567,9 +586,10 @@
                             android:layout_height="wrap_content"
                             android:background="@drawable/rounded_corner_with_line"
                             android:hint="@string/selectTitle"
+                            android:padding="@dimen/margin_5"
                             android:inputType="none"
                             android:labelFor="@+id/spInterestPayout"
-                            android:textColorHint="#757575"
+                            android:textColorHint="@color/greyColor2"
                             android:textSize="@dimen/text_size_14" />
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -675,9 +695,10 @@
                             android:layout_height="wrap_content"
                             android:background="@drawable/rounded_corner_with_line"
                             android:hint="@string/selectRelation"
+                            android:padding="@dimen/margin_5"
                             android:inputType="none"
                             android:labelFor="@+id/spInterestPayout"
-                            android:textColorHint="#757575"
+                            android:textColorHint="@color/greyColor2"
                             android:textSize="@dimen/text_size_14" />
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -750,9 +771,10 @@
                             android:layout_height="wrap_content"
                             android:background="@drawable/rounded_corner_with_line"
                             android:hint="@string/selectRelation"
+                            android:padding="@dimen/margin_5"
                             android:inputType="none"
                             android:labelFor="@+id/spInterestPayout"
-                            android:textColorHint="#757575"
+                            android:textColorHint="@color/greyColor2"
                             android:textSize="@dimen/text_size_14" />
                     </com.google.android.material.textfield.TextInputLayout>
 

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

@@ -128,6 +128,9 @@
     <string name="netBanking">NetBanking</string>
     <string name="upto1LakhOnly">Upto Rs. 1 Lakh Only</string>
     <string name="eligibleBankOption">Eligible Bank Option</string>
+    <string name="paymentModeCategory">PaymentMode</string>
+    <string name="customerCategory">CustomerCategory</string>
+    <string name="validGuardianDetails">Please enter Guardian Details</string>
 
     <!-- Validations   -->
     <string name="emptyMobileNumber">Please enter mobile number</string>
@@ -181,7 +184,6 @@
     <string name="emptyPaymentMode">Please select payment mode</string>
 
 
-
     <!--  Step Three  -->
     <string name="uploadKycDocuments">Upload KYC Documents</string>
     <string name="addressProofType">Address Proof Type <font color='#E9161E'>*</font></string>
@@ -193,6 +195,9 @@
     <string name="photograph">Photograph <font color='#E9161E'>*</font></string>
     <string name="pan">PAN <font color='#E9161E'>*</font></string>
     <string name="docType">Doctype</string>
+    <string name="selectOption">Select Option</string>
+    <string name="gallery">Gallery</string>
+    <string name="camera">Camera</string>
 
 
     <!--  Step Four  -->
@@ -202,14 +207,9 @@
     <string name="interestPayout">Interest Payout</string>
     <string name="rateOfInterest">Rate of Interest</string>
     <string name="termsAndCondition"><![CDATA[Terms & condition]]></string>
-    <string name="directorOfBajajFinance">Director of Bajaj Finance Ltd.</string>
-    <string name="promoterOfBajajFinanceLtd">Promoter of Bajaj Finance Ltd.</string>
-    <string name="relativeOfBajajFinanceLtd">Relative of director or promoter of Bajaj Finance Ltd.</string>
-    <string name="shareholderOfBajajFinanceLtd">Shareholder of Bajaj Finance Ltd.</string>
-    <string name="politicallyExposedPerson">Are you a politically exposed person</string>
-    <string name="outsideOfIndia">I am not a citizen, national or tax resident of any country outside of India</string>
     <string name="termsCondition">I undertake to inform company any change in status of my nationality or tax residence. I am making investment from my Indian resident Individual Savings bank account. I/ We confirm that 1/we have read and understood the detailed terms and conditions annexed to this Application including the interest rate and other charges. I have gone through the financials and other statements/particulars representations furnished/made by the company and after careful consideration I am making the deposit with the company at my own risk and volition. I have read and agree to the <font color='#5077FF'>Terms &amp; conditions</font></string>
-
+    <string name="pay">PAY</string>
+    <string name="payment">Payment</string>
     <string name="validTermsConditions">Please accept terms &amp; conditions.</string>
 
 
@@ -237,17 +237,9 @@
     <string name="nonSeniorCitizen">Non Senior Citizen</string>
     <string name="add_new_account">Add New Account</string>
 
-    <string name="ok"><font fgcolor='#FF8E8E93'>OK</font></string>
+    <string name="Ok"><font fgcolor='#FF8E8E93'>OK</font></string>
     <string name="cancel">Cancel</string>
     <string name="aadhar">Aadhar</string>
 
-    <string name="selectOption">Select Option</string>
-    <string name="gallery">Gallery</string>
-    <string name="camera">Camera</string>
-    <string name="paymentModeCategory">PaymentMode</string>
-    <string name="customerCategory">CustomerCategory</string>
-    <string name="pay">PAY</string>
-    <string name="payment">Payment</string>
-    <string name="validGuardianDetails">Please enter Guardian Details</string>
 
 </resources>

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

@@ -128,6 +128,9 @@
     <string name="netBanking">NetBanking</string>
     <string name="upto1LakhOnly">Upto Rs. 1 Lakh Only</string>
     <string name="eligibleBankOption">Eligible Bank Option</string>
+    <string name="paymentModeCategory">PaymentMode</string>
+    <string name="customerCategory">CustomerCategory</string>
+    <string name="validGuardianDetails">Please enter Guardian Details</string>
 
     <!-- Validations   -->
     <string name="emptyMobileNumber">Please enter mobile number</string>
@@ -181,7 +184,6 @@
     <string name="emptyPaymentMode">Please select payment mode</string>
 
 
-
     <!--  Step Three  -->
     <string name="uploadKycDocuments">Upload KYC Documents</string>
     <string name="addressProofType">Address Proof Type <font color='#E9161E'>*</font></string>
@@ -193,6 +195,9 @@
     <string name="photograph">Photograph <font color='#E9161E'>*</font></string>
     <string name="pan">PAN <font color='#E9161E'>*</font></string>
     <string name="docType">Doctype</string>
+    <string name="selectOption">Select Option</string>
+    <string name="gallery">Gallery</string>
+    <string name="camera">Camera</string>
 
 
     <!--  Step Four  -->
@@ -202,14 +207,9 @@
     <string name="interestPayout">Interest Payout</string>
     <string name="rateOfInterest">Rate of Interest</string>
     <string name="termsAndCondition"><![CDATA[Terms & condition]]></string>
-    <string name="directorOfBajajFinance">Director of Bajaj Finance Ltd.</string>
-    <string name="promoterOfBajajFinanceLtd">Promoter of Bajaj Finance Ltd.</string>
-    <string name="relativeOfBajajFinanceLtd">Relative of director or promoter of Bajaj Finance Ltd.</string>
-    <string name="shareholderOfBajajFinanceLtd">Shareholder of Bajaj Finance Ltd.</string>
-    <string name="politicallyExposedPerson">Are you a politically exposed person</string>
-    <string name="outsideOfIndia">I am not a citizen, national or tax resident of any country outside of India</string>
     <string name="termsCondition">I undertake to inform company any change in status of my nationality or tax residence. I am making investment from my Indian resident Individual Savings bank account. I/ We confirm that 1/we have read and understood the detailed terms and conditions annexed to this Application including the interest rate and other charges. I have gone through the financials and other statements/particulars representations furnished/made by the company and after careful consideration I am making the deposit with the company at my own risk and volition. I have read and agree to the <font color='#5077FF'>Terms &amp; conditions</font></string>
-
+    <string name="pay">PAY</string>
+    <string name="payment">Payment</string>
     <string name="validTermsConditions">Please accept terms &amp; conditions.</string>
 
 
@@ -237,17 +237,9 @@
     <string name="nonSeniorCitizen">Non Senior Citizen</string>
     <string name="add_new_account">Add New Account</string>
 
-    <string name="ok"><font fgcolor='#FF8E8E93'>OK</font></string>
+    <string name="Ok"><font fgcolor='#FF8E8E93'>OK</font></string>
     <string name="cancel">Cancel</string>
     <string name="aadhar">Aadhar</string>
 
-    <string name="selectOption">Select Option</string>
-    <string name="gallery">Gallery</string>
-    <string name="camera">Camera</string>
-    <string name="paymentModeCategory">PaymentMode</string>
-    <string name="customerCategory">CustomerCategory</string>
-    <string name="pay">PAY</string>
-    <string name="payment">Payment</string>
-    <string name="validGuardianDetails">Please enter Guardian Details</string>
 
 </resources>