Add Geowidget module

.github/workflows/ci.yml

@@ -87,6 +87,78 @@ jobs:
         working-directory: android
         run:  bash <(curl -s https://codecov.io/bash) -F engine -f "engine/build/reports/jacoco/fhircoreJacocoReport/fhircoreJacocoReport.xml"
 
+  geowidget-tests:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        api-level: [30]
+    steps:
+      - name: Cancel Previous workflow runs
+        uses: styfle/cancel-workflow-action@0.9.1
+        with:
+          access_token: ${{ github.token }}
+
+      - name: Checkout 🛎️
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+        working-directory: android
+
+      - name: Copy CI gradle.properties
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties && cat ~/.gradle/gradle.properties
+
+      - name: Setup Gradle cache
+        uses: gradle/gradle-build-action@v2
+
+      - name: Spotless check geowidget module
+        run: ./gradlew :geowidget:spotlessCheck --stacktrace
+        working-directory: android 
+
+      - name: Load AVD cache
+        uses: actions/cache@v2
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-${{ matrix.api-level }}
+
+      - name: Create AVD and generate snapshot for caching
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          working-directory: android
+          api-level: ${{ matrix.api-level }}
+          arch: x86_64
+          force-avd-creation: false
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: false
+          script: echo "Generated AVD snapshot for caching."
+
+      - name: Run Geowidget module unit and instrumentation tests and generate coverage report
+        uses: reactivecircus/android-emulator-runner@v2
+        with: 
+          working-directory: android
+          api-level: ${{ matrix.api-level }}
+          arch: x86_64
+          force-avd-creation: true
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: ./gradlew :geowidget:clean && ./gradlew :geowidget:fhircoreJacocoReport --stacktrace
+
+      - name: Upload Geowidget module test coverage report to Codecov
+        if: matrix.api-level == 30 # Only upload coverage on API level 30
+        working-directory: android
+        run:  bash <(curl -s https://codecov.io/bash) -F geowidget -f "geowidget/build/reports/jacoco/fhircoreJacocoReport/fhircoreJacocoReport.xml"
+
   quest-tests:
     runs-on: macos-latest
     strategy:

android/build.gradle

@@ -1,12 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     apply from: 'deps.gradle'
+    apply from: 'configs.gradle'
+
     repositories {
         google()
         maven { url "https://plugins.gradle.org/m2/" }
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
 
     }
+
     dependencies {
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10'
         classpath "org.jetbrains.kotlin:kotlin-serialization:1.6.21"
@@ -32,6 +35,9 @@ allprojects {
             name = "fhirsdk"
             url = uri("/Users/ndegwamartin/.m2.dev/fhirsdk")
         }
+        maven {
+            url 'https://jcenter.bintray.com/'
+        }
     }
 }
 

android/configs.gradle

@@ -0,0 +1,2 @@
+def geowidgetEnabled = true
+ext.geowidgetEnabled = geowidgetEnabled

android/deps.gradle

@@ -33,8 +33,10 @@ versions.hapi_r4 = '5.3.0'
 versions.junit5_api = '5.8.2'
 versions.junit5_plugin = '1.8.2.0'
 versions.kotlin = '1.6.10'
+versions.kujaku_library = '0.9.0'
 versions.lifecycle = '2.2.0'
 versions.material = '1.5.0'
+versions.mapbox_sdk_turf = '4.8.0'
 versions.okhttp_logging_interceptor = '4.0.0'
 versions.recyclerview = '1.1.0'
 versions.retrofit = '2.7.2'
@@ -89,6 +91,8 @@ deps.junit5_plugin = "de.mannodermaus.gradle.plugins:android-junit5:$versions.ju
 deps.junit5_api = "org.junit.jupiter:junit-jupiter-api:$versions.junit5_api"
 deps.junit5_engine = "org.junit.jupiter:junit-jupiter-engine:$versions.junit5_api"
 deps.junit5_engine_vintage = "org.junit.vintage:junit-vintage-engine:$versions.junit5_api"
+deps.kujaku_library = "io.ona.kujaku:library:$versions.kujaku_library"
+deps.mapbox_sdk_turf = "com.mapbox.mapboxsdk:mapbox-sdk-turf:$versions.mapbox_sdk_turf"
 deps.mockk = "io.mockk:mockk:$versions.mockk"
 deps.mockk_android = "io.mockk:mockk-android:$versions.mockk"
 deps.dokka_plugin = "org.jetbrains.dokka:dokka-gradle-plugin:$versions.dokka"

android/engine/build.gradle

@@ -10,6 +10,7 @@ plugins {
 }
 
 apply from: '../jacoco.gradle'
+apply from: '../configs.gradle'
 
 android {
 
@@ -18,6 +19,7 @@ android {
     dataBinding {
         enabled true
     }
+
     defaultConfig {
         minSdkVersion sdk_versions.min_sdk
         targetSdkVersion sdk_versions.target_sdk
@@ -158,7 +160,7 @@ dependencies {
     // P2P dependency
     implementation('org.smartregister:p2p-lib:0.4.0-SNAPSHOT')
 
-    // Configure Jetpack Compose
+    //Configure Jetpack Compose
     def composeVersion = "1.3.0-alpha01"
     api("androidx.compose.ui:ui:$composeVersion")
     api("androidx.compose.ui:ui-tooling:$composeVersion")

android/engine/src/main/AndroidManifest.xml

@@ -19,7 +19,8 @@
 
     <uses-permission android:name="android.permission.CALL_PHONE" />
 
-    <application>
+    <application
+        xmlns:tools="http://schemas.android.com/tools">
 
         <activity
             android:name=".ui.appsetting.AppSettingActivity"

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/ConfigType.kt

@@ -35,4 +35,5 @@ sealed class ConfigType(
   object Register : ConfigType("register", multiConfig = true)
   object MeasureReport : ConfigType("measureReport")
   object Profile : ConfigType("profile", multiConfig = true)
+  object GeoWidget : ConfigType("geoWidget", multiConfig = true)
 }

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/Configuration.kt

@@ -25,6 +25,7 @@ package org.smartregister.fhircore.engine.configuration
  * @property appId Unique identifier for the application to which this configurations is applied
  * @property configType Used to categorize multiple configurations of the same type. E.g. two
  * RegisterViewConfigurations used in an application with two registers.
+ * @property resourceType Optional FHIR resource type
  */
 abstract class Configuration {
   open lateinit var appId: String

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/geowidget/GeoWidgetConfiguration.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2021 Ona Systems, Inc
+ *
+ * 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 org.smartregister.fhircore.engine.configuration.geowidget
+
+import kotlinx.serialization.Serializable
+import org.smartregister.fhircore.engine.configuration.ConfigType
+import org.smartregister.fhircore.engine.configuration.Configuration
+import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
+
+@Serializable
+data class GeoWidgetConfiguration(
+  override var appId: String,
+  override var configType: String = ConfigType.GeoWidget.name,
+  val id: String,
+  val profileId: String,
+  val registrationQuestionnaire: QuestionnaireConfig
+) : Configuration()

android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/register/RegisterRepository.kt

@@ -246,8 +246,14 @@ constructor(
     val baseResourceClass = baseResourceConfig.resource.resourceClassType()
     val baseResourceType = baseResourceClass.newInstance().resourceType
 
+    // Some resource id maybe in the format  Group/1be72fc8-5e5c-4f90-a37d-739c73fc4bdf/_history/7
+    val parsedResourceId =
+      if (resourceId.startsWith(baseResourceType.name))
+        resourceId.substringAfter("/").substringBefore("/")
+      else resourceId
+
     val baseResource: Resource =
-      withContext(dispatcherProvider.io()) { fhirEngine.get(baseResourceType, resourceId) }
+      withContext(dispatcherProvider.io()) { fhirEngine.get(baseResourceType, parsedResourceId) }
 
     return retrieveRelatedResources(
       relatedResourcesConfig = relatedResourcesConfig,

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

@@ -170,13 +170,15 @@ open class QuestionnaireActivity : BaseMultiLanguageActivity(), View.OnClickList
 
               if (clientIdentifier != null) {
                 setBarcode(questionnaire, clientIdentifier!!, true)
-                questionnaireResponse =
-                  questionnaireViewModel.generateQuestionnaireResponse(questionnaire, intent)
-                this.putString(
-                  QuestionnaireFragment.EXTRA_QUESTIONNAIRE_RESPONSE_JSON_STRING,
-                  questionnaireResponse.encodeResourceToString()
-                )
               }
+
+              questionnaireResponse =
+                questionnaireViewModel.generateQuestionnaireResponse(questionnaire, intent)
+
+              this.putString(
+                QuestionnaireFragment.EXTRA_QUESTIONNAIRE_RESPONSE_JSON_STRING,
+                questionnaireResponse.encodeResourceToString()
+              )
             }
       }
     supportFragmentManager.commit { add(R.id.container, fragment, QUESTIONNAIRE_FRAGMENT_TAG) }
@@ -374,6 +376,10 @@ open class QuestionnaireActivity : BaseMultiLanguageActivity(), View.OnClickList
     }
   }
 
+  override fun onResume() {
+    super.onResume()
+  }
+
   open fun getDismissDialogMessage() = R.string.questionnaire_alert_back_pressed_message
 
   companion object {

android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/AndroidExtensions.kt

@@ -18,6 +18,7 @@ package org.smartregister.fhircore.engine.util.extension
 
 import android.app.Activity
 import android.content.Context
+import android.content.ContextWrapper
 import android.content.Intent
 import android.content.res.Configuration
 import android.content.res.Resources
@@ -26,6 +27,7 @@ import android.os.Build
 import android.os.Bundle
 import android.os.LocaleList
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.ui.graphics.Color as ComposeColor
 import java.util.Locale
 import org.smartregister.fhircore.engine.domain.model.QuestionnaireType
@@ -165,3 +167,10 @@ fun String?.parseColor(): androidx.compose.ui.graphics.Color {
   }
   return ComposeColor.Unspecified
 }
+
+fun Context.getActivity(): AppCompatActivity? =
+  when (this) {
+    is AppCompatActivity -> this
+    is ContextWrapper -> baseContext.getActivity()
+    else -> null
+  }

android/geowidget/.gitignore

@@ -0,0 +1 @@
+/build