Merge branch 'master' into rm/review-layout-catalog-app

Author: rahulmalhotra

catalog/src/main/assets/component_auto_complete.json

@@ -82,7 +82,7 @@
         },
         {
           "valueCoding": {
-            "code": "hypertension",
+            "code": "hbp",
             "display": "High Blood Pressure"
           }
         },

catalog/src/main/assets/component_auto_complete_with_validation.json

@@ -7,6 +7,26 @@
       "type": "choice",
       "repeats": true,
       "required": true,
+      "item": [
+        {
+          "extension": [
+            {
+              "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory",
+              "valueCodeableConcept": {
+                "coding": [
+                  {
+                    "system": "http://hl7.org/fhir/questionnaire-display-category",
+                    "code": "instructions"
+                  }
+                ]
+              }
+            }
+          ],
+          "linkId": "instruction",
+          "text": "Try typing Asthma, Chronic Lung Disease, Depression, Diabetes, Hypertension, High Blood Pressure, or High Cholesterol",
+          "type": "display"
+        }
+      ],
       "extension": [
         {
           "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
@@ -27,7 +47,8 @@
           "valueCoding": {
             "code": "asthma",
             "display": "Asthma"
-          }
+          },
+          "initialSelected": true
         },
         {
           "valueCoding": {
@@ -55,7 +76,7 @@
         },
         {
           "valueCoding": {
-            "code": "hypertension",
+            "code": "hbp",
             "display": "High Blood Pressure"
           }
         },
@@ -65,13 +86,7 @@
             "display": "High Cholesterol"
           }
         }
-      ],
-      "initial": {
-        "valueCoding": {
-          "code": "asthma",
-          "display": "Asthma"
-        }
-      }
+      ]
     }
   ]
 }

catalog/src/main/assets/component_help.json

@@ -51,7 +51,7 @@
               }
             }
           ],
-          "linkId": "1.3",
+          "linkId": "1.1",
           "text": "Select one",
           "type": "display"
         },
@@ -69,7 +69,7 @@
               }
             }
           ],
-          "linkId": "1.3",
+          "linkId": "1.2",
           "text": "Only one answer can be selected. If none apply, skip the question.",
           "type": "display"
         }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.test.espresso.Espresso.onData
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.PerformException
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.typeText
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -51,6 +52,7 @@ import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.hl7.fhir.r4.model.Reference
 import org.hl7.fhir.r4.model.StringType
+import org.junit.Assert.assertThrows
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -274,6 +276,81 @@ class DropDownViewHolderFactoryEspressoTest {
       .isEqualTo(3)
   }
 
+  @Test
+  fun shouldPreventTypingWhenAnswerIsSelectedInAutoCompleteDropdown() {
+    val preselectedAnswer =
+      QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
+        addAnswer().value = StringType("Coding 1")
+      }
+
+    val questionnaireItem =
+      QuestionnaireViewItem(
+        createAnswerOptions("Coding 1", "Coding 2", "Coding 3"),
+        preselectedAnswer,
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _, _ -> },
+      )
+
+    val autoComplete = viewHolder.itemView.findViewById<AutoCompleteTextView>(R.id.auto_complete)
+
+    runOnUI {
+      viewHolder.bind(questionnaireItem)
+      autoComplete.showDropDown()
+    }
+
+    assertThrows(PerformException::class.java) {
+      onView(withId(R.id.auto_complete)).perform(typeText("new text"))
+    }
+
+    assertThat(autoComplete.text.toString()).isEqualTo("Coding 1")
+  }
+
+  @Test
+  fun shouldSelectAndClearAnswerInAutoCompleteDropdown() {
+    var selectedAnswers: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? =
+      null
+    val answerOptions = listOf("Coding 1", "Coding 2", "Coding 3")
+
+    var questionnaireItem =
+      QuestionnaireViewItem(
+        createAnswerOptions(*answerOptions.toTypedArray()),
+        responseValueStringOptions(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, answers, _ -> selectedAnswers = answers },
+      )
+
+    val autoComplete = viewHolder.itemView.findViewById<AutoCompleteTextView>(R.id.auto_complete)
+
+    runOnUI {
+      viewHolder.bind(questionnaireItem)
+      autoComplete.showDropDown()
+    }
+
+    // Test selection flow
+    onView(withText("Coding 1"))
+      .inRoot(isPlatformPopup())
+      .check(matches(isDisplayed()))
+      .perform(click())
+
+    assertThat(selectedAnswers).hasSize(1)
+    assertThat((selectedAnswers!!.first().value as StringType).valueAsString).isEqualTo("Coding 1")
+
+    // Test clearing flow
+    questionnaireItem =
+      QuestionnaireViewItem(
+        createAnswerOptions(*answerOptions.toTypedArray()),
+        responseValueStringOptions().apply { answer = selectedAnswers },
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, answers, _ -> selectedAnswers = answers },
+      )
+
+    runOnUI { viewHolder.bind(questionnaireItem) }
+
+    onView(withId(R.id.clear_input_icon)).perform(click())
+
+    assertThat(selectedAnswers).isEmpty()
+  }
+
   @Test
   fun shouldReturnFilteredWithNoResultsDropDownMenuItems() {
     val questionnaireViewItem =

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import com.google.android.fhir.datacapture.extensions.flattened
 import com.google.android.fhir.datacapture.extensions.localizedFlyoverSpanned
+import com.google.android.fhir.datacapture.extensions.toSpanned
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.ValidationResult
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -90,9 +91,12 @@ internal class QuestionnaireValidationErrorMessageDialogFragment(
           val viewModel: QuestionnaireValidationErrorViewModel by
             activityViewModels(factoryProducer = factoryProducer)
           text =
-            viewModel.getItemsTextWithValidationErrors().joinToString(separator = "\n") {
-              context.getString(R.string.questionnaire_validation_error_item_text_with_bullet, it)
-            }
+            viewModel
+              .getItemsTextWithValidationErrors()
+              .joinToString(separator = "\n") {
+                context.getString(R.string.questionnaire_validation_error_item_text_with_bullet, it)
+              }
+              .toSpanned()
         }
       }
   }

datacapture/src/main/java/com/google/android/fhir/datacapture/mapping/ResourceMapper.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 Google LLC
+ * Copyright 2022-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ package com.google.android.fhir.datacapture.mapping
 import com.google.android.fhir.datacapture.extensions.createQuestionnaireResponseItem
 import com.google.android.fhir.datacapture.extensions.filterByCodeInNameExtension
 import com.google.android.fhir.datacapture.extensions.initialExpression
+import com.google.android.fhir.datacapture.extensions.initialSelected
 import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.datacapture.extensions.questionnaireLaunchContexts
 import com.google.android.fhir.datacapture.extensions.targetStructureMap
@@ -248,22 +249,59 @@ object ResourceMapper {
       "QuestionnaireItem item is not allowed to have both initial.value and initial expression. See rule at http://build.fhir.org/ig/HL7/sdc/expressions.html#initialExpression."
     }
 
+    // Initial values can't be specified for groups or display items
+    check(
+      !(questionnaireItem.type == Questionnaire.QuestionnaireItemType.GROUP ||
+        questionnaireItem.type == Questionnaire.QuestionnaireItemType.DISPLAY) ||
+        (questionnaireItem.initial.isEmpty() && questionnaireItem.initialExpression == null),
+    ) {
+      "QuestionnaireItem item is not allowed to have initial value or initial expression for groups or display items. See rule at http://build.fhir.org/ig/HL7/sdc/expressions.html#initialExpression."
+    }
+
     questionnaireItem.initialExpression
       ?.let {
         evaluateToBase(
-            questionnaireResponse = null,
-            questionnaireResponseItem = null,
-            expression = it.expression,
-            contextMap = launchContexts,
-          )
-          .firstOrNull()
+          questionnaireResponse = null,
+          questionnaireResponseItem = null,
+          expression = it.expression,
+          contextMap = launchContexts,
+        )
       }
       ?.let {
-        // Set initial value for the questionnaire item. Questionnaire items should not have both
-        // initial value and initial expression.
-        val value = it.asExpectedType(questionnaireItem.type)
-        questionnaireItem.initial =
-          mutableListOf(Questionnaire.QuestionnaireItemInitialComponent().setValue(value))
+        // Set initial value for the questionnaire item.
+        if (it.isEmpty()) return@let
+
+        // If questionnaireItem.repeats is false only first value is selected from initialExpression
+        // result set
+        val evaluatedExpressionResult =
+          if (questionnaireItem.repeats) {
+            it.map { it.asExpectedType(questionnaireItem.type) }
+          } else {
+            listOf(it.first().asExpectedType(questionnaireItem.type))
+          }
+
+        /**
+         * For answer options, the initialSelected extension is used to highlight initial values.
+         *
+         * Note: If the initial expression evaluates to five values (1, 2, 3, 4, 5) but only three
+         * answer options (1, 2, 3) exist, then 4 and 5 will be ignored. These values are not added
+         * as additional options, nor would it make sense to do so. This behavior ensures the answer
+         * options remain consistent with the defined set.
+         */
+        if (questionnaireItem.answerOption.isNotEmpty()) {
+          questionnaireItem.answerOption.forEach { answerOption ->
+            answerOption.initialSelected =
+              evaluatedExpressionResult.any { answerOption.value.equalsDeep(it) }
+          }
+        } else {
+          questionnaireItem.initial =
+            evaluatedExpressionResult.map {
+              Questionnaire.QuestionnaireItemInitialComponent()
+                .setValue(
+                  it,
+                )
+            }
+        }
       }
 
     populateInitialValues(questionnaireItem.item, launchContexts)

datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 Google LLC
+ * Copyright 2022-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,13 +19,17 @@ package com.google.android.fhir.datacapture.views.factories
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.text.Spanned
+import android.text.method.TextKeyListener
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.inputmethod.InputMethodManager
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
+import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.doOnNextLayout
 import androidx.lifecycle.lifecycleScope
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.extensions.displayString
@@ -52,14 +56,28 @@ internal object DropDownViewHolderFactory :
       private lateinit var header: HeaderView
       private lateinit var textInputLayout: TextInputLayout
       private lateinit var autoCompleteTextView: MaterialAutoCompleteTextView
+      private lateinit var clearInputIcon: ImageView
       override lateinit var questionnaireViewItem: QuestionnaireViewItem
       private lateinit var context: AppCompatActivity
 
       override fun init(itemView: View) {
         header = itemView.findViewById(R.id.header)
         textInputLayout = itemView.findViewById(R.id.text_input_layout)
         autoCompleteTextView = itemView.findViewById(R.id.auto_complete)
+        clearInputIcon = itemView.findViewById(R.id.clear_input_icon)
         context = itemView.context.tryUnwrapContext()!!
+        autoCompleteTextView.setOnFocusChangeListener { view, hasFocus ->
+          if (!hasFocus) {
+            (view.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager)
+              .hideSoftInputFromWindow(view.windowToken, 0)
+          }
+        }
+        clearInputIcon.setOnClickListener {
+          context.lifecycleScope.launch {
+            questionnaireViewItem.clearAnswer()
+            autoCompleteTextView.doOnNextLayout { autoCompleteTextView.showDropDown() }
+          }
+        }
       }
 
       override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
@@ -130,6 +148,10 @@ internal object DropDownViewHolderFactory :
               }
             }
           }
+        val isEditable = questionnaireViewItem.answers.isEmpty()
+        if (!isEditable) autoCompleteTextView.clearFocus()
+        autoCompleteTextView.keyListener = if (isEditable) TextKeyListener.getInstance() else null
+        clearInputIcon.visibility = if (isEditable) View.GONE else View.VISIBLE
 
         displayValidationResult(questionnaireViewItem.validationResult)
       }

datacapture/src/main/res/drawable/ic_clear.xml

@@ -0,0 +1,13 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+>
+  <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"
+    />
+</vector>