X-FHIR-Query support for variable extension

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

@@ -217,11 +217,13 @@ class DemoQuestionnaireFragment : Fragment() {
     }
 
   private fun onSubmitQuestionnaireClick() {
-    val questionnaireFragment =
-      childFragmentManager.findFragmentByTag(QUESTIONNAIRE_FRAGMENT_TAG) as QuestionnaireFragment
-    launchQuestionnaireResponseFragment(
-      viewModel.getQuestionnaireResponseJson(questionnaireFragment.getQuestionnaireResponse()),
-    )
+    lifecycleScope.launch {
+      val questionnaireFragment =
+        childFragmentManager.findFragmentByTag(QUESTIONNAIRE_FRAGMENT_TAG) as QuestionnaireFragment
+      launchQuestionnaireResponseFragment(
+        viewModel.getQuestionnaireResponseJson(questionnaireFragment.getQuestionnaireResponse()),
+      )
+    }
   }
 
   private fun launchQuestionnaireResponseFragment(response: String) {

contrib/barcode/src/main/java/com/google/android/fhir/datacapture/contrib/views/barcode/BarCodeReaderViewHolderFactory.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 Google LLC
+ * Copyright 2022-2024 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,15 @@ package com.google.android.fhir.datacapture.contrib.views.barcode
 import android.graphics.Typeface
 import android.view.View
 import android.widget.TextView
+import androidx.lifecycle.lifecycleScope
 import com.google.android.fhir.datacapture.contrib.views.barcode.mlkit.md.LiveBarcodeScanningFragment
 import com.google.android.fhir.datacapture.extensions.localizedPrefixSpanned
 import com.google.android.fhir.datacapture.extensions.localizedTextSpanned
 import com.google.android.fhir.datacapture.extensions.tryUnwrapContext
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolderDelegate
 import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolderFactory
+import kotlinx.coroutines.launch
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.hl7.fhir.r4.model.StringType
 
@@ -67,13 +69,15 @@ object BarCodeReaderViewHolderFactory :
                 }
               }
 
-            if (answer == null) {
-              questionnaireViewItem.clearAnswer()
-            } else {
-              questionnaireViewItem.setAnswer(answer)
-            }
+            context.lifecycleScope.launch {
+              if (answer == null) {
+                questionnaireViewItem.clearAnswer()
+              } else {
+                questionnaireViewItem.setAnswer(answer)
+              }
 
-            setInitial(questionnaireViewItem.answers.singleOrNull(), reScanView)
+              setInitial(questionnaireViewItem.answers.singleOrNull(), reScanView)
+            }
           }
           LiveBarcodeScanningFragment()
             .show(

contrib/locationwidget/src/main/java/com/google/android/fhir/datacapture/contrib/views/locationwidget/LocationGpsCoordinateViewHolderFactory.kt

@@ -17,6 +17,7 @@
 package com.google.android.fhir.datacapture.contrib.views.locationwidget
 
 import android.view.View
+import androidx.lifecycle.lifecycleScope
 import com.google.android.fhir.datacapture.extensions.getRequiredOrOptionalText
 import com.google.android.fhir.datacapture.extensions.getValidationErrorMessage
 import com.google.android.fhir.datacapture.extensions.localizedFlyoverSpanned
@@ -28,6 +29,7 @@ import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemView
 import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolderFactory
 import com.google.android.material.textfield.MaterialAutoCompleteTextView
 import com.google.android.material.textfield.TextInputLayout
+import kotlinx.coroutines.launch
 import org.hl7.fhir.r4.model.DecimalType
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
@@ -67,11 +69,13 @@ object LocationGpsCoordinateViewHolderFactory :
               ) { _, bundleResult ->
                 val latitude =
                   bundleResult.getDouble(CurrentLocationDialogFragment.LATITUDE_REQUEST_RESULT_KEY)
-                questionnaireViewItem.setAnswer(
-                  QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
-                    value = DecimalType(latitude)
-                  },
-                )
+                lifecycleScope.launch {
+                  questionnaireViewItem.setAnswer(
+                    QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+                      value = DecimalType(latitude)
+                    },
+                  )
+                }
               }
             }
             GPS_COORDINATE_EXTENSION_VALUE_LONGITUDE -> {
@@ -81,11 +85,13 @@ object LocationGpsCoordinateViewHolderFactory :
               ) { _, bundleResult ->
                 val longitude =
                   bundleResult.getDouble(CurrentLocationDialogFragment.LONGITUDE_REQUEST_RESULT_KEY)
-                questionnaireViewItem.setAnswer(
-                  QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
-                    value = DecimalType(longitude)
-                  },
-                )
+                lifecycleScope.launch {
+                  questionnaireViewItem.setAnswer(
+                    QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+                      value = DecimalType(longitude)
+                    },
+                  )
+                }
               }
             }
             GPS_COORDINATE_EXTENSION_VALUE_ALTITUDE -> {
@@ -95,11 +101,13 @@ object LocationGpsCoordinateViewHolderFactory :
               ) { _, bundleResult ->
                 val altitude =
                   bundleResult.getDouble(CurrentLocationDialogFragment.ALTITUDE_REQUEST_RESULT_KEY)
-                questionnaireViewItem.setAnswer(
-                  QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
-                    value = DecimalType(altitude)
-                  },
-                )
+                lifecycleScope.launch {
+                  questionnaireViewItem.setAnswer(
+                    QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+                      value = DecimalType(altitude)
+                    },
+                  )
+                }
               }
             }
           }

datacapture/build.gradle.kts

@@ -65,6 +65,7 @@ dependencies {
   androidTestImplementation(Dependencies.AndroidxTest.core)
   androidTestImplementation(Dependencies.AndroidxTest.extJunit)
   androidTestImplementation(Dependencies.AndroidxTest.extJunitKtx)
+  androidTestImplementation(Dependencies.Kotlin.kotlinCoroutinesTest)
   androidTestImplementation(Dependencies.AndroidxTest.rules)
   androidTestImplementation(Dependencies.AndroidxTest.runner)
   androidTestImplementation(Dependencies.junit)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,17 @@
 
 package com.google.android.fhir.datacapture.contrib.views
 
+import android.view.View
 import android.widget.FrameLayout
 import android.widget.TextView
-import androidx.appcompat.view.ContextThemeWrapper
 import androidx.test.annotation.UiThreadTest
+import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.google.android.fhir.datacapture.QuestionnaireEditAdapter
 import com.google.android.fhir.datacapture.QuestionnaireViewHolderType
 import com.google.android.fhir.datacapture.R
+import com.google.android.fhir.datacapture.test.TestActivity
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
@@ -38,25 +40,27 @@ import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.hl7.fhir.r4.model.StringType
 import org.junit.Before
 import org.junit.Ignore
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class PhoneNumberViewHolderFactoryInstrumentedTest {
-  private lateinit var context: ContextThemeWrapper
+
+  @Rule
+  @JvmField
+  var activityScenarioRule: ActivityScenarioRule<TestActivity> =
+    ActivityScenarioRule(TestActivity::class.java)
+
   private lateinit var parent: FrameLayout
   private lateinit var viewHolder: QuestionnaireItemViewHolder
   private lateinit var questionnaireEditAdapter: QuestionnaireEditAdapter
 
   @Before
   fun setUp() {
-    context =
-      ContextThemeWrapper(
-        InstrumentationRegistry.getInstrumentation().targetContext,
-        com.google.android.material.R.style.Theme_Material3_DayNight,
-      )
-    parent = FrameLayout(context)
+    activityScenarioRule.scenario.onActivity { activity -> parent = FrameLayout(activity) }
     viewHolder = PhoneNumberViewHolderFactory.create(parent)
+    setTestLayout(viewHolder.itemView)
     questionnaireEditAdapter = QuestionnaireEditAdapter()
   }
 
@@ -75,6 +79,7 @@ class PhoneNumberViewHolderFactoryInstrumentedTest {
   }
 
   @Test
+  @UiThreadTest
   fun shouldSetTextViewText() {
     viewHolder.bind(
       QuestionnaireViewItem(
@@ -253,4 +258,10 @@ class PhoneNumberViewHolderFactoryInstrumentedTest {
       )
       .isFalse()
   }
+
+  /** Method to set content view for test activity */
+  private fun setTestLayout(view: View) {
+    activityScenarioRule.scenario.onActivity { activity -> activity.setContentView(view) }
+    InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+  }
 }