Hides error textview in the header for textInputLayout views. (#1728)

* hides error textview in the header for textinputlayout views. * Address review comment. * Update datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest.kt Co-authored-by: Santosh Pingle <[email protected]> Co-authored-by: Jing Tang <[email protected]>
google · Dec 5, 2022 · c55276d · c55276d
1 parent 5095aba
commit c55276d
Show file tree

Hide file tree

Showing 15 changed files with 216 additions and 4 deletions.
diff --git a/...fhir/datacapture/views/QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest.kt b/...fhir/datacapture/views/QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest.kt
@@ -24,8 +24,10 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions
 import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
+import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.platform.app.InstrumentationRegistry
@@ -43,6 +45,7 @@ import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.material.textfield.TextInputLayout
 import com.google.common.truth.StringSubject
 import com.google.common.truth.Truth.assertThat
+import org.hamcrest.Matchers.not
 import org.hl7.fhir.r4.model.CodeableConcept
 import org.hl7.fhir.r4.model.Coding
 import org.hl7.fhir.r4.model.Extension
@@ -348,6 +351,23 @@ class QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest {
     onView(withId(R.id.add_another)).check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
   }
 
+  @Test
+  fun `shouldHideErrorTextviewInHeader`() {
+    val questionnaireItem = answerOptions(true, "Coding 1")
+    questionnaireItem.addExtension(openChoiceType)
+    val questionnaireItemViewItem =
+      QuestionnaireItemViewItem(
+        questionnaireItem,
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _ -> },
+      )
+
+    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+
+    onView(withId(R.id.error_text_at_header)).check(matches(not(isDisplayed())))
+  }
+
   /** Method to run code snippet on UI/main thread */
   private fun runOnUI(action: () -> Unit) {
     activityScenarioRule.scenario.onActivity { activity -> action() }

diff --git a/...re/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemHeaderView.kt b/...re/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemHeaderView.kt
@@ -54,10 +54,6 @@ internal class QuestionnaireItemHeaderView(context: Context, attrs: AttributeSet
   private var hint: TextView = findViewById(R.id.hint)
   private var errorTextView: TextView = findViewById(R.id.error_text_at_header)
 
-  /**
-   * Shows error in the header,and widgets could either use this, or use another view (i.e.
-   * TextInputLayout's error field) to display error.
-   */
   fun bind(questionnaireItem: Questionnaire.QuestionnaireItemComponent) {
     prefix.updateTextAndVisibility(questionnaireItem.localizedPrefixSpanned)
     updateQuestionText(question, questionnaireItem)
@@ -68,6 +64,10 @@ internal class QuestionnaireItemHeaderView(context: Context, attrs: AttributeSet
     visibility = getViewGroupVisibility(prefix, question, hint)
   }
 
+  /**
+   * Shows an error in the header,and widgets could either use this or use another view (i.e.
+   * TextInputLayout's error field) to display error.
+   */
   fun showErrorText(errorText: String? = null, isErrorTextVisible: Boolean = true) {
     errorTextView.visibility =
       when (isErrorTextVisible) {

diff --git a/datacapture/src/main/res/layout/questionnaire_item_header.xml b/datacapture/src/main/res/layout/questionnaire_item_header.xml
@@ -68,6 +68,7 @@
         app:layout_constraintTop_toBottomOf="@id/helpContainer"
         app:layout_constraintStart_toStartOf="parent"
         tools:text="Sample error text"
+        android:visibility="gone"
     />
 
     <com.google.android.material.card.MaterialCardView

diff --git a/...ogle/android/fhir/datacapture/views/QuestionnaireItemAutoCompleteViewHolderFactoryTest.kt b/...ogle/android/fhir/datacapture/views/QuestionnaireItemAutoCompleteViewHolderFactoryTest.kt
@@ -228,6 +228,21 @@ class QuestionnaireItemAutoCompleteViewHolderFactoryTest {
       .isNull()
   }
 
+  @Test
+  fun `hides error textview in the header`() {
+    viewHolder.bind(
+      QuestionnaireItemViewItem(
+        Questionnaire.QuestionnaireItemComponent(),
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.error_text_at_header).visibility)
+      .isEqualTo(View.GONE)
+  }
+
   @Test
   fun bind_readOnly_shouldDisableView() {
     val questionnaireItem =

diff --git a/...google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactoryTest.kt b/...google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactoryTest.kt
@@ -16,6 +16,7 @@
 
 package com.google.android.fhir.datacapture.views
 
+import android.view.View
 import android.widget.FrameLayout
 import android.widget.TextView
 import com.google.android.fhir.datacapture.R
@@ -264,6 +265,21 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
       .isNull()
   }
 
+  @Test
+  fun `hides error textview in the header`() {
+    viewHolder.bind(
+      QuestionnaireItemViewItem(
+        Questionnaire.QuestionnaireItemComponent(),
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.error_text_at_header).visibility)
+      .isEqualTo(View.GONE)
+  }
+
   @Test
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(

diff --git a/...le/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactoryTest.kt b/...le/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactoryTest.kt
@@ -16,6 +16,7 @@
 
 package com.google.android.fhir.datacapture.views
 
+import android.view.View
 import android.widget.FrameLayout
 import android.widget.TextView
 import com.google.android.fhir.datacapture.R
@@ -246,6 +247,21 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
       .isNull()
   }
 
+  @Test
+  fun `hides error textview in the header`() {
+    viewHolder.bind(
+      QuestionnaireItemViewItem(
+        Questionnaire.QuestionnaireItemComponent(),
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.error_text_at_header).visibility)
+      .isEqualTo(View.GONE)
+  }
+
   @Test
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(

diff --git a/...om/google/android/fhir/datacapture/views/QuestionnaireItemDisplayViewHolderFactoryTest.kt b/...om/google/android/fhir/datacapture/views/QuestionnaireItemDisplayViewHolderFactoryTest.kt
@@ -16,6 +16,7 @@
 
 package com.google.android.fhir.datacapture.views
 
+import android.view.View
 import android.widget.FrameLayout
 import android.widget.TextView
 import com.google.android.fhir.datacapture.R
@@ -50,4 +51,19 @@ class QuestionnaireItemDisplayViewHolderFactoryTest {
     assertThat(viewHolder.itemView.findViewById<TextView>(R.id.question).text.toString())
       .isEqualTo("Display")
   }
+
+  @Test
+  fun `hides error textview in the header`() {
+    viewHolder.bind(
+      QuestionnaireItemViewItem(
+        Questionnaire.QuestionnaireItemComponent(),
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.error_text_at_header).visibility)
+      .isEqualTo(View.GONE)
+  }
 }
diff --git a/...m/google/android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactoryTest.kt b/...m/google/android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactoryTest.kt
@@ -16,6 +16,7 @@
 
 package com.google.android.fhir.datacapture.views
 
+import android.view.View
 import android.widget.AutoCompleteTextView
 import android.widget.FrameLayout
 import android.widget.TextView
@@ -268,6 +269,21 @@ class QuestionnaireItemDropDownViewHolderFactoryTest {
       .isNull()
   }
 
+  @Test
+  fun `hides error textview in the header`() {
+    viewHolder.bind(
+      QuestionnaireItemViewItem(
+        Questionnaire.QuestionnaireItemComponent(),
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.error_text_at_header).visibility)
+      .isEqualTo(View.GONE)
+  }
+
   @Test
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(

diff --git a/...e/android/fhir/datacapture/views/QuestionnaireItemEditTextDecimalViewHolderFactoryTest.kt b/...e/android/fhir/datacapture/views/QuestionnaireItemEditTextDecimalViewHolderFactoryTest.kt
@@ -16,6 +16,7 @@
 
 package com.google.android.fhir.datacapture.views
 
+import android.view.View
 import android.widget.FrameLayout
 import android.widget.TextView
 import com.google.android.fhir.datacapture.R
@@ -213,6 +214,21 @@ class QuestionnaireItemEditTextDecimalViewHolderFactoryTest {
       .isEqualTo("Minimum value allowed is:2.1")
   }
 
+  @Test
+  fun `hides error textview in the header`() {
+    viewHolder.bind(
+      QuestionnaireItemViewItem(
+        Questionnaire.QuestionnaireItemComponent(),
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.error_text_at_header).visibility)
+      .isEqualTo(View.GONE)
+  }
+
   @Test
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(

diff --git a/...e/android/fhir/datacapture/views/QuestionnaireItemEditTextIntegerViewHolderFactoryTest.kt b/...e/android/fhir/datacapture/views/QuestionnaireItemEditTextIntegerViewHolderFactoryTest.kt
@@ -16,6 +16,7 @@
 
 package com.google.android.fhir.datacapture.views
 
+import android.view.View
 import android.widget.FrameLayout
 import android.widget.TextView
 import com.google.android.fhir.datacapture.R
@@ -209,6 +210,21 @@ class QuestionnaireItemEditTextIntegerViewHolderFactoryTest {
       .isEqualTo("Minimum value allowed is:2")
   }
 
+  @Test
+  fun `hides error textview in the header`() {
+    viewHolder.bind(
+      QuestionnaireItemViewItem(
+        Questionnaire.QuestionnaireItemComponent(),
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.error_text_at_header).visibility)
+      .isEqualTo(View.GONE)
+  }
+
   @Test
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(

diff --git a/...android/fhir/datacapture/views/QuestionnaireItemEditTextMultiLineViewHolderFactoryTest.kt b/...android/fhir/datacapture/views/QuestionnaireItemEditTextMultiLineViewHolderFactoryTest.kt
@@ -16,6 +16,7 @@
 
 package com.google.android.fhir.datacapture.views
 
+import android.view.View
 import android.widget.FrameLayout
 import android.widget.TextView
 import com.google.android.fhir.datacapture.R
@@ -207,6 +208,21 @@ class QuestionnaireItemEditTextMultiLineViewHolderFactoryTest {
       .isEqualTo("The minimum number of characters that are permitted in the answer is: 10")
   }
 
+  @Test
+  fun `hides error textview in the header`() {
+    viewHolder.bind(
+      QuestionnaireItemViewItem(
+        Questionnaire.QuestionnaireItemComponent(),
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.error_text_at_header).visibility)
+      .isEqualTo(View.GONE)
+  }
+
   @Test
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(

diff --git a/.../android/fhir/datacapture/views/QuestionnaireItemEditTextQuantityViewHolderFactoryTest.kt b/.../android/fhir/datacapture/views/QuestionnaireItemEditTextQuantityViewHolderFactoryTest.kt
@@ -16,6 +16,7 @@
 
 package com.google.android.fhir.datacapture.views
 
+import android.view.View
 import android.widget.FrameLayout
 import android.widget.TextView
 import com.google.android.fhir.datacapture.R
@@ -208,6 +209,21 @@ class QuestionnaireItemEditTextQuantityViewHolderFactoryTest {
       .isNull()
   }
 
+  @Test
+  fun `hides error textview in the header`() {
+    viewHolder.bind(
+      QuestionnaireItemViewItem(
+        Questionnaire.QuestionnaireItemComponent(),
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.error_text_at_header).visibility)
+      .isEqualTo(View.GONE)
+  }
+
   @Test
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(

diff --git a/...ndroid/fhir/datacapture/views/QuestionnaireItemEditTextSingleLineViewHolderFactoryTest.kt b/...ndroid/fhir/datacapture/views/QuestionnaireItemEditTextSingleLineViewHolderFactoryTest.kt
@@ -16,6 +16,7 @@
 
 package com.google.android.fhir.datacapture.views
 
+import android.view.View
 import android.widget.FrameLayout
 import android.widget.TextView
 import com.google.android.fhir.datacapture.R
@@ -205,6 +206,21 @@ class QuestionnaireItemEditTextSingleLineViewHolderFactoryTest {
       .isEqualTo("The minimum number of characters that are permitted in the answer is: 10")
   }
 
+  @Test
+  fun `hides error textview in the header`() {
+    viewHolder.bind(
+      QuestionnaireItemViewItem(
+        Questionnaire.QuestionnaireItemComponent(),
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.error_text_at_header).visibility)
+      .isEqualTo(View.GONE)
+  }
+
   @Test
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(

diff --git a/...ir/datacapture/views/QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactoryTest.kt b/...ir/datacapture/views/QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactoryTest.kt
@@ -25,6 +25,7 @@ import com.google.android.fhir.datacapture.DisplayItemControlType
 import com.google.android.fhir.datacapture.EXTENSION_ITEM_CONTROL_SYSTEM
 import com.google.android.fhir.datacapture.EXTENSION_ITEM_CONTROL_URL
 import com.google.android.fhir.datacapture.R
+import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.material.divider.MaterialDivider
 import com.google.common.truth.Truth.assertThat
@@ -288,4 +289,19 @@ class QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactoryTest {
     assertThat(viewHolder.itemView.findViewById<MaterialDivider>(R.id.text_divider).visibility)
       .isEqualTo(View.VISIBLE)
   }
+
+  @Test
+  fun `hides error textview in the header`() {
+    viewHolder.bind(
+      QuestionnaireItemViewItem(
+        Questionnaire.QuestionnaireItemComponent(),
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.error_text_at_header).visibility)
+      .isEqualTo(View.GONE)
+  }
 }