erik/TESRemoteProgrammer
erik/TESRemoteProgrammer
1
0
Fork 0
Code Issues Pull requests Releases Activity

Improved validateField function.

Browse source
This commit is contained in:
Erik C. Thauvin 2016-09-14 21:51:51 -07:00
parent 24ae562927
commit 2dd5d206e2
1 changed files with 2 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt
View file

@ -263,15 +263,7 @@ class ProgrammingActivity : AppCompatActivity(), AnkoLogger {
if (v.text.isNullOrBlank()) { if (v.text.isNullOrBlank()) {
v.error = getString(R.string.error_required) v.error = getString(R.string.error_required)
isValid = false isValid = false
} } else if (!validateSize(v.length(), if ((!type.isDKS() && !zeros) && min >= 0) min.toString().length else minSize, size)) {
val min = if ((!type.isDKS() && !zeros) && min >= 0) {
min.toString().length
} else {
minSize
}
if (!validateSize(v.length(), min, size)) {
if (minSize > 0) { if (minSize > 0) {
v.error = getString( v.error = getString(
R.string.error_invalid_size, R.string.error_invalid_size,
@ -285,11 +277,8 @@ class ProgrammingActivity : AppCompatActivity(), AnkoLogger {
resources.getQuantityString(R.plurals.error_digit, size), resources.getQuantityString(R.plurals.error_digit, size),
empty) empty)
} }
isValid = false isValid = false
} } else {
if (min > 0 && max > 0) {
try { try {
if (v.text.toString().toInt() !in IntRange(min, max)) { if (v.text.toString().toInt() !in IntRange(min, max)) {
v.error = getString(R.string.error_invalid) v.error = getString(R.string.error_invalid)
@ -299,11 +288,9 @@ class ProgrammingActivity : AppCompatActivity(), AnkoLogger {
v.error = getString(R.string.error_invalid) v.error = getString(R.string.error_invalid)
isValid = false isValid = false
} }
} }
} }
} }
} }
return isValid return isValid