forked from google/android-fhir
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support location widget to get current location (google#2341)
* Support location widget to get current location Added a custom location-widget as contrib/locationwidget library * Allow License https://developer.android.com/studio/terms.html * Remove unnecesary unit view for location widget * Update tests for contrib locationwidget --------- Co-authored-by: Jing Tang <jingtang@google.com>
- Loading branch information
1 parent
35b7272
commit 4169a8d
Showing
28 changed files
with
886 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| { | ||
| "resourceType": "Questionnaire", | ||
| "language": "en", | ||
| "status": "active", | ||
| "date": "2020-11-18T07:24:47.111Z", | ||
| "item": [ | ||
| { | ||
| "linkId": "location-widget", | ||
| "type": "group", | ||
| "text": "Location Widget", | ||
| "extension": [ | ||
| { | ||
| "url": "https://github.com/google/android-fhir/StructureDefinition/questionnaire-itemControl", | ||
| "valueCodeableConcept": { | ||
| "coding": [ | ||
| { | ||
| "system": "https://github.com/google/android-fhir/questionnaire-item-control", | ||
| "code": "location-widget" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ], | ||
| "item": [ | ||
| { | ||
| "linkId": "latitude", | ||
| "type": "decimal", | ||
| "required": true, | ||
| "text": "Latitude", | ||
| "extension": [ | ||
| { | ||
| "url": "gps-coordinate", | ||
| "valueString": "latitude" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "linkId": "longitude", | ||
| "type": "decimal", | ||
| "required": true, | ||
| "text": "Longitude", | ||
| "extension": [ | ||
| { | ||
| "url": "gps-coordinate", | ||
| "valueString": "longitude" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
.../android/fhir/catalog/ContribQuestionnaireItemViewHolderFactoryMatchersProviderFactory.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * Copyright 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. | ||
| * 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.catalog | ||
|
|
||
| import com.google.android.fhir.datacapture.QuestionnaireFragment | ||
| import com.google.android.fhir.datacapture.QuestionnaireItemViewHolderFactoryMatchersProviderFactory | ||
| import com.google.android.fhir.datacapture.contrib.views.locationwidget.LocationGpsCoordinateViewHolderFactory | ||
| import com.google.android.fhir.datacapture.contrib.views.locationwidget.LocationWidgetViewHolderFactory | ||
|
|
||
| object ContribQuestionnaireItemViewHolderFactoryMatchersProviderFactory : | ||
| QuestionnaireItemViewHolderFactoryMatchersProviderFactory { | ||
|
|
||
| const val LOCATION_WIDGET_PROVIDER = "location-widget-provider" | ||
|
|
||
| override fun get( | ||
| provider: String, | ||
| ): QuestionnaireFragment.QuestionnaireItemViewHolderFactoryMatchersProvider = | ||
| when (provider) { | ||
| LOCATION_WIDGET_PROVIDER -> | ||
| object : QuestionnaireFragment.QuestionnaireItemViewHolderFactoryMatchersProvider() { | ||
| override fun get(): | ||
| List<QuestionnaireFragment.QuestionnaireItemViewHolderFactoryMatcher> { | ||
| return listOf( | ||
| QuestionnaireFragment.QuestionnaireItemViewHolderFactoryMatcher( | ||
| factory = LocationGpsCoordinateViewHolderFactory, | ||
| matches = LocationGpsCoordinateViewHolderFactory::matcher, | ||
| ), | ||
| QuestionnaireFragment.QuestionnaireItemViewHolderFactoryMatcher( | ||
| factory = LocationWidgetViewHolderFactory, | ||
| matches = LocationWidgetViewHolderFactory::matcher, | ||
| ), | ||
| ) | ||
| } | ||
| } | ||
| else -> throw NotImplementedError() | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <vector | ||
| xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="128dp" | ||
| android:height="128dp" | ||
| android:tint="#1A73E8" | ||
| android:viewportWidth="24" | ||
| android:viewportHeight="24" | ||
| > | ||
| <path | ||
| android:fillColor="@android:color/white" | ||
| android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z" | ||
| /> | ||
| </vector> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| /build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| import Dependencies.removeIncompatibleDependencies | ||
|
|
||
| plugins { | ||
| id(Plugins.BuildPlugins.androidLib) | ||
| id(Plugins.BuildPlugins.kotlinAndroid) | ||
| id(Plugins.BuildPlugins.mavenPublish) | ||
| jacoco | ||
| } | ||
|
|
||
| publishArtifact(Releases.Contrib.LocationWidget) | ||
|
|
||
| createJacocoTestReportTask() | ||
|
|
||
| android { | ||
| namespace = "com.google.android.fhir.datacapture.contrib.views.locationwidget" | ||
| compileSdk = Sdk.compileSdk | ||
| defaultConfig { | ||
| minSdk = Sdk.minSdk | ||
| testInstrumentationRunner = Dependencies.androidJunitRunner | ||
| // Need to specify this to prevent junit runner from going deep into our dependencies | ||
| testInstrumentationRunnerArguments["package"] = "com.google.android.fhir.datacapture" | ||
| } | ||
|
|
||
| buildFeatures { viewBinding = true } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| isMinifyEnabled = false | ||
| proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt")) | ||
| } | ||
| } | ||
|
|
||
| packaging { | ||
| resources.excludes.addAll( | ||
| listOf( | ||
| "META-INF/INDEX.LIST", | ||
| "META-INF/ASL2.0", | ||
| "META-INF/ASL-2.0.txt", | ||
| "META-INF/LGPL-3.0.txt", | ||
| ), | ||
| ) | ||
| } | ||
|
|
||
| configureJacocoTestOptions() | ||
|
|
||
| testOptions { animationsDisabled = true } | ||
| kotlin { jvmToolchain(11) } | ||
| } | ||
|
|
||
| configurations { all { removeIncompatibleDependencies() } } | ||
|
|
||
| dependencies { | ||
| implementation(project(":datacapture")) | ||
| implementation(Dependencies.Androidx.coreKtx) | ||
| implementation(Dependencies.Androidx.fragmentKtx) | ||
| implementation(Dependencies.playServicesLocation) | ||
| implementation(Dependencies.Kotlin.kotlinCoroutinesPlay) | ||
| implementation(Dependencies.material) | ||
| implementation(Dependencies.timber) | ||
| implementation(Dependencies.Androidx.appCompat) | ||
|
|
||
| testImplementation(Dependencies.AndroidxTest.fragmentTesting) | ||
| testImplementation(Dependencies.Kotlin.kotlinTestJunit) | ||
| testImplementation(Dependencies.junit) | ||
| testImplementation(Dependencies.robolectric) | ||
| testImplementation(Dependencies.truth) | ||
|
|
||
| androidTestImplementation(Dependencies.AndroidxTest.core) | ||
| androidTestImplementation(Dependencies.AndroidxTest.extJunit) | ||
| androidTestImplementation(Dependencies.AndroidxTest.extJunitKtx) | ||
| androidTestImplementation(Dependencies.AndroidxTest.fragmentTesting) | ||
| androidTestImplementation(Dependencies.AndroidxTest.rules) | ||
| androidTestImplementation(Dependencies.AndroidxTest.runner) | ||
| androidTestImplementation(Dependencies.truth) | ||
| } |
Oops, something went wrong.