Browse Source

push changes in GetStartedFragment

ManojBranch
Manoj 2 years ago
parent
commit
3d2c45adad
3 changed files with 18 additions and 8 deletions
  1. +1
    -1
      app/build.gradle
  2. +16
    -6
      app/src/main/java/com/nivesh/production/partnerOnBoarding/ui/fragments/GetStartedFragment.kt
  3. +1
    -1
      app/src/main/res/layout/fragment_get_started.xml

+ 1
- 1
app/build.gradle View File

@ -44,7 +44,7 @@ ext{
dependencies {
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.8.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'


+ 16
- 6
app/src/main/java/com/nivesh/production/partnerOnBoarding/ui/fragments/GetStartedFragment.kt View File

@ -51,6 +51,8 @@ import com.nivesh.production.partnerOnBoarding.ui.activities.BaseActivity
import com.nivesh.production.partnerOnBoarding.ui.activities.SignUpActivity
import com.nivesh.production.partnerOnBoarding.util.*
import com.nivesh.production.partnerOnBoarding.util.Common.Companion.getFileExtension
import com.nivesh.production.partnerOnBoarding.util.Common.Companion.isValidIndividualPan
import com.nivesh.production.partnerOnBoarding.util.Common.Companion.isValidPan
import com.nivesh.production.partnerOnBoarding.util.Common.Companion.showDialogValidation
import com.nivesh.production.partnerOnBoarding.util.Common.Companion.showDialogWithTwoButtons
import com.nivesh.production.partnerOnBoarding.viewModels.OnBoardingViewModel
@ -80,7 +82,6 @@ class GetStartedFragment : BaseFragment() {
private var actionType: Int = -1
private var panString: String = ""
private var photoString: String = ""
private var docString: String = ""
private var docString2: String = ""
private var panFileExt: String? = ""
@ -90,6 +91,7 @@ class GetStartedFragment : BaseFragment() {
private var docValue: String = ""
private var uploadPosition = 0
private var isFront: Boolean = false
private var preSelectedDate = ""
private var preSelectedDate2 = ""
@ -100,10 +102,10 @@ class GetStartedFragment : BaseFragment() {
lateinit var viewModel: OnBoardingViewModel
private lateinit var listOfDocType: List<Data>
private var imageSelectedList = ArrayList<File>()
private var imageSelectedARNOrEUIN = kotlin.collections.ArrayList<File>()
private var arnList = ArrayList<DataX>()
private lateinit var arnData: DataX
private lateinit var panRes: PANResponse
private var isCharacterTotalCountReach = false
private val MaxFileSize = 5
private val permissions = arrayOf(
@ -958,7 +960,9 @@ class GetStartedFragment : BaseFragment() {
if (size < MaxFileSize) {
if (type == "c") {
encodedPANBase64(fileExtension)
imageSelectedList.add(2, fileExtension)
// imageSelectedARNOrEUIN.add(0,fileExtension)
imageSelectedARNOrEUIN.add(0,fileExtension)
binding.tvUploadARN.visibility = View.GONE
} else {
val bitmap: Bitmap =
MediaStore.Images.Media.getBitmap(context?.contentResolver, uri)
@ -973,7 +977,9 @@ class GetStartedFragment : BaseFragment() {
fOut.close()
if (file.exists()) encodedPANBase64(file)
imageSelectedList.add(2, file)
// imageSelectedList.add(2, file)
imageSelectedARNOrEUIN.add(0,file)
binding.tvUploadARN.visibility = View.GONE
Log.e("check_panString", panString + "\n" + bitmap.toString())
}
} else {
@ -993,7 +999,9 @@ class GetStartedFragment : BaseFragment() {
if (size < MaxFileSize) {
if (type == "c") {
encodedPANBase64(fileExtension)
imageSelectedList.add(3, fileExtension)
// imageSelectedList.add(3, fileExtension)
imageSelectedARNOrEUIN.add(1,fileExtension)
binding.tvUploadEUINTitle.visibility = View.GONE
} else {
val bitmap: Bitmap =
MediaStore.Images.Media.getBitmap(context?.contentResolver, uri)
@ -1008,7 +1016,9 @@ class GetStartedFragment : BaseFragment() {
fOut.close()
if (file.exists()) encodedPANBase64(file)
imageSelectedList.add(3, file)
// imageSelectedList.add(3, file)
imageSelectedARNOrEUIN.add(1,file)
binding.tvUploadEUINTitle.visibility = View.GONE
Log.e("check_panString", panString + "\n" + bitmap.toString())
}
} else {


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

@ -258,7 +258,7 @@
android:id="@+id/rlEUINUpload"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="visible"
android:visibility="gone"
android:layout_marginTop="@dimen/margin_10"
app:layout_constraintTop_toBottomOf="@+id/tlFullNamePanCard">


Loading…
Cancel
Save

Powered by TurnKey Linux.