Merge branch 'main' into bugfix/3821-fix-auth-server-connection-crash

Author: allan-on

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

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2021-2024 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
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable
+
+@Serializable
+@Parcelize
+data class ExternalAppConfig(
+  val id: String,
+  val label: String,
+  val packageName: String,
+  val playStoreUrl: String? = null,
+) : Parcelable

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

@@ -68,4 +68,7 @@ enum class ApplicationWorkflow {
 
   /** A workflow that launches report indicators screen */
   LAUNCH_REPORT_INDICATORS,
+
+  /** A workflow that launches an external application via Intent */
+  LAUNCH_EXTERNAL_APP,
 }

android/engine/src/main/java/org/smartregister/fhircore/engine/domain/model/ActionConfig.kt

@@ -22,6 +22,7 @@ import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 import org.hl7.fhir.r4.model.Enumerations
 import org.hl7.fhir.r4.model.ResourceType
+import org.smartregister.fhircore.engine.configuration.ExternalAppConfig
 import org.smartregister.fhircore.engine.configuration.PdfConfig
 import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
 import org.smartregister.fhircore.engine.configuration.profile.ManagingEntityConfig
@@ -44,6 +45,7 @@ data class ActionConfig(
   val popNavigationBackStack: Boolean? = null,
   val multiSelectViewConfig: MultiSelectViewConfig? = null,
   val pdfConfig: PdfConfig? = null,
+  val externalAppConfig: ExternalAppConfig? = null,
 ) : Parcelable, java.io.Serializable {
   fun paramsBundle(computedValuesMap: Map<String, Any> = emptyMap()): Bundle =
     Bundle().apply {

android/engine/src/main/res/drawable/ic_elearning.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="512" android:viewportWidth="512" android:width="24dp">
+
+    <path android:fillColor="#020202" android:pathData="m251.79,75.05c-20.35,3.18 -40.04,15.23 -59,22.96 -43.24,17.62 -85.84,36.78 -129,54.59 -19.05,7.86 -52.29,14.92 -57.49,38.01 -7.09,31.49 24.97,40.19 47.49,49.85 47.55,20.41 95.47,39.98 143,60.43 21.59,9.29 46.65,25.08 71,21.28 23.13,-3.61 46.58,-17.58 68,-26.71 40.28,-17.16 80.8,-33.78 121,-51.13 18.88,-8.15 51.16,-14.58 56.47,-37.72 7.2,-31.38 -25.16,-40.35 -47.47,-49.85 -47.63,-20.29 -95.39,-40.26 -143,-60.57 -21.54,-9.19 -46.74,-24.93 -71,-21.14m220,185.56c-5.06,2.7 -15.77,4.57 -18.97,9.42 -4.49,6.78 1.53,18.02 -1.63,25.37 -1.43,3.32 -5.66,4.84 -8.07,7.39 -4.39,4.66 -7.14,11.43 -7.28,17.82 -0.15,7.51 9.07,17.29 7.78,23 -0.87,3.87 -4.73,7.11 -6.08,11 -3.09,8.94 -5.89,37.91 2.45,44.27 5.22,3.98 13.66,2.73 19.79,2.73 7.45,0 18.47,1.92 24.89,-2.73 7.62,-5.51 5.53,-32.76 3.58,-41.27 -1.15,-5 -7.42,-10.32 -7.42,-15 0,-3.41 4.21,-6.95 5.6,-10 2.91,-6.38 3.23,-14.41 0.79,-21 -2.75,-7.43 -12.29,-11.1 -14.12,-18.04 -2.72,-10.34 2.85,-23.03 -1.32,-32.96m-372,23v62c0,17.08 -0.42,33.5 10.16,48 14.01,19.21 43.03,29.06 64.84,36.33 56.94,18.98 117.31,17.58 174,-1.33 19.3,-6.44 45.28,-15.91 58.53,-32 12.95,-15.73 12.47,-33.77 12.47,-53v-60c-13.97,3.32 -27.82,11.05 -41,16.72 -22.27,9.58 -44.69,18.8 -67,28.28 -16.54,7.03 -33.56,15.92 -52,15.92 -17.56,0 -33.16,-8.31 -49,-14.72 -23.81,-9.63 -47.4,-19.92 -71,-30.05 -12.88,-5.53 -26.35,-12.92 -40,-16.15z" android:strokeColor="#00000000"/>
+
+</vector>

android/quest/src/main/AndroidManifest.xml

@@ -12,6 +12,14 @@
     <uses-feature android:name="android.hardware.camera" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" android:foregroundServiceType="dataSync" />
 
+    <!-- Required for Android 11+ to query if external apps are installed -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.LAUNCHER" />
+        </intent>
+    </queries>
+
     <application
         android:name=".QuestApplication"
         android:allowBackup="false"

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/AppDrawer.kt

@@ -181,7 +181,8 @@ fun AppDrawer(
         }
 
         // Display list of configurable client registers
-        items(navigationConfiguration.clientRegisters, { it.id }) { navigationMenu ->
+        items(navigationConfiguration.clientRegisters.filter { it.visible }, { it.id }) {
+          navigationMenu ->
           SideMenuItem(
             imageConfig = navigationMenu.menuIconConfig,
             title = navigationMenu.display,
@@ -217,7 +218,8 @@ fun AppDrawer(
         item { Divider(color = DividerColor) }
 
         // Display list of configurable static menu
-        items(navigationConfiguration.staticMenu, { it.id }) { navigationMenu ->
+        items(navigationConfiguration.staticMenu.filter { it.visible }, { it.id }) { navigationMenu,
+          ->
           SideMenuItem(
             imageConfig = navigationMenu.menuIconConfig,
             title = navigationMenu.display,

android/quest/src/main/java/org/smartregister/fhircore/quest/util/ExternalAppLauncher.kt

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2021-2024 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.quest.util
+
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.net.Uri.parse
+import android.widget.Toast
+import org.smartregister.fhircore.engine.configuration.ExternalAppConfig
+import org.smartregister.fhircore.quest.R
+
+fun openExternalApp(context: Context, config: ExternalAppConfig) {
+  if (config.packageName.isBlank()) {
+    Toast.makeText(
+        context,
+        context.getString(R.string.external_app_invalid_config),
+        Toast.LENGTH_SHORT,
+      )
+      .show()
+    return
+  }
+
+  val launchIntent = context.packageManager.getLaunchIntentForPackage(config.packageName)
+  if (launchIntent != null) {
+    context.startActivity(launchIntent)
+  } else {
+    if (!config.playStoreUrl.isNullOrBlank()) {
+      try {
+        val browserIntent = Intent(Intent.ACTION_VIEW, parse(config.playStoreUrl))
+        context.startActivity(browserIntent)
+      } catch (e: ActivityNotFoundException) {
+        Toast.makeText(
+            context,
+            context.getString(R.string.external_app_not_installed),
+            Toast.LENGTH_SHORT,
+          )
+          .show()
+      }
+    } else {
+      Toast.makeText(
+          context,
+          context.getString(R.string.external_app_not_installed),
+          Toast.LENGTH_SHORT,
+        )
+        .show()
+    }
+  }
+}

android/quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensions.kt

@@ -62,6 +62,7 @@ import org.smartregister.fhircore.quest.navigation.MainNavigationScreen
 import org.smartregister.fhircore.quest.navigation.NavigationArg
 import org.smartregister.fhircore.quest.ui.pdf.PdfLauncherFragment
 import org.smartregister.fhircore.quest.ui.shared.QuestionnaireHandler
+import org.smartregister.fhircore.quest.util.openExternalApp
 import org.smartregister.p2p.utils.startP2PScreen
 
 const val PRACTITIONER_ID = "practitionerId"
@@ -227,6 +228,11 @@ fun ActionConfig.handleClickEvent(
         Toast.LENGTH_LONG,
       )
     }
+    ApplicationWorkflow.LAUNCH_EXTERNAL_APP -> {
+      actionConfig.externalAppConfig?.let { config ->
+        openExternalApp(navController.context, config)
+      }
+    }
     ApplicationWorkflow.LAUNCH_LOCATION_SELECTOR -> {
       val args =
         bundleOf(

android/quest/src/main/res/values/strings.xml

@@ -164,4 +164,6 @@
     <string name="no_encounter_data_available">No data available</string>
     <string name="no_data_available_for_period">No data available for this period</string>
     <string name="reports_suffix">Reports</string>
+    <string name="external_app_not_installed">The app is not installed. Please contact your administrator.</string>
+    <string name="external_app_invalid_config">Invalid app configuration. Please contact your administrator.</string>
 </resources>

android/quest/src/test/java/org/smartregister/fhircore/quest/ui/report/indicator/ReportIndicatorViewModelTest.kt

@@ -263,10 +263,12 @@ class ReportIndicatorViewModelTest : RobolectricTest() {
     val ranges = viewModel.reportPeriodRange.value
     val years = ranges.keys.toList()
 
+    val currentYear = Calendar.getInstance().get(Calendar.YEAR)
+
     assertTrue(years.size >= 2)
-    assertEquals("2025", years[0])
-    assertEquals("2024", years[1])
-    assertEquals("2023", years[2])
+    assertEquals(currentYear.toString(), years[0])
+    assertTrue(years.contains("2024"))
+    assertTrue(years.contains("2023"))
   }
 
   @Test