Browse Source

minor changes

PankajBranch
Hemant Khadase 2 years ago
parent
commit
0ba5c14a40
4 changed files with 40 additions and 33 deletions
  1. +4
    -4
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt
  2. +28
    -29
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt
  3. +4
    -0
      app/src/main/res/values-hi-rIN/strings.xml
  4. +4
    -0
      app/src/main/res/values/strings.xml

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

@ -568,25 +568,25 @@ class StepThreeBajajFDFragment : BaseFragment() {
if (panString.isEmpty()) { if (panString.isEmpty()) {
Common.showDialogValidation( Common.showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
"Upload PAN Document"
getString(R.string.uploadPanDoc)
) )
return false return false
} else if (photoString.isEmpty()) { } else if (photoString.isEmpty()) {
Common.showDialogValidation( Common.showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
"Upload Photo"
getString(R.string.uploadPhotoDoc)
) )
return false return false
} else if (docString.isEmpty()) { } else if (docString.isEmpty()) {
Common.showDialogValidation( Common.showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
"Upload $docValue Image"
"Upload $docValue Document"
) )
return false return false
} else if (docValue == "Aadhar" && docString2.isEmpty()) { } else if (docValue == "Aadhar" && docString2.isEmpty()) {
Common.showDialogValidation( Common.showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
"Upload Aadhar Back Image"
getString(R.string.uploadAadharBackDoc)
) )
return false return false
} }


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

@ -33,7 +33,6 @@ import com.nivesh.production.bajajfd.model.*
import com.nivesh.production.bajajfd.repositories.MainRepository import com.nivesh.production.bajajfd.repositories.MainRepository
import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity
import com.nivesh.production.bajajfd.ui.providerfactory.StepTwoModelProviderFactory import com.nivesh.production.bajajfd.ui.providerfactory.StepTwoModelProviderFactory
import com.nivesh.production.bajajfd.util.Common
import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorAutoCompleteMethod import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorAutoCompleteMethod
import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorMethod import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorMethod
import com.nivesh.production.bajajfd.util.Common.Companion.commonSpinnerErrorMethod import com.nivesh.production.bajajfd.util.Common.Companion.commonSpinnerErrorMethod
@ -550,7 +549,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
binding.addBankDetail.setOnClickListener { binding.addBankDetail.setOnClickListener {
if (bankListAdapter.itemCount == 5) { if (bankListAdapter.itemCount == 5) {
showDialogValidation(mActivity, "You can not add more than five accounts")
showDialogValidation(mActivity, getString(R.string.fiveAccountValidation))
} else { } else {
showHideBankDetail() showHideBankDetail()
} }
@ -753,7 +752,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
} }
// 650 -> refreshToken() // 650 -> refreshToken()
else -> { else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
createFDApplicationResponse.Response.Errors[0].ErrorMessage createFDApplicationResponse.Response.Errors[0].ErrorMessage
) )
@ -764,7 +763,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> { is Resource.Error -> {
response.message?.let { message -> response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
} }
} }
is Resource.Loading -> { is Resource.Loading -> {
@ -815,7 +814,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
} }
// 650 -> refreshToken() // 650 -> refreshToken()
else -> { else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
getIFSCCodeListResponse.Response.message getIFSCCodeListResponse.Response.message
) )
@ -826,7 +825,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> { is Resource.Error -> {
response.message?.let { message -> response.message?.let { message ->
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
message message
) )
@ -865,7 +864,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
} }
is Resource.Error -> { is Resource.Error -> {
response.message?.let { message -> response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
} }
} }
is Resource.Loading -> { is Resource.Loading -> {
@ -953,7 +952,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> { is Resource.Error -> {
response.message?.let { message -> response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
} }
} }
is Resource.Loading -> { is Resource.Loading -> {
@ -1088,7 +1087,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> { is Resource.Error -> {
response.message?.let { message -> response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
} }
} }
is Resource.Loading -> { is Resource.Loading -> {
@ -1160,7 +1159,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
} }
// 650 -> refreshToken() // 650 -> refreshToken()
else -> { else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
getCodeResponse.Response.Errors[0].ErrorMessage getCodeResponse.Response.Errors[0].ErrorMessage
) )
@ -1171,7 +1170,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> { is Resource.Error -> {
response.message?.let { message -> response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
} }
} }
is Resource.Loading -> { is Resource.Loading -> {
@ -1211,7 +1210,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
} }
// 650 -> refreshToken() // 650 -> refreshToken()
else -> { else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
getCodeResponse.Response.Errors[0].ErrorMessage getCodeResponse.Response.Errors[0].ErrorMessage
) )
@ -1222,7 +1221,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> { is Resource.Error -> {
response.message?.let { message -> response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
} }
} }
is Resource.Loading -> { is Resource.Loading -> {
@ -1282,7 +1281,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
} }
// 650 -> refreshToken() // 650 -> refreshToken()
else -> { else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
getCodeResponse.Response.Errors[0].ErrorMessage getCodeResponse.Response.Errors[0].ErrorMessage
) )
@ -1293,7 +1292,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> { is Resource.Error -> {
response.message?.let { message -> response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
} }
} }
is Resource.Loading -> { is Resource.Loading -> {
@ -1349,7 +1348,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
} }
// 650 -> refreshToken() // 650 -> refreshToken()
else -> { else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
getCodeResponse.Response.Errors[0].ErrorMessage getCodeResponse.Response.Errors[0].ErrorMessage
) )
@ -1360,7 +1359,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> { is Resource.Error -> {
response.message?.let { message -> response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
} }
} }
is Resource.Loading -> { is Resource.Loading -> {
@ -1410,7 +1409,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
} }
// 650 -> refreshToken() // 650 -> refreshToken()
else -> { else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
getCodeResponse.Response.Errors[0].ErrorMessage getCodeResponse.Response.Errors[0].ErrorMessage
) )
@ -1421,7 +1420,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> { is Resource.Error -> {
response.message?.let { message -> response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
} }
} }
is Resource.Loading -> { is Resource.Loading -> {
@ -1470,7 +1469,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
} }
// 650 -> refreshToken() // 650 -> refreshToken()
else -> { else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
getCodeResponse.Response.Errors[0].ErrorMessage getCodeResponse.Response.Errors[0].ErrorMessage
) )
@ -1481,7 +1480,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> { is Resource.Error -> {
response.message?.let { message -> response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
} }
} }
is Resource.Loading -> { is Resource.Loading -> {
@ -1530,7 +1529,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
} }
// 650 -> refreshToken() // 650 -> refreshToken()
else -> { else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
getCodeResponse.Response.Errors[0].ErrorMessage getCodeResponse.Response.Errors[0].ErrorMessage
) )
@ -1541,7 +1540,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> { is Resource.Error -> {
response.message?.let { message -> response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
} }
} }
is Resource.Loading -> { is Resource.Loading -> {
@ -1602,7 +1601,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
} }
// 650 -> refreshToken() // 650 -> refreshToken()
else -> { else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
stateListResponse.response.message stateListResponse.response.message
) )
@ -1613,7 +1612,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> { is Resource.Error -> {
response.message?.let { message -> response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
} }
} }
is Resource.Loading -> { is Resource.Loading -> {
@ -1680,7 +1679,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
} }
// 650 -> refreshToken() // 650 -> refreshToken()
else -> { else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
cityListResponse.response.message cityListResponse.response.message
) )
@ -1691,7 +1690,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> { is Resource.Error -> {
response.message?.let { message -> response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
} }
} }
is Resource.Loading -> { is Resource.Loading -> {
@ -1724,7 +1723,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
} }
// 650 -> refreshToken() // 650 -> refreshToken()
else -> { else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
getFDBankListResponse.Response.Errors[0].ErrorMessage getFDBankListResponse.Response.Errors[0].ErrorMessage
) )
@ -1735,7 +1734,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> { is Resource.Error -> {
response.message?.let { message -> response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
} }
} }
is Resource.Loading -> { is Resource.Loading -> {


+ 4
- 0
app/src/main/res/values-hi-rIN/strings.xml View File

@ -240,6 +240,10 @@
<string name="Ok"><font fgcolor='#FF8E8E93'>OK</font></string> <string name="Ok"><font fgcolor='#FF8E8E93'>OK</font></string>
<string name="cancel">Cancel</string> <string name="cancel">Cancel</string>
<string name="aadhar">Aadhar</string> <string name="aadhar">Aadhar</string>
<string name="uploadPanDoc">Upload PAN Document</string>
<string name="uploadPhotoDoc">Upload Photo Document</string>
<string name="uploadAadharBackDoc">Upload Aadhar Back Document</string>
<string name="fiveAccountValidation">You can not add more than five accounts</string>
</resources> </resources>

+ 4
- 0
app/src/main/res/values/strings.xml View File

@ -240,6 +240,10 @@
<string name="Ok"><font fgcolor='#FF8E8E93'>OK</font></string> <string name="Ok"><font fgcolor='#FF8E8E93'>OK</font></string>
<string name="cancel">Cancel</string> <string name="cancel">Cancel</string>
<string name="aadhar">Aadhar</string> <string name="aadhar">Aadhar</string>
<string name="uploadPanDoc">Upload PAN Document</string>
<string name="uploadPhotoDoc">Upload Photo Document</string>
<string name="uploadAadharBackDoc">Upload Aadhar Back Document</string>
<string name="fiveAccountValidation">You can not add more than five accounts</string>
</resources> </resources>

Loading…
Cancel
Save

Powered by TurnKey Linux.