Browse Source

upload check

PankajBranch
Manoj 2 years ago
parent
commit
9e6ffe5706
3 changed files with 97 additions and 13 deletions
  1. +34
    -12
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt
  2. +5
    -0
      app/src/main/res/drawable/ic_baseline_check_24.xml
  3. +58
    -1
      app/src/main/res/layout/fragment_bajajfd_step_three.xml

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

@ -58,6 +58,12 @@ class StepThreeBajajFDFragment : BaseFragment() {
private var checkPANUploadFile: Boolean? = false private var checkPANUploadFile: Boolean? = false
private var checkPhotoUploadFile: Boolean? = false private var checkPhotoUploadFile: Boolean? = false
var actionType: AccountCaptureType? = null
enum class AccountCaptureType {
MAIN_PAN_UPLOAD,MAIN_PHOTO_UPLOAD,FIRST_UPLOAD,SECOND_UPLOAD
}
companion object { companion object {
fun getInstance(fdInterface: BajajFDInterface): StepThreeBajajFDFragment { fun getInstance(fdInterface: BajajFDInterface): StepThreeBajajFDFragment {
val stepTwoFragment = StepThreeBajajFDFragment() val stepTwoFragment = StepThreeBajajFDFragment()
@ -80,7 +86,6 @@ class StepThreeBajajFDFragment : BaseFragment() {
} }
} }
override fun onCreateView( override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?, inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle? savedInstanceState: Bundle?
@ -126,24 +131,28 @@ class StepThreeBajajFDFragment : BaseFragment() {
binding.btnPANUpload.setOnClickListener { binding.btnPANUpload.setOnClickListener {
checkPANUploadFile = true checkPANUploadFile = true
checkPhotoUploadFile = false checkPhotoUploadFile = false
actionType = AccountCaptureType.MAIN_PAN_UPLOAD
selectImage("PAN") selectImage("PAN")
} }
binding.btnPhotoUpload.setOnClickListener { binding.btnPhotoUpload.setOnClickListener {
checkPhotoUploadFile = true checkPhotoUploadFile = true
checkPANUploadFile = false checkPANUploadFile = false
actionType = AccountCaptureType.MAIN_PHOTO_UPLOAD
selectImage("Photograph") selectImage("Photograph")
} }
binding.btnAadhaarFrontUpload.setOnClickListener { binding.btnAadhaarFrontUpload.setOnClickListener {
checkPANUploadFile = false checkPANUploadFile = false
checkPhotoUploadFile = false checkPhotoUploadFile = false
actionType = AccountCaptureType.FIRST_UPLOAD
selectImage(binding.spDocType.text.toString()) selectImage(binding.spDocType.text.toString())
} }
binding.btnAadhaarBackUpload.setOnClickListener { binding.btnAadhaarBackUpload.setOnClickListener {
checkPANUploadFile = false checkPANUploadFile = false
checkPhotoUploadFile = false checkPhotoUploadFile = false
actionType = AccountCaptureType.SECOND_UPLOAD
selectImage(binding.spDocType.text.toString()) selectImage(binding.spDocType.text.toString())
} }
@ -164,6 +173,7 @@ class StepThreeBajajFDFragment : BaseFragment() {
return root return root
} }
@SuppressLint("Range") @SuppressLint("Range")
fun getFileName(uri: Uri): String { fun getFileName(uri: Uri): String {
var result = "" var result = ""
@ -262,6 +272,15 @@ class StepThreeBajajFDFragment : BaseFragment() {
} else { } else {
selectedImage?.let { mapImage.put(it, front) } 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
}
}
} }
} }
@ -410,23 +429,26 @@ class StepThreeBajajFDFragment : BaseFragment() {
private fun validate(): Boolean { private fun validate(): Boolean {
if (mapImage.size == 3 && binding.spDocType.text.equals(R.string.aadhar)) {
if (binding.spDocType.text.equals(R.string.aadhar) && mapImage.size < 3) {
Common.showDialogValidation(
activity as BajajFdMainActivity,
"Upload Aadhar Images"
)
return false
} else if (!binding.spDocType.text.equals(R.string.aadhar) && mapImage.size == 3) {
Common.showDialogValidation( Common.showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
"Upload Aadhar Images" "Upload Aadhar Images"
) )
return false return false
} else if (mapImage.size < 3) {
Common.showDialogValidation(
activity as BajajFdMainActivity,
"Upload All Images"
)
return false
} }
else if (mapImage.size < 3) {
Common.showDialogValidation(
activity as BajajFdMainActivity,
"Upload All Images"
)
return false
}
else return true
return false
return true
} }
private fun takeImage() { private fun takeImage() {


+ 5
- 0
app/src/main/res/drawable/ic_baseline_check_24.xml View File

@ -0,0 +1,5 @@
<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>

+ 58
- 1
app/src/main/res/layout/fragment_bajajfd_step_three.xml View File

@ -109,11 +109,25 @@
android:textColor="@color/black" android:textColor="@color/black"
app:layout_constraintBottom_toTopOf="@+id/btnPhotoUpload" app:layout_constraintBottom_toTopOf="@+id/btnPhotoUpload"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.925"
app:layout_constraintHorizontal_bias="0.78"
app:layout_constraintStart_toEndOf="@+id/tvPAN" app:layout_constraintStart_toEndOf="@+id/tvPAN"
app:layout_constraintTop_toBottomOf="@+id/tvUploadKYCDocument" app:layout_constraintTop_toBottomOf="@+id/tvUploadKYCDocument"
tools:ignore="DuplicateSpeakableTextCheck" /> tools:ignore="DuplicateSpeakableTextCheck" />
<ImageView
android:id="@+id/ivPan"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="7dp"
android:background="@drawable/ic_baseline_check_24"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@+id/btnPANUpload"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.384"
app:layout_constraintStart_toEndOf="@+id/btnPANUpload"
app:layout_constraintTop_toTopOf="@+id/btnPANUpload"
app:layout_constraintVertical_bias="0.333" />
<TextView <TextView
android:id="@+id/tvPhotoUpload" android:id="@+id/tvPhotoUpload"
style="@style/regularStyle" style="@style/regularStyle"
@ -146,6 +160,20 @@
app:layout_constraintStart_toEndOf="@+id/tvPhotoUpload" app:layout_constraintStart_toEndOf="@+id/tvPhotoUpload"
app:layout_constraintTop_toBottomOf="@+id/btnPANUpload" /> app:layout_constraintTop_toBottomOf="@+id/btnPANUpload" />
<ImageView
android:id="@+id/ivPhotograph"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="7dp"
android:visibility="invisible"
android:background="@drawable/ic_baseline_check_24"
app:layout_constraintBottom_toBottomOf="@+id/btnPhotoUpload"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.384"
app:layout_constraintStart_toEndOf="@+id/btnPhotoUpload"
app:layout_constraintTop_toTopOf="@+id/btnPhotoUpload"
app:layout_constraintVertical_bias="0.333" />
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/spAddressType" android:id="@+id/spAddressType"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu" style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
@ -190,6 +218,7 @@
android:layout_height="@dimen/margin_48" android:layout_height="@dimen/margin_48"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:layout_marginEnd="28dp"
android:backgroundTint="@color/greyColor4" android:backgroundTint="@color/greyColor4"
android:paddingLeft="@dimen/margin_30" android:paddingLeft="@dimen/margin_30"
android:paddingRight="@dimen/margin_30" android:paddingRight="@dimen/margin_30"
@ -200,6 +229,20 @@
app:layout_constraintTop_toBottomOf="@+id/spAddressType" app:layout_constraintTop_toBottomOf="@+id/spAddressType"
tools:ignore="DuplicateSpeakableTextCheck" /> tools:ignore="DuplicateSpeakableTextCheck" />
<ImageView
android:id="@+id/ivAadharFront"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="7dp"
android:background="@drawable/ic_baseline_check_24"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@+id/btnAadhaarFrontUpload"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.38"
app:layout_constraintStart_toEndOf="@+id/btnAadhaarFrontUpload"
app:layout_constraintTop_toTopOf="@+id/btnAadhaarFrontUpload"
app:layout_constraintVertical_bias="0.333" />
<Button <Button
android:id="@+id/btnAadhaarBackUpload" android:id="@+id/btnAadhaarBackUpload"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -219,6 +262,20 @@
app:layout_constraintTop_toBottomOf="@+id/btnAadhaarFrontUpload" app:layout_constraintTop_toBottomOf="@+id/btnAadhaarFrontUpload"
app:layout_constraintVertical_bias="0.0" /> app:layout_constraintVertical_bias="0.0" />
<ImageView
android:id="@+id/ivAadharBack"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="7dp"
android:background="@drawable/ic_baseline_check_24"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@+id/btnAadhaarBackUpload"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.38"
app:layout_constraintStart_toEndOf="@+id/btnAadhaarBackUpload"
app:layout_constraintTop_toTopOf="@+id/btnAadhaarBackUpload"
app:layout_constraintVertical_bias="0.333" />
<TextView <TextView
android:id="@+id/tvAadhaarBack" android:id="@+id/tvAadhaarBack"
style="@style/regularStyle" style="@style/regularStyle"


Loading…
Cancel
Save

Powered by TurnKey Linux.