From 8eb5a90386af6adcca795f0f2d4c59e4a7a980de Mon Sep 17 00:00:00 2001 From: Manoj Date: Wed, 4 Jan 2023 18:30:05 +0530 Subject: [PATCH] after upload changes --- .../nivesh/production/bajajfd/model/GetCodes.kt | 3 --- .../bajajfd/ui/activity/BajajFdMainActivity.kt | 5 ----- .../ui/fragment/StepThreeBajajFDFragment.kt | 17 ++++++++++++++--- app/src/main/res/values-hi-rIN/strings.xml | 1 - app/src/main/res/values-night/strings.xml | 1 + 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/GetCodes.kt b/app/src/main/java/com/nivesh/production/bajajfd/model/GetCodes.kt index 6741a5c..1ac69ed 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/GetCodes.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/model/GetCodes.kt @@ -8,7 +8,4 @@ data class GetCodes( override fun toString(): String { return Label } - - - } \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt index 2982565..931d3a9 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt @@ -32,7 +32,6 @@ 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 { lateinit var binding: ActivityBajajFdBinding private lateinit var viewModel: BajajFDViewModel @@ -369,10 +368,8 @@ class BajajFdMainActivity : BaseActivity(), BajajFDInterface { } } } - } - // set background for selected/ default step private fun setBackground( drawable: Drawable?, @@ -547,7 +544,5 @@ class BajajFdMainActivity : BaseActivity(), BajajFDInterface { override fun onPageFinished(view: WebView, url: String) { super.onPageFinished(view, url) } - } - } \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt index e57c40a..2ef0685 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt @@ -151,7 +151,7 @@ class StepThreeBajajFDFragment : BaseFragment() { AdapterView.OnItemClickListener { parent, _, position, _ -> val getCodes: GetCodes = parent.getItemAtPosition(position) as GetCodes - when (getCodes.Value) { + when (getCodes.Label) { resources.getString(R.string.aadhar) -> setAadhaarUploadLayout() else -> { @@ -311,7 +311,7 @@ class StepThreeBajajFDFragment : BaseFragment() { stepThreeBajajFDViewModel.getDocumentUploadMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { - Log.e("UploadImage", "Response-->"+response.data.toString()) + Log.e("UploadImage", "Response-->" + response.data.toString()) val getUploadResponse: UploadResponse = Gson().fromJson(response.data?.toString(), UploadResponse::class.java) getUploadResponse.Response.StatusCode.let { code -> @@ -410,7 +410,18 @@ class StepThreeBajajFDFragment : BaseFragment() { private fun validate(): Boolean { - return true + if (binding.spDocType.text.equals(R.string.aadhar) && mapImage.size == 4) { + return true + } else if (mapImage.size == 3) { + return true + } else if (mapImage.size < 3) { + Common.showDialogValidation( + activity as BajajFdMainActivity, + "Upload Image Not Done" + ) + return false + } + return false } private fun takeImage() { diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 1edf775..86039fa 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -244,7 +244,6 @@ Select Option Gallery Camera - Select Option PaymentMode CustomerCategory PAY diff --git a/app/src/main/res/values-night/strings.xml b/app/src/main/res/values-night/strings.xml index d495c0f..67f71fe 100644 --- a/app/src/main/res/values-night/strings.xml +++ b/app/src/main/res/values-night/strings.xml @@ -1,4 +1,5 @@ Add New Account + Aadhar \ No newline at end of file