FIX: validate inputs immediately

Qase · Aug 29, 2021 · 95ccdfb · 95ccdfb
1 parent 538aa84
commit 95ccdfb
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/...uilderlibrary/src/main/java/cz/qase/android/formbuilderlibrary/element/EditTextElement.kt b/...uilderlibrary/src/main/java/cz/qase/android/formbuilderlibrary/element/EditTextElement.kt
@@ -62,7 +62,7 @@ open class EditTextElement(
         editText?.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable) {
                 if (validateImmediately) {
-                    validate()
+                    validation()
                 } else {
                     positiveValidation()
                 }
@@ -79,6 +79,15 @@ open class EditTextElement(
         return view
     }
 
+    private fun validation() {
+        try {
+            super.validate()
+            textInputLayout?.error = null
+        } catch (e: ValidationException) {
+            textInputLayout?.error = e.message
+        }
+    }
+
     private fun positiveValidation() {
         try {
             super.validate()

diff --git a/...lderlibrary/src/main/java/cz/qase/android/formbuilderlibrary/element/LabelInputElement.kt b/...lderlibrary/src/main/java/cz/qase/android/formbuilderlibrary/element/LabelInputElement.kt
@@ -85,7 +85,7 @@ class LabelInputElement(
             object : TextWatcher {
                 override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
                     if (validateImmediately) {
-                        validate()
+                        validation()
                     } else {
                         positiveValidation()
                     }
@@ -116,6 +116,15 @@ class LabelInputElement(
         textInputEditText?.setText(text)
     }
 
+    private fun validation() {
+        try {
+            super.validate()
+            textInputLayout?.error = null
+        } catch (e: ValidationException) {
+            textInputLayout?.error = e.message
+        }
+    }
+
     private fun positiveValidation() {
         try {
             super.validate()

diff --git a/...uilderlibrary/src/main/java/cz/qase/android/formbuilderlibrary/element/TextAreaElement.kt b/...uilderlibrary/src/main/java/cz/qase/android/formbuilderlibrary/element/TextAreaElement.kt
@@ -95,7 +95,7 @@ class TextAreaElement(
                         footerView?.text = "$length"
                     }
                     if (validateImmediately) {
-                        validate()
+                        validation()
                     } else {
                         positiveValidation()
                     }
@@ -154,6 +154,15 @@ class TextAreaElement(
         }
     }
 
+    private fun validation() {
+        try {
+            super.validate()
+            textInputLayout?.error = null
+        } catch (e: ValidationException) {
+            textInputLayout?.error = e.message
+        }
+    }
+
     override fun validate() {
         try {
             super.validate()