Browse Source

added missing code and resolved an error

PankajBranch
Hemant Khadase 2 years ago
parent
commit
587bd7862a
9 changed files with 68 additions and 21 deletions
  1. +15
    -10
      app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt
  2. +13
    -0
      app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BaseActivity.kt
  3. +21
    -0
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/BaseFragment.kt
  4. +8
    -6
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt
  5. +1
    -1
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt
  6. +6
    -2
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt
  7. +1
    -1
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt
  8. +2
    -1
      app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt
  9. +1
    -0
      app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepThreeBajajFDViewModel.kt

+ 15
- 10
app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt View File

@ -3,7 +3,6 @@ package com.nivesh.production.bajajfd.ui.activity
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.os.Bundle import android.os.Bundle
import android.util.Log import android.util.Log
import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.viewpager.widget.ViewPager import androidx.viewpager.widget.ViewPager
@ -26,7 +25,7 @@ import com.nivesh.production.bajajfd.util.Resource
import com.nivesh.production.bajajfd.viewModel.* import com.nivesh.production.bajajfd.viewModel.*
class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
class BajajFdMainActivity : BaseActivity(), BajajFDInterface {
lateinit var binding: ActivityBajajFdBinding lateinit var binding: ActivityBajajFdBinding
private lateinit var viewModel: BajajFDViewModel private lateinit var viewModel: BajajFDViewModel
@ -385,13 +384,13 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
// step 2 response // step 2 response
override fun stepTwoApi(data: CreateFDRequest) { override fun stepTwoApi(data: CreateFDRequest) {
Log.e("stepTwoApi", " response ---> $data") Log.e("stepTwoApi", " response ---> $data")
if (stepCount == 4) {
// if (stepCount == 4) {
// go to step 3 image Upload // go to step 3 image Upload
binding.viewPager.currentItem = 2
} else {
// binding.viewPager.currentItem = 2
// } else {
// call create fd api bypass step 3 // call create fd api bypass step 3
createFDApi(data, 2)
}
createFDApi(data, 2, "2")
// }
} }
@ -399,7 +398,7 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
override fun stepThreeApi(data: CreateFDRequest) { override fun stepThreeApi(data: CreateFDRequest) {
Log.e("stepThreeApi", " response ---> $data") Log.e("stepThreeApi", " response ---> $data")
// call create fd api // call create fd api
createFDApi(data, 3)
createFDApi(data, 3, "3")
} }
// step 4 response // step 4 response
@ -408,7 +407,7 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
binding.viewPager.currentItem = 4 binding.viewPager.currentItem = 4
} }
private fun createFDApi(data: CreateFDRequest, currentItem: Int) {
private fun createFDApi(data: CreateFDRequest, currentItem: Int, step: String) {
if (Common.isNetworkAvailable(this@BajajFdMainActivity)) { if (Common.isNetworkAvailable(this@BajajFdMainActivity)) {
viewModel.createFDApi(data, token) viewModel.createFDApi(data, token)
@ -425,10 +424,16 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
when (code) { when (code) {
200 -> { 200 -> {
binding.viewPager.currentItem = currentItem binding.viewPager.currentItem = currentItem
StepFourBajajFDFragment.getInstance(this).displayReceivedData(createFDApplicationResponse)
if (step == "2"){
val stepThreeBajajFDFragment: StepThreeBajajFDFragment =
sectionsPagerAdapter.getRegisteredFragment(stepCount - 1) as StepThreeBajajFDFragment
stepThreeBajajFDFragment.displayReceivedData(createFDApplicationResponse)
}
else{
val stepFourFDFragment: StepFourBajajFDFragment = val stepFourFDFragment: StepFourBajajFDFragment =
sectionsPagerAdapter.getRegisteredFragment(stepCount - 1) as StepFourBajajFDFragment sectionsPagerAdapter.getRegisteredFragment(stepCount - 1) as StepFourBajajFDFragment
stepFourFDFragment.displayReceivedData(createFDApplicationResponse) stepFourFDFragment.displayReceivedData(createFDApplicationResponse)
}
} }
// 650 -> refreshToken() // 650 -> refreshToken()
else -> { else -> {


+ 13
- 0
app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BaseActivity.kt View File

@ -0,0 +1,13 @@
package com.nivesh.production.bajajfd.ui.activity
import android.app.Activity
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
open class BaseActivity : AppCompatActivity() {
private lateinit var mActivity: Activity
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
mActivity = this
}
}

+ 21
- 0
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/BaseFragment.kt View File

@ -0,0 +1,21 @@
package com.nivesh.production.bajajfd.ui.fragment
import android.content.Context
import android.os.Bundle
import androidx.fragment.app.Fragment
import com.nivesh.production.bajajfd.ui.activity.BaseActivity
open class BaseFragment : Fragment() {
protected var mActivity: BaseActivity? = null
override fun onAttach(context: Context) {
super.onAttach(context)
if (context is BaseActivity) {
mActivity = context
} else try {
throw ClassCastException("You need to extend BaseActivity to calling activity.")
} catch (e: Exception) {
e.printStackTrace()
}
}
}

+ 8
- 6
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt View File

@ -1,7 +1,5 @@
package com.nivesh.production.bajajfd.ui.fragment package com.nivesh.production.bajajfd.ui.fragment
import android.app.Activity
import android.content.Context
import android.os.Bundle import android.os.Bundle
import android.util.Log import android.util.Log
import android.view.LayoutInflater import android.view.LayoutInflater
@ -22,7 +20,7 @@ import com.nivesh.production.bajajfd.util.Constants
import com.nivesh.production.bajajfd.util.Resource import com.nivesh.production.bajajfd.util.Resource
import com.nivesh.production.bajajfd.viewModel.StepFourBajajFDViewModel import com.nivesh.production.bajajfd.viewModel.StepFourBajajFDViewModel
class StepFourBajajFDFragment : Fragment() {
class StepFourBajajFDFragment : BaseFragment() {
private lateinit var stepFourBajajFDViewModel: StepFourBajajFDViewModel private lateinit var stepFourBajajFDViewModel: StepFourBajajFDViewModel
private var _binding: FragmentBajajfdStepFourBinding? = null private var _binding: FragmentBajajfdStepFourBinding? = null
@ -67,6 +65,10 @@ class StepFourBajajFDFragment : Fragment() {
) )
} }
} }
binding.btnBack.setOnClickListener{
(activity as BajajFdMainActivity).binding.viewPager.currentItem = 2
}
return root return root
} }
@ -130,10 +132,10 @@ class StepFourBajajFDFragment : Fragment() {
} }
private fun getFDDetailsApi(uniqueId: String) { private fun getFDDetailsApi(uniqueId: String) {
if (Common.isNetworkAvailable(requireActivity())) {
if (Common.isNetworkAvailable(mActivity!!)) {
val getFDDetailsRequest = GetFDDetailsRequest() val getFDDetailsRequest = GetFDDetailsRequest()
getFDDetailsRequest.FDProvider = requireActivity().getString(R.string.bajaj)
getFDDetailsRequest.NiveshClientCode = (requireContext().applicationContext as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
getFDDetailsRequest.FDProvider = mActivity!!.getString(R.string.bajaj)
getFDDetailsRequest.NiveshClientCode = (mActivity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
getFDDetailsRequest.UniqueId = uniqueId getFDDetailsRequest.UniqueId = uniqueId
stepFourBajajFDViewModel.getFDDetails(getFDDetailsRequest, Constants.token) stepFourBajajFDViewModel.getFDDetails(getFDDetailsRequest, Constants.token)
stepFourBajajFDViewModel.getFDDetailsMutableData.observe(viewLifecycleOwner) { response -> stepFourBajajFDViewModel.getFDDetailsMutableData.observe(viewLifecycleOwner) { response ->


+ 1
- 1
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt View File

@ -31,7 +31,7 @@ import com.nivesh.production.bajajfd.util.Resource
import com.nivesh.production.bajajfd.viewModel.StepOneBajajFDViewModel import com.nivesh.production.bajajfd.viewModel.StepOneBajajFDViewModel
class StepOneBajajFDFragment : Fragment() {
class StepOneBajajFDFragment : BaseFragment() {
private var _binding: FragmentBajajfdStepOneBinding? = null private var _binding: FragmentBajajfdStepOneBinding? = null
private val binding get() = _binding!! private val binding get() = _binding!!


+ 6
- 2
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt View File

@ -36,7 +36,7 @@ import com.nivesh.production.bajajfd.util.Resource
import com.nivesh.production.bajajfd.viewModel.StepThreeBajajFDViewModel import com.nivesh.production.bajajfd.viewModel.StepThreeBajajFDViewModel
import java.io.File import java.io.File
class StepThreeBajajFDFragment : Fragment() {
class StepThreeBajajFDFragment : BaseFragment() {
private var latestTmpUri: Uri? = null private var latestTmpUri: Uri? = null
private var _binding: FragmentBajajfdStepThreeBinding? = null private var _binding: FragmentBajajfdStepThreeBinding? = null
@ -45,7 +45,7 @@ class StepThreeBajajFDFragment : Fragment() {
private lateinit var bajajFDInterface: BajajFDInterface private lateinit var bajajFDInterface: BajajFDInterface
private lateinit var stepThreeBajajFDViewModel: StepThreeBajajFDViewModel private lateinit var stepThreeBajajFDViewModel: StepThreeBajajFDViewModel
private var uniqueId: String? = ""
private lateinit var dialog: Dialog private lateinit var dialog: Dialog
companion object { companion object {
@ -313,4 +313,8 @@ class StepThreeBajajFDFragment : Fragment() {
super.onDestroyView() super.onDestroyView()
_binding = null _binding = null
} }
fun displayReceivedData(createFDApplicationResponse: CreateFDApplicationResponse) {
uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId
}
} }

+ 1
- 1
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt View File

@ -46,7 +46,7 @@ import com.nivesh.production.bajajfd.viewModel.StepTwoBajajFDViewModel
import java.util.* import java.util.*
class StepTwoBajajFDFragment : Fragment() {
class StepTwoBajajFDFragment : BaseFragment() {
private var _binding: FragmentBajajfdStepTwoBinding? = null private var _binding: FragmentBajajfdStepTwoBinding? = null
private val binding get() = _binding!! private val binding get() = _binding!!


+ 2
- 1
app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt View File

@ -15,6 +15,7 @@ import com.google.android.material.textfield.TextInputEditText
import com.google.android.material.textfield.TextInputLayout import com.google.android.material.textfield.TextInputLayout
import com.google.gson.JsonObject import com.google.gson.JsonObject
import com.nivesh.production.bajajfd.R import com.nivesh.production.bajajfd.R
import com.nivesh.production.bajajfd.ui.activity.BaseActivity
import retrofit2.HttpException import retrofit2.HttpException
import java.io.IOException import java.io.IOException
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
@ -33,7 +34,7 @@ class Common {
val connectivityManager = getApplication<NewsApplication>().getSystemService(.... val connectivityManager = getApplication<NewsApplication>().getSystemService(....
**/ **/
//internet check //internet check
fun isNetworkAvailable(activity: Activity): Boolean {
fun isNetworkAvailable(activity: BaseActivity): Boolean {
val connectivityManager = activity.getSystemService( val connectivityManager = activity.getSystemService(
Context.CONNECTIVITY_SERVICE Context.CONNECTIVITY_SERVICE
) as ConnectivityManager ) as ConnectivityManager


+ 1
- 0
app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepThreeBajajFDViewModel.kt View File

@ -27,4 +27,5 @@ class StepThreeBajajFDViewModel(private val mainRepository: MainRepository) : Vi
getTitleMutableData.postValue(handleRatesResponse(response)) getTitleMutableData.postValue(handleRatesResponse(response))
} }
} }

Loading…
Cancel
Save

Powered by TurnKey Linux.