Add the SDC Location picker widget to the main branch

android/build.gradle.kts

@@ -94,6 +94,16 @@ subprojects {
           "org.jacoco" -> useVersion("0.8.11")
         }
       }
+
+      // Maximum Jackson libraries (excluding core) version that supports Android API Level 24:
+      // https://github.com/FasterXML/jackson-databind/issues/3658
+      force("com.fasterxml.jackson.core:jackson-annotations:2.13.4")
+      force("com.fasterxml.jackson:jackson-bom:2.13.4")
+      force("com.fasterxml.jackson.core:jackson-core:2.13.4")
+      force("com.fasterxml.jackson.core:jackson-databind:2.13.4")
+      force("com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.13.4")
+      force("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4")
+      force("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.4")
     }
   }
 

android/engine/build.gradle.kts

@@ -208,6 +208,13 @@ dependencies {
     exclude(group = "com.google.android.fhir", module = "common")
     exclude(group = "com.google.android.fhir", module = "engine")
   }
+  api(libs.contrib.locationwidget) {
+    isTransitive = true
+    exclude(group = "org.smartregister", module = "data-capture")
+    exclude(group = "ca.uhn.hapi.fhir")
+    exclude(group = "com.google.android.fhir", module = "common")
+    exclude(group = "com.google.android.fhir", module = "engine")
+  }
   api(libs.fhir.engine) {
     isTransitive = true
     exclude(group = "com.google.android.fhir", module = "common")

android/gradle/libs.versions.toml

@@ -9,6 +9,7 @@ compressor = "3.0.1"
 constraintlayout = "2.1.4"
 constraintlayout-compose = "1.0.1"
 contrib-barcode = "0.1.0-beta3-preview5-SNAPSHOT"
+contrib-locationwidget = "0.1.0-alpha01-lw-SNAPSHOT"
 converter-gson = "2.9.0"
 core-ktx = "1.12.0"
 android-x-test= "1.5.2"
@@ -93,6 +94,7 @@ compressor = { group = "id.zelory", name = "compressor", version.ref = "compress
 constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
 constraintlayout-compose = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref = "constraintlayout-compose" }
 contrib-barcode = { group = "org.smartregister", name = "contrib-barcode", version.ref = "contrib-barcode" }
+contrib-locationwidget = { group = "org.smartregister", name = "contrib-locationwidget", version.ref = "contrib-locationwidget" }
 converter-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "converter-gson" }
 core-desugar = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "desugar-jdk-libs" }
 core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" }

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt

@@ -30,8 +30,6 @@ import androidx.lifecycle.lifecycleScope
 import com.google.android.fhir.datacapture.QuestionnaireFragment
 import com.google.android.fhir.logicalId
 import dagger.hilt.android.AndroidEntryPoint
-import java.io.Serializable
-import java.util.LinkedList
 import kotlinx.coroutines.launch
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
@@ -52,6 +50,8 @@ import org.smartregister.fhircore.engine.util.extension.showToast
 import org.smartregister.fhircore.quest.R
 import org.smartregister.fhircore.quest.databinding.QuestionnaireActivityBinding
 import timber.log.Timber
+import java.io.Serializable
+import java.util.LinkedList
 
 @AndroidEntryPoint
 class QuestionnaireActivity : BaseMultiLanguageActivity() {
@@ -163,6 +163,9 @@ class QuestionnaireActivity : BaseMultiLanguageActivity() {
     val questionnaireFragmentBuilder =
       QuestionnaireFragment.builder()
         .setQuestionnaire(questionnaire.json())
+        .setCustomQuestionnaireItemViewHolderFactoryMatchersProvider(
+          OPENSRP_ITEM_VIEWHOLDER_FACTORY_MATCHERS_PROVIDER,
+        )
         .showAsterisk(questionnaireConfig.showRequiredTextAsterisk)
         .showRequiredText(questionnaireConfig.showRequiredText)
 

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireItemViewHolderFactoryMatchersProviderFactoryImpl.kt

@@ -19,18 +19,27 @@ package org.smartregister.fhircore.quest.ui.questionnaire
 import com.google.android.fhir.datacapture.QuestionnaireFragment
 import com.google.android.fhir.datacapture.QuestionnaireItemViewHolderFactoryMatchersProviderFactory
 import com.google.android.fhir.datacapture.contrib.views.barcode.BarCodeReaderViewHolderFactory
+import com.google.android.fhir.datacapture.contrib.views.locationwidget.LocationGpsCoordinateViewHolderFactory
+import com.google.android.fhir.datacapture.contrib.views.locationwidget.LocationWidgetViewHolderFactory
 import com.google.android.fhir.datacapture.extensions.asStringValue
 
+const val OPENSRP_ITEM_VIEWHOLDER_FACTORY_MATCHERS_PROVIDER =
+  "org.smartregister.fhircore.quest.QuestionnaireItemViewHolderFactoryMatchersProvider"
+
 object QuestionnaireItemViewHolderFactoryMatchersProviderFactoryImpl :
   QuestionnaireItemViewHolderFactoryMatchersProviderFactory {
 
   override fun get(
     provider: String,
   ): QuestionnaireFragment.QuestionnaireItemViewHolderFactoryMatchersProvider {
-    return QuestionnaireItemViewHolderFactoryMatchersProviderImpl
+    return when (provider) {
+      OPENSRP_ITEM_VIEWHOLDER_FACTORY_MATCHERS_PROVIDER ->
+        OpenSRPQuestionnaireItemViewHolderFactoryMatchersProviderImpl
+      else -> throw NotImplementedError()
+    }
   }
 
-  object QuestionnaireItemViewHolderFactoryMatchersProviderImpl :
+  object OpenSRPQuestionnaireItemViewHolderFactoryMatchersProviderImpl :
     QuestionnaireFragment.QuestionnaireItemViewHolderFactoryMatchersProvider() {
 
     const val BARCODE_URL = "https://fhir.labs.smartregister.org/barcode-type-widget-extension"
@@ -45,6 +54,14 @@ object QuestionnaireItemViewHolderFactoryMatchersProviderFactoryImpl :
             if (it == null) false else it.value.asStringValue() == BARCODE_NAME
           }
         },
+        QuestionnaireFragment.QuestionnaireItemViewHolderFactoryMatcher(
+          factory = LocationGpsCoordinateViewHolderFactory,
+          matches = LocationGpsCoordinateViewHolderFactory::matcher,
+        ),
+        QuestionnaireFragment.QuestionnaireItemViewHolderFactoryMatcher(
+          factory = LocationWidgetViewHolderFactory,
+          matches = LocationWidgetViewHolderFactory::matcher,
+        ),
       )
     }
   }