Merge remote-tracking branch 'upstream/master' into update-reference-indexes

Author: LZRS

buildSrc/src/main/kotlin/Dependencies.kt

@@ -101,7 +101,6 @@ object Dependencies {
   const val mockWebServer = "com.squareup.okhttp3:mockwebserver:${Versions.http}"
 
   const val jsonToolsPatch = "com.github.java-json-tools:json-patch:${Versions.jsonToolsPatch}"
-  const val material = "com.google.android.material:material:${Versions.material}"
   const val sqlcipher = "net.zetetic:android-database-sqlcipher:${Versions.sqlcipher}"
   const val timber = "com.jakewharton.timber:timber:${Versions.timber}"
   const val woodstox = "com.fasterxml.woodstox:woodstox-core:${Versions.woodstox}"
@@ -143,7 +142,6 @@ object Dependencies {
 
     const val jsonToolsPatch = "1.13"
     const val jsonAssert = "1.5.1"
-    const val material = "1.9.0"
     const val retrofit = "2.9.0"
     const val gsonConverter = "2.1.0"
     const val sqlcipher = "4.5.4"

buildSrc/src/main/kotlin/Releases.kt

@@ -48,7 +48,7 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "1.0.0"
+    override val version = "1.1.0"
     override val name = "Android FHIR Engine Library"
   }
 
@@ -98,6 +98,12 @@ object Releases {
     const val versionCode = 1
     const val versionName = "1.0"
   }
+
+  object WorkflowDemo {
+    const val applicationId = "com.google.android.fhir.workflow.demo"
+    const val versionCode = 1
+    const val versionName = "1.0"
+  }
 }
 
 fun Project.publishArtifact(artifact: LibraryArtifact) {

catalog/build.gradle.kts

@@ -46,14 +46,14 @@ dependencies {
 
   coreLibraryDesugaring(Dependencies.desugarJdkLibs)
 
-  implementation(Dependencies.material)
   implementation(libs.androidx.appcompat)
   implementation(libs.androidx.constraintlayout)
   implementation(libs.androidx.core)
   implementation(libs.androidx.fragment)
   implementation(libs.androidx.navigation.fragment)
   implementation(libs.androidx.navigation.ui)
   implementation(libs.kotlin.stdlib)
+  implementation(libs.material)
 
   implementation(project(path = ":datacapture"))
   implementation(project(path = ":engine"))

contrib/barcode/build.gradle.kts

@@ -70,11 +70,11 @@ dependencies {
   implementation(Dependencies.Mlkit.barcodeScanning)
   implementation(Dependencies.Mlkit.objectDetection)
   implementation(Dependencies.Mlkit.objectDetectionCustom)
-  implementation(Dependencies.material)
   implementation(Dependencies.timber)
   implementation(libs.androidx.appcompat)
   implementation(libs.androidx.core)
   implementation(libs.androidx.fragment)
+  implementation(libs.material)
 
   testImplementation(Dependencies.mockitoInline)
   testImplementation(Dependencies.mockitoKotlin)

contrib/locationwidget/build.gradle.kts

@@ -65,12 +65,12 @@ dependencies {
 
   implementation(project(":datacapture"))
   implementation(Dependencies.playServicesLocation)
-  implementation(Dependencies.material)
   implementation(Dependencies.timber)
   implementation(libs.androidx.appcompat)
   implementation(libs.androidx.core)
   implementation(libs.androidx.fragment)
   implementation(libs.kotlinx.coroutines.playservices)
+  implementation(libs.material)
 
   coreLibraryDesugaring(Dependencies.desugarJdkLibs)
 

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

@@ -27,6 +27,7 @@ import androidx.core.view.isVisible
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.google.common.truth.Truth.assertThat
+import org.hl7.fhir.r4.model.Questionnaire
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -55,4 +56,30 @@ class LocationGpsCoordinateViewHolderFactoryInstrumentedTest {
       )
       .isEqualTo(InputType.TYPE_NULL)
   }
+
+  @Test
+  fun matcherShouldReturnTrueForOriginalGpsCoordinateUrl() {
+    val questionnaireItem = Questionnaire.QuestionnaireItemComponent()
+    questionnaireItem.addExtension(
+      LocationGpsCoordinateViewHolderFactory.PRIMARY_GPS_COORDINATE_EXTENSION_URL,
+      null,
+    )
+    assertThat(LocationGpsCoordinateViewHolderFactory.matcher(questionnaireItem)).isTrue()
+  }
+
+  @Test
+  fun matcherShouldReturnTrueForOldGpsCoordinateUrl() {
+    val questionnaireItem = Questionnaire.QuestionnaireItemComponent()
+    questionnaireItem.addExtension(
+      LocationGpsCoordinateViewHolderFactory.GPS_COORDINATE_EXTENSION_URL,
+      null,
+    )
+    assertThat(LocationGpsCoordinateViewHolderFactory.matcher(questionnaireItem)).isTrue()
+  }
+
+  @Test
+  fun matcherShouldReturnFalseForNoGpsCoordinateUrl() {
+    val questionnaireItem = Questionnaire.QuestionnaireItemComponent()
+    assertThat(LocationGpsCoordinateViewHolderFactory.matcher(questionnaireItem)).isFalse()
+  }
 }

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

@@ -59,8 +59,11 @@ object LocationGpsCoordinateViewHolderFactory :
         header.context.tryUnwrapContext()?.apply {
           val gpsCoordinateExtensionValue =
             questionnaireViewItem.questionnaireItem
-              .getExtensionByUrl(GPS_COORDINATE_EXTENSION_URL)
-              .value as StringType
+              .getExtensionByUrl(PRIMARY_GPS_COORDINATE_EXTENSION_URL)
+              ?.value as? StringType
+              ?: questionnaireViewItem.questionnaireItem
+                .getExtensionByUrl(GPS_COORDINATE_EXTENSION_URL)
+                .value as StringType
           when (gpsCoordinateExtensionValue.valueAsString) {
             GPS_COORDINATE_EXTENSION_VALUE_LATITUDE -> {
               supportFragmentManager.setFragmentResultListener(
@@ -148,9 +151,12 @@ object LocationGpsCoordinateViewHolderFactory :
     }
 
   fun matcher(questionnaireItem: Questionnaire.QuestionnaireItemComponent): Boolean {
-    return questionnaireItem.hasExtension(GPS_COORDINATE_EXTENSION_URL)
+    return questionnaireItem.hasExtension(PRIMARY_GPS_COORDINATE_EXTENSION_URL) ||
+      questionnaireItem.hasExtension(GPS_COORDINATE_EXTENSION_URL)
   }
 
+  const val PRIMARY_GPS_COORDINATE_EXTENSION_URL =
+    "https://github.com/google/android-fhir/StructureDefinition/gps-coordinate"
   const val GPS_COORDINATE_EXTENSION_URL = "gps-coordinate"
   const val GPS_COORDINATE_EXTENSION_VALUE_LATITUDE = "latitude"
   const val GPS_COORDINATE_EXTENSION_VALUE_LONGITUDE = "longitude"

datacapture/build.gradle.kts

@@ -90,7 +90,6 @@ dependencies {
     exclude(module = "commons-logging")
     exclude(module = "httpclient")
   }
-  implementation(Dependencies.material)
   implementation(Dependencies.timber)
   implementation(libs.android.fhir.common)
   implementation(libs.androidx.appcompat)
@@ -101,6 +100,7 @@ dependencies {
   implementation(libs.glide)
   implementation(libs.kotlin.stdlib)
   implementation(libs.kotlinx.coroutines.core)
+  implementation(libs.material)
 
   testImplementation(Dependencies.mockitoInline)
   testImplementation(Dependencies.mockitoKotlin)

demo/build.gradle.kts

@@ -43,7 +43,6 @@ dependencies {
 
   coreLibraryDesugaring(Dependencies.desugarJdkLibs)
 
-  implementation(Dependencies.material)
   implementation(Dependencies.timber)
   implementation(libs.androidx.activity)
   implementation(libs.androidx.appcompat)
@@ -60,6 +59,7 @@ dependencies {
   implementation(libs.kotlin.stdlib)
   implementation(libs.kotlinx.coroutines.android)
   implementation(libs.kotlinx.coroutines.core)
+  implementation(libs.material)
   implementation(project(":datacapture")) {
     exclude(group = "com.google.android.fhir", module = "engine")
   }

docs/use/api.md

@@ -1,6 +1,6 @@
 # API
 
-* [Engine](api/engine/1.0.0/index.html)
+* [Engine](api/engine/1.1.0/index.html)
 * [Data Capture](api/data-capture/1.2.0/index.html)
 * [Workflow](api/workflow/0.1.0-beta01/index.html)
 * [Knowledge](api/knowledge/0.1.0-beta01/index.html)