Review changes

datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt

@@ -78,10 +78,7 @@ open class QuestionnaireFragment : Fragment() {
  paginationNextButton.setOnClickListener { viewModel.goToNextPage() }
  view.findViewById<Button>(R.id.submit_questionnaire).setOnClickListener {
  viewModel.validateQuestionnaireAndUpdateUI().let { validationMap ->
- if (validationMap
- .filter { (_, validations) -> validations.filterIsInstance<Invalid>().isNotEmpty() }
- .isEmpty()
- ) {
+ if (validationMap.values.flatten().filterIsInstance<Invalid>().isEmpty()) {
  setFragmentResult(SUBMIT_REQUEST_KEY, Bundle.EMPTY)
  } else {
  val errorViewModel: QuestionnaireValidationErrorViewModel by activityViewModels()
@@ -178,6 +175,10 @@ open class QuestionnaireFragment : Fragment() {
  submitButton.visibility = if (state.pagination.showSubmitButton) View.VISIBLE else View.GONE
  }
  }
+ requireActivity().supportFragmentManager.setFragmentResultListener(
+ QuestionnaireValidationErrorMessageDialogFragment.RESULT_CALLBACK,
+ viewLifecycleOwner
+ ) { _, _ -> setFragmentResult(SUBMIT_REQUEST_KEY, Bundle.EMPTY) }
  }
 
  /** Calculates the progress percentage from given [count] and [totalCount] values. */

datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireValidationErrorMessageDialogFragment.kt

@@ -27,6 +27,7 @@ import androidx.appcompat.view.ContextThemeWrapper
 import androidx.core.content.res.use
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.setFragmentResult
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DiffUtil
@@ -53,7 +54,14 @@ internal class QuestionnaireValidationErrorMessageDialogFragment(
 
  override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
  isCancelable = false
- return MaterialAlertDialogBuilder(requireContext()).setView(onCreateCustomView()).create()
+ return MaterialAlertDialogBuilder(requireContext())
+ .setView(onCreateCustomView())
+ .setPositiveButton(android.R.string.ok) { dialog, _ -> dialog?.dismiss() }
+ .setNegativeButton(R.string.submit_button_text) { dialog, _ ->
+ setFragmentResult(RESULT_CALLBACK, Bundle.EMPTY)
+ dialog?.dismiss()
+ }
+ .create()
  }
 
  @VisibleForTesting
@@ -84,7 +92,6 @@ internal class QuestionnaireValidationErrorMessageDialogFragment(
  adapter =
  ErrorAdapter().apply { submitList(viewModel.getItemsTextWithValidationErrors()) }
  }
- findViewById<View>(R.id.positive_button).setOnClickListener { dialog?.dismiss() }
  }
  }
 
@@ -115,6 +122,7 @@ internal class QuestionnaireValidationErrorMessageDialogFragment(
 
  companion object {
  const val TAG = "QuestionnaireValidationErrorMessageDialogFragment"
+ const val RESULT_CALLBACK = "QuestionnaireValidationResultCallback"
  }
 }
 
@@ -161,4 +169,13 @@ internal class QuestionnaireValidationErrorViewModel : ViewModel() {
  }
 }
 
-data class ValidationErrorDataModel(val linkId: String, val questionnaireItemText: String)
+/**
+ * Data model for showing validation error of a particular [QuestionnaireItemComponent] in the
+ * Dialog.
+ */
+data class ValidationErrorDataModel(
+ /** Id of the [QuestionnaireItemComponent] with error */
+ val linkId: String,
+ /** Text of the [QuestionnaireItemComponent] with error */
+ val questionnaireItemText: String
+)

datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt

@@ -101,7 +101,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
  private var isPaginationButtonPressed = false
 
  /** Forces response validation each time [getQuestionnaireItemViewItems] is called. */
- private var forceValidate = false
+ private var hasPressedSubmitButton = false
 
  init {
  when {
@@ -312,8 +312,8 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
  }
 
  /**
- * Validates questionnaire and return the validation results. As a side effect, it triggers the UI
- * update to show errors in case there are any validation errors.
+ * Validates entire questionnaire and return the validation results. As a side effect, it triggers
+ * the UI update to show errors in case there are any validation errors.
  */
  internal fun validateQuestionnaireAndUpdateUI(): Map<String, List<ValidationResult>> =
  QuestionnaireResponseValidator.validateQuestionnaireResponse(
@@ -323,7 +323,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
  )
  .also { result ->
  if (result.values.flatten().filterIsInstance<Invalid>().isNotEmpty()) {
- forceValidate = true
+ hasPressedSubmitButton = true
  modificationCount.update { it + 1 }
  }
  }
@@ -624,7 +624,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
  val validationResult =
  if (modifiedQuestionnaireResponseItemSet.contains(questionnaireResponseItem) ||
  isPaginationButtonPressed ||
- forceValidate
+ hasPressedSubmitButton
  ) {
  QuestionnaireResponseItemValidator.validate(
  questionnaireItem,

datacapture/src/main/res/layout/questionnaire_validation_dialog_item.xml

@@ -11,7 +11,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<com.google.android.material.textview.MaterialTextView
+<TextView
  xmlns:android="https://schemas.android.com/apk/res/android"
  xmlns:tools="https://schemas.android.com/tools"
  android:id="@+id/text_view"

datacapture/src/main/res/layout/questionnaire_validation_error_dialog.xml

@@ -47,16 +47,4 @@
  android:layout_weight="1"
  tools:listitem="@layout/questionnaire_validation_dialog_item"
  />
-
- <com.google.android.material.button.MaterialButton
- android:layout_marginTop="@dimen/padding_modal_card"
- android:layout_gravity="right"
- android:id="@+id/positive_button"
- style="?attr/questionnaireValidationDialogButtonStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="@dimen/padding_half_size"
- android:text="@android:string/ok"
- />
-
 </LinearLayout>

datacapture/src/main/res/values/strings.xml

@@ -44,15 +44,15 @@
  <string name="not_answered">"Not Answered"</string>
  <string name="help">Help</string>
  <string name="space_asterisk">\u0020\u002a</string>
- <string
- name="questionnaire_validation_error_supporting_text"
- >Fields that need to be completed:</string>
+ <string name="group_header_add_item_button">Add item</string>
+ <!-- Questionnaire validation popup texts-->
  <string
  name="questionnaire_validation_error_headline"
  >Complete all required fields</string>
+ <string
+ name="questionnaire_validation_error_supporting_text"
+ >Fields that need to be completed:</string>
  <string
  name="questionnaire_validation_error_item_text_with_bullet"
  >• %s</string>
- <string name="group_header_add_item_button">Add item</string>
-
 </resources>

datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireValidationErrorMessageDialogFragmentTest.kt

@@ -90,41 +90,6 @@ class QuestionnaireValidationErrorMessageDialogFragmentTest {
  assertThat(holder.textView.text).isEqualTo("• First Name")
  }
 
- @Test
- fun `createCustomView with a valid questionnaire response validation result`() {
- val questionnaire =
- Questionnaire().apply {
- url = "questionnaire-1"
- addItem(
- Questionnaire.QuestionnaireItemComponent().apply {
- linkId = "name-id"
- text = "First Name"
- type = Questionnaire.QuestionnaireItemType.STRING
- }
- )
- }
- val questionnaireResponse =
- QuestionnaireResponse().apply {
- this.questionnaire = "questionnaire-1"
- addItem(QuestionnaireResponse.QuestionnaireResponseItemComponent(StringType("name-id")))
- }
-
- val scenario =
- launchFragmentInContainer<QuestionnaireValidationErrorMessageDialogFragment>(
- initialState = Lifecycle.State.CREATED,
- factory = createDialogFragmentFactoryForTests(questionnaire, questionnaireResponse)
- )
-
- val result = scenario.withFragment { onCreateCustomView() }
-
- assertThat(result.findViewById<TextView>(R.id.dialog_title).text)
- .isEqualTo("Complete all required fields")
- assertThat(result.findViewById<TextView>(R.id.dialog_subtitle).text)
- .isEqualTo("Fields that need to be completed:")
- assertThat(result.findViewById<RecyclerView>(R.id.recycler_view).adapter!!.itemCount)
- .isEqualTo(0)
- }
-
  private fun createTestValidationErrorViewModel(
  questionnaire: Questionnaire,
  questionnaireResponse: QuestionnaireResponse
@@ -147,7 +112,7 @@ class QuestionnaireValidationErrorMessageDialogFragmentTest {
  val fragmentFactory: FragmentFactory = mock()
  val factory =
  object : ViewModelProvider.Factory {
- override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+ override fun <T : ViewModel> create(modelClass: Class<T>): T {
  return createTestValidationErrorViewModel(questionnaire, questionnaireResponse) as T
  }
  }