From 2dd5d206e21b71e53b0af2875c938b3798eba789 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 14 Sep 2016 21:51:51 -0700
Subject: [PATCH] Improved validateField function.

---
 .../tesremoteprogrammer/ProgrammingActivity.kt  | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt
index 0a10596..10e9514 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt
@@ -263,15 +263,7 @@ class ProgrammingActivity : AppCompatActivity(), AnkoLogger {
                     if (v.text.isNullOrBlank()) {
                         v.error = getString(R.string.error_required)
                         isValid = false
-                    }
-
-                    val min = if ((!type.isDKS() && !zeros) && min >= 0) {
-                        min.toString().length
-                    } else {
-                        minSize
-                    }
-
-                    if (!validateSize(v.length(), min, size)) {
+                    } else if (!validateSize(v.length(), if ((!type.isDKS() && !zeros) && min >= 0) min.toString().length else minSize, size)) {
                         if (minSize > 0) {
                             v.error = getString(
                                     R.string.error_invalid_size,
@@ -285,11 +277,8 @@ class ProgrammingActivity : AppCompatActivity(), AnkoLogger {
                                     resources.getQuantityString(R.plurals.error_digit, size),
                                     empty)
                         }
-
                         isValid = false
-                    }
-
-                    if (min > 0 && max > 0) {
+                    } else {
                         try {
                             if (v.text.toString().toInt() !in IntRange(min, max)) {
                                 v.error = getString(R.string.error_invalid)
@@ -299,11 +288,9 @@ class ProgrammingActivity : AppCompatActivity(), AnkoLogger {
                             v.error = getString(R.string.error_invalid)
                             isValid = false
                         }
-
                     }
                 }
             }
-
         }
 
         return isValid