minor changes

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

@@ -38,11 +38,11 @@ class BajajFdMainActivity : BaseActivity(), BajajFDInterface {
     lateinit var binding: ActivityBajajFdBinding
     private lateinit var viewModel: BajajFDViewModel
 
-    val stepOneBajajFDFragment = StepOneBajajFDFragment()
-    val stepTwoBajajFDFragment = StepTwoBajajFDFragment()
-    val stepThreeBajajFDFragment = StepThreeBajajFDFragment()
-    val stepFourBajajFDFragment = StepFourBajajFDFragment()
-    val stepFiveBajajFDFragment = StepFiveBajajFDFragment()
+    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()

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

@@ -11,18 +11,14 @@ import android.os.Build
 import android.provider.ContactsContract
 import android.text.format.DateFormat
 import android.util.Patterns
-import android.widget.Toast
 import com.google.android.material.textfield.MaterialAutoCompleteTextView
 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.BajajFdMainActivity
-import com.nivesh.production.bajajfd.ui.activity.BaseActivity
 import kotlinx.coroutines.CoroutineExceptionHandler
 import retrofit2.HttpException
 import java.io.IOException
-import java.net.UnknownHostException
 import java.text.SimpleDateFormat
 import java.util.*
 import java.util.regex.Matcher
@@ -191,12 +187,12 @@ class Common {
         }
 
         fun handleResponse(response: retrofit2.Response<JsonObject>): Resource<JsonObject> {
-         //   try {
-                if (response.isSuccessful && response.body() != null) {
-                    response.body()?.let { resultResponse ->
-                        return Resource.Success(resultResponse)
-                    }
+            //   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))
@@ -210,11 +206,17 @@ class Common {
         }
 
         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()))
+            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

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

@@ -5,7 +5,6 @@ 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
@@ -19,57 +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, 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))
+    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, 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))
+    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, 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))
+    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, 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))
+    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,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))
+    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))
+            }
         }
-    }
 }