Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the SDC Location picker widget to the main branch #3046

Merged
merged 15 commits into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions android/engine/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,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")
Expand Down
2 changes: 2 additions & 0 deletions android/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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-preview-SNAPSHOT"
converter-gson = "2.9.0"
core-ktx = "1.12.0"
android-x-test= "1.5.2"
Expand Down Expand Up @@ -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" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@
val questionnaireFragmentBuilder =
QuestionnaireFragment.builder()
.setQuestionnaire(questionnaire.json())
.setCustomQuestionnaireItemViewHolderFactoryMatchersProvider(
OPENSRP_ITEM_VIEWHOLDER_FACTORY_MATCHERS_PROVIDER,

Check warning on line 167 in android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt

View check run for this annotation

Codecov / codecov/patch

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt#L166-L167

Added lines #L166 - L167 were not covered by tests
)
.showAsterisk(questionnaireConfig.showRequiredTextAsterisk)
.showRequiredText(questionnaireConfig.showRequiredText)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,30 @@
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) {

Check warning on line 35 in android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireItemViewHolderFactoryMatchersProviderFactoryImpl.kt

View check run for this annotation

Codecov / codecov/patch

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

Added line #L35 was not covered by tests
OPENSRP_ITEM_VIEWHOLDER_FACTORY_MATCHERS_PROVIDER ->
OpenSRPQuestionnaireItemViewHolderFactoryMatchersProviderImpl
else -> throw NotImplementedError()

Check warning on line 38 in android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireItemViewHolderFactoryMatchersProviderFactoryImpl.kt

View check run for this annotation

Codecov / codecov/patch

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireItemViewHolderFactoryMatchersProviderFactoryImpl.kt#L37-L38

Added lines #L37 - L38 were not covered by tests
}
}

object QuestionnaireItemViewHolderFactoryMatchersProviderImpl :
object OpenSRPQuestionnaireItemViewHolderFactoryMatchersProviderImpl :
QuestionnaireFragment.QuestionnaireItemViewHolderFactoryMatchersProvider() {

const val BARCODE_URL = "https://fhir.labs.smartregister.org/barcode-type-widget-extension"
const val BARCODE_URL = "https://smartregister.org/barcode-type-widget-extension"
const val BARCODE_NAME = "barcode"

override fun get(): List<QuestionnaireFragment.QuestionnaireItemViewHolderFactoryMatcher> {
Expand All @@ -45,6 +54,14 @@
if (it == null) false else it.value.asStringValue() == BARCODE_NAME
}
},
QuestionnaireFragment.QuestionnaireItemViewHolderFactoryMatcher(
factory = LocationGpsCoordinateViewHolderFactory,
matches = LocationGpsCoordinateViewHolderFactory::matcher,

Check warning on line 59 in android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireItemViewHolderFactoryMatchersProviderFactoryImpl.kt

View check run for this annotation

Codecov / codecov/patch

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireItemViewHolderFactoryMatchersProviderFactoryImpl.kt#L57-L59

Added lines #L57 - L59 were not covered by tests
),
QuestionnaireFragment.QuestionnaireItemViewHolderFactoryMatcher(
factory = LocationWidgetViewHolderFactory,
matches = LocationWidgetViewHolderFactory::matcher,

Check warning on line 63 in android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireItemViewHolderFactoryMatchersProviderFactoryImpl.kt

View check run for this annotation

Codecov / codecov/patch

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireItemViewHolderFactoryMatchersProviderFactoryImpl.kt#L61-L63

Added lines #L61 - L63 were not covered by tests
),
)
}
}
Expand Down
Loading