Update DropDown compose component for QuantityViewHolderFactory

Author: LZRS

datacapture/src/androidTest/java/com/google/android/fhir/datacapture/test/views/compose/ExposedDropDownMenuBoxItemTest.kt renamed to datacapture/src/androidTest/java/com/google/android/fhir/datacapture/test/views/compose/DropDownItemTest.kt

@@ -28,14 +28,14 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.views.compose.DROP_DOWN_TEXT_FIELD_TAG
-import com.google.android.fhir.datacapture.views.compose.ExposedDropDownMenuBoxItem
+import com.google.android.fhir.datacapture.views.compose.DropDownItem
 import com.google.android.fhir.datacapture.views.factories.DropDownAnswerOption
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class ExposedDropDownMenuBoxItemTest {
+class DropDownItemTest {
 
   @get:Rule val composeTestRule = createComposeRule()
 
@@ -51,7 +51,7 @@ class ExposedDropDownMenuBoxItemTest {
       )
 
     composeTestRule.setContent {
-      ExposedDropDownMenuBoxItem(
+      DropDownItem(
         modifier = Modifier,
         enabled = true,
         options = listOf(testDropDownAnswerOption),

datacapture/src/main/java/com/google/android/fhir/datacapture/views/compose/ExposedDropDownMenuBoxItem.kt renamed to datacapture/src/main/java/com/google/android/fhir/datacapture/views/compose/DropDownItem.kt

@@ -16,13 +16,14 @@
 
 package com.google.android.fhir.datacapture.views.compose
 
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExposedDropdownMenuAnchorType
 import androidx.compose.material3.ExposedDropdownMenuBox
 import androidx.compose.material3.ExposedDropdownMenuDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.MenuAnchorType
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -35,14 +36,20 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.semantics.error
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.AnnotatedString
 import androidx.core.graphics.drawable.toBitmap
 import com.google.android.fhir.datacapture.views.factories.DropDownAnswerOption
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-internal fun ExposedDropDownMenuBoxItem(
+internal fun DropDownItem(
   modifier: Modifier,
   enabled: Boolean,
+  labelText: AnnotatedString? = null,
+  supportingText: String? = null,
+  isError: Boolean = false,
   selectedOption: DropDownAnswerOption? = null,
   options: List<DropDownAnswerOption>,
   onDropDownAnswerOptionSelected: (DropDownAnswerOption?) -> Unit,
@@ -68,39 +75,66 @@ internal fun ExposedDropDownMenuBoxItem(
       value = selectedOptionDisplay,
       onValueChange = {},
       modifier =
-        Modifier.testTag(DROP_DOWN_TEXT_FIELD_TAG)
-          .menuAnchor(MenuAnchorType.PrimaryNotEditable, enabled),
+        Modifier.fillMaxWidth()
+          .testTag(DROP_DOWN_TEXT_FIELD_TAG)
+          .semantics { if (isError) error(supportingText ?: "") }
+          .menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable, enabled),
       readOnly = true,
       enabled = enabled,
       minLines = 1,
-      label = {},
-      supportingText = {},
+      isError = isError,
+      label = { labelText?.let { Text(it) } },
+      supportingText = { supportingText?.let { Text(it) } },
+      leadingIcon =
+        selectedDropDownAnswerOption?.answerOptionImage?.let {
+          {
+            Icon(
+              it.toBitmap().asImageBitmap(),
+              contentDescription = selectedOptionDisplay,
+              modifier = Modifier.testTag(DROP_DOWN_TEXT_FIELD_LEADING_ICON_TAG),
+            )
+          }
+        },
       trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
     )
     ExposedDropdownMenu(expanded = expanded, onDismissRequest = { expanded = false }) {
       options.forEach { option ->
-        DropdownMenuItem(
-          text = {
-            Text(option.answerOptionAnnotatedString(), style = MaterialTheme.typography.bodyLarge)
-          },
-          leadingIcon = {
-            option.answerOptionImage?.let {
-              Icon(
-                it.toBitmap().asImageBitmap(),
-                contentDescription = option.answerOptionString,
-              )
-            }
-          },
-          enabled = enabled,
-          onClick = {
-            selectedDropDownAnswerOption = option
-            expanded = false
-          },
-          contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding,
-        )
+        DropDownAnswerMenuItem(enabled, option) {
+          selectedDropDownAnswerOption = option
+          expanded = false
+        }
       }
     }
   }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+internal fun DropDownAnswerMenuItem(
+  enabled: Boolean,
+  answerOption: DropDownAnswerOption,
+  onSelected: () -> Unit,
+) {
+  DropdownMenuItem(
+    modifier = Modifier.testTag(DROP_DOWN_ANSWER_MENU_ITEM_TAG),
+    text = {
+      Text(answerOption.answerOptionAnnotatedString(), style = MaterialTheme.typography.bodyLarge)
+    },
+    leadingIcon =
+      answerOption.answerOptionImage?.let {
+        {
+          Icon(
+            it.toBitmap().asImageBitmap(),
+            contentDescription = answerOption.answerOptionString,
+          )
+        }
+      },
+    enabled = enabled,
+    onClick = { onSelected() },
+    contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding,
+  )
+}
+
 const val DROP_DOWN_TEXT_FIELD_TAG = "drop_down_text_field"
+const val DROP_DOWN_TEXT_FIELD_LEADING_ICON_TAG = "drop_down_text_field_leading_icon"
+const val DROP_DOWN_ANSWER_MENU_ITEM_TAG = "drop_down_answer_list_menu_item"

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

@@ -47,9 +47,9 @@ import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.datacapture.validation.ValidationResult
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
+import com.google.android.fhir.datacapture.views.compose.DropDownItem
 import com.google.android.fhir.datacapture.views.compose.EditTextFieldItem
 import com.google.android.fhir.datacapture.views.compose.EditTextFieldState
-import com.google.android.fhir.datacapture.views.compose.ExposedDropDownMenuBoxItem
 import com.google.android.fhir.datacapture.views.compose.Header
 import com.google.android.fhir.datacapture.views.compose.MediaItem
 import java.math.BigDecimal
@@ -77,6 +77,7 @@ internal object QuantityViewHolderFactory : QuestionnaireItemComposeViewHolderFa
         val selectedOption =
           remember(questionnaireViewItem) {
             unitTextCoding(questionnaireViewItem)?.toDropDownAnswerOption()
+              ?: dropDownOptions.singleOrNull() // Select if has only one option
           }
 
         var quantity by
@@ -118,16 +119,17 @@ internal object QuantityViewHolderFactory : QuestionnaireItemComposeViewHolderFa
           Header(questionnaireViewItem)
           questionnaireViewItem.questionnaireItem.itemMedia?.let { MediaItem(it) }
 
-          Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
+          Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.Top) {
             EditTextFieldItem(
               modifier = Modifier.weight(1f),
               textFieldState = composeViewQuestionnaireState,
             )
             Spacer(modifier = Modifier.width(dimensionResource(R.dimen.item_margin_horizontal)))
-            ExposedDropDownMenuBoxItem(
+            DropDownItem(
               modifier = Modifier.weight(1f),
               enabled = !isReadOnly,
               selectedOption = selectedOption,
+              isError = !validationUiMessage.isNullOrBlank(),
               options = dropDownOptions,
             ) { answerOption ->
               quantity = UiQuantity(quantity.value, answerOption?.findCoding(unitOptions))
@@ -147,14 +149,27 @@ internal object QuantityViewHolderFactory : QuestionnaireItemComposeViewHolderFa
         questionnaireViewItem: QuestionnaireViewItem,
         input: UiQuantity,
       ) {
-        val currentAnswerQuantity = questionnaireViewItem.answers.singleOrNull()?.valueQuantity
-        val draftAnswer = questionnaireViewItem.draftAnswer
-
-        val decimal =
-          input.value?.toBigDecimalOrNull()
-            ?: (draftAnswer as? BigDecimal) ?: currentAnswerQuantity?.value
-        val unit =
-          input.unitDropDown ?: ((draftAnswer as? Coding) ?: currentAnswerQuantity?.toCoding())
+        var decimal: BigDecimal? = null
+        var unit: Coding? = null
+
+        // Read decimal value and unit from complete answer
+        questionnaireViewItem.answers.singleOrNull()?.let {
+          val quantity = it.value as Quantity
+          decimal = quantity.value
+          unit = quantity.toCoding()
+        }
+
+        // Read decimal value and unit from partial answer
+        questionnaireViewItem.draftAnswer?.let {
+          when (it) {
+            is BigDecimal -> decimal = it
+            is Coding -> unit = it
+          }
+        }
+
+        // Update decimal value and unit
+        input.value?.let { decimal = it.toBigDecimalOrNull() }
+        input.unitDropDown?.let { unit = it }
 
         when {
           decimal == null && unit == null -> {

engine/benchmarks/app/src/main/java/com/google/android/fhir/engine/benchmarks/app/ui/DetailScaffold.kt

@@ -19,9 +19,6 @@ package com.google.android.fhir.engine.benchmarks.app.ui
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.automirrored.outlined.ArrowBack
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -33,10 +30,12 @@ import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.google.android.fhir.engine.benchmarks.app.R
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -52,8 +51,8 @@ fun DetailScaffold(
         navigationIcon = {
           IconButton(onClick = navigateToHome) {
             Icon(
-              imageVector = Icons.AutoMirrored.Outlined.ArrowBack,
-              contentDescription = "Localized description",
+              painterResource(R.drawable.arrow_back_24px),
+              contentDescription = "Back",
             )
           }
         },

engine/benchmarks/app/src/main/res/drawable/arrow_back_24px.xml

@@ -0,0 +1,16 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:tint="#1A73E8"
+    android:viewportHeight="960"
+    android:viewportWidth="960"
+    android:width="24dp"
+>
+      
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M313,520L537,744L480,800L160,480L480,160L537,216L313,440L800,440L800,520L313,520Z"
+    />
+    
+</vector>

gradle/libs.versions.toml

@@ -6,20 +6,20 @@ android-fhir-common = "0.1.0-alpha05"
 android-fhir-engine = "0.1.0-beta05"
 android-fhir-knowledge = "0.1.0-beta01"
 androidx-activity = "1.7.2"
-androidx-activity-compose = "1.10.1"
+androidx-activity-compose = "1.11.0"
 androidx-appcompat = "1.6.1"
 androidx-arch-core = "2.2.0"
 androidx-benchmark = "1.4.0-rc01"
 androidx-benchmark-macro = "1.4.0-rc01"
-androidx-compose-bom = "2025.07.00"
+androidx-compose-bom = "2025.10.01"
 androidx-constraintlayout = "2.1.4"
 androidx-core = "1.10.1"
 androidx-datastore = "1.0.0"
 androidx-espresso = "3.5.1"
 androidx-fragment = "1.6.0"
 androidx-lifecycle = "2.8.7"
 androidx-navigation = "2.6.0"
-androidx-navigation-compose = "2.8.9"
+androidx-navigation-compose = "2.9.5"
 androidx-profilerinstaller = "1.4.1"
 androidx-recyclerview = "1.4.0"
 androidx-room = "2.7.1"