726 repeated groups

catalog/src/main/java/com/google/android/fhir/catalog/CustomNumberPickerFactory.kt

@@ -38,7 +38,7 @@ object CustomNumberPickerFactory :
         numberPicker = itemView.findViewById(R.id.number_picker)
       }
 
-      override fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem) {
+      override fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem, position: Int) {
         numberPicker.minValue = 1
         numberPicker.maxValue = 100
       }

datacapture/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest.kt

@@ -64,13 +64,43 @@ class QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest {
     assertThat(viewHolderFromAdapter).isInstanceOf(viewHolder::class.java)
   }
 
+  @Test
+  fun shouldShowPrefixText() {
+    viewHolder.bind(
+      QuestionnaireItemViewItem(
+        Questionnaire.QuestionnaireItemComponent().apply { prefix = "Prefix?" },
+        QuestionnaireResponse.QuestionnaireResponseItemComponent()
+      ) {},
+      0
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.prefix_text_view).isVisible).isTrue()
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.prefix_text_view).text.toString())
+      .isEqualTo("Prefix?")
+  }
+
+  @Test
+  fun shouldHidePrefixText() {
+    viewHolder.bind(
+      QuestionnaireItemViewItem(
+        Questionnaire.QuestionnaireItemComponent().apply { prefix = "" },
+        QuestionnaireResponse.QuestionnaireResponseItemComponent()
+      ) {},
+      0
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.prefix_text_view).isVisible)
+      .isFalse()
+  }
+
   @Test
   fun shouldSetTextViewText() {
     viewHolder.bind(
       QuestionnaireItemViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
-      ) {}
+      ) {},
+      0
     )
 
     assertThat(viewHolder.itemView.findViewById<TextView>(R.id.question).text.toString())
@@ -88,7 +118,8 @@ class QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest {
               value = StringType("+12345678910")
             }
           )
-      ) {}
+      ) {},
+      0
     )
 
     assertThat(
@@ -113,13 +144,15 @@ class QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest {
               value = StringType("+12345678910")
             }
           )
-      ) {}
+      ) {},
+      0
     )
     viewHolder.bind(
       QuestionnaireItemViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
-      ) {}
+      ) {},
+      0
     )
 
     assertThat(
@@ -141,7 +174,7 @@ class QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest {
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
       ) {}
 
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireItemViewItem, 0)
     viewHolder
       .itemView
       .findViewById<TextInputEditText>(R.id.text_input_edit_text)
@@ -161,7 +194,7 @@ class QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest {
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
       ) {}
 
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireItemViewItem, 0)
     viewHolder.itemView.findViewById<TextInputEditText>(R.id.text_input_edit_text).setText("")
 
     assertThat(questionnaireItemViewItem.questionnaireResponseItem.answer.size).isEqualTo(0)
@@ -184,7 +217,8 @@ class QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest {
             }
           )
         }
-      ) {}
+      ) {},
+      0
     )
 
     assertThat(viewHolder.itemView.findViewById<TextInputLayout>(R.id.text_input_layout).error)
@@ -204,7 +238,8 @@ class QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest {
             }
           )
         }
-      ) {}
+      ) {},
+      0
     )
 
     assertThat(viewHolder.itemView.findViewById<TextInputLayout>(R.id.text_input_layout).error)
@@ -218,7 +253,8 @@ class QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest {
       QuestionnaireItemViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { readOnly = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
-      ) {}
+      ) {},
+      0
     )
 
     assertThat(

datacapture/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/barcode/QuestionnaireItemBarCodeReaderViewHolderFactoryInstrumentedTest.kt

@@ -58,7 +58,8 @@ class QuestionnaireItemBarCodeReaderViewHolderFactoryInstrumentedTest {
       QuestionnaireItemViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { prefix = "Prefix?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
-      ) {}
+      ) {},
+      0
     )
 
     assertThat(viewHolder.itemView.findViewById<TextView>(R.id.prefix).isVisible).isTrue()
@@ -73,7 +74,8 @@ class QuestionnaireItemBarCodeReaderViewHolderFactoryInstrumentedTest {
       QuestionnaireItemViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { prefix = "" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
-      ) {}
+      ) {},
+      0
     )
 
     assertThat(viewHolder.itemView.findViewById<TextView>(R.id.prefix).isVisible).isFalse()
@@ -86,7 +88,8 @@ class QuestionnaireItemBarCodeReaderViewHolderFactoryInstrumentedTest {
       QuestionnaireItemViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
-      ) {}
+      ) {},
+      0
     )
 
     assertThat(viewHolder.itemView.findViewById<TextView>(R.id.question).text.toString())
@@ -106,7 +109,8 @@ class QuestionnaireItemBarCodeReaderViewHolderFactoryInstrumentedTest {
               value = StringType("Barcode Result")
             }
           )
-      ) {}
+      ) {},
+      0
     )
 
     assertThat(viewHolder.itemView.findViewById<TextView>(R.id.textInputEditText).text.toString())

datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemAutoCompleteViewHolderFactoryInstrumentedTest.kt

@@ -61,7 +61,8 @@ class QuestionnaireItemAutoCompleteViewHolderFactoryInstrumentedTest {
       QuestionnaireItemViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
-      ) {}
+      ) {},
+      0
     )
 
     assertThat(viewHolder.itemView.findViewById<TextView>(R.id.question).text.toString())
@@ -91,7 +92,8 @@ class QuestionnaireItemAutoCompleteViewHolderFactoryInstrumentedTest {
             (QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
               value = answerOption.first { it.displayString == "Test1 Code" }.valueCoding
             })
-        }
+        },
+      0
     )
 
     assertThat(viewHolder.itemView.findViewById<ViewGroup>(R.id.flexboxLayout).childCount)
@@ -133,7 +135,8 @@ class QuestionnaireItemAutoCompleteViewHolderFactoryInstrumentedTest {
               value = answerOption.first { it.displayString == "Test2 Code" }.valueCoding
             }
           )
-        }
+        },
+      0
     )
 
     assertThat(viewHolder.itemView.findViewById<ViewGroup>(R.id.flexboxLayout).childCount)
@@ -168,7 +171,8 @@ class QuestionnaireItemAutoCompleteViewHolderFactoryInstrumentedTest {
             (QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
               value = answerOption.first { it.displayString == "Test1 Code" }.valueCoding
             })
-        }
+        },
+      0
     )
 
     assertThat(viewHolder.itemView.findViewById<ViewGroup>(R.id.flexboxLayout).childCount)
@@ -182,7 +186,8 @@ class QuestionnaireItemAutoCompleteViewHolderFactoryInstrumentedTest {
       QuestionnaireItemViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { required = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
-      ) {}
+      ) {},
+      0
     )
 
     assertThat(viewHolder.itemView.findViewById<TextInputLayout>(R.id.text_input_layout).error)
@@ -209,7 +214,8 @@ class QuestionnaireItemAutoCompleteViewHolderFactoryInstrumentedTest {
             }
           )
         }
-      ) {}
+      ) {},
+      0
     )
 
     assertThat(viewHolder.itemView.findViewById<TextInputLayout>(R.id.text_input_layout).error)
@@ -236,7 +242,8 @@ class QuestionnaireItemAutoCompleteViewHolderFactoryInstrumentedTest {
             (QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
               value = answerOption.first { it.displayString == "readOnly" }.valueCoding
             })
-        }
+        },
+      0
     )
 
     assertThat(viewHolder.itemView.findViewById<ViewGroup>(R.id.flexboxLayout)[0].isEnabled)

datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemBooleanTypePickerViewHolderFactoryInstrumentedTest.kt

@@ -52,7 +52,8 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryInstrumentedTest {
           text = "Question?"
         },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
-      ) {}
+      ) {},
+      0
     )
 
     assertThat(viewHolder.itemView.findViewById<TextView>(R.id.question).text.toString())
@@ -67,7 +68,7 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryInstrumentedTest {
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
       ) {}
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireItemViewItem, 0)
 
     assertThat(questionnaireItemViewItem.questionnaireResponseItem.answer).isEmpty()
   }
@@ -79,7 +80,8 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryInstrumentedTest {
       QuestionnaireItemViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
-      ) {}
+      ) {},
+      0
     )
 
     assertThat(viewHolder.itemView.findViewById<RadioButton>(R.id.yes_radio_button).isChecked)
@@ -101,7 +103,7 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryInstrumentedTest {
             }
           )
       ) {}
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireItemViewItem, 0)
 
     assertThat(
         questionnaireItemViewItem.questionnaireResponseItem.answer.single().valueBooleanType.value
@@ -121,7 +123,8 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryInstrumentedTest {
               value = BooleanType(true)
             }
           )
-      ) {}
+      ) {},
+      0
     )
 
     assertThat(viewHolder.itemView.findViewById<RadioButton>(R.id.yes_radio_button).isChecked)
@@ -143,7 +146,7 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryInstrumentedTest {
             }
           )
       ) {}
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireItemViewItem, 0)
 
     assertThat(
         questionnaireItemViewItem.questionnaireResponseItem.answer.single().valueBooleanType.value
@@ -163,7 +166,8 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryInstrumentedTest {
               value = BooleanType(false)
             }
           )
-      ) {}
+      ) {},
+      0
     )
 
     assertThat(viewHolder.itemView.findViewById<RadioButton>(R.id.yes_radio_button).isChecked)
@@ -180,7 +184,7 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryInstrumentedTest {
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
       ) {}
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireItemViewItem, 0)
     viewHolder.itemView.findViewById<RadioButton>(R.id.yes_radio_button).performClick()
 
     assertThat(
@@ -197,7 +201,7 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryInstrumentedTest {
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
       ) {}
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireItemViewItem, 0)
     viewHolder.itemView.findViewById<RadioButton>(R.id.no_radio_button).performClick()
 
     assertThat(
@@ -220,7 +224,7 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryInstrumentedTest {
           )
         }
       ) {}
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireItemViewItem, 0)
     viewHolder.itemView.findViewById<RadioButton>(R.id.yes_radio_button).performClick()
 
     assertThat(questionnaireItemViewItem.questionnaireResponseItem.answer).isEmpty()
@@ -240,7 +244,7 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryInstrumentedTest {
           )
         }
       ) {}
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireItemViewItem, 0)
     viewHolder.itemView.findViewById<RadioButton>(R.id.yes_radio_button).performClick()
 
     assertThat(viewHolder.itemView.findViewById<RadioButton>(R.id.yes_radio_button).isChecked)
@@ -263,7 +267,7 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryInstrumentedTest {
           )
         }
       ) {}
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireItemViewItem, 0)
     viewHolder.itemView.findViewById<RadioButton>(R.id.no_radio_button).performClick()
 
     assertThat(questionnaireItemViewItem.questionnaireResponseItem.answer).isEmpty()
@@ -283,7 +287,7 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryInstrumentedTest {
           )
         }
       ) {}
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireItemViewItem, 0)
     viewHolder.itemView.findViewById<RadioButton>(R.id.no_radio_button).performClick()
 
     assertThat(viewHolder.itemView.findViewById<RadioButton>(R.id.yes_radio_button).isChecked)
@@ -299,7 +303,8 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryInstrumentedTest {
       QuestionnaireItemViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { required = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
-      ) {}
+      ) {},
+      0
     )
 
     assertThat(viewHolder.itemView.findViewById<TextView>(R.id.error).text)
@@ -319,7 +324,8 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryInstrumentedTest {
             }
           )
         }
-      ) {}
+      ) {},
+      0
     )
 
     assertThat(viewHolder.itemView.findViewById<TextView>(R.id.error).text).isEqualTo("")
@@ -341,7 +347,8 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryInstrumentedTest {
             }
           )
         }
-      ) {}
+      ) {},
+      0
     )
 
     assertThat(