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

Reworked field validation.

Browse source
This commit is contained in:
Erik C. Thauvin 2016-09-07 22:33:33 -07:00
parent 083d2a7097
commit c76e931d9f
1 changed files with 42 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -252,46 +252,57 @@ class ProgrammingActivity : AppCompatActivity(), AnkoLogger {
var isValid = true var isValid = true
fields.forEachIndexed { i, v -> fields.forEachIndexed { i, v ->
if (!option.fields[i].alpha) { with(option.fields[i]!!) {
if (v.text.isNullOrBlank()) { if (alpha) { // alphanumeric fields
v.error = getString(R.string.error_required) if (minSize < 0 && v.text.isNullOrBlank()) {
isValid = false v.error = getString(R.string.error_required)
} isValid = false
}
val min = if ((!type.isDKS() && !option.fields[i].zeros) && option.fields[i].min > 0) { } else { // numeric fields
option.fields[i].min.toString().length if (v.text.isNullOrBlank()) {
} else { v.error = getString(R.string.error_required)
option.fields[i].minSize isValid = false
}
if (!validateSize(v.length(), min, option.fields[i].size)) {
if (option.fields[i].minSize > 0) {
v.error = getString(R.string.error_invalid_size, option.fields[i].minSize,
resources.getQuantityString(R.plurals.error_digit, option.fields[i].minSize),
getString(R.string.error_minimum))
} else {
v.error = getString(R.string.error_invalid_size, option.fields[i].size,
resources.getQuantityString(R.plurals.error_digit, option.fields[i].size), "")
} }
isValid = false val min = if ((!type.isDKS() && !zeros) && min >= 0) {
} min.toString().length
} else {
minSize
}
if (option.fields[i].min > 0 && option.fields[i].max > 0) { if (!validateSize(v.length(), min, size)) {
try { if (minSize > 0) {
if (v.text.toString().toInt() !in IntRange(option.fields[i].min, option.fields[i].max)) { v.error = getString(
R.string.error_invalid_size,
minSize,
resources.getQuantityString(R.plurals.error_digit, minSize),
getString(R.string.error_minimum))
} else {
v.error = getString(
R.string.error_invalid_size,
size,
resources.getQuantityString(R.plurals.error_digit, size),
empty)
}
isValid = false
}
if (min > 0 && max > 0) {
try {
if (v.text.toString().toInt() !in IntRange(min, max)) {
v.error = getString(R.string.error_invalid)
isValid = false
}
} catch (nfe: NumberFormatException) {
v.error = getString(R.string.error_invalid) v.error = getString(R.string.error_invalid)
isValid = false isValid = false
} }
} catch (nfe: NumberFormatException) {
v.error = getString(R.string.error_invalid)
isValid = false
} }
} }
} else if (option.fields[i].minSize < 0 && v.text.isNullOrBlank()) {
v.error = getString(R.string.error_required)
isValid = false
} }
} }
return isValid return isValid