Enable Drawer Menu Opening on Swipe From Left Gesture

.gitignore

@@ -5,7 +5,6 @@ node_modules/
 .gradle/
 build/
 
-
 # Local configuration file (sdk path, etc)
 local.properties
 
@@ -38,6 +37,7 @@ android/quest/src/main/assets/configs/*
 # Project resource directories
 android/quest/src/main/assets/resources/echis/
 
-# Claude Code documentation (local only)
 CLAUDE.md
-android/CLAUDE.md
+.claude/
+.claude.json
+.mcp.json

android/buildSrc/src/main/kotlin/BuildConfigs.kt

@@ -2,8 +2,8 @@ object BuildConfigs {
     const val minSdk = 26
     const val compileSdk = 35
     const val targetSdk = 35
-    const val versionCode = 19
-    const val versionName = "2.2.2"
+    const val versionCode = 22
+    const val versionName = "2.2.4"
     const val applicationId = "org.smartregister.opensrp"
     const val jvmToolchain = 17
     const val kotlinCompilerExtensionVersion = "1.5.14"

android/engine/src/main/res/values-ar/strings.xml

@@ -11,7 +11,7 @@
     <string name="empty_client_list_message_title">لا توجد نتائج</string>
     <string name="empty_client_list_message_details">نأسف، لم نتمكن من العثور على العميل بالاسم أو المعرف المحدد</string>
     <string name="register_new_client">تسجيل عميل جديد</string>
-    <string name="default_app_title" translatable="false">Fhir App</string>
+    <string name="default_app_title" translatable="false">OpenSRP</string>
     <string name="app_logo">شعار التطبيق</string>
     <string name="powered_by">مدعوم من</string>
     <string name="app_version">نسخة التطبيق %1$d(%2$s)</string>
@@ -99,7 +99,7 @@
     <string name="application_id">معرف التطبيق</string>
     <string name="app_id_sample" translatable="false">e.g. ecbis, quest, cha</string>
     <string name="load_configurations">تكوينات التحميل</string>
-    <string name="fhir_core_app" translatable="false">FHIRCORE APP</string>
+    <string name="fhir_core_app" translatable="false">OPENSRP 2</string>
     <string name="remember_app">تذكر التطبيق</string>
     <string name="done">منتهي</string>
     <string name="replace_photo">استبدال الصورة</string>
@@ -184,6 +184,7 @@
     <string name="care_team">فريق الرعاية</string>
     <string name="location">موقع</string>
     <string name="app_version_code">رمز إصدار التطبيق</string>
+    <string name="app_build_type">نوع خطة التطبيق</string>
     <string name="build_date">تاريخ البناء</string>
     <string name="manufacture">الشركة المصنعة</string>
     <string name="app_versions">نسخة التطبيق</string>

android/engine/src/main/res/values-es/strings.xml

@@ -10,7 +10,7 @@
     <string name="empty_client_list_message_title">Sin resultados</string>
     <string name="empty_client_list_message_details">Lo sentimos, no pudimos encontrar el cliente con su nombre o ID</string>
     <string name="register_new_client">Registrar nuevo cliente</string>
-    <string name="default_app_title" translatable="false">Aplicación Fhir</string>
+    <string name="default_app_title" translatable="false">OpenSRP</string>
     <string name="app_logo">Logotipo de la aplicación</string>
     <string name="powered_by">Desarrollado por</string>
     <string name="app_version">Versión de la aplicación %1$d(%2$s)</string>
@@ -94,7 +94,7 @@
     <string name="application_id">ID de aplicación</string>
     <string name="app_id_sample" translatable="false">por ejemplo, ecbis, quest, cha</string>
     <string name="load_configurations">CARGAR CONFIGURACIONES</string>
-    <string name="fhir_core_app" translatable="false">APLICACIÓN FHIRCORE</string>
+    <string name="fhir_core_app" translatable="false">OpenSRP</string>
     <string name="remember_app">Recordar aplicación</string>
     <string name="done">Listo</string>
     <string name="replace_photo">Reemplazar foto</string>
@@ -176,6 +176,7 @@
     <string name="care_team">Equipo de atención</string>
     <string name="location">Ubicación</string>
     <string name="app_version_code">Código de versión de la aplicación</string>
+    <string name="app_build_type">Tipo de compilación de la aplicación</string>
     <string name="build_date">Fecha de compilación</string>
     <string name="manufacture">Fabricante</string>
     <string name="app_versions">Versión de la aplicación</string>

android/engine/src/main/res/values-fr/strings.xml

@@ -162,6 +162,7 @@
     <string name="care_team">Care Team</string>
     <string name="location">Localisation</string>
     <string name="app_version_code">Code de version de l\'application</string>
+    <string name="app_build_type">Type de build d\'application</string>
     <string name="build_date">Date de création</string>
     <string name="manufacture">Fabricant</string>
     <string name="app_versions">Version de l\'application</string>

android/engine/src/main/res/values-in/strings.xml

@@ -11,7 +11,7 @@
     <string name="empty_client_list_message_title">Tidak Ada Hasil</string>
     <string name="empty_client_list_message_details">Maaf, kami tidak dapat menemukan klien dengan nama atau nomor ID tersebut</string>
     <string name="register_new_client">Daftarkan klien baru</string>
-    <string name="default_app_title" translatable="false">Fhir App</string>
+    <string name="default_app_title" translatable="false">OpenSRP</string>
     <string name="app_logo">Logo aplikasi</string>
     <string name="powered_by">Dipersembahkan oleh</string>
     <string name="app_version">App versi %1$d(%2$s)</string>
@@ -97,7 +97,7 @@
     <string name="application_id">ID Aplikasi</string>
     <string name="app_id_sample" translatable="false">e.g. ecbis, quest, cha</string>
     <string name="load_configurations">MEMUAT KONFIGURASI</string>
-    <string name="fhir_core_app" translatable="false">FHIRCORE APP</string>
+    <string name="fhir_core_app" translatable="false">OPENSRP 2</string>
     <string name="remember_app">Ingat aplikasi</string>
     <string name="done">Selesai</string>
     <string name="replace_photo">Ganti foto</string>
@@ -177,6 +177,7 @@
     <string name="care_team">Tim Perawatan</string>
     <string name="location">Lokasi</string>
     <string name="app_version_code">Kode versi aplikasi</string>
+    <string name="app_build_type">Jenis pembuatan aplikasi</string>
     <string name="build_date">Tanggal build</string>
     <string name="manufacture">Manufaktur</string>
     <string name="app_versions">Versi Aplikasi</string>

android/engine/src/main/res/values-sw/strings.xml

@@ -139,4 +139,5 @@
     <string name="invalid_offline_login_state">Usanidi wa mtumiaji unahitajika. Washa mtandao</string>
     <string name="sync_completed_with_errors">Usawazishaji umekamilika na hitilafu. Inajaribu tena…</string>
     <string name="error_occurred">Hitilafu fulani imetokea…</string>
+    <string name="app_build_type">Aina ya uundaji wa programu</string>
 </resources>

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

@@ -11,7 +11,7 @@
     <string name="empty_client_list_message_title">No Results</string>
     <string name="empty_client_list_message_details">Sorry, we could not find client with given name or ID</string>
     <string name="register_new_client">Register new client</string>
-    <string name="default_app_title" translatable="false">Fhir App</string>
+    <string name="default_app_title" translatable="false">OpenSRP</string>
     <string name="app_logo">Application logo</string>
     <string name="powered_by">Powered By</string>
     <string name="app_version">App version %1$d(%2$s)</string>
@@ -99,7 +99,7 @@
     <string name="application_id">Application ID</string>
     <string name="app_id_sample" translatable="false">e.g. ecbis, quest, cha</string>
     <string name="load_configurations">LOAD CONFIGURATIONS</string>
-    <string name="fhir_core_app" translatable="false">FHIRCORE APP</string>
+    <string name="fhir_core_app" translatable="false">OPENSRP 2</string>
     <string name="remember_app">Remember application</string>
     <string name="done">Done</string>
     <string name="replace_photo">Replace photo</string>
@@ -182,10 +182,11 @@
     <string name="user">User</string>
     <string name="team">Team</string>
     <string name="locality" >Locality</string>
-    <string name="team_organization">Team(Organization)</string>
+    <string name="team_organization">Team (Organization)</string>
     <string name="care_team">Care Team</string>
     <string name="location">Location</string>
     <string name="app_version_code">App version code</string>
+    <string name="app_build_type">App build type</string>
     <string name="build_date">Build date</string>
     <string name="manufacture">Manufacturer</string>
     <string name="app_versions">App version</string>
@@ -205,7 +206,7 @@
     <string name="sync_down_inprogress"> %1$d%% Syncing down…</string>
     <string name="default_html_title">file</string>
     <string name="retry">RETRY</string>
-    <string name="unsynced_data_present">There\'s some un-synced data</string>
+    <string name="unsynced_data_present">There\'s some unsynced data</string>
     <string name="missing_supervisor_contact">Supervisor contact missing or the provided phone number is invalid</string>
     <string name="apply_filter">APPLY FILTER</string>
     <string name="questionnaire_save_draft_title">Save draft changes</string>

android/engine/src/test/assets/configs/dirext/json/sample_config.json

@@ -0,0 +1,4 @@
+{
+  "appId": "dirext",
+  "configType": "sample"
+}

android/gradle/libs.versions.toml

@@ -28,9 +28,9 @@ dokkaBase = "1.9.20"
 easyRulesCore = "4.1.1"
 espresso-core = "3.6.1"
 fhir-sdk-common = "0.1.0-alpha05-preview3-SNAPSHOT"
-fhir-sdk-contrib-barcode = "0.1.0-beta3-preview7-SNAPSHOT"
-fhir-sdk-contrib-locationwidget = "0.1.0-alpha01-preview2-SNAPSHOT"
-fhir-sdk-data-capture = "1.3.0-preview1-SNAPSHOT"
+fhir-sdk-contrib-barcode = "0.1.0-beta3-preview8-SNAPSHOT"
+fhir-sdk-contrib-locationwidget = "0.1.0-alpha01-preview3-SNAPSHOT"
+fhir-sdk-data-capture = "1.3.0-preview9-SNAPSHOT"
 fhir-sdk-engine = "1.2.0-preview1-SNAPSHOT"
 fhir-sdk-knowledge = "0.1.0-beta01-preview1-SNAPSHOT"
 fhir-sdk-workflow = "0.1.0-beta01-preview2-SNAPSHOT"

android/quest/build.gradle.kts

@@ -1,4 +1,5 @@
 import com.android.build.api.variant.FilterConfiguration.FilterType
+import com.android.build.gradle.internal.api.BaseVariantOutputImpl
 import io.sentry.android.gradle.extensions.InstrumentationFeature
 import io.sentry.android.gradle.instrumentation.logcat.LogcatLevel
 import java.io.FileReader
@@ -429,6 +430,20 @@ android {
       versionNameSuffix = "-trueCover"
       manifestPlaceholders["appLabel"] = "True Cover"
     }
+
+    create("echisDataFi") {
+      dimension = "apps"
+      applicationId = "org.dataforimplementation.echis"
+      versionNameSuffix = "-echis"
+      manifestPlaceholders["appLabel"] = "Data.FI eCHIS Reference"
+    }
+
+    create("echisNawi") {
+      dimension = "apps"
+      applicationId = "ke.nawi.echis"
+      versionNameSuffix = "-echis"
+      manifestPlaceholders["appLabel"] = "Nawi eCHIS"
+    }
   }
 
   applicationVariants.all {
@@ -439,6 +454,13 @@ android {
       "app_name",
       "\"${variant.mergedFlavor.manifestPlaceholders["appLabel"]}\"",
     )
+
+    variant.outputs
+      .map { it as BaseVariantOutputImpl }
+      .forEach { output ->
+        output.outputFileName =
+          "quest-${variant.flavorName}-${variant.buildType.name}-${variant.versionName}.apk"
+      }
   }
 
   applicationVariants.all {

android/quest/src/androidTest/java/org/smartregister/fhircore/quest/integration/ui/pin/PinLoginScreenKtTest.kt

@@ -73,7 +73,7 @@ class PinLoginScreenKtTest {
           ApplicationConfiguration(
             appId = "appId",
             configType = "application",
-            appTitle = "FHIRCore App",
+            appTitle = "OPENSRP 2",
           ),
         onSetPin = {},
         showProgressBar = false,
@@ -111,7 +111,7 @@ class PinLoginScreenKtTest {
           ApplicationConfiguration(
             appId = "appId",
             configType = "application",
-            appTitle = "FHIRCore App",
+            appTitle = "OPENSRP 2",
           ),
         onSetPin = {},
         showProgressBar = false,
@@ -155,7 +155,7 @@ class PinLoginScreenKtTest {
           ApplicationConfiguration(
             appId = "appId",
             configType = "application",
-            appTitle = "FHIRCore App",
+            appTitle = "OPENSRP 2",
           ),
         onSetPin = {},
         showProgressBar = false,
@@ -185,7 +185,7 @@ class PinLoginScreenKtTest {
           ApplicationConfiguration(
             appId = "appId",
             configType = "application",
-            appTitle = "FHIRCore App",
+            appTitle = "OPENSRP 2",
           ),
         onSetPin = {},
         showProgressBar = true,
@@ -219,7 +219,7 @@ class PinLoginScreenKtTest {
           ApplicationConfiguration(
             appId = "appId",
             configType = "application",
-            appTitle = "FHIRCore App",
+            appTitle = "OPENSRP 2",
           ),
         onSetPin = {},
         showProgressBar = false,

android/quest/src/androidTest/java/org/smartregister/fhircore/quest/integration/ui/usersetting/UserSettingInsightScreenTest.kt

@@ -128,6 +128,7 @@ class UserSettingInsightScreenTest {
           location = "location",
           appVersionCode = "v.123",
           appVersion = "3",
+          appBuildType = "debug",
           buildDate = "29 jan 2023",
           unsyncedResourcesFlow = unsyncedResourcesFlow,
           navController = rememberNavController(),

android/quest/src/echisDataFi/res/drawable/ic_app_logo.xml

@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="407dp"
+    android:height="80dp"
+    android:viewportWidth="407"
+    android:viewportHeight="80">
+  <path
+      android:pathData="M13.33,36.04C13.33,21.42 19.47,12.02 34.19,12.02C48.91,12.02 55.04,21.42 55.04,36.04C55.04,50.66 48.9,60.04 34.18,60.04C19.46,60.04 13.33,50.66 13.33,36.04ZM21.79,36.04C21.79,44.83 24.24,52.32 34.18,52.32C44.13,52.32 46.52,44.83 46.52,36.04C46.52,27.24 44.14,19.75 34.18,19.75C24.24,19.75 21.79,27.24 21.79,36.04Z"
+      android:fillColor="#40A1DA"/>
+  <path
+      android:pathData="M71.79,59.21H63.44V12.86H81.08C88.82,12.86 96.99,15.71 96.99,27.3C96.99,38.95 88.94,41.8 81.14,41.8H71.79V59.21ZM81.73,20.58H71.79V34.01H81.73C84.59,34.01 88.41,33.19 88.41,27.3C88.41,21.42 84.6,20.58 81.73,20.58Z"
+      android:fillColor="#40A1DA"/>
+  <path
+      android:pathData="M138.05,12.86V20.58H113.44V31.64H135.25V39.37H113.44V51.5H139.18V59.22H105.11V12.86H138.05Z"
+      android:fillColor="#40A1DA"/>
+  <path
+      android:pathData="M160.69,35.32L156.1,28.19L156.22,39.31V59.21H147.87V12.86H155.56L171.59,36.75L176.18,43.88L176.06,32.76V12.86H184.41V59.21H176.72L160.69,35.32Z"
+      android:fillColor="#40A1DA"/>
+  <path
+      android:pathData="M196.69,45.84L205.16,44.96C205.81,50.36 209.14,52.33 215.46,52.33C220.11,52.27 225.35,50.55 225.35,45.43C225.35,41.39 222.91,39.66 215.22,38.95C206.7,38.24 198.36,36.05 198.3,26.12C198.24,16.37 206.04,12.03 215.04,12.03C227.2,12.03 232.74,17.38 233.57,26.17L225.11,27.07C224.45,21.6 221.35,19.76 215.04,19.76C211.88,19.81 206.63,20.94 206.63,26.17C206.69,29.38 208.48,30.75 215.63,31.47C227.01,32.48 233.56,34.56 233.63,45.43C233.69,55.77 224.69,60.05 215.45,60.05C202.88,60.04 197.65,55.05 196.69,45.84Z"
+      android:fillColor="#32647D"/>
+  <path
+      android:pathData="M251.45,59.21H243.11V12.86H262.3C270.34,12.86 278.08,15.53 278.08,26.94C278.08,35.14 274.09,38.77 268.91,40.13L280.17,59.21H270.4L259.97,41.03H251.45V59.21ZM262.83,33.24C265.75,33.24 269.56,32.7 269.56,26.93C269.56,21.11 265.75,20.57 262.83,20.57H251.45V33.24H262.83Z"
+      android:fillColor="#32647D"/>
+  <path
+      android:pathData="M296.51,59.21H288.16V12.86H305.8C313.54,12.86 321.71,15.71 321.71,27.3C321.71,38.95 313.66,41.8 305.86,41.8H296.51V59.21ZM306.45,20.58H296.51V34.01H306.45C309.31,34.01 313.13,33.19 313.13,27.3C313.13,21.42 309.31,20.58 306.45,20.58Z"
+      android:fillColor="#32647D"/>
+  <path
+      android:pathData="M362.87,71.68L382.82,58.85H342.91L362.87,71.68Z"
+      android:fillColor="#8EC641"/>
+  <path
+      android:pathData="M393.33,17.68L376.3,13.06C380.29,15.58 382.87,19.59 382.87,25.12C382.87,34.79 375.13,37.68 367.37,40.88C359.75,44.03 354.96,44.85 354.84,48.62H383.43V58.46L393.33,52.1V17.68Z"
+      android:fillColor="#40A1DA"/>
+  <path
+      android:pathData="M361.58,32.41C368.63,30.02 371.34,28.58 371.34,25.12C371.34,21.35 367.93,20.22 363.78,20.22C357.99,20.22 355.52,22.11 355.4,27.7L343.56,26.25C343.64,20.09 346.07,15.41 350.92,12.65L332.39,17.67V52.09L342.29,58.45C342.17,38.6 350.76,36.1 361.58,32.41Z"
+      android:fillColor="#8FD1EC"/>
+</vector>

android/quest/src/echisDataFi/res/drawable/ic_launcher.xml

@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="80dp"
+    android:height="80dp"
+    android:viewportWidth="80"
+    android:viewportHeight="80">
+  <path
+      android:pathData="M59.054,70H20.958V55.552H59.054V70Z"
+      android:fillColor="#8DC541"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M20.958,47.221H59.054V32.773H20.958V47.221Z"
+      android:fillColor="#40A1D9"/>
+  <path
+      android:pathData="M20.958,24.448H59.054V10H20.958V24.448Z"
+      android:fillColor="#8ED0EA"/>
+</vector>