From 1d4f1b9958872172a2f71a2f3d60ef466c1fd271 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 5 Sep 2016 22:16:42 -0700 Subject: [PATCH] Improved number field size validation. --- .../erik/android/tesremoteprogrammer/MainActivity.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt index d2f2682..57c5e82 100644 --- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt +++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt @@ -44,6 +44,7 @@ import com.google.gson.JsonSyntaxException import net.thauvin.erik.android.tesremoteprogrammer.models.Config import net.thauvin.erik.android.tesremoteprogrammer.models.Configurations import net.thauvin.erik.android.tesremoteprogrammer.util.Dtmf +import net.thauvin.erik.android.tesremoteprogrammer.util.isDKS import net.thauvin.erik.android.tesremoteprogrammer.util.isDigits import org.jetbrains.anko.* import org.jetbrains.anko.design.textInputLayout @@ -459,13 +460,12 @@ class MainActivity : AppCompatActivity(), AnkoLogger { if (it.text.isNullOrBlank()) { it.error = getString(R.string.error_required) isValid = false + } else if (size > 0 && (fields[1].text.length != size)) { + isValid = false + fields[1].error = getString(R.string.error_invalid_size, size, + resources.getQuantityString(R.plurals.error_digit, size), "") } } - if (size > 0 && (fields[1].text.length != size)) { - isValid = false - fields[1].error = getString(R.string.error_invalid_size, size, - resources.getQuantityString(R.plurals.error_digit, size)) - } return isValid }