Merge prs for releases

catalog/src/main/assets/calculated_expression_questionnaire.json

@@ -0,0 +1,36 @@
+{
+  "resourceType": "Questionnaire",
+  "item": [
+    {
+      "linkId": "a-birthdate",
+      "text": "Birth Date",
+      "type": "date",
+      "extension": [
+        {
+          "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-calculatedExpression",
+          "valueExpression": {
+            "language": "text/fhirpath",
+            "expression": "%resource.repeat(item).where(linkId='a-age-years' and answer.empty().not()).select(today() - answer.value)"
+          }
+        }
+      ]
+    },
+    {
+      "linkId": "a-age-years",
+      "text": "Age years",
+      "type": "quantity",
+      "initial": [{
+        "valueQuantity": {
+          "unit": "years",
+          "system": "http://unitsofmeasure.org",
+          "code": "years"
+        }
+      }]
+    },
+    {
+      "linkId": "a-age-acknowledge",
+      "text": "Input age to automatically calculate birthdate until birthdate is updated manually",
+      "type": "display"
+    }
+  ]
+}

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

@@ -109,5 +109,10 @@ class ComponentListViewModel(application: Application, private val state: SavedS
       "component_auto_complete.json",
       "component_auto_complete_with_validation.json"
     ),
+    CALCULATED_EXPRESSION(
+      R.drawable.ic_unitoptions,
+      R.string.component_name_calculated_expression,
+      "calculated_expression_questionnaire.json"
+    ),
   }
 }

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

@@ -30,6 +30,9 @@
   <string name="component_name_slider">Slider</string>
   <string name="component_name_dropdown">Dropdown</string>
   <string name="component_name_image">Image</string>
+  <string
+        name="component_name_calculated_expression"
+    >Calculated Expression</string>
   <string name="component_name_auto_complete">Auto Complete</string>
   <string name="layout_name_default_text">Default</string>
   <string name="layout_name_paginated">Paginated</string>

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

@@ -22,13 +22,13 @@ import android.view.View
 import android.widget.TextView
 import androidx.fragment.app.FragmentResultListener
 import com.google.android.fhir.datacapture.contrib.views.barcode.mlkit.md.LiveBarcodeScanningFragment
+import com.google.android.fhir.datacapture.contrib.views.barcode.mlkit.md.Utils.tryUnwrapContext
 import com.google.android.fhir.datacapture.localizedPrefixSpanned
 import com.google.android.fhir.datacapture.localizedTextSpanned
 import com.google.android.fhir.datacapture.validation.ValidationResult
 import com.google.android.fhir.datacapture.views.QuestionnaireItemViewHolderDelegate
 import com.google.android.fhir.datacapture.views.QuestionnaireItemViewHolderFactory
 import com.google.android.fhir.datacapture.views.QuestionnaireItemViewItem
-import com.google.android.fhir.datacapture.views.tryUnwrapContext
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.hl7.fhir.r4.model.StringType
 

contrib/barcode/src/main/java/com/google/android/fhir/datacapture/contrib/views/barcode/mlkit/md/Utils.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * Copyright 2022 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,8 @@ import android.graphics.RectF
 import android.graphics.YuvImage
 import android.hardware.Camera
 import android.net.Uri
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.view.ContextThemeWrapper
 import androidx.exifinterface.media.ExifInterface
 import com.google.android.fhir.datacapture.contrib.views.barcode.mlkit.md.camera.CameraSizePair
 import com.google.mlkit.vision.barcode.BarcodeScanning
@@ -224,4 +226,25 @@ object Utils {
   }
 
   fun getBarcodeScanningClient() = BarcodeScanning.getClient()
+
+  /**
+   * Returns the [AppCompatActivity] if there exists one wrapped inside [ContextThemeWrapper] s, or
+   * `null` otherwise.
+   *
+   * This function is inspired by the function with the same name in `AppCompateDelegateImpl`. See
+   * https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:appcompat/appcompat/src/main/java/androidx/appcompat/app/AppCompatDelegateImpl.java;l=1615
+   *
+   * TODO: find a more robust way to do this as it is not guaranteed that the activity is an
+   * AppCompatActivity.
+   */
+  internal fun Context.tryUnwrapContext(): AppCompatActivity? {
+    var context = this
+    while (true) {
+      when (context) {
+        is AppCompatActivity -> return context
+        is ContextThemeWrapper -> context = context.baseContext
+        else -> return null
+      }
+    }
+  }
 }

datacapture/src/androidTest/AndroidManifest.xml

@@ -21,6 +21,7 @@
 
   <application
         android:theme="@style/Theme.MaterialComponents.DayNight.DarkActionBar"
+        android:name=".DataCaptureTestApplication"
     >
     <activity android:name=".TestActivity" />
   </application>

datacapture/src/androidTest/java/com/google/android/fhir/datacapture/DataCaptureTestApplication.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.fhir.datacapture
+
+import android.app.Application
+
+/** Application class when you want to test the DataCaptureConfig.Provider */
+internal class DataCaptureTestApplication : Application(), DataCaptureConfig.Provider {
+  var dataCaptureConfiguration: DataCaptureConfig? = null
+
+  override fun getDataCaptureConfig(): DataCaptureConfig {
+    if (dataCaptureConfiguration == null) {
+      dataCaptureConfiguration = DataCaptureConfig()
+    }
+
+    return dataCaptureConfiguration!!
+  }
+}

datacapture/src/androidTest/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemComponentsInstrumentedTest.kt

@@ -0,0 +1,126 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.fhir.datacapture
+
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.util.Base64
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import java.nio.charset.Charset
+import kotlinx.coroutines.runBlocking
+import org.hl7.fhir.r4.model.Attachment
+import org.hl7.fhir.r4.model.Binary
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class MoreQuestionnaireItemComponentsInstrumentedTest {
+
+  @Test
+  fun fetchBitmap_shouldReturnNull_whenAttachmentHasDataAndIncorrectContentType() {
+    val attachment =
+      Attachment().apply {
+        data = "some-byte".toByteArray(Charset.forName("UTF-8"))
+        contentType = "document/pdf"
+      }
+    val bitmap: Bitmap?
+    runBlocking { bitmap = attachment.fetchBitmap(ApplicationProvider.getApplicationContext()) }
+    assertThat(bitmap).isNull()
+  }
+
+  @Test
+  fun fetchBitmap_shouldReturnBitmap_whenAttachmentHasDataAndCorrectContentType() {
+    val attachment =
+      Attachment().apply {
+        data =
+          Base64.decode("R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7", Base64.DEFAULT)
+        contentType = "image/png"
+      }
+    val bitmap: Bitmap?
+    runBlocking { bitmap = attachment.fetchBitmap(ApplicationProvider.getApplicationContext()) }
+    assertThat(bitmap).isNotNull()
+  }
+
+  @Test
+  fun isImage_shouldTrue_whenAttachmentContentTypeIsImage() {
+    val attachment = Attachment().apply { contentType = "image/png" }
+    assertThat(attachment.isImage).isTrue()
+  }
+
+  @Test
+  fun isImage_shouldFalseWhenAttachmentContentTypeIsNotImage() {
+    val attachment = Attachment().apply { contentType = "document/pdf" }
+    assertThat(attachment.isImage).isFalse()
+  }
+
+  @Test
+  fun fetchBitmap_shouldReturnBitmapAndCallAttachmentResolverResolveBinaryResource() {
+    val attachment = Attachment().apply { url = "https://hapi.fhir.org/Binary/f006" }
+    ApplicationProvider.getApplicationContext<DataCaptureTestApplication>()
+      .getDataCaptureConfig()
+      .attachmentResolver = TestAttachmentResolver()
+
+    val bitmap: Bitmap?
+    runBlocking { bitmap = attachment.fetchBitmap(ApplicationProvider.getApplicationContext()) }
+
+    assertThat(bitmap).isNotNull()
+  }
+
+  @Test
+  fun fetchBitmap_shouldReturnBitmapAndCallAttachmentResolverResolveImageUrl() {
+    val attachment = Attachment().apply { url = "https://some-image-server.com/images/f0006.png" }
+
+    val byteArray =
+      Base64.decode("R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7", Base64.DEFAULT)
+    val expectedBitmap = BitmapFactory.decodeByteArray(byteArray, 0, byteArray.size)
+
+    ApplicationProvider.getApplicationContext<DataCaptureTestApplication>()
+      .getDataCaptureConfig()
+      .attachmentResolver = TestAttachmentResolver(expectedBitmap)
+
+    val resolvedBitmap: Bitmap?
+    runBlocking {
+      resolvedBitmap = attachment.fetchBitmap(ApplicationProvider.getApplicationContext())
+    }
+
+    assertThat(resolvedBitmap).isEqualTo(expectedBitmap)
+  }
+
+  class TestAttachmentResolver(var testBitmap: Bitmap? = null) : AttachmentResolver {
+
+    override suspend fun resolveBinaryResource(uri: String): Binary? {
+      return if (uri == "https://hapi.fhir.org/Binary/f006") {
+        Binary().apply {
+          contentType = "image/png"
+          data =
+            Base64.decode(
+              "R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",
+              Base64.DEFAULT
+            )
+        }
+      } else null
+    }
+
+    override suspend fun resolveImageUrl(uri: String): Bitmap? {
+      return if (uri == "https://some-image-server.com/images/f0006.png") {
+        testBitmap
+      } else null
+    }
+  }
+}