From 7aa06dfdab378a9438dd639db3249053c1595fbe Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Fri, 24 Feb 2023 12:30:50 +0300
Subject: [PATCH 001/126] OpenSRP Sonatype Publishing Set Up - Updated versions
 of preview releases - Releases.kt - Publishing configurations of individual
 modules

---
 buildSrc/src/main/kotlin/Releases.kt | 12 ++++++------
 common/build.gradle.kts              | 11 +++++++++++
 contrib/barcode/build.gradle.kts     | 11 +++++++++++
 datacapture/build.gradle.kts         |  9 +++++++++
 engine/build.gradle.kts              | 10 ++++++++++
 workflow/build.gradle.kts            | 10 ++++++++++
 6 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index c6da3648f2..a7e711aaf7 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -36,38 +36,38 @@ interface LibraryArtifact {
 }
 
 object Releases {
-  const val groupId = "com.google.android.fhir"
+  const val groupId = "org.smartregister"
 
   // Libraries
 
   object Common : LibraryArtifact {
     override val artifactId = "common"
-    override val version = "0.1.0-alpha03"
+    override val version = "0.1.0-alpha03-preview4-SNAPSHOT"
     override val name = "Android FHIR Common Library"
   }
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta02"
+    override val version = "0.1.0-beta02-preview10-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "0.1.0-beta06"
+    override val version = "0.1.0-beta06-preview8-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 
   object Workflow : LibraryArtifact {
     override val artifactId = "workflow"
-    override val version = "0.1.0-alpha02"
+    override val version = "0.1.0-alpha02-preview8-SNAPSHOT"
     override val name = "Android FHIR Workflow Library"
   }
 
   object Contrib {
     object Barcode : LibraryArtifact {
       override val artifactId = "contrib-barcode"
-      override val version = "0.1.0-beta3"
+      override val version = "0.1.0-beta3-preview3-SNAPSHOT"
       override val name = "Android FHIR Structured Data Capture - Barcode Extensions (contrib)"
     }
   }
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index b184a4294b..5de1bf50cf 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -5,6 +5,17 @@ plugins {
   jacoco
 }
 
+publishing{
+  repositories {
+    maven {
+
+      credentials(PasswordCredentials::class)
+      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
+      name = "sonatype"
+    }
+  }
+}
+
 publishArtifact(Releases.Common)
 
 createJacocoTestReportTask()
diff --git a/contrib/barcode/build.gradle.kts b/contrib/barcode/build.gradle.kts
index 7741acc4ce..529275b999 100644
--- a/contrib/barcode/build.gradle.kts
+++ b/contrib/barcode/build.gradle.kts
@@ -5,6 +5,17 @@ plugins {
   jacoco
 }
 
+publishing{
+  repositories {
+    maven {
+
+      credentials(PasswordCredentials::class)
+      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
+      name = "sonatype"
+    }
+  }
+}
+
 publishArtifact(Releases.Contrib.Barcode)
 
 createJacocoTestReportTask()
diff --git a/datacapture/build.gradle.kts b/datacapture/build.gradle.kts
index dbe640a214..70f13c67c8 100644
--- a/datacapture/build.gradle.kts
+++ b/datacapture/build.gradle.kts
@@ -7,6 +7,15 @@ plugins {
   jacoco
   id(Plugins.BuildPlugins.dokka).version(Plugins.Versions.dokka)
 }
+publishing{
+  repositories {
+    maven {
+      credentials(PasswordCredentials::class)
+      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
+      name = "sonatype"
+    }
+  }
+}
 
 publishArtifact(Releases.DataCapture)
 
diff --git a/engine/build.gradle.kts b/engine/build.gradle.kts
index 843be249af..acdc5aab01 100644
--- a/engine/build.gradle.kts
+++ b/engine/build.gradle.kts
@@ -9,6 +9,16 @@ plugins {
   jacoco
   id(Plugins.BuildPlugins.dokka).version(Plugins.Versions.dokka)
 }
+publishing{
+  repositories {
+    maven {
+
+      credentials(PasswordCredentials::class)
+      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
+      name = "sonatype"
+    }
+  }
+}
 
 publishArtifact(Releases.Engine)
 
diff --git a/workflow/build.gradle.kts b/workflow/build.gradle.kts
index 8cf440e40e..a370529caf 100644
--- a/workflow/build.gradle.kts
+++ b/workflow/build.gradle.kts
@@ -10,6 +10,16 @@ plugins {
   id(Plugins.BuildPlugins.dokka).version(Plugins.Versions.dokka)
 }
 
+publishing{
+  repositories {
+    maven {
+      credentials(PasswordCredentials::class)
+      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
+      name = "sonatype"
+    }
+  }
+}
+
 publishArtifact(Releases.Workflow)
 
 createJacocoTestReportTask()

From 10e46a0eac5f41b68b5bb1caa87069b83d36c6b1 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Fri, 24 Feb 2023 15:37:49 +0300
Subject: [PATCH 002/126] SDK Release: Engine, SDC

- With unmerged PR https://github.com/google/android-fhir/pull/1669 branch
---
 buildSrc/src/main/kotlin/Releases.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index f570d3ebb2..3a3a1200db 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,13 +48,13 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta02-preview10-SNAPSHOT"
+    override val version = "0.1.0-beta02-preview11-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.0.0"
+    override val version = "1.0.0-preview-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 

From fb3b13b6c16a6b7e0766fb41ad3cddaf5dddecd5 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 1 Mar 2023 11:38:12 +0300
Subject: [PATCH 003/126] SDK Release: Barcode

  - With unmerged PR https://github.com/google/android-fhir/pull/1669 branch
---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 3a3a1200db..8d8e200215 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -67,7 +67,7 @@ object Releases {
   object Contrib {
     object Barcode : LibraryArtifact {
       override val artifactId = "contrib-barcode"
-      override val version = "0.1.0-beta3-preview3-SNAPSHOT"
+      override val version = "0.1.0-beta3-preview4-SNAPSHOT"
       override val name = "Android FHIR Structured Data Capture - Barcode Extensions (contrib)"
     }
   }

From 167e89685694b30f67937bbb15ee00a94f30b259 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Fri, 3 Mar 2023 16:52:22 +0300
Subject: [PATCH 004/126]     SDK Release: Engine

      - With unmerged PR https://github.com/google/android-fhir/pull/1669 branch
---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 8d8e200215..78bd4f2f28 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,7 +48,7 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta02-preview11-SNAPSHOT"
+    override val version = "0.1.0-beta02-preview12-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 

From abd41d026ff21980e95c7a4861149708e174e1cc Mon Sep 17 00:00:00 2001
From: Allan Onchuru <a.onchuru@gmail.com>
Date: Fri, 3 Mar 2023 17:42:48 +0300
Subject: [PATCH 005/126] SDK Release: Engine

	- With unmerged PR https://github.com/google/android-fhir/pull/1669 branch
	- With unmerged PR https://github.com/google/android-fhir/pull/1893 branch
---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 78bd4f2f28..4fa35118ba 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,7 +48,7 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta02-preview12-SNAPSHOT"
+    override val version = "0.1.0-beta02-preview13-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 

From 32952bb1d9229a19fafef086d881cf090b9d4934 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Tue, 21 Mar 2023 14:12:53 +0300
Subject: [PATCH 006/126] Reinstate Sonatype support

---
 buildSrc/src/main/kotlin/Releases.kt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 4fa35118ba..d01507a815 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -15,11 +15,13 @@
  */
 
 import org.gradle.api.Project
+import org.gradle.api.artifacts.repositories.PasswordCredentials
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.tasks.bundling.Jar
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.create
+import org.gradle.kotlin.dsl.credentials
 import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.register
@@ -132,6 +134,11 @@ fun Project.publishArtifact(artifact: LibraryArtifact) {
                   artifact.version
                 }
             }
+            maven {
+              credentials(PasswordCredentials::class)
+              url = uri("https://oss.sonatype.org/content/repositories/snapshots")
+              name = "sonatype"
+            }
           }
         }
       }

From 8274e4803a07f8d5003a374a20f4932ac5c1ef9b Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Tue, 21 Mar 2023 14:00:15 +0300
Subject: [PATCH 007/126] SDK Release: SDC, Engine, Workflow - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/1 - With unmerged PR
 https://github.com/google/android-fhir/pull/1669 - With unmerged PR
 https://github.com/google/android-fhir/pull/1927 - With unmerged PR
 https://github.com/google/android-fhir/pull/1917

---
 buildSrc/src/main/kotlin/Releases.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index d01507a815..0d1f4c8fd3 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -50,19 +50,19 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta02-preview13-SNAPSHOT"
+    override val version = "0.1.0-beta02-preview14-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.0.0-preview-SNAPSHOT"
+    override val version = "1.0.0-preview2-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 
   object Workflow : LibraryArtifact {
     override val artifactId = "workflow"
-    override val version = "0.1.0-alpha02-preview8-SNAPSHOT"
+    override val version = "0.1.0-alpha02-preview9-SNAPSHOT"
     override val name = "Android FHIR Workflow Library"
   }
 

From d59c54275db03235046208b5c519b0e4cf160387 Mon Sep 17 00:00:00 2001
From: Allan Onchuru <a.onchuru@gmail.com>
Date: Fri, 14 Apr 2023 19:30:09 +0300
Subject: [PATCH 008/126] SDK Release: Engine   - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/1   - With unmerged PR
 https://github.com/google/android-fhir/pull/1917

---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index dc1bb0a154..bcf7b5443c 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -50,7 +50,7 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta03"
+    override val version = "0.1.0-beta03-preview-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 

From 3c2bc65fbfcc43cfa94e87998496f78e5ad20bd0 Mon Sep 17 00:00:00 2001
From: Allan Onchuru <a.onchuru@gmail.com>
Date: Mon, 17 Apr 2023 11:52:34 +0300
Subject: [PATCH 009/126] =?UTF-8?q?SDK=20Release:=20SDC=20=20=20-=20With?=
 =?UTF-8?q?=20unmerged=20PR=20https://github.com/google/android-fhir/pull/?=
 =?UTF-8?q?1973=20=C2=A0=20-=20With=20unmerged=20PR=20https://github.com/o?=
 =?UTF-8?q?pensrp/android-fhir/pull/1=20=C2=A0=20-=20With=20unmerged=20PR?=
 =?UTF-8?q?=20https://github.com/google/android-fhir/pull/1917?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index bcf7b5443c..d28a315233 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -56,7 +56,7 @@ object Releases {
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.0.0-preview2-SNAPSHOT"
+    override val version = "1.0.0-preview3-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 

From 9a5c079e2ab9ce61af70d2bbbe0faeb2fafb8906 Mon Sep 17 00:00:00 2001
From: Allan Onchuru <a.onchuru@gmail.com>
Date: Wed, 26 Apr 2023 12:47:23 +0300
Subject: [PATCH 010/126] SDK Release: Engine, SDC, Workflow, Contrib:Barcode,
 Common, Knowledger   - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/1   - With unmerged PR
 https://github.com/google/android-fhir/pull/1917   - With unmerged PR
 https://github.com/google/android-fhir/pull/1978   - With unmerged PR
 https://github.com/google/android-fhir/pull/1964

---
 buildSrc/src/main/kotlin/Releases.kt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index c16150dbd7..c76b003d72 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -50,33 +50,33 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta03-preview-SNAPSHOT"
+    override val version = "0.1.0-beta03-preview1-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.0.0-preview3-SNAPSHOT"
+    override val version = "1.0.0-preview4-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 
   object Workflow : LibraryArtifact {
     override val artifactId = "workflow"
-    override val version = "0.1.0-alpha02-preview9-SNAPSHOT"
+    override val version = "0.1.0-alpha02-preview10-SNAPSHOT"
     override val name = "Android FHIR Workflow Library"
   }
 
   object Contrib {
     object Barcode : LibraryArtifact {
       override val artifactId = "contrib-barcode"
-      override val version = "0.1.0-beta3-preview4-SNAPSHOT"
+      override val version = "0.1.0-beta3-preview5-SNAPSHOT"
       override val name = "Android FHIR Structured Data Capture - Barcode Extensions (contrib)"
     }
   }
 
   object Knowledge : LibraryArtifact {
     override val artifactId = "knowledger"
-    override val version = "0.1.0-alpha001"
+    override val version = "0.1.0-alpha001-preview-SNAPSHOT"
     override val name = "Android FHIR Knowledge Manager Library"
   }
 

From de945a5bb004b8f5ebbc838bb0a6f267fdcea14e Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Thu, 11 May 2023 18:26:55 +0300
Subject: [PATCH 011/126] SDK Release: Engine, SDC, Workflow, Contrib:Barcode,
 Common, Knowledger   - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/1   - With unmerged PR
 https://github.com/google/android-fhir/pull/1917   - With unmerged PR
 https://github.com/google/android-fhir/pull/1978   - With unmerged PR
 https://github.com/google/android-fhir/pull/1964   - With unmerged PR
 https://github.com/google/android-fhir/pull/1963   - With unmerged PR
 https://github.com/google/android-fhir/pull/1907

---
 buildSrc/src/main/kotlin/Releases.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index c76b003d72..c4f1c236e4 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -50,13 +50,13 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta03-preview1-SNAPSHOT"
+    override val version = "0.1.0-beta03-preview3-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.0.0-preview4-SNAPSHOT"
+    override val version = "1.0.0-preview5-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 

From ffa535a2d9b5c9e995a9a98d36b71e900bfd5da6 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Tue, 23 May 2023 16:58:56 +0300
Subject: [PATCH 012/126] SDK Release: Engine, SDC, Workflow, Contrib:Barcode,
 Common, Knowledger

  - With unmerged PR opensrp#1
  - With unmerged PR #1917
  - With unmerged PR #1978
  - With unmerged PR #1964
  - With unmerged PR #1907
---
 buildSrc/src/main/kotlin/Releases.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index d630acfbad..b51c253887 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -50,13 +50,13 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta03-preview3-SNAPSHOT"
+    override val version = "0.1.0-beta03-preview4-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.0.0-preview5-SNAPSHOT"
+    override val version = "1.0.0-preview6-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 

From 6968bf1596e3fb9a528f78cc387d2f610286221b Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Thu, 15 Jun 2023 15:41:23 +0300
Subject: [PATCH 013/126] SDK Release: Engine, SDC, Workflow, Contrib:Barcode,
 Common, Knowledger   - With unmerged PR #1   - With unmerged PR google#1917  
 - With unmerged PR google#1978   - With unmerged PR google#1907   - With
 unmerged PR https://github.com/google/android-fhir/pull/2016   - With
 unmerged PR https://github.com/google/android-fhir/pull/2032

---
 buildSrc/src/main/kotlin/Releases.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index b51c253887..a7196f686c 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -50,13 +50,13 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta03-preview4-SNAPSHOT"
+    override val version = "0.1.0-beta03-preview6-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.0.0-preview6-SNAPSHOT"
+    override val version = "1.0.0-preview9-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 

From e87bf59055a6cbb82942d89da4b07cc473b4ec35 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Fri, 23 Jun 2023 16:53:07 +0300
Subject: [PATCH 014/126]     SDK Release: Engine, SDC, Workflow,
 Contrib:Barcode, Common, Knowledger       - With unmerged PR #1       - With
 unmerged PR google#1917       - With unmerged PR google#1978       - With
 unmerged PR google#1907       - With unmerged PR
 https://github.com/google/android-fhir/pull/2016       - With unmerged PR
 https://github.com/google/android-fhir/pull/2032       - With unmerged PR
 https://github.com/google/android-fhir/pull/1669

---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index a7196f686c..730f28e241 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -50,7 +50,7 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta03-preview6-SNAPSHOT"
+    override val version = "0.1.0-beta03-preview7-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 

From 92b193818a1b8171e83a7f8e9a75e08ef318fea0 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Mon, 26 Jun 2023 17:03:10 +0300
Subject: [PATCH 015/126] SDK Release: Engine, SDC, Workflow, Contrib:Barcode,
 Common, Knowledger    - With unmerged PR #1    - With unmerged PR google#1917
    - With unmerged PR google#1978    - With unmerged PR google#1907    - With
 unmerged PR https://github.com/google/android-fhir/pull/2032    - With
 unmerged PR https://github.com/google/android-fhir/pull/1669    - With
 unmerged PR https://github.com/google/android-fhir/pull/2047

---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 730f28e241..ed812e8e26 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -50,7 +50,7 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta03-preview7-SNAPSHOT"
+    override val version = "0.1.0-beta03-preview8-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 

From 7a45e18cf5280d60b1ebe8dfd08c9745134b4197 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 23 Aug 2023 10:00:56 +0300
Subject: [PATCH 016/126] New API to support saving local only resources -
 https://github.com/google/android-fhir/issues/2123

---
 engine/src/main/java/com/google/android/fhir/FhirEngine.kt    | 2 ++
 .../main/java/com/google/android/fhir/impl/FhirEngineImpl.kt  | 4 ++++
 .../main/java/com/google/android/fhir/testing/Utilities.kt    | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
index f0cc2f72f9..376ff3b327 100644
--- a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
+++ b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
@@ -34,6 +34,8 @@ interface FhirEngine {
    */
   suspend fun create(vararg resource: Resource): List<String>
 
+  suspend fun createRemote(vararg resource: Resource)
+
   /** Loads a FHIR resource given the class and the logical ID. */
   suspend fun get(type: ResourceType, id: String): Resource
 
diff --git a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
index 3b9911d66f..de35675a0b 100644
--- a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
@@ -44,6 +44,10 @@ internal class FhirEngineImpl(private val database: Database, private val contex
     return database.insert(*resource)
   }
 
+  override suspend fun createRemote(vararg resource: Resource) {
+    return database.insertRemote(*resource)
+  }
+
   override suspend fun get(type: ResourceType, id: String): Resource {
     return database.select(type, id)
   }
diff --git a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
index 59e035d41f..1e680aa479 100644
--- a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
+++ b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
@@ -133,6 +133,9 @@ open class TestDownloadManagerImpl(
 
 object TestFhirEngineImpl : FhirEngine {
   override suspend fun create(vararg resource: Resource) = emptyList<String>()
+  override suspend fun createRemote(vararg resource: Resource) {
+    TODO("Not yet implemented")
+  }
 
   override suspend fun update(vararg resource: Resource) {}
 

From 0cae3508363a28241912575623e7afb3e58f486f Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 23 Aug 2023 10:02:19 +0300
Subject: [PATCH 017/126] API access for data in the LocalChangeEntity table -
 https://github.com/google/android-fhir/issues/2048

---
 engine/src/main/java/com/google/android/fhir/FhirEngine.kt    | 2 +-
 .../main/java/com/google/android/fhir/impl/FhirEngineImpl.kt  | 3 +++
 .../main/java/com/google/android/fhir/testing/Utilities.kt    | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
index 376ff3b327..59ab1f3991 100644
--- a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
+++ b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
@@ -97,7 +97,7 @@ interface FhirEngine {
    * an empty list.
    */
   suspend fun getLocalChanges(type: ResourceType, id: String): List<LocalChange>
-
+  suspend fun getUnsyncedLocalChanges(): List<SquashedLocalChange>
   /**
    * Purges a resource from the database based on resource type and id without any deletion of data
    * from the server.
diff --git a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
index de35675a0b..e3a913990d 100644
--- a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
@@ -79,6 +79,9 @@ internal class FhirEngineImpl(private val database: Database, private val contex
   override suspend fun getLocalChanges(type: ResourceType, id: String): List<LocalChange> {
     return database.getLocalChanges(type, id)
   }
+  // FhirEngineImpl.kt
+  override suspend fun getUnsyncedLocalChanges(): List<SquashedLocalChange> =
+    database.getAllLocalChanges()
 
   override suspend fun purge(type: ResourceType, id: String, forcePurge: Boolean) {
     database.purge(type, id, forcePurge)
diff --git a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
index 1e680aa479..8e6666edfc 100644
--- a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
+++ b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
@@ -184,6 +184,10 @@ object TestFhirEngineImpl : FhirEngine {
     )
   }
 
+  override suspend fun getUnsyncedLocalChanges(): List<LocalChange> {
+    TODO("Not yet implemented")
+  }
+
   override suspend fun purge(type: ResourceType, id: String, forcePurge: Boolean) {}
 }
 

From bb1f2eb06aede3f47ef8271d26870af6103e7da1 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 23 Aug 2023 10:09:16 +0300
Subject: [PATCH 018/126] Add a SyncJobStatus result callback amid Sync retries
 - https://github.com/google/android-fhir/issues/2049

---
 .../android/fhir/sync/FhirSyncWorker.kt       | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt b/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt
index 148e3f01a7..772fad8348 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt
@@ -21,6 +21,7 @@ import androidx.work.CoroutineWorker
 import androidx.work.Data
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import ca.uhn.fhir.context.FhirContext
 import com.google.android.fhir.FhirEngine
 import com.google.android.fhir.FhirEngineProvider
 import com.google.android.fhir.OffsetDateTimeTypeAdapter
@@ -29,6 +30,7 @@ import com.google.android.fhir.sync.upload.UploaderImpl
 import com.google.gson.ExclusionStrategy
 import com.google.gson.FieldAttributes
 import com.google.gson.GsonBuilder
+import java.nio.charset.StandardCharsets
 import java.time.OffsetDateTime
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -36,6 +38,9 @@ import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
+import org.apache.commons.io.IOUtils
+import org.hl7.fhir.r4.model.OperationOutcome
+import retrofit2.HttpException
 import timber.log.Timber
 
 /** A WorkManager Worker that handles periodic sync. */
@@ -91,6 +96,9 @@ abstract class FhirSyncWorker(appContext: Context, workerParams: WorkerParameter
         )
         .apply { subscribe(flow) }
         .synchronize()
+
+    if (result is SyncJobStatus.Failed) onFailedSyncJobResult(result)
+
     val output = buildWorkData(result)
 
     // await/join is needed to collect states completely
@@ -118,6 +126,33 @@ abstract class FhirSyncWorker(appContext: Context, workerParams: WorkerParameter
     }
   }
 
+  open fun onFailedSyncJobResult(failedSyncJobStatus: SyncJobStatus.Failed) {
+    try {
+      CoroutineScope(Dispatchers.IO).launch {
+        val jsonParser = FhirContext.forR4().newJsonParser()
+
+        (failedSyncJobStatus).exceptions.filterIsInstance<HttpException>().forEach {
+          resourceSyncHTTPException ->
+          val operationOutcome =
+            jsonParser.parseResource(
+              IOUtils.toString(
+                resourceSyncHTTPException.response()?.errorBody()?.byteStream(),
+                StandardCharsets.UTF_8
+              )
+            ) as OperationOutcome
+
+          operationOutcome.issue.forEach { operationOutcome ->
+            Timber.e(
+              "SERVER ${operationOutcome.severity} - HTTP ${resourceSyncHTTPException.code()} | Code - ${operationOutcome.code} | Diagnostics - ${operationOutcome.diagnostics}"
+            )
+          }
+        }
+      }
+    } catch (e: Exception) {
+      Timber.e(e)
+    }
+  }
+
   private fun buildWorkData(state: SyncJobStatus): Data {
     return workDataOf(
       // send serialized state and type so that consumer can convert it back

From a6b0ec272d1241e4fc45e4be22b764f1b19a9080 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Tue, 22 Aug 2023 18:26:32 +0300
Subject: [PATCH 019/126] Engine, SDC, Workflow, Common, Knowledge

- With unmerged PR https://github.com/google/android-fhir/pull/2032
- With unmerged PR https://github.com/opensrp/android-fhir/pull/1
- With unmerged PR https://github.com/google/android-fhir/pull/1669
- With unmerged PR https://github.com/google/android-fhir/pull/2132
- With unmerged PR https://github.com/opensrp/android-fhir/pull/9
---
 buildSrc/src/main/kotlin/Releases.kt | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 1d49065c4e..2c0de7c5ce 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -15,7 +15,6 @@
  */
 
 import org.gradle.api.Project
-import org.gradle.api.artifacts.repositories.PasswordCredentials
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.kotlin.dsl.configure
@@ -43,25 +42,25 @@ object Releases {
 
   object Common : LibraryArtifact {
     override val artifactId = "common"
-    override val version = "0.1.0-alpha04"
+    override val version = "0.1.0-alpha04-preview1-SNAPSHOT"
     override val name = "Android FHIR Common Library"
   }
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta03-preview8-SNAPSHOT"
+    override val version = "0.1.0-beta03-preview10-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.0.0-preview9-SNAPSHOT"
+    override val version = "1.0.0-preview15-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 
   object Workflow : LibraryArtifact {
     override val artifactId = "workflow"
-    override val version = "0.1.0-alpha03"
+    override val version = "0.1.0-alpha03-preview1-SNAPSHOT"
     override val name = "Android FHIR Workflow Library"
   }
 
@@ -75,7 +74,7 @@ object Releases {
 
   object Knowledge : LibraryArtifact {
     override val artifactId = "knowledge"
-    override val version = "0.1.0-alpha01-preview-SNAPSHOT"
+    override val version = "0.1.0-alpha01-preview2-SNAPSHOT"
     override val name = "Android FHIR Knowledge Manager Library"
   }
 
@@ -127,11 +126,13 @@ fun Project.publishArtifact(artifact: LibraryArtifact) {
                   artifact.version
                 }
             }
-            maven {
-              credentials(PasswordCredentials::class)
-              url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-              name = "sonatype"
-            }
+            // Weird quirk, build fails with this entry. Reverting to individual configuration per
+            // module
+            //            maven {
+            //              credentials(PasswordCredentials::class)
+            //              url = uri("https://oss.sonatype.org/content/repositories/snapshots")
+            //              name = "sonatype"
+            //            }
           }
         }
       }

From bf060ad192519749ad33758fd11d9b6f2cf5ec4d Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 23 Aug 2023 18:18:34 +0300
Subject: [PATCH 020/126] Spotless formatting

---
 common/build.gradle.kts          |  3 +--
 contrib/barcode/build.gradle.kts |  3 +--
 datacapture/build.gradle.kts     |  3 ++-
 engine/build.gradle.kts          |  4 ++--
 knowledge/build.gradle.kts       | 10 ++++++++++
 workflow/build.gradle.kts        |  2 +-
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 17ac60024a..0df63e6f0d 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -5,10 +5,9 @@ plugins {
   jacoco
 }
 
-publishing{
+publishing {
   repositories {
     maven {
-
       credentials(PasswordCredentials::class)
       url = uri("https://oss.sonatype.org/content/repositories/snapshots")
       name = "sonatype"
diff --git a/contrib/barcode/build.gradle.kts b/contrib/barcode/build.gradle.kts
index 2e4bf64560..861d85af1a 100644
--- a/contrib/barcode/build.gradle.kts
+++ b/contrib/barcode/build.gradle.kts
@@ -5,10 +5,9 @@ plugins {
   jacoco
 }
 
-publishing{
+publishing {
   repositories {
     maven {
-
       credentials(PasswordCredentials::class)
       url = uri("https://oss.sonatype.org/content/repositories/snapshots")
       name = "sonatype"
diff --git a/datacapture/build.gradle.kts b/datacapture/build.gradle.kts
index 27825d8f3a..aea69ae388 100644
--- a/datacapture/build.gradle.kts
+++ b/datacapture/build.gradle.kts
@@ -7,7 +7,8 @@ plugins {
   jacoco
   id(Plugins.BuildPlugins.dokka).version(Plugins.Versions.dokka)
 }
-publishing{
+
+publishing {
   repositories {
     maven {
       credentials(PasswordCredentials::class)
diff --git a/engine/build.gradle.kts b/engine/build.gradle.kts
index 0761f17293..19885d02c3 100644
--- a/engine/build.gradle.kts
+++ b/engine/build.gradle.kts
@@ -9,10 +9,10 @@ plugins {
   jacoco
   id(Plugins.BuildPlugins.dokka).version(Plugins.Versions.dokka)
 }
-publishing{
+
+publishing {
   repositories {
     maven {
-
       credentials(PasswordCredentials::class)
       url = uri("https://oss.sonatype.org/content/repositories/snapshots")
       name = "sonatype"
diff --git a/knowledge/build.gradle.kts b/knowledge/build.gradle.kts
index 4cdbb8212c..721186b709 100644
--- a/knowledge/build.gradle.kts
+++ b/knowledge/build.gradle.kts
@@ -9,6 +9,16 @@ plugins {
   id(Plugins.BuildPlugins.dokka).version(Plugins.Versions.dokka)
 }
 
+publishing {
+  repositories {
+    maven {
+      credentials(PasswordCredentials::class)
+      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
+      name = "sonatype"
+    }
+  }
+}
+
 publishArtifact(Releases.Knowledge)
 
 createJacocoTestReportTask()
diff --git a/workflow/build.gradle.kts b/workflow/build.gradle.kts
index 605adccdfb..d2ef9805d1 100644
--- a/workflow/build.gradle.kts
+++ b/workflow/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
   id(Plugins.BuildPlugins.dokka).version(Plugins.Versions.dokka)
 }
 
-publishing{
+publishing {
   repositories {
     maven {
       credentials(PasswordCredentials::class)

From 75f243da2ec22cc9b7605b25d2ad0383de39422c Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Mon, 28 Aug 2023 10:28:03 +0300
Subject: [PATCH 021/126] Engine, SDC, Workflow, Common, Knowledge

    - With unmerged PR https://github.com/google/android-fhir/pull/2032
    - With unmerged PR https://github.com/opensrp/android-fhir/pull/1
    - With unmerged PR https://github.com/google/android-fhir/pull/1669
    - With unmerged PR https://github.com/google/android-fhir/pull/2132
    - With unmerged PR https://github.com/opensrp/android-fhir/pull/9
    - With unmerged PR https://github.com/google/android-fhir/pull/2076
    - With unmerged PR https://github.com/opensrp/android-fhir/pull/10
---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 2c0de7c5ce..07a6c07fbb 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -54,7 +54,7 @@ object Releases {
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.0.0-preview15-SNAPSHOT"
+    override val version = "1.0.0-preview16-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 

From d7036a96d129eda4139658c1c588341d6025d92c Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Thu, 7 Sep 2023 15:52:49 +0300
Subject: [PATCH 022/126]     Engine, SDC, Workflow, Common, Knowledge

        - With unmerged PR https://github.com/google/android-fhir/pull/2032
        - With unmerged PR https://github.com/opensrp/android-fhir/pull/1
        - With unmerged PR https://github.com/google/android-fhir/pull/1669
        - With unmerged PR https://github.com/google/android-fhir/pull/2132
        - With unmerged PR https://github.com/opensrp/android-fhir/pull/9
        - With unmerged PR https://github.com/google/android-fhir/pull/2076
        - With unmerged PR https://github.com/opensrp/android-fhir/pull/10
---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index cbe31d828f..08fd99bed9 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,7 +48,7 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta04"
+    override val version = "0.1.0-beta04-preview-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 

From edb284259a3ae1e8db4f36f3afafe7dbabdacc95 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 13 Sep 2023 11:19:11 +0300
Subject: [PATCH 023/126]         Engine, SDC, Workflow, Common, Knowledge

            - With unmerged PR https://github.com/opensrp/android-fhir/pull/1
            - With unmerged PR https://github.com/google/android-fhir/pull/1669
            - With unmerged PR https://github.com/opensrp/android-fhir/pull/9
            - With unmerged PR https://github.com/opensrp/android-fhir/pull/10
---
 buildSrc/src/main/kotlin/Releases.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 08fd99bed9..892218c76a 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,13 +48,13 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta04-preview-SNAPSHOT"
+    override val version = "0.1.0-beta04-preview2-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.0.0-preview16-SNAPSHOT"
+    override val version = "1.0.0-preview17-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 

From 95633d25a2fd29028ed0f17b4b3462d70c7f6530 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Thu, 14 Sep 2023 12:41:53 +0300
Subject: [PATCH 024/126] Refactor SquashedLocalChanges to LocalChanges

---
 engine/src/main/java/com/google/android/fhir/FhirEngine.kt     | 2 +-
 .../main/java/com/google/android/fhir/impl/FhirEngineImpl.kt   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
index a44c2c56c7..1046c3aa50 100644
--- a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
+++ b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
@@ -96,7 +96,7 @@ interface FhirEngine {
    * an empty list.
    */
   suspend fun getLocalChanges(type: ResourceType, id: String): List<LocalChange>
-  suspend fun getUnsyncedLocalChanges(): List<SquashedLocalChange>
+  suspend fun getUnsyncedLocalChanges(): List<LocalChange>
   /**
    * Purges a resource from the database based on resource type and id without any deletion of data
    * from the server.
diff --git a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
index 3b08ac8c9c..5567e3f5d8 100644
--- a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
@@ -79,8 +79,7 @@ internal class FhirEngineImpl(private val database: Database, private val contex
     return database.getLocalChanges(type, id)
   }
   // FhirEngineImpl.kt
-  override suspend fun getUnsyncedLocalChanges(): List<SquashedLocalChange> =
-    database.getAllLocalChanges()
+  override suspend fun getUnsyncedLocalChanges(): List<LocalChange> = database.getAllLocalChanges()
 
   override suspend fun purge(type: ResourceType, id: String, forcePurge: Boolean) {
     database.purge(type, id, forcePurge)

From e31fc6fcdb7562efeb44558564c30bc6be14b0a5 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 23 Aug 2023 10:00:56 +0300
Subject: [PATCH 025/126] New API to support saving local only resources -
 https://github.com/google/android-fhir/issues/2123

---
 engine/src/main/java/com/google/android/fhir/FhirEngine.kt    | 2 ++
 .../main/java/com/google/android/fhir/impl/FhirEngineImpl.kt  | 4 ++++
 .../main/java/com/google/android/fhir/testing/Utilities.kt    | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
index 59a2a1322e..fe06d2dd3b 100644
--- a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
+++ b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
@@ -33,6 +33,8 @@ interface FhirEngine {
    */
   suspend fun create(vararg resource: Resource): List<String>
 
+  suspend fun createRemote(vararg resource: Resource)
+
   /** Loads a FHIR resource given the class and the logical ID. */
   suspend fun get(type: ResourceType, id: String): Resource
 
diff --git a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
index 3d90ed3114..d3d8849ac5 100644
--- a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
@@ -43,6 +43,10 @@ internal class FhirEngineImpl(private val database: Database, private val contex
     return database.insert(*resource)
   }
 
+  override suspend fun createRemote(vararg resource: Resource) {
+    return database.insertRemote(*resource)
+  }
+
   override suspend fun get(type: ResourceType, id: String): Resource {
     return database.select(type, id)
   }
diff --git a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
index 6b7a27ae57..3cfdaf01b7 100644
--- a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
+++ b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
@@ -133,6 +133,9 @@ open class TestDownloadManagerImpl(
 
 object TestFhirEngineImpl : FhirEngine {
   override suspend fun create(vararg resource: Resource) = emptyList<String>()
+  override suspend fun createRemote(vararg resource: Resource) {
+    TODO("Not yet implemented")
+  }
 
   override suspend fun update(vararg resource: Resource) {}
 

From efd34445937d79e2bacc8b84489360ced7fefdc7 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Sat, 16 Sep 2023 16:16:00 +0300
Subject: [PATCH 026/126] Add API to support saving local only resources

---
 .../com/google/android/fhir/FhirEngine.kt     | 28 ++++---
 .../android/fhir/impl/FhirEngineImpl.kt       | 14 ++--
 .../google/android/fhir/testing/Utilities.kt  | 12 +--
 .../android/fhir/impl/FhirEngineImplTest.kt   | 78 ++++++++++++-------
 4 files changed, 83 insertions(+), 49 deletions(-)

diff --git a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
index fe06d2dd3b..b1e41239f7 100644
--- a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
+++ b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
@@ -33,6 +33,10 @@ interface FhirEngine {
    */
   suspend fun create(vararg resource: Resource): List<String>
 
+  /**
+   * Creates one or more remote FHIR [resource]s in the local storage without flagging as local
+   * changes.
+   */
   suspend fun createRemote(vararg resource: Resource)
 
   /** Loads a FHIR resource given the class and the logical ID. */
@@ -55,7 +59,7 @@ interface FhirEngine {
    * api caller should [Flow.collect] it.
    */
   suspend fun syncUpload(
-    upload: (suspend (List<LocalChange>) -> Flow<Pair<LocalChangeToken, Resource>>)
+    upload: (suspend (List<LocalChange>) -> Flow<Pair<LocalChangeToken, Resource>>),
   )
 
   /**
@@ -64,7 +68,7 @@ interface FhirEngine {
    */
   suspend fun syncDownload(
     conflictResolver: ConflictResolver,
-    download: suspend () -> Flow<List<Resource>>
+    download: suspend () -> Flow<List<Resource>>,
   )
 
   /**
@@ -89,29 +93,32 @@ interface FhirEngine {
    * Retrieves a list of [LocalChange]s for [Resource] with given type and id, which can be used to
    * purge resource from database. If there is no local change for given [resourceType] and
    * [Resource.id], return an empty list.
+   *
    * @param type The [ResourceType]
    * @param id The resource id [Resource.id]
    * @return [List]<[LocalChange]> A list of local changes for given [resourceType] and
-   * [Resource.id] . If there is no local change for given [resourceType] and [Resource.id], return
-   * an empty list.
+   *   [Resource.id] . If there is no local change for given [resourceType] and [Resource.id],
+   *   return an empty list.
    */
   suspend fun getLocalChanges(type: ResourceType, id: String): List<LocalChange>
 
   /**
    * Purges a resource from the database based on resource type and id without any deletion of data
    * from the server.
+   *
    * @param type The [ResourceType]
    * @param id The resource id [Resource.id]
    * @param isLocalPurge default value is false here resource will not be deleted from
-   * LocalChangeEntity table but it will throw IllegalStateException("Resource has local changes
-   * either sync with server or FORCE_PURGE required") if local change exists. If true this API will
-   * delete resource entry from LocalChangeEntity table.
+   *   LocalChangeEntity table but it will throw IllegalStateException("Resource has local changes
+   *   either sync with server or FORCE_PURGE required") if local change exists. If true this API
+   *   will delete resource entry from LocalChangeEntity table.
    */
   suspend fun purge(type: ResourceType, id: String, forcePurge: Boolean = false)
 }
 
 /**
  * Returns a FHIR resource of type [R] with [id] from the local storage.
+ *
  * @param <R> The resource type which should be a subtype of [Resource].
  * @throws ResourceNotFoundException if the resource is not found
  */
@@ -122,6 +129,7 @@ suspend inline fun <reified R : Resource> FhirEngine.get(id: String): R {
 
 /**
  * Deletes a FHIR resource of type [R] with [id] from the local storage.
+ *
  * @param <R> The resource type which should be a subtype of [Resource].
  */
 suspend inline fun <reified R : Resource> FhirEngine.delete(id: String) {
@@ -140,7 +148,7 @@ data class SearchResult<R : Resource>(
   /** Matching referenced resources as per the [Search.include] criteria in the query. */
   val included: Map<SearchParamName, List<Resource>>?,
   /** Matching referenced resources as per the [Search.revInclude] criteria in the query. */
-  val revIncluded: Map<Pair<ResourceType, SearchParamName>, List<Resource>>?
+  val revIncluded: Map<Pair<ResourceType, SearchParamName>, List<Resource>>?,
 ) {
   override fun equals(other: Any?) =
     other is SearchResult<*> &&
@@ -157,7 +165,7 @@ data class SearchResult<R : Resource>(
 
   private fun equalsShallow(
     first: Map<SearchParamName, List<Resource>>?,
-    second: Map<SearchParamName, List<Resource>>?
+    second: Map<SearchParamName, List<Resource>>?,
   ) =
     if (first != null && second != null && first.size == second.size) {
       first.entries.asSequence().zip(second.entries.asSequence()).all { (x, y) ->
@@ -170,7 +178,7 @@ data class SearchResult<R : Resource>(
   @JvmName("equalsShallowRevInclude")
   private fun equalsShallow(
     first: Map<Pair<ResourceType, SearchParamName>, List<Resource>>?,
-    second: Map<Pair<ResourceType, SearchParamName>, List<Resource>>?
+    second: Map<Pair<ResourceType, SearchParamName>, List<Resource>>?,
   ) =
     if (first != null && second != null && first.size == second.size) {
       first.entries.asSequence().zip(second.entries.asSequence()).all { (x, y) ->
diff --git a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
index d3d8849ac5..158be8eff4 100644
--- a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
@@ -85,7 +85,7 @@ internal class FhirEngineImpl(private val database: Database, private val contex
 
   override suspend fun syncDownload(
     conflictResolver: ConflictResolver,
-    download: suspend () -> Flow<List<Resource>>
+    download: suspend () -> Flow<List<Resource>>,
   ) {
     download().collect { resources ->
       database.withTransaction {
@@ -93,7 +93,7 @@ internal class FhirEngineImpl(private val database: Database, private val contex
           resolveConflictingResources(
             resources,
             getConflictingResourceIds(resources),
-            conflictResolver
+            conflictResolver,
           )
         database.insertSyncedResources(resources)
         saveResolvedResourcesToDatabase(resolved)
@@ -111,7 +111,7 @@ internal class FhirEngineImpl(private val database: Database, private val contex
   private suspend fun resolveConflictingResources(
     resources: List<Resource>,
     conflictingResourceIds: Set<String>,
-    conflictResolver: ConflictResolver
+    conflictResolver: ConflictResolver,
   ) =
     resources
       .filter { conflictingResourceIds.contains(it.logicalId) }
@@ -127,7 +127,7 @@ internal class FhirEngineImpl(private val database: Database, private val contex
       .intersect(database.getAllLocalChanges().map { it.resourceId }.toSet())
 
   override suspend fun syncUpload(
-    upload: suspend (List<LocalChange>) -> Flow<Pair<LocalChangeToken, Resource>>
+    upload: suspend (List<LocalChange>) -> Flow<Pair<LocalChangeToken, Resource>>,
   ) {
     val localChanges = database.getAllLocalChanges()
     if (localChanges.isNotEmpty()) {
@@ -165,7 +165,7 @@ internal class FhirEngineImpl(private val database: Database, private val contex
           id,
           type,
           getVersionFromETag(response.etag),
-          response.lastModified.toInstant()
+          response.lastModified.toInstant(),
         )
       }
     }
@@ -177,7 +177,7 @@ internal class FhirEngineImpl(private val database: Database, private val contex
         resource.id,
         resource.resourceType,
         resource.meta.versionId,
-        resource.meta.lastUpdated.toInstant()
+        resource.meta.lastUpdated.toInstant(),
       )
     }
   }
@@ -201,9 +201,7 @@ internal class FhirEngineImpl(private val database: Database, private val contex
    * [Bundle.BundleEntryResponseComponent.location].
    *
    * [Bundle.BundleEntryResponseComponent.location] may be:
-   *
    * 1. absolute path: `<server-path>/<resource-type>/<resource-id>/_history/<version>`
-   *
    * 2. relative path: `<resource-type>/<resource-id>/_history/<version>`
    */
   private val Bundle.BundleEntryResponseComponent.resourceIdAndType: Pair<String, ResourceType>?
diff --git a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
index 3cfdaf01b7..a0c23f7963 100644
--- a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
+++ b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
@@ -111,7 +111,7 @@ object TestDataSourceImpl : DataSource {
 }
 
 open class TestDownloadManagerImpl(
-  private val queries: List<String> = listOf("Patient?address-city=NAIROBI")
+  private val queries: List<String> = listOf("Patient?address-city=NAIROBI"),
 ) : DownloadWorkManager {
   private val urls = LinkedList(queries)
 
@@ -133,6 +133,7 @@ open class TestDownloadManagerImpl(
 
 object TestFhirEngineImpl : FhirEngine {
   override suspend fun create(vararg resource: Resource) = emptyList<String>()
+
   override suspend fun createRemote(vararg resource: Resource) {
     TODO("Not yet implemented")
   }
@@ -150,17 +151,18 @@ object TestFhirEngineImpl : FhirEngine {
   }
 
   override suspend fun syncUpload(
-    upload: suspend (List<LocalChange>) -> Flow<Pair<LocalChangeToken, Resource>>
+    upload: suspend (List<LocalChange>) -> Flow<Pair<LocalChangeToken, Resource>>,
   ) {
     upload(getLocalChanges(ResourceType.Patient, "123")).collect()
   }
 
   override suspend fun syncDownload(
     conflictResolver: ConflictResolver,
-    download: suspend () -> Flow<List<Resource>>
+    download: suspend () -> Flow<List<Resource>>,
   ) {
     download().collect()
   }
+
   override suspend fun count(search: Search): Long {
     return 0
   }
@@ -179,8 +181,8 @@ object TestFhirEngineImpl : FhirEngine {
         payload = "{ 'resourceType' : 'Patient', 'id' : '123' }",
         token = LocalChangeToken(listOf()),
         type = LocalChange.Type.INSERT,
-        timestamp = Instant.now()
-      )
+        timestamp = Instant.now(),
+      ),
     )
   }
 
diff --git a/engine/src/test/java/com/google/android/fhir/impl/FhirEngineImplTest.kt b/engine/src/test/java/com/google/android/fhir/impl/FhirEngineImplTest.kt
index d19d1b8dfc..59421d6095 100644
--- a/engine/src/test/java/com/google/android/fhir/impl/FhirEngineImplTest.kt
+++ b/engine/src/test/java/com/google/android/fhir/impl/FhirEngineImplTest.kt
@@ -77,6 +77,31 @@ class FhirEngineImplTest {
     assertResourceEquals(TEST_PATIENT_2, fhirEngine.get<Patient>(TEST_PATIENT_2_ID))
   }
 
+  @Test
+  fun createRemote_shouldCreateResourceWithoutFlaggingLocalChange() = runBlocking {
+    val totalLocalChangesPatient2 =
+      fhirEngine.getLocalChanges(ResourceType.Patient, TEST_PATIENT_2_ID).size
+    fhirEngine.createRemote(TEST_PATIENT_2)
+    assertResourceEquals(TEST_PATIENT_2, fhirEngine.get<Patient>(TEST_PATIENT_2_ID))
+    assertThat(fhirEngine.getLocalChanges(ResourceType.Patient, TEST_PATIENT_2_ID).size)
+      .isEqualTo(totalLocalChangesPatient2)
+  }
+
+  @Test
+  fun createRemoteAll_shouldCreateResourceWithoutFlaggingLocalChange() = runBlocking {
+    val totalLocalChangesPatient1 =
+      fhirEngine.getLocalChanges(ResourceType.Patient, TEST_PATIENT_1_ID).size
+    val totalLocalChangesPatient2 =
+      fhirEngine.getLocalChanges(ResourceType.Patient, TEST_PATIENT_2_ID).size
+    fhirEngine.createRemote(TEST_PATIENT_1, TEST_PATIENT_2)
+    assertResourceEquals(TEST_PATIENT_1, fhirEngine.get<Patient>(TEST_PATIENT_1_ID))
+    assertResourceEquals(TEST_PATIENT_2, fhirEngine.get<Patient>(TEST_PATIENT_2_ID))
+    assertThat(fhirEngine.getLocalChanges(ResourceType.Patient, TEST_PATIENT_1_ID).size)
+      .isEqualTo(totalLocalChangesPatient1)
+    assertThat(fhirEngine.getLocalChanges(ResourceType.Patient, TEST_PATIENT_2_ID).size)
+      .isEqualTo(totalLocalChangesPatient2)
+  }
+
   @Test
   fun create_resourceWithoutId_shouldCreateResourceWithAssignedId() = runBlocking {
     val patient =
@@ -85,7 +110,7 @@ class FhirEngineImplTest {
           HumanName().apply {
             family = "FamilyName"
             addGiven("GivenName")
-          }
+          },
         )
       }
     val ids = fhirEngine.create(patient.copy())
@@ -101,7 +126,7 @@ class FhirEngineImplTest {
       }
     assertThat(exception.message)
       .isEqualTo(
-        "Resource not found with type ${TEST_PATIENT_2.resourceType.name} and id $TEST_PATIENT_2_ID!"
+        "Resource not found with type ${TEST_PATIENT_2.resourceType.name} and id $TEST_PATIENT_2_ID!",
       )
   }
 
@@ -160,7 +185,7 @@ class FhirEngineImplTest {
       }
     assertThat(resourceNotFoundException.message)
       .isEqualTo(
-        "Resource not found with type ${ResourceType.Patient.name} and id nonexistent_patient!"
+        "Resource not found with type ${ResourceType.Patient.name} and id nonexistent_patient!",
       )
   }
 
@@ -175,7 +200,7 @@ class FhirEngineImplTest {
       listOf(
         buildPatient("3", "C", Enumerations.AdministrativeGender.FEMALE),
         buildPatient("2", "B", Enumerations.AdministrativeGender.FEMALE),
-        buildPatient("1", "A", Enumerations.AdministrativeGender.MALE)
+        buildPatient("1", "A", Enumerations.AdministrativeGender.MALE),
       )
 
     fhirEngine.create(*patients.toTypedArray())
@@ -184,7 +209,7 @@ class FhirEngineImplTest {
 
     assertThat(result.size).isEqualTo(2)
     assertThat(
-        result.all { (it.resource as Patient).gender == Enumerations.AdministrativeGender.FEMALE }
+        result.all { (it.resource as Patient).gender == Enumerations.AdministrativeGender.FEMALE },
       )
       .isTrue()
   }
@@ -195,7 +220,7 @@ class FhirEngineImplTest {
       listOf(
         buildPatient("3", "C", Enumerations.AdministrativeGender.FEMALE),
         buildPatient("2", "B", Enumerations.AdministrativeGender.FEMALE),
-        buildPatient("1", "A", Enumerations.AdministrativeGender.MALE)
+        buildPatient("1", "A", Enumerations.AdministrativeGender.MALE),
       )
 
     fhirEngine.create(*patients.toTypedArray())
@@ -212,7 +237,7 @@ class FhirEngineImplTest {
       listOf(
         buildPatient("3", "C", Enumerations.AdministrativeGender.FEMALE),
         buildPatient("2", "B", Enumerations.AdministrativeGender.FEMALE),
-        buildPatient("1", "A", Enumerations.AdministrativeGender.MALE)
+        buildPatient("1", "A", Enumerations.AdministrativeGender.MALE),
       )
 
     fhirEngine.create(*patients.toTypedArray())
@@ -258,7 +283,7 @@ class FhirEngineImplTest {
         },
         buildPatient("2", "Patient2", Enumerations.AdministrativeGender.FEMALE).apply {
           meta = Meta().setTag(mutableListOf(Coding("http://d-tree.org/", "Tag2", "Tag 2")))
-        }
+        },
       )
 
     fhirEngine.create(*patients.toTypedArray())
@@ -279,15 +304,15 @@ class FhirEngineImplTest {
               .setProfile(
                 mutableListOf(
                   CanonicalType(
-                    "http://fhir.org/STU3/StructureDefinition/Example-Patient-Profile-1"
-                  )
-                )
+                    "http://fhir.org/STU3/StructureDefinition/Example-Patient-Profile-1",
+                  ),
+                ),
               )
         },
         buildPatient("4", "C", Enumerations.AdministrativeGender.FEMALE).apply {
           meta =
             Meta().setProfile(mutableListOf(CanonicalType("http://d-tree.org/Diabetes-Patient")))
-        }
+        },
       )
 
     fhirEngine.create(*patients.toTypedArray())
@@ -295,7 +320,7 @@ class FhirEngineImplTest {
     val result =
       fhirEngine
         .search(
-          "Patient?_profile=http://fhir.org/STU3/StructureDefinition/Example-Patient-Profile-1"
+          "Patient?_profile=http://fhir.org/STU3/StructureDefinition/Example-Patient-Profile-1",
         )
         .map { it.resource as Patient }
 
@@ -305,7 +330,7 @@ class FhirEngineImplTest {
           patient.meta.profile.all {
             it.value.equals("http://fhir.org/STU3/StructureDefinition/Example-Patient-Profile-1")
           }
-        }
+        },
       )
       .isTrue()
   }
@@ -340,7 +365,7 @@ class FhirEngineImplTest {
   private fun buildPatient(
     patientId: String,
     name: String,
-    patientGender: Enumerations.AdministrativeGender
+    patientGender: Enumerations.AdministrativeGender,
   ) =
     Patient().apply {
       id = patientId
@@ -436,7 +461,7 @@ class FhirEngineImplTest {
       }
     assertThat(resourceNotFoundException.message)
       .isEqualTo(
-        "Resource not found with type ${TEST_PATIENT_1.resourceType.name} and id $TEST_PATIENT_1_ID!"
+        "Resource not found with type ${TEST_PATIENT_1.resourceType.name} and id $TEST_PATIENT_1_ID!",
       )
     assertThat(fhirEngine.getLocalChanges(ResourceType.Patient, TEST_PATIENT_1_ID)).isEmpty()
   }
@@ -450,7 +475,7 @@ class FhirEngineImplTest {
         }
       assertThat(resourceIllegalStateException.message)
         .isEqualTo(
-          "Resource with type ${TEST_PATIENT_1.resourceType.name} and id $TEST_PATIENT_1_ID has local changes, either sync with server or FORCE_PURGE required"
+          "Resource with type ${TEST_PATIENT_1.resourceType.name} and id $TEST_PATIENT_1_ID has local changes, either sync with server or FORCE_PURGE required",
         )
     }
 
@@ -462,9 +487,10 @@ class FhirEngineImplTest {
       }
     assertThat(resourceNotFoundException.message)
       .isEqualTo(
-        "Resource not found with type ${TEST_PATIENT_1.resourceType.name} and id nonexistent_patient!"
+        "Resource not found with type ${TEST_PATIENT_1.resourceType.name} and id nonexistent_patient!",
       )
   }
+
   fun syncDownload_conflictResolution_acceptRemote_shouldHaveNoLocalChangeAnymore() = runBlocking {
     val originalPatient =
       Patient().apply {
@@ -478,7 +504,7 @@ class FhirEngineImplTest {
           HumanName().apply {
             family = "Stark"
             addGiven("Tony")
-          }
+          },
         )
       }
     fhirEngine.syncDownload(AcceptRemoteConflictResolver) { flowOf((listOf((originalPatient)))) }
@@ -500,7 +526,7 @@ class FhirEngineImplTest {
     fhirEngine.syncDownload(AcceptRemoteConflictResolver) { flowOf((listOf(remoteChange))) }
 
     assertThat(
-        services.database.getAllLocalChanges().filter { it.resourceId == "Patient/original-001" }
+        services.database.getAllLocalChanges().filter { it.resourceId == "Patient/original-001" },
       )
       .isEmpty()
     assertResourceEquals(fhirEngine.get<Patient>("original-001"), remoteChange)
@@ -521,7 +547,7 @@ class FhirEngineImplTest {
             HumanName().apply {
               family = "Stark"
               addGiven("Tony")
-            }
+            },
           )
         }
       fhirEngine.syncDownload(AcceptLocalConflictResolver) { flowOf((listOf((originalPatient)))) }
@@ -535,7 +561,7 @@ class FhirEngineImplTest {
             Address().apply {
               city = "Malibu"
               state = "California"
-            }
+            },
           )
         }
       fhirEngine.update(localChange)
@@ -555,7 +581,7 @@ class FhirEngineImplTest {
       val localChangeDiff =
         """[{"op":"remove","path":"\/address\/0\/country"},{"op":"add","path":"\/address\/0\/city","value":"Malibu"},{"op":"add","path":"\/address\/-","value":{"city":"Malibu","state":"California"}}]"""
       assertThat(
-          services.database.getAllLocalChanges().first { it.resourceId == "original-002" }.payload
+          services.database.getAllLocalChanges().first { it.resourceId == "original-002" }.payload,
         )
         .isEqualTo(localChangeDiff)
       assertResourceEquals(fhirEngine.get<Patient>("original-002"), localChange)
@@ -575,7 +601,7 @@ class FhirEngineImplTest {
           {
             value = of(DateTimeType(Date.from(localChangeTimestamp)))
             prefix = ParamPrefixEnum.EQUAL
-          }
+          },
         )
       }
 
@@ -597,7 +623,7 @@ class FhirEngineImplTest {
             HumanName().apply {
               addGiven("John")
               family = "Doe"
-            }
+            },
           )
         }
       fhirEngine.update(patientUpdate)
@@ -611,7 +637,7 @@ class FhirEngineImplTest {
             {
               value = of(DateTimeType(Date.from(localChangeTimestampWhenUpdated)))
               prefix = ParamPrefixEnum.EQUAL
-            }
+            },
           )
         }
 

From 283ad6e9811e7a2eebdda406b8c06e0a3e9e637a Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Mon, 18 Sep 2023 10:55:05 +0300
Subject: [PATCH 027/126] Engine, SDC, Workflow, Knowledge   - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/1   - With unmerged PR
 https://github.com/google/android-fhir/pull/1669   - With unmerged PR
 https://github.com/google/android-fhir/pull/2178   - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/9   - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/10

---
 buildSrc/src/main/kotlin/Releases.kt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 892218c76a..991dde9d45 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,19 +48,19 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta04-preview2-SNAPSHOT"
+    override val version = "0.1.0-beta04-preview3-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.0.0-preview17-SNAPSHOT"
+    override val version = "1.0.0-preview18-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 
   object Workflow : LibraryArtifact {
     override val artifactId = "workflow"
-    override val version = "0.1.0-alpha03-preview1-SNAPSHOT"
+    override val version = "0.1.0-alpha03-preview2-SNAPSHOT"
     override val name = "Android FHIR Workflow Library"
   }
 
@@ -74,7 +74,7 @@ object Releases {
 
   object Knowledge : LibraryArtifact {
     override val artifactId = "knowledge"
-    override val version = "0.1.0-alpha01-preview2-SNAPSHOT"
+    override val version = "0.1.0-alpha01-preview3-SNAPSHOT"
     override val name = "Android FHIR Knowledge Manager Library"
   }
 

From 1721a4a6c835e2d0fbc730c6886a72d36cf05d71 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 20 Sep 2023 10:51:34 +0300
Subject: [PATCH 028/126] Revert "New API to support saving local only
 resources"

This reverts commit 7a45e18cf5280d60b1ebe8dfd08c9745134b4197.

The changes will be introduced by the PR https://github.com/google/android-fhir/pull/2178
---
 engine/src/main/java/com/google/android/fhir/FhirEngine.kt    | 2 --
 .../main/java/com/google/android/fhir/impl/FhirEngineImpl.kt  | 4 ----
 .../main/java/com/google/android/fhir/testing/Utilities.kt    | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
index 1769bb1b93..38f8d469ce 100644
--- a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
+++ b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
@@ -34,8 +34,6 @@ interface FhirEngine {
    */
   suspend fun create(vararg resource: Resource): List<String>
 
-  suspend fun createRemote(vararg resource: Resource)
-
   /** Loads a FHIR resource given the class and the logical ID. */
   suspend fun get(type: ResourceType, id: String): Resource
 
diff --git a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
index 56cbfe2405..d7b4c8d0e8 100644
--- a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
@@ -44,10 +44,6 @@ internal class FhirEngineImpl(private val database: Database, private val contex
     return database.insert(*resource)
   }
 
-  override suspend fun createRemote(vararg resource: Resource) {
-    return database.insertRemote(*resource)
-  }
-
   override suspend fun get(type: ResourceType, id: String): Resource {
     return database.select(type, id)
   }
diff --git a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
index cd3505cd5e..2169a75543 100644
--- a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
+++ b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
@@ -134,9 +134,6 @@ open class TestDownloadManagerImpl(
 
 object TestFhirEngineImpl : FhirEngine {
   override suspend fun create(vararg resource: Resource) = emptyList<String>()
-  override suspend fun createRemote(vararg resource: Resource) {
-    TODO("Not yet implemented")
-  }
 
   override suspend fun update(vararg resource: Resource) {}
 

From 658f9c498ff4ab7d261b54d0efaadc3518b5d3a4 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Thu, 21 Sep 2023 09:13:34 +0300
Subject: [PATCH 029/126] Engine, SDC   - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/11   - Wup
 https://github.com/google/android-fhir/pull/1669   - Wup
 https://github.com/google/android-fhir/pull/2076   - Wup
 https://github.com/opensrp/android-fhir/pull/9   - Wup
 https://github.com/google/android-fhir/pull/2178   - Wup
 https://github.com/opensrp/android-fhir/pull/10

---
 buildSrc/src/main/kotlin/Releases.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 991dde9d45..3da9f67280 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,13 +48,13 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta04-preview3-SNAPSHOT"
+    override val version = "0.1.0-beta04-preview4-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.0.0-preview18-SNAPSHOT"
+    override val version = "1.0.0-preview19-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 

From 78d5bb536f791d80f2310584b2f1acf5ca59b44a Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Thu, 21 Sep 2023 12:59:02 +0300
Subject: [PATCH 030/126] Refactor create local only changes API

---
 .../main/java/com/google/android/fhir/FhirEngine.kt    | 10 +++-------
 .../main/java/com/google/android/fhir/db/Database.kt   |  9 +++++++++
 .../com/google/android/fhir/db/impl/DatabaseImpl.kt    |  4 ++++
 .../com/google/android/fhir/impl/FhirEngineImpl.kt     |  8 ++------
 .../java/com/google/android/fhir/testing/Utilities.kt  |  7 ++-----
 .../com/google/android/fhir/impl/FhirEngineImplTest.kt |  4 ++--
 6 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
index 0333fd54f6..4882a78775 100644
--- a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
+++ b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
@@ -30,15 +30,11 @@ interface FhirEngine {
   /**
    * Creates one or more FHIR [resource]s in the local storage.
    *
+   * @param isLocalOnly - Setting the value to [true] instructs engine that the resource and its
+   *   subsequent updates should never be synced to the server.
    * @return the logical IDs of the newly created resources.
    */
-  suspend fun create(vararg resource: Resource): List<String>
-
-  /**
-   * Creates one or more remote FHIR [resource]s in the local storage without flagging as local
-   * changes.
-   */
-  suspend fun createRemote(vararg resource: Resource)
+  suspend fun create(vararg resource: Resource, isLocalOnly: Boolean = false): List<String>
 
   /** Loads a FHIR resource given the class and the logical ID. */
   suspend fun get(type: ResourceType, id: String): Resource
diff --git a/engine/src/main/java/com/google/android/fhir/db/Database.kt b/engine/src/main/java/com/google/android/fhir/db/Database.kt
index cbbc840b64..c8ea52b4fd 100644
--- a/engine/src/main/java/com/google/android/fhir/db/Database.kt
+++ b/engine/src/main/java/com/google/android/fhir/db/Database.kt
@@ -37,6 +37,15 @@ internal interface Database {
    */
   suspend fun <R : Resource> insert(vararg resource: R): List<String>
 
+  /**
+   * Inserts a list of local `resources` into the FHIR resource database. If any of the resources
+   * already exists, it will be overwritten.
+   *
+   * @param <R> The resource type
+   * @return the logical IDs of the newly created resources.
+   */
+  suspend fun <R : Resource> insertLocalOnly(vararg resource: R): List<String>
+
   /**
    * Inserts a list of remote `resources` into the FHIR resource database. If any of the resources
    * already exists, it will be overwritten.
diff --git a/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt b/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
index 8ca9fff23c..b2f7de8647 100644
--- a/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
@@ -123,6 +123,10 @@ internal class DatabaseImpl(
     return logicalIds
   }
 
+  override suspend fun <R : Resource> insertLocalOnly(vararg resource: R): List<String> {
+    return db.withTransaction { resourceDao.insertAllRemote(resource.toList()) }
+  }
+
   override suspend fun <R : Resource> insertRemote(vararg resource: R) {
     db.withTransaction { resourceDao.insertAllRemote(resource.toList()) }
   }
diff --git a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
index 8f82a10815..3c61d80f5b 100644
--- a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
@@ -40,12 +40,8 @@ import org.hl7.fhir.r4.model.ResourceType
 /** Implementation of [FhirEngine]. */
 internal class FhirEngineImpl(private val database: Database, private val context: Context) :
   FhirEngine {
-  override suspend fun create(vararg resource: Resource): List<String> {
-    return database.insert(*resource)
-  }
-
-  override suspend fun createRemote(vararg resource: Resource) {
-    return database.insertRemote(*resource)
+  override suspend fun create(vararg resource: Resource, isLocalOnly: Boolean): List<String> {
+    return if (isLocalOnly) database.insertLocalOnly(*resource) else database.insert(*resource)
   }
 
   override suspend fun get(type: ResourceType, id: String): Resource {
diff --git a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
index 18b3f66596..94598c401d 100644
--- a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
+++ b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
@@ -133,11 +133,8 @@ open class TestDownloadManagerImpl(
 }
 
 object TestFhirEngineImpl : FhirEngine {
-  override suspend fun create(vararg resource: Resource) = emptyList<String>()
-
-  override suspend fun createRemote(vararg resource: Resource) {
-    TODO("Not yet implemented")
-  }
+  override suspend fun create(vararg resource: Resource, isLocalOnly: Boolean): List<String> =
+    emptyList()
 
   override suspend fun update(vararg resource: Resource) {}
 
diff --git a/engine/src/test/java/com/google/android/fhir/impl/FhirEngineImplTest.kt b/engine/src/test/java/com/google/android/fhir/impl/FhirEngineImplTest.kt
index f9d626941c..fa7a0e08de 100644
--- a/engine/src/test/java/com/google/android/fhir/impl/FhirEngineImplTest.kt
+++ b/engine/src/test/java/com/google/android/fhir/impl/FhirEngineImplTest.kt
@@ -82,7 +82,7 @@ class FhirEngineImplTest {
   fun createRemote_shouldCreateResourceWithoutFlaggingLocalChange() = runBlocking {
     val totalLocalChangesPatient2 =
       fhirEngine.getLocalChanges(ResourceType.Patient, TEST_PATIENT_2_ID).size
-    fhirEngine.createRemote(TEST_PATIENT_2)
+    fhirEngine.create(TEST_PATIENT_2, isLocalOnly = true)
     assertResourceEquals(TEST_PATIENT_2, fhirEngine.get<Patient>(TEST_PATIENT_2_ID))
     assertThat(fhirEngine.getLocalChanges(ResourceType.Patient, TEST_PATIENT_2_ID).size)
       .isEqualTo(totalLocalChangesPatient2)
@@ -94,7 +94,7 @@ class FhirEngineImplTest {
       fhirEngine.getLocalChanges(ResourceType.Patient, TEST_PATIENT_1_ID).size
     val totalLocalChangesPatient2 =
       fhirEngine.getLocalChanges(ResourceType.Patient, TEST_PATIENT_2_ID).size
-    fhirEngine.createRemote(TEST_PATIENT_1, TEST_PATIENT_2)
+    fhirEngine.create(TEST_PATIENT_1, TEST_PATIENT_2, isLocalOnly = true)
     assertResourceEquals(TEST_PATIENT_1, fhirEngine.get<Patient>(TEST_PATIENT_1_ID))
     assertResourceEquals(TEST_PATIENT_2, fhirEngine.get<Patient>(TEST_PATIENT_2_ID))
     assertThat(fhirEngine.getLocalChanges(ResourceType.Patient, TEST_PATIENT_1_ID).size)

From 563c233a2340b9aae1113f7e5fd01ac4f66b0d15 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Thu, 21 Sep 2023 13:05:47 +0300
Subject: [PATCH 031/126] Rename test cases

---
 .../java/com/google/android/fhir/impl/FhirEngineImplTest.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engine/src/test/java/com/google/android/fhir/impl/FhirEngineImplTest.kt b/engine/src/test/java/com/google/android/fhir/impl/FhirEngineImplTest.kt
index fa7a0e08de..06490cd545 100644
--- a/engine/src/test/java/com/google/android/fhir/impl/FhirEngineImplTest.kt
+++ b/engine/src/test/java/com/google/android/fhir/impl/FhirEngineImplTest.kt
@@ -79,7 +79,7 @@ class FhirEngineImplTest {
   }
 
   @Test
-  fun createRemote_shouldCreateResourceWithoutFlaggingLocalChange() = runBlocking {
+  fun create_isLocalOnlyTrue_shouldCreateResourceWithoutFlaggingLocalChange() = runBlocking {
     val totalLocalChangesPatient2 =
       fhirEngine.getLocalChanges(ResourceType.Patient, TEST_PATIENT_2_ID).size
     fhirEngine.create(TEST_PATIENT_2, isLocalOnly = true)
@@ -89,7 +89,7 @@ class FhirEngineImplTest {
   }
 
   @Test
-  fun createRemoteAll_shouldCreateResourceWithoutFlaggingLocalChange() = runBlocking {
+  fun createAll_isLocalOnlyTrue_shouldCreateResourceWithoutFlaggingLocalChange() = runBlocking {
     val totalLocalChangesPatient1 =
       fhirEngine.getLocalChanges(ResourceType.Patient, TEST_PATIENT_1_ID).size
     val totalLocalChangesPatient2 =

From 7d7d440852678ebd734e48837ebdb8ac9ba441d2 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Thu, 21 Sep 2023 13:08:49 +0300
Subject: [PATCH 032/126] Revert return type for Test Utilites create method
 signature

---
 .../src/main/java/com/google/android/fhir/testing/Utilities.kt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
index 94598c401d..4e519c90d5 100644
--- a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
+++ b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
@@ -133,8 +133,7 @@ open class TestDownloadManagerImpl(
 }
 
 object TestFhirEngineImpl : FhirEngine {
-  override suspend fun create(vararg resource: Resource, isLocalOnly: Boolean): List<String> =
-    emptyList()
+  override suspend fun create(vararg resource: Resource, isLocalOnly: Boolean) = emptyList<String>()
 
   override suspend fun update(vararg resource: Resource) {}
 

From c9ca366fd87c533d940b089baf10deea4118106c Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <ndegwamartin@users.noreply.github.com>
Date: Fri, 13 Oct 2023 12:31:57 +0300
Subject: [PATCH 033/126] Disable eTAGs for Uploads

Disable using eTAGs - Fixes HTTP 400 exception during transaction bundle sync

*Resources:*
- https://github.com/hapifhir/hapi-fhir/issues/3575
- https://github.com/opensrp/fhircore/pull/2481
---
 .../main/java/com/google/android/fhir/sync/upload/Uploader.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine/src/main/java/com/google/android/fhir/sync/upload/Uploader.kt b/engine/src/main/java/com/google/android/fhir/sync/upload/Uploader.kt
index b5a8ee66d8..6b479a42d3 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/upload/Uploader.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/upload/Uploader.kt
@@ -40,7 +40,7 @@ import timber.log.Timber
  */
 internal class Uploader(private val dataSource: DataSource) {
   private val patchGenerator = PerResourcePatchGenerator
-  private val requestGenerator = TransactionBundleGenerator.getDefault()
+  private val requestGenerator = TransactionBundleGenerator.getDefault(useETagForUpload = false)
 
   suspend fun upload(localChanges: List<LocalChange>): UploadSyncResult {
     val patches = patchGenerator.generate(localChanges)

From ac92d70af41dcad9439c2b8298104f90c19507ce Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Fri, 13 Oct 2023 12:59:34 +0300
Subject: [PATCH 034/126] Engine, SDC, Workflow, Common, Knowledge   - With
 unmerged PR https://github.com/opensrp/android-fhir/pull/11   - Wup
 https://github.com/google/android-fhir/pull/1669   - Wup
 https://github.com/opensrp/android-fhir/pull/9   - Wup
 https://github.com/google/android-fhir/pull/2178   - Wup
 https://github.com/opensrp/android-fhir/pull/10   - Wup
 https://github.com/google/android-fhir/pull/2230   - Wup
 https://github.com/google/android-fhir/pull/2262

---
 buildSrc/src/main/kotlin/Releases.kt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 99bbccaa72..164ac9f9bc 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -42,25 +42,25 @@ object Releases {
 
   object Common : LibraryArtifact {
     override val artifactId = "common"
-    override val version = "0.1.0-alpha05"
+    override val version = "0.1.0-alpha05-preview-SNAPSHOT"
     override val name = "Android FHIR Common Library"
   }
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta04-preview4-SNAPSHOT"
+    override val version = "0.1.0-beta04-preview5-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.0.0-preview19-SNAPSHOT"
+    override val version = "1.0.0-preview20-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 
   object Workflow : LibraryArtifact {
     override val artifactId = "workflow"
-    override val version = "0.1.0-alpha03-preview2-SNAPSHOT"
+    override val version = "0.1.0-alpha03-preview3-SNAPSHOT"
     override val name = "Android FHIR Workflow Library"
   }
 
@@ -74,7 +74,7 @@ object Releases {
 
   object Knowledge : LibraryArtifact {
     override val artifactId = "knowledge"
-    override val version = "0.1.0-alpha02"
+    override val version = "0.1.0-alpha02-preview-SNAPSHOT"
     override val name = "Android FHIR Knowledge Manager Library"
   }
 

From 136833ad3271adc7023a76d862c6bf04c4719210 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Fri, 13 Oct 2023 14:51:13 +0300
Subject: [PATCH 035/126] Apply Spotless

---
 engine/src/main/java/com/google/android/fhir/FhirEngine.kt  | 2 ++
 .../java/com/google/android/fhir/impl/FhirEngineImpl.kt     | 1 +
 .../java/com/google/android/fhir/sync/FhirSyncWorker.kt     | 6 +++---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
index 8c38aa94fa..da6437394c 100644
--- a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
+++ b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
@@ -105,7 +105,9 @@ interface FhirEngine {
    *   return an empty list.
    */
   suspend fun getLocalChanges(type: ResourceType, id: String): List<LocalChange>
+
   suspend fun getUnsyncedLocalChanges(): List<LocalChange>
+
   /**
    * Purges a resource from the database based on resource type and id without any deletion of data
    * from the server.
diff --git a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
index d70233efbe..36fe8c984b 100644
--- a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
@@ -77,6 +77,7 @@ internal class FhirEngineImpl(private val database: Database, private val contex
   override suspend fun getLocalChanges(type: ResourceType, id: String): List<LocalChange> {
     return database.getLocalChanges(type, id)
   }
+
   // FhirEngineImpl.kt
   override suspend fun getUnsyncedLocalChanges(): List<LocalChange> = database.getAllLocalChanges()
 
diff --git a/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt b/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt
index 6a51fc7715..5ac262d89f 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt
@@ -127,13 +127,13 @@ abstract class FhirSyncWorker(appContext: Context, workerParams: WorkerParameter
             jsonParser.parseResource(
               IOUtils.toString(
                 resourceSyncHTTPException.response()?.errorBody()?.byteStream(),
-                StandardCharsets.UTF_8
-              )
+                StandardCharsets.UTF_8,
+              ),
             ) as OperationOutcome
 
           operationOutcome.issue.forEach { operationOutcome ->
             Timber.e(
-              "SERVER ${operationOutcome.severity} - HTTP ${resourceSyncHTTPException.code()} | Code - ${operationOutcome.code} | Diagnostics - ${operationOutcome.diagnostics}"
+              "SERVER ${operationOutcome.severity} - HTTP ${resourceSyncHTTPException.code()} | Code - ${operationOutcome.code} | Diagnostics - ${operationOutcome.diagnostics}",
             )
           }
         }

From 111c6629d91b2c503ffa83b76b50d8f4c42ac7f9 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Mon, 30 Oct 2023 12:40:07 +0300
Subject: [PATCH 036/126] Engine, SDC, Workflow, Common, Knowledge   - With
 unmerged PR https://github.com/opensrp/android-fhir/pull/11   - Wup
 https://github.com/google/android-fhir/pull/1669   - Wup
 https://github.com/opensrp/android-fhir/pull/9   - Wup
 https://github.com/google/android-fhir/pull/2178

---
 buildSrc/src/main/kotlin/Dependencies.kt | 8 ++++----
 buildSrc/src/main/kotlin/Releases.kt     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 34711c988f..a844ffa424 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -133,7 +133,7 @@ object Dependencies {
       "com.google.mlkit:object-detection-custom:${Versions.Mlkit.objectDetectionCustom}"
   }
 
-  const val androidFhirGroup = "com.google.android.fhir"
+  const val androidFhirGroup = "org.smartregister"
   const val androidFhirEngineModule = "engine"
   const val androidFhirKnowledgeModule = "knowledge"
   const val androidFhirCommon = "$androidFhirGroup:common:${Versions.androidFhirCommon}"
@@ -219,9 +219,9 @@ object Dependencies {
       const val stdlib = "1.8.20"
     }
 
-    const val androidFhirCommon = "0.1.0-alpha05"
-    const val androidFhirEngine = "0.1.0-beta05"
-    const val androidFhirKnowledge = "0.1.0-alpha03"
+    const val androidFhirCommon = "0.1.0-alpha05-preview-SNAPSHOT"
+    const val androidFhirEngine = "0.1.0-beta05-preview1-SNAPSHOT"
+    const val androidFhirKnowledge = "0.1.0-alpha03-preview-SNAPSHOT"
     const val apacheCommonsCompress = "1.21"
     const val desugarJdkLibs = "2.0.3"
     const val caffeine = "2.9.1"
diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 1280d22110..a6f8476d9c 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,19 +48,19 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta05"
+    override val version = "0.1.0-beta05-preview1-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.0.0-preview20-SNAPSHOT"
+    override val version = "1.0.0-preview22-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 
   object Workflow : LibraryArtifact {
     override val artifactId = "workflow"
-    override val version = "0.1.0-alpha04"
+    override val version = "0.1.0-alpha04-preview-SNAPSHOT"
     override val name = "Android FHIR Workflow Library"
   }
 
@@ -74,7 +74,7 @@ object Releases {
 
   object Knowledge : LibraryArtifact {
     override val artifactId = "knowledge"
-    override val version = "0.1.0-alpha03"
+    override val version = "0.1.0-alpha03-preview-SNAPSHOT"
     override val name = "Android FHIR Knowledge Manager Library"
   }
 

From afbfd9a07e7e6cd6777c93131ae88c1a29a54372 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Mon, 30 Oct 2023 13:45:59 +0300
Subject: [PATCH 037/126] Fix build for Insert Local Only

---
 .../main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt b/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
index 34ab857068..de6584cefb 100644
--- a/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
@@ -38,6 +38,7 @@ import java.time.Instant
 import java.util.UUID
 import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
+import java.util.Collections
 
 /**
  * The implementation for the persistence layer using Room. See docs for
@@ -140,7 +141,7 @@ internal class DatabaseImpl(
   }
 
   override suspend fun <R : Resource> insertLocalOnly(vararg resource: R): List<String> {
-    return db.withTransaction { resourceDao.insertAllRemote(resource.toList()) }
+    return db.withTransaction { resourceDao.insertAllRemote(resource.toList()).map { it.toString() }.toList() }
   }
 
   override suspend fun <R : Resource> insertRemote(vararg resource: R) {

From 5276c82480313773aeb6df76e832e4c6a62fe3d2 Mon Sep 17 00:00:00 2001
From: Rkareko <rkareko@ona.io>
Date: Fri, 24 Nov 2023 18:27:33 +0300
Subject: [PATCH 038/126] Engine, SDC, Workflow, Common, Knowledge       - With
 unmerged PR https://github.com/opensrp/android-fhir/pull/11       - Wup
 https://github.com/google/android-fhir/pull/1669       - Wup
 https://github.com/opensrp/android-fhir/pull/9       - Wup
 https://github.com/google/android-fhir/pull/2178

---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index a6f8476d9c..c72b399388 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,7 +48,7 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta05-preview1-SNAPSHOT"
+    override val version = "0.1.0-beta05-preview3-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 

From d03017af2b709136d3de860cd5673558d9d00056 Mon Sep 17 00:00:00 2001
From: Rkareko <rkareko@ona.io>
Date: Tue, 19 Dec 2023 13:57:20 +0300
Subject: [PATCH 039/126]   Engine, SDC, Workflow, Common, Knowledge

      - With unmerged PR #11
      - Wup google#1669
      - Wup #9
      - Wup google#2178
---
 buildSrc/src/main/kotlin/Releases.kt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index c72b399388..194282305e 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -42,25 +42,25 @@ object Releases {
 
   object Common : LibraryArtifact {
     override val artifactId = "common"
-    override val version = "0.1.0-alpha05-preview-SNAPSHOT"
+    override val version = "0.1.0-alpha05-preview1-SNAPSHOT"
     override val name = "Android FHIR Common Library"
   }
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta05-preview3-SNAPSHOT"
+    override val version = "0.1.0-beta05-preview4-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.0.0-preview22-SNAPSHOT"
+    override val version = "1.0.0-preview23-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 
   object Workflow : LibraryArtifact {
     override val artifactId = "workflow"
-    override val version = "0.1.0-alpha04-preview-SNAPSHOT"
+    override val version = "0.1.0-alpha04-preview1-SNAPSHOT"
     override val name = "Android FHIR Workflow Library"
   }
 
@@ -74,7 +74,7 @@ object Releases {
 
   object Knowledge : LibraryArtifact {
     override val artifactId = "knowledge"
-    override val version = "0.1.0-alpha03-preview-SNAPSHOT"
+    override val version = "0.1.0-alpha03-preview1-SNAPSHOT"
     override val name = "Android FHIR Knowledge Manager Library"
   }
 

From 6ebc36debbee309fc0ed099cb804b246863927d4 Mon Sep 17 00:00:00 2001
From: Rkareko <rkareko@ona.io>
Date: Wed, 20 Dec 2023 04:47:43 +0300
Subject: [PATCH 040/126] Disable eTAGs for Uploads

---
 .../android/fhir/sync/upload/request/UploadRequestGenerator.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt b/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt
index 62a4612d97..ebdb63a490 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt
@@ -59,6 +59,7 @@ internal object UploadRequestGeneratorFactory {
         TransactionBundleGenerator.getGenerator(
           mode.httpVerbToUseForCreate,
           mode.httpVerbToUseForUpdate,
+          useETagForUpload = false
         )
     }
 }

From dfe6232bbeb9b093855035a1550187db851a507f Mon Sep 17 00:00:00 2001
From: Rkareko <rkareko@ona.io>
Date: Tue, 9 Jan 2024 14:53:13 +0300
Subject: [PATCH 041/126]  Engine, SDC, Workflow, Common, Knowledge,
 Datacapture, Contrib, Catalog

      - With unmerged PR #11
      - Wup google#1669
      - Wup #9
      - Wup google#2178
---
 buildSrc/src/main/kotlin/Releases.kt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 194282305e..74bd028c4d 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -42,39 +42,39 @@ object Releases {
 
   object Common : LibraryArtifact {
     override val artifactId = "common"
-    override val version = "0.1.0-alpha05-preview1-SNAPSHOT"
+    override val version = "0.1.0-alpha05-preview2-SNAPSHOT"
     override val name = "Android FHIR Common Library"
   }
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta05-preview4-SNAPSHOT"
+    override val version = "0.1.0-beta05-preview5-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.0.0-preview23-SNAPSHOT"
+    override val version = "1.0.0-preview24-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 
   object Workflow : LibraryArtifact {
     override val artifactId = "workflow"
-    override val version = "0.1.0-alpha04-preview1-SNAPSHOT"
+    override val version = "0.1.0-alpha04-preview2-SNAPSHOT"
     override val name = "Android FHIR Workflow Library"
   }
 
   object Contrib {
     object Barcode : LibraryArtifact {
       override val artifactId = "contrib-barcode"
-      override val version = "0.1.0-beta3-preview5-SNAPSHOT"
+      override val version = "0.1.0-beta3-preview6-SNAPSHOT"
       override val name = "Android FHIR Structured Data Capture - Barcode Extensions (contrib)"
     }
   }
 
   object Knowledge : LibraryArtifact {
     override val artifactId = "knowledge"
-    override val version = "0.1.0-alpha03-preview1-SNAPSHOT"
+    override val version = "0.1.0-alpha03-preview2-SNAPSHOT"
     override val name = "Android FHIR Knowledge Manager Library"
   }
 

From 219cd36a9990a44740dce31e196c3a0876b96398 Mon Sep 17 00:00:00 2001
From: Rkareko <rkareko@ona.io>
Date: Wed, 10 Jan 2024 12:44:04 +0300
Subject: [PATCH 042/126] 	 Engine, Workflow

      - With unmerged PR #11
      - Wup google#1669
      - Wup #9
      - Wup google#2178
---
 buildSrc/src/main/kotlin/Releases.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 74bd028c4d..d341713ea4 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,7 +48,7 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta05-preview5-SNAPSHOT"
+    override val version = "0.1.0-beta05-preview6-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
@@ -60,7 +60,7 @@ object Releases {
 
   object Workflow : LibraryArtifact {
     override val artifactId = "workflow"
-    override val version = "0.1.0-alpha04-preview2-SNAPSHOT"
+    override val version = "0.1.0-alpha04-preview3-SNAPSHOT"
     override val name = "Android FHIR Workflow Library"
   }
 

From 64ffbae29834227dbbc5a1f59f95a5571531ef5b Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Mon, 22 Jan 2024 14:00:10 +0300
Subject: [PATCH 043/126]        SDC, Engine, Workflow

          - With unmerged PR https://github.com/google/android-fhir/pull/11
          - Wup https://github.com/google/android-fhir/pull/1669
          - Wup https://github.com/google/android-fhir/pull/9
          - Wup https://github.com/google/android-fhir/pull/2178
---
 buildSrc/src/main/kotlin/Dependencies.kt | 6 +++---
 buildSrc/src/main/kotlin/Releases.kt     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 4188123d79..4d64f753d5 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -247,9 +247,9 @@ object Dependencies {
       const val stdlib = "1.8.20"
     }
 
-    const val androidFhirCommon = "0.1.0-alpha05-preview-SNAPSHOT"
-    const val androidFhirEngine = "0.1.0-beta05-preview1-SNAPSHOT"
-    const val androidFhirKnowledge = "0.1.0-alpha03-preview-SNAPSHOT"
+    const val androidFhirCommon = "0.1.0-alpha05-preview2-SNAPSHOT"
+    const val androidFhirEngine = "0.1.0-beta05-preview7-SNAPSHOT"
+    const val androidFhirKnowledge = "0.1.0-alpha03-preview2-SNAPSHOT"
     const val apacheCommonsCompress = "1.21"
     const val desugarJdkLibs = "2.0.3"
     const val caffeine = "2.9.1"
diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index dc4dbea6cc..7ae69ab45f 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,19 +48,19 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "0.1.0-beta05-preview6-SNAPSHOT"
+    override val version = "0.1.0-beta05-preview7-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.1.0"
+    override val version = "1.1.0-preview-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 
   object Workflow : LibraryArtifact {
     override val artifactId = "workflow"
-    override val version = "0.1.0-alpha04-preview3-SNAPSHOT"
+    override val version = "0.1.0-alpha04-preview4-SNAPSHOT"
     override val name = "Android FHIR Workflow Library"
   }
 

From e049913eb9905f711f1ff5de5fc3752702d01833 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 24 Jan 2024 14:00:27 +0300
Subject: [PATCH 044/126] SDC : Minor Data capture version update

---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 7ae69ab45f..9d3e4d59e4 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -54,7 +54,7 @@ object Releases {
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.1.0-preview-SNAPSHOT"
+    override val version = "1.1.0-preview1-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 

From 4f0fea0b0c453f7bb0316304af78f20b0ddae84f Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 7 Feb 2024 15:45:15 +0300
Subject: [PATCH 045/126] Release Engine, SDC

* With unmerged PRS
- https://github.com/opensrp/android-fhir/pull/9
- https://github.com/google/android-fhir/pull/2420
- https://github.com/google/android-fhir/pull/2178
---
 buildSrc/src/main/kotlin/Dependencies.kt | 2 +-
 buildSrc/src/main/kotlin/Releases.kt     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 4d64f753d5..b2e5c1e964 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -248,7 +248,7 @@ object Dependencies {
     }
 
     const val androidFhirCommon = "0.1.0-alpha05-preview2-SNAPSHOT"
-    const val androidFhirEngine = "0.1.0-beta05-preview7-SNAPSHOT"
+    const val androidFhirEngine = "1.0.0-preview1-SNAPSHOT"
     const val androidFhirKnowledge = "0.1.0-alpha03-preview2-SNAPSHOT"
     const val apacheCommonsCompress = "1.21"
     const val desugarJdkLibs = "2.0.3"
diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 3b6afdb180..c639d7f95c 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,13 +48,13 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "1.0.0"
+    override val version = "1.0.0-preview2-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.1.0-preview1-SNAPSHOT"
+    override val version = "1.1.0-preview4-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 

From 3e4ccf83ac70ae78e5b4c612f2d149207a78c5f9 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Fri, 9 Feb 2024 21:42:04 +0300
Subject: [PATCH 046/126] Release SDC, Workflow

    * With unmerged PRS
    - https://github.com/opensrp/android-fhir/pull/9
    - https://github.com/google/android-fhir/pull/2420
    - https://github.com/google/android-fhir/pull/2178
---
 buildSrc/src/main/kotlin/Dependencies.kt | 2 +-
 buildSrc/src/main/kotlin/Releases.kt     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 75946211c2..b10f5e8612 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -252,7 +252,7 @@ object Dependencies {
     }
 
     const val androidFhirCommon = "0.1.0-alpha05-preview2-SNAPSHOT"
-    const val androidFhirEngine = "1.0.0-preview1-SNAPSHOT"
+    const val androidFhirEngine = "1.0.0-preview2-SNAPSHOT"
     const val androidFhirKnowledge = "0.1.0-alpha03-preview2-SNAPSHOT"
     const val apacheCommonsCompress = "1.21"
     const val desugarJdkLibs = "2.0.3"
diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index f6c5837a59..526e2a3658 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -54,13 +54,13 @@ object Releases {
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.1.0-preview4-SNAPSHOT"
+    override val version = "1.1.0-preview5-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 
   object Workflow : LibraryArtifact {
     override val artifactId = "workflow"
-    override val version = "0.1.0-alpha04-preview4-SNAPSHOT"
+    override val version = "0.1.0-alpha04-preview5-SNAPSHOT"
     override val name = "Android FHIR Workflow Library"
   }
 

From e6439e33efba21a254bccf956f411e34d8208952 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Fri, 9 Feb 2024 21:35:15 +0300
Subject: [PATCH 047/126] Update Clinical Reasoning version to PRE9

---
 buildSrc/src/main/kotlin/Dependencies.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 5469d71f81..7fb6a4b1dd 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -244,7 +244,7 @@ object Dependencies {
     }
 
     object Cql {
-      const val clinicalReasoning = "3.0.0-PRE9-SNAPSHOT"
+      const val clinicalReasoning = "3.0.0-PRE9"
     }
 
     object Kotlin {

From 7097dfbbd144151fff231d69cee686f2caaecb07 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Fri, 9 Feb 2024 21:33:04 +0300
Subject: [PATCH 048/126] Expose overloaded API for evaluateMeasure - Implement
 evaluateMeasure API method in the FHIR Operator with Measure as parameter

---
 .../FhirEngineR4MeasureProcessor.java         | 62 +++++++++++++++++++
 .../android/fhir/workflow/FhirOperator.kt     | 55 +++++++++++++++-
 2 files changed, 115 insertions(+), 2 deletions(-)
 create mode 100644 workflow/src/main/java/com/google/android/fhir/workflow/FhirEngineR4MeasureProcessor.java

diff --git a/workflow/src/main/java/com/google/android/fhir/workflow/FhirEngineR4MeasureProcessor.java b/workflow/src/main/java/com/google/android/fhir/workflow/FhirEngineR4MeasureProcessor.java
new file mode 100644
index 0000000000..a13540e501
--- /dev/null
+++ b/workflow/src/main/java/com/google/android/fhir/workflow/FhirEngineR4MeasureProcessor.java
@@ -0,0 +1,62 @@
+package com.google.android.fhir.workflow;
+
+import org.hl7.fhir.instance.model.api.IBaseBundle;
+import org.hl7.fhir.r4.model.Measure;
+import org.hl7.fhir.r4.model.MeasureReport;
+import org.opencds.cqf.fhir.api.Repository;
+import org.opencds.cqf.fhir.cr.measure.MeasureEvaluationOptions;
+import org.opencds.cqf.fhir.cr.measure.common.MeasureEvalType;
+import org.opencds.cqf.fhir.cr.measure.common.SubjectProvider;
+import org.opencds.cqf.fhir.cr.measure.r4.R4MeasureProcessor;
+import org.opencds.cqf.fhir.cr.measure.r4.R4RepositorySubjectProvider;
+import org.opencds.cqf.fhir.utility.repository.FederatedRepository;
+import org.opencds.cqf.fhir.utility.repository.InMemoryFhirRepository;
+
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class FhirEngineR4MeasureProcessor extends R4MeasureProcessor {
+    private static String FIELD_SUBJECT_PROVIDER="subjectProvider";
+    private Repository repository;
+
+    public FhirEngineR4MeasureProcessor(Repository repository, MeasureEvaluationOptions measureEvaluationOptions) {
+        super(repository, measureEvaluationOptions);
+        this.repository = repository;
+    }
+
+    public FhirEngineR4MeasureProcessor(Repository repository, MeasureEvaluationOptions measureEvaluationOptions, SubjectProvider subjectProvider) {
+        super(repository, measureEvaluationOptions, subjectProvider);
+        this.repository = repository;
+    }
+
+    @Override
+    public MeasureReport evaluateMeasure(Measure measure, String periodStart, String periodEnd, String reportType, List<String> subjectIds, IBaseBundle additionalData, MeasureEvalType evalType) {
+        var actualRepo = this.repository;
+        if (additionalData != null) {
+            actualRepo = new FederatedRepository(
+                    this.repository, new InMemoryFhirRepository(this.repository.fhirContext(), additionalData));
+        }
+
+        SubjectProvider subjectProvider = getSubjectProvider();
+        var subjects = subjectProvider.getSubjects(actualRepo, evalType, subjectIds).collect(Collectors.toList());
+        return super.evaluateMeasure( measure,  periodStart,  periodEnd,  reportType, subjects,  additionalData,  evalType) ;
+    }
+
+
+    /***
+     * We have two constructors that could result in different subject providers. So for this field we will use reflection
+     * @return [SubjectProvider] the SubjectProvider
+     */
+    public SubjectProvider getSubjectProvider(){
+        SubjectProvider subjectProvider;
+        try {
+            Field field = this.getClass().getSuperclass().getDeclaredField(FIELD_SUBJECT_PROVIDER);
+            field.setAccessible(true);
+            subjectProvider = (SubjectProvider) field.get(this);
+        }catch (Exception e){
+            subjectProvider = null;
+        }
+        return subjectProvider;
+    }
+}
diff --git a/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt b/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt
index 81ca998e40..abd727b026 100644
--- a/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt
+++ b/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt
@@ -31,6 +31,7 @@ import org.hl7.fhir.instance.model.api.IBaseParameters
 import org.hl7.fhir.instance.model.api.IBaseResource
 import org.hl7.fhir.r4.model.CanonicalType
 import org.hl7.fhir.r4.model.IdType
+import org.hl7.fhir.r4.model.Measure
 import org.hl7.fhir.r4.model.MeasureReport
 import org.hl7.fhir.r4.model.Parameters
 import org.hl7.fhir.r4.model.PlanDefinition
@@ -38,8 +39,8 @@ import org.hl7.fhir.r4.model.Reference
 import org.opencds.cqf.fhir.cql.EvaluationSettings
 import org.opencds.cqf.fhir.cql.LibraryEngine
 import org.opencds.cqf.fhir.cr.measure.MeasureEvaluationOptions
+import org.opencds.cqf.fhir.cr.measure.common.MeasureEvalType
 import org.opencds.cqf.fhir.cr.measure.common.MeasureReportType
-import org.opencds.cqf.fhir.cr.measure.r4.R4MeasureProcessor
 import org.opencds.cqf.fhir.cr.plandefinition.r4.PlanDefinitionProcessor
 import org.opencds.cqf.fhir.utility.monad.Eithers
 import org.opencds.cqf.fhir.utility.repository.ProxyRepository
@@ -68,7 +69,8 @@ internal constructor(
 
   private val libraryProcessor = LibraryEngine(repository, evaluationSettings)
 
-  private val measureProcessor = R4MeasureProcessor(repository, measureEvaluationOptions)
+  private val measureProcessor: FhirEngineR4MeasureProcessor =
+    FhirEngineR4MeasureProcessor(repository, measureEvaluationOptions)
   private val planDefinitionProcessor = PlanDefinitionProcessor(repository, evaluationSettings)
 
   /**
@@ -209,6 +211,55 @@ internal constructor(
     return report
   }
 
+  /**
+   * Generates a [MeasureReport] based on the provided inputs.
+   *
+   * NOTE: The API may internally result in a blocking IO operation. The user should call the API
+   * from a worker thread or it may throw [BlockingMainThreadException] exception.
+   */
+  @WorkerThread
+  fun evaluateMeasure(
+    measure: Measure,
+    start: String,
+    end: String,
+    reportType: String,
+    subjectId: String? = null,
+    practitioner: String? = null,
+    additionalData: IBaseBundle? = null,
+  ): MeasureReport {
+    val subject =
+      if (!practitioner.isNullOrBlank()) {
+        checkAndAddType(practitioner, "Practitioner")
+      } else if (!subjectId.isNullOrBlank()) {
+        checkAndAddType(subjectId, "Patient")
+      } else {
+        // List of null is required to run population-level measures
+        null
+      }
+    val evalType =
+      MeasureEvalType.fromCode(reportType)
+        .orElse(
+          if (!subjectId.isNullOrEmpty()) MeasureEvalType.SUBJECT else MeasureEvalType.POPULATION,
+        ) as MeasureEvalType
+
+    val report =
+      measureProcessor.evaluateMeasure(
+        /* measure = */ measure,
+        /* periodStart = */ start,
+        /* periodEnd = */ end,
+        /* reportType = */ reportType,
+        /* subjectIds = */ if (subject.isNullOrEmpty()) listOf() else listOf(subject),
+        /* additionalData = */ additionalData,
+        /* evalType = */ evalType,
+      )
+
+    // add subject reference for non-individual reportTypes
+    if (report.type.name == MeasureReportType.SUMMARY.name && !subject.isNullOrBlank()) {
+      report.setSubject(Reference(subject))
+    }
+    return report
+  }
+
   /**
    * Generates a [CarePlan] based on the provided inputs.
    *

From c5cb3c73ff525f4422540284c0a35fdc0bef38a0 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Mon, 12 Feb 2024 10:47:08 +0300
Subject: [PATCH 049/126]   Release SDC, Workflow, Location Widget

     * With unmerged PRS
        - https://github.com/opensrp/android-fhir/pull/9
        - https://github.com/google/android-fhir/pull/2420
        - https://github.com/google/android-fhir/pull/2178
---
 buildSrc/src/main/kotlin/Releases.kt    |  4 ++--
 contrib/locationwidget/build.gradle.kts | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 526e2a3658..bfc7e89c1d 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -60,7 +60,7 @@ object Releases {
 
   object Workflow : LibraryArtifact {
     override val artifactId = "workflow"
-    override val version = "0.1.0-alpha04-preview5-SNAPSHOT"
+    override val version = "0.1.0-alpha04-preview6-SNAPSHOT"
     override val name = "Android FHIR Workflow Library"
   }
 
@@ -73,7 +73,7 @@ object Releases {
 
     object LocationWidget : LibraryArtifact {
       override val artifactId = "contrib-locationwidget"
-      override val version = "0.1.0-alpha01"
+      override val version = "0.1.0-alpha01-preview-SNAPSHOT"
       override val name =
         "Android FHIR Structured Data Capture - Location Widget Extensions (contrib)"
     }
diff --git a/contrib/locationwidget/build.gradle.kts b/contrib/locationwidget/build.gradle.kts
index 324638d7d0..08df914de7 100644
--- a/contrib/locationwidget/build.gradle.kts
+++ b/contrib/locationwidget/build.gradle.kts
@@ -7,6 +7,16 @@ plugins {
   jacoco
 }
 
+publishing {
+  repositories {
+    maven {
+      credentials(PasswordCredentials::class)
+      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
+      name = "sonatype"
+    }
+  }
+}
+
 publishArtifact(Releases.Contrib.LocationWidget)
 
 createJacocoTestReportTask()

From 207190c294a32dbc4bd2719115870968435662c3 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Tue, 19 Mar 2024 12:04:43 +0300
Subject: [PATCH 050/126] SDK Release: Engine, SDC, Workflow, Barcode, Location
 Widget, Common, Knowledger  - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/9  - With unmerged PR
 https://github.com/google/android-fhir/pull/2420  - WUP PR
 https://github.com/google/android-fhir/pull/2178/

---
 buildSrc/src/main/kotlin/Dependencies.kt |  6 +++---
 buildSrc/src/main/kotlin/Releases.kt     | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index b10f5e8612..e4e35401fa 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -251,9 +251,9 @@ object Dependencies {
       const val stdlib = "1.8.20"
     }
 
-    const val androidFhirCommon = "0.1.0-alpha05-preview2-SNAPSHOT"
-    const val androidFhirEngine = "1.0.0-preview2-SNAPSHOT"
-    const val androidFhirKnowledge = "0.1.0-alpha03-preview2-SNAPSHOT"
+    const val androidFhirCommon = "0.1.0-alpha05-preview3-SNAPSHOT"
+    const val androidFhirEngine = "1.0.0-preview3-SNAPSHOT"
+    const val androidFhirKnowledge = "0.1.0-alpha03-preview3-SNAPSHOT"
     const val apacheCommonsCompress = "1.21"
     const val desugarJdkLibs = "2.0.3"
     const val caffeine = "2.9.1"
diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index bfc7e89c1d..681fdd2b77 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -42,38 +42,38 @@ object Releases {
 
   object Common : LibraryArtifact {
     override val artifactId = "common"
-    override val version = "0.1.0-alpha05-preview2-SNAPSHOT"
+    override val version = "0.1.0-alpha05-preview3-SNAPSHOT"
     override val name = "Android FHIR Common Library"
   }
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "1.0.0-preview2-SNAPSHOT"
+    override val version = "1.0.0-preview4-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.1.0-preview5-SNAPSHOT"
+    override val version = "1.1.0-preview6-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 
   object Workflow : LibraryArtifact {
     override val artifactId = "workflow"
-    override val version = "0.1.0-alpha04-preview6-SNAPSHOT"
+    override val version = "0.1.0-alpha04-preview8-SNAPSHOT"
     override val name = "Android FHIR Workflow Library"
   }
 
   object Contrib {
     object Barcode : LibraryArtifact {
       override val artifactId = "contrib-barcode"
-      override val version = "0.1.0-beta3-preview6-SNAPSHOT"
+      override val version = "0.1.0-beta3-preview7-SNAPSHOT"
       override val name = "Android FHIR Structured Data Capture - Barcode Extensions (contrib)"
     }
 
     object LocationWidget : LibraryArtifact {
       override val artifactId = "contrib-locationwidget"
-      override val version = "0.1.0-alpha01-preview-SNAPSHOT"
+      override val version = "0.1.0-alpha01-preview2-SNAPSHOT"
       override val name =
         "Android FHIR Structured Data Capture - Location Widget Extensions (contrib)"
     }
@@ -81,7 +81,7 @@ object Releases {
 
   object Knowledge : LibraryArtifact {
     override val artifactId = "knowledge"
-    override val version = "0.1.0-alpha03-preview2-SNAPSHOT"
+    override val version = "0.1.0-alpha03-preview3-SNAPSHOT"
     override val name = "Android FHIR Knowledge Manager Library"
   }
 

From 91795e8666cc21327e632dbb5fe4da610a1287f0 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Fri, 22 Mar 2024 18:44:42 +0300
Subject: [PATCH 051/126] SDK Release: Engine, SDC, Workflow, Barcode, Location
 Widget, Common, Knowledger   - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/9   - WUP PR
 https://github.com/google/android-fhir/pull/2178/

---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 681fdd2b77..00fe162a98 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,7 +48,7 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "1.0.0-preview4-SNAPSHOT"
+    override val version = "1.0.0-preview5-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 

From f7a23c9a518e0f9626a92496a510a0ca1eb70433 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 27 Mar 2024 14:19:48 +0300
Subject: [PATCH 052/126]   SDK Release: Engine, SDC, Workflow, Barcode,
 Location Widget, Common, Knowledger      - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/9      - WUP PR
 https://github.com/google/android-fhir/pull/2178/

---
 buildSrc/src/main/kotlin/Releases.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 00fe162a98..18efa67068 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -54,7 +54,7 @@ object Releases {
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.1.0-preview6-SNAPSHOT"
+    override val version = "1.1.0-preview7-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 
@@ -81,7 +81,7 @@ object Releases {
 
   object Knowledge : LibraryArtifact {
     override val artifactId = "knowledge"
-    override val version = "0.1.0-alpha03-preview3-SNAPSHOT"
+    override val version = "0.1.0-alpha03-preview3.1-SNAPSHOT"
     override val name = "Android FHIR Knowledge Manager Library"
   }
 

From 5643dd0e55094f5b66d9f86f6efefb46688a5614 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Fri, 19 Apr 2024 18:21:23 +0300
Subject: [PATCH 053/126] SDK Release: Engine, SDC, Workflow, Barcode, Location
 Widget, Common, Knowledger     - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/9     - WUP PR
 https://github.com/google/android-fhir/pull/2178/

---
 buildSrc/src/main/kotlin/Releases.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 18efa67068..7a60691ad8 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,13 +48,13 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "1.0.0-preview5-SNAPSHOT"
+    override val version = "1.0.0-preview6-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.1.0-preview7-SNAPSHOT"
+    override val version = "1.1.0-preview8-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 
@@ -81,7 +81,7 @@ object Releases {
 
   object Knowledge : LibraryArtifact {
     override val artifactId = "knowledge"
-    override val version = "0.1.0-alpha03-preview3.1-SNAPSHOT"
+    override val version = "0.1.0-alpha03-preview4-SNAPSHOT"
     override val name = "Android FHIR Knowledge Manager Library"
   }
 

From eb73046af4a5afa0a74c5029f6ed12b649356a32 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Tue, 23 Apr 2024 11:16:13 +0300
Subject: [PATCH 054/126]     SDK Release: Engine, SDC, Workflow, Barcode,
 Location Widget, Common, Knowledger         - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/9         - WUP PR
 https://github.com/google/android-fhir/pull/2178/

---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 7a60691ad8..aa717a8a27 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,7 +48,7 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "1.0.0-preview6-SNAPSHOT"
+    override val version = "1.0.0-preview7-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 

From e4ce8208cfaec0a3dbab3c09e7707d0bd4e5f547 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Mon, 29 Apr 2024 11:33:29 +0300
Subject: [PATCH 055/126] SDK Release: Engine, SDC, Workflow, Barcode, Location
 Widget, Common, Knowledger      - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/9      - WUP PR
 https://github.com/google/android-fhir/pull/2178/      - WUP PR
 https://github.com/google/android-fhir/pull/2511/

---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index aa717a8a27..4fd7dcc490 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,7 +48,7 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "1.0.0-preview7-SNAPSHOT"
+    override val version = "1.0.0-preview7.1-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 

From 6c072101044183f9d65b81423228312547721f14 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 8 May 2024 13:38:47 +0300
Subject: [PATCH 056/126]     SDK Release          - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/9          - WUP PR
 https://github.com/google/android-fhir/pull/2178/          - WUP PR
 https://github.com/google/android-fhir/pull/2511/

---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 4fd7dcc490..5f242c11bb 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -54,7 +54,7 @@ object Releases {
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.1.0-preview8-SNAPSHOT"
+    override val version = "1.1.0-preview8.1-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 

From 51dc8ecea0801bbf07c4d0762e1c3aa3b13b9ea3 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Tue, 14 May 2024 18:53:09 +0300
Subject: [PATCH 057/126] Update Workflow Knowledge dependency

---
 buildSrc/src/main/kotlin/Dependencies.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 131a09030b..bbe671af48 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -253,7 +253,7 @@ object Dependencies {
 
     const val androidFhirCommon = "0.1.0-alpha05-preview3-SNAPSHOT"
     const val androidFhirEngine = "1.0.0-preview3-SNAPSHOT"
-    const val androidFhirKnowledge = "0.1.0-alpha03-preview3-SNAPSHOT"
+    const val androidFhirKnowledge = "0.1.0-alpha03-preview5-SNAPSHOT"
     const val apacheCommonsCompress = "1.21"
     const val desugarJdkLibs = "2.0.3"
     const val caffeine = "2.9.1"

From ee02125a86a3f275e17b2fd76476a8986b620d67 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Tue, 14 May 2024 18:53:21 +0300
Subject: [PATCH 058/126] SDK Release    - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/9    - WUP PR
 https://github.com/google/android-fhir/pull/2178/    - WUP PR
 https://github.com/google/android-fhir/pull/2511/

---
 buildSrc/src/main/kotlin/Releases.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 5f242c11bb..d74194de9c 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -60,7 +60,7 @@ object Releases {
 
   object Workflow : LibraryArtifact {
     override val artifactId = "workflow"
-    override val version = "0.1.0-alpha04-preview8-SNAPSHOT"
+    override val version = "0.1.0-alpha04-preview9-SNAPSHOT"
     override val name = "Android FHIR Workflow Library"
   }
 
@@ -81,7 +81,7 @@ object Releases {
 
   object Knowledge : LibraryArtifact {
     override val artifactId = "knowledge"
-    override val version = "0.1.0-alpha03-preview4-SNAPSHOT"
+    override val version = "0.1.0-alpha03-preview5-SNAPSHOT"
     override val name = "Android FHIR Knowledge Manager Library"
   }
 

From 1531f9be6bce6ad06277a25b3b5225e54464c1b7 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Tue, 4 Jun 2024 12:50:49 +0300
Subject: [PATCH 059/126]     SDK Release        - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/9        - WUP PR
 https://github.com/google/android-fhir/pull/2178/        - WUP PR
 https://github.com/google/android-fhir/pull/2511/        - WUP PR
 https://github.com/google/android-fhir/pull/2464

---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index d74194de9c..03e1c4eae3 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,7 +48,7 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "1.0.0-preview7.1-SNAPSHOT"
+    override val version = "1.0.0-preview8-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 

From 748664ea9e635b7634e21bd03c6aa8491ac5b769 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Mon, 10 Jun 2024 19:20:10 +0300
Subject: [PATCH 060/126]         SDK Release            - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/9            - WUP PR
 https://github.com/google/android-fhir/pull/2178/            - WUP PR
 https://github.com/google/android-fhir/pull/2511

---
 buildSrc/src/main/kotlin/Releases.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 03e1c4eae3..89aa44ecc6 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,13 +48,13 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "1.0.0-preview8-SNAPSHOT"
+    override val version = "1.0.0-preview9-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.1.0-preview8.1-SNAPSHOT"
+    override val version = "1.1.0-preview9-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 

From 865fdae6e216455c5227a67ff10ec2c36c3b9975 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Tue, 11 Jun 2024 18:08:01 +0300
Subject: [PATCH 061/126] SDK Release - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/9 - WUP PR
 https://github.com/google/android-fhir/pull/2178/ - WUP PR
 https://github.com/google/android-fhir/pull/2511 - WUP PR
 https://github.com/google/android-fhir/pull/2537 - WUP PR
 https://github.com/google/android-fhir/pull/2511

---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 89aa44ecc6..096bb89477 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -54,7 +54,7 @@ object Releases {
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.1.0-preview9-SNAPSHOT"
+    override val version = "1.1.0-preview10-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 

From c78f967979b9f65244265aca4ca30ca8e5e37a17 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Fri, 21 Jun 2024 13:12:39 +0300
Subject: [PATCH 062/126]     SDK Release     - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/9     - WUP PR
 https://github.com/google/android-fhir/pull/2178/     - WUP PR
 https://github.com/google/android-fhir/pull/2511     - WUP PR
 https://github.com/google/android-fhir/pull/2511     - WUP PR
 https://github.com/google/android-fhir/pull/2544

---
 buildSrc/src/main/kotlin/Dependencies.kt | 2 +-
 buildSrc/src/main/kotlin/Releases.kt     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 56fea1d216..cceedaf847 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -236,7 +236,7 @@ object Dependencies {
     }
 
     const val androidFhirCommon = "0.1.0-alpha05-preview3-SNAPSHOT"
-    const val androidFhirEngine = "1.0.0-preview3-SNAPSHOT"
+    const val androidFhirEngine = "1.0.0-preview10-SNAPSHOT"
     const val androidFhirKnowledge = "0.1.0-alpha03-preview5-SNAPSHOT"
     const val apacheCommonsCompress = "1.21"
     const val desugarJdkLibs = "2.0.3"
diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index ba69cad7f8..7532b62db4 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,13 +48,13 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "1.0.0-preview9-SNAPSHOT"
+    override val version = "1.0.0-preview10-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.1.0-preview10-SNAPSHOT"
+    override val version = "1.1.0-preview11-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 

From 3ef1357124dbd7bc9a3a319b80ce9a1aa1d882fb Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Tue, 9 Jul 2024 11:03:07 +0300
Subject: [PATCH 063/126]         SDK Release         - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/9         - WUP PR
 https://github.com/google/android-fhir/pull/2178/         - WUP PR
 https://github.com/google/android-fhir/pull/2544         - WUP PR
 https://github.com/google/android-fhir/pull/2607

---
 buildSrc/src/main/kotlin/Dependencies.kt | 2 +-
 buildSrc/src/main/kotlin/Releases.kt     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 5d0114f78f..8f35539ffb 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -144,7 +144,7 @@ object Dependencies {
     }
 
     const val androidFhirCommon = "0.1.0-alpha05-preview3-SNAPSHOT"
-    const val androidFhirEngine = "1.0.0-preview10-SNAPSHOT"
+    const val androidFhirEngine = "1.0.0-preview11-SNAPSHOT"
     const val androidFhirKnowledge = "0.1.0-alpha03-preview5-SNAPSHOT"
     const val apacheCommonsCompress = "1.21"
     const val desugarJdkLibs = "2.0.3"
diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 7532b62db4..d304c779ff 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,19 +48,19 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "1.0.0-preview10-SNAPSHOT"
+    override val version = "1.0.0-preview11-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.1.0-preview11-SNAPSHOT"
+    override val version = "1.1.0-preview12-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 
   object Workflow : LibraryArtifact {
     override val artifactId = "workflow"
-    override val version = "0.1.0-alpha04-preview9-SNAPSHOT"
+    override val version = "0.1.0-alpha04-preview10-SNAPSHOT"
     override val name = "Android FHIR Workflow Library"
   }
 

From 5ac832348ff3087c08cc938129199a39b906befa Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Sat, 27 Jul 2024 15:40:26 +0700
Subject: [PATCH 064/126] Refactor QuestionnaireNavigationViewUIState

---
 .../QuestionnaireNavigationViewUIState.kt     |  3 +-
 .../datacapture/QuestionnaireViewModel.kt     | 43 +++++++++++++++----
 .../datacapture/views/NavigationViewHolder.kt | 19 ++++++--
 datacapture/src/main/res/values/strings.xml   |  2 +-
 4 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireNavigationViewUIState.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireNavigationViewUIState.kt
index c33a25785d..1d566086b2 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireNavigationViewUIState.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireNavigationViewUIState.kt
@@ -19,7 +19,7 @@ package com.google.android.fhir.datacapture
 sealed class QuestionnaireNavigationViewUIState(val isShown: Boolean, val isEnabled: Boolean) {
   data object Hidden : QuestionnaireNavigationViewUIState(isShown = false, isEnabled = false)
 
-  data class Enabled(val labelText: String? = null, val onClickAction: () -> Unit) :
+  data class Enabled(val labelText: String? = null, val onClickAction: () -> Unit = {}) :
     QuestionnaireNavigationViewUIState(isShown = true, isEnabled = true)
 }
 
@@ -29,4 +29,5 @@ data class QuestionnaireNavigationUIState(
   val navSubmit: QuestionnaireNavigationViewUIState = QuestionnaireNavigationViewUIState.Hidden,
   val navCancel: QuestionnaireNavigationViewUIState = QuestionnaireNavigationViewUIState.Hidden,
   val navReview: QuestionnaireNavigationViewUIState = QuestionnaireNavigationViewUIState.Hidden,
+  val navNextProgressBar: QuestionnaireNavigationViewUIState = QuestionnaireNavigationViewUIState.Hidden,
 )
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
index 4343257704..2951fa36f3 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
@@ -731,8 +731,8 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
           navSubmit =
             if (showSubmitButton) {
               QuestionnaireNavigationViewUIState.Enabled(
-                submitButtonText,
-                onSubmitButtonClickListener,
+                labelText = submitButtonText,
+                onClickAction = onSubmitButtonClickListener,
               )
             } else {
               QuestionnaireNavigationViewUIState.Hidden
@@ -740,6 +740,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
           navCancel =
             if (!isReadOnly && shouldShowCancelButton) {
               QuestionnaireNavigationViewUIState.Enabled(
+                labelText = (getApplication() as Context).getString(R.string.cancel_questionnaire),
                 onClickAction = onCancelButtonClickListener,
               )
             } else {
@@ -799,7 +800,10 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
         navPrevious =
           when {
             questionnairePagination.isPaginated && questionnairePagination.hasPreviousPage -> {
-              QuestionnaireNavigationViewUIState.Enabled { goToPreviousPage() }
+              QuestionnaireNavigationViewUIState.Enabled(
+                labelText = (getApplication() as Context).getString(R.string.button_pagination_previous),
+                onClickAction = { goToPreviousPage() }
+              )
             }
             else -> {
               QuestionnaireNavigationViewUIState.Hidden
@@ -807,8 +811,16 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
           },
         navNext =
           when {
+            questionnairePagination.isPaginated && questionnairePagination.hasNextPage && isLoadingNextPage.value -> {
+              QuestionnaireNavigationViewUIState.Enabled(
+                labelText = null,
+              )
+            }
             questionnairePagination.isPaginated && questionnairePagination.hasNextPage -> {
-              QuestionnaireNavigationViewUIState.Enabled { goToNextPage() }
+              QuestionnaireNavigationViewUIState.Enabled(
+                labelText = (getApplication() as Context).getString(R.string.button_pagination_next),
+                onClickAction = { goToNextPage() }
+              )
             }
             else -> {
               QuestionnaireNavigationViewUIState.Hidden
@@ -817,24 +829,39 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
         navSubmit =
           if (showSubmitButton) {
             QuestionnaireNavigationViewUIState.Enabled(
-              submitButtonText,
-              onSubmitButtonClickListener,
+              labelText = submitButtonText,
+              onClickAction = onSubmitButtonClickListener
             )
           } else {
             QuestionnaireNavigationViewUIState.Hidden
           },
         navReview =
           if (showReviewButton) {
-            QuestionnaireNavigationViewUIState.Enabled { setReviewMode(true) }
+            QuestionnaireNavigationViewUIState.Enabled(
+              labelText = (getApplication() as Context).getString(R.string.button_review),
+              onClickAction = { setReviewMode(true) }
+            )
           } else {
             QuestionnaireNavigationViewUIState.Hidden
           },
         navCancel =
           if (showCancelButton) {
-            QuestionnaireNavigationViewUIState.Enabled(onClickAction = onCancelButtonClickListener)
+            QuestionnaireNavigationViewUIState.Enabled(
+              labelText = (getApplication() as Context).getString(R.string.cancel_questionnaire),
+              onClickAction = onCancelButtonClickListener
+            )
           } else {
             QuestionnaireNavigationViewUIState.Hidden
           },
+        navNextProgressBar =
+          when {
+            questionnairePagination.isPaginated && isLoadingNextPage.value -> {
+              QuestionnaireNavigationViewUIState.Enabled()
+            }
+            else -> {
+              QuestionnaireNavigationViewUIState.Hidden
+            }
+          },
       )
     val bottomNavigationItems =
       listOf(QuestionnaireAdapterItem.Navigation(bottomNavigationUiViewState))
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/NavigationViewHolder.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/NavigationViewHolder.kt
index 171990ba05..bb43e00253 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/NavigationViewHolder.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/NavigationViewHolder.kt
@@ -22,6 +22,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.android.fhir.datacapture.QuestionnaireNavigationUIState
 import com.google.android.fhir.datacapture.QuestionnaireNavigationViewUIState
 import com.google.android.fhir.datacapture.R
+import com.google.android.material.progressindicator.CircularProgressIndicator
 
 class NavigationViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
@@ -41,6 +42,9 @@ class NavigationViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
     itemView
       .findViewById<Button>(R.id.submit_questionnaire)
       .updateState(questionnaireNavigationUIState.navSubmit)
+    itemView
+      .findViewById<CircularProgressIndicator>(R.id.pagination_next_button_progress_bar)
+      .updateState(questionnaireNavigationUIState.navNextProgressBar)
   }
 
   private fun Button.updateState(navigationViewState: QuestionnaireNavigationViewUIState) {
@@ -48,9 +52,7 @@ class NavigationViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
       is QuestionnaireNavigationViewUIState.Enabled -> {
         visibility = View.VISIBLE
         isEnabled = true
-        if (navigationViewState.labelText.isNullOrBlank().not() && this is Button) {
-          text = navigationViewState.labelText
-        }
+        text = navigationViewState.labelText
         setOnClickListener { navigationViewState.onClickAction() }
       }
       QuestionnaireNavigationViewUIState.Hidden -> {
@@ -58,4 +60,15 @@ class NavigationViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
       }
     }
   }
+
+  private fun CircularProgressIndicator.updateState(navigationViewState: QuestionnaireNavigationViewUIState) {
+    visibility = when (navigationViewState) {
+      is QuestionnaireNavigationViewUIState.Enabled -> {
+        View.VISIBLE
+      }
+      QuestionnaireNavigationViewUIState.Hidden -> {
+        View.GONE
+      }
+    }
+  }
 }
diff --git a/datacapture/src/main/res/values/strings.xml b/datacapture/src/main/res/values/strings.xml
index 79fa579348..cfac9e3382 100644
--- a/datacapture/src/main/res/values/strings.xml
+++ b/datacapture/src/main/res/values/strings.xml
@@ -10,7 +10,7 @@
     <string name="review_answers_text">Review answers</string>
     <string name="button_review">Review</string>
     <string name="submit_questionnaire">Submit</string>
-    <string name="cancel_questionnaire">@android:string/cancel</string>
+    <string name="cancel_questionnaire">Cancel</string>
 
     <!-- 1.2 Submit Pop-up -->
     <string name="questionnaire_validation_error_headline">Errors found</string>

From 0ae53010cfa7947a1ef7e671cfeb0cbcb4c08ced Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Sat, 27 Jul 2024 16:11:50 +0700
Subject: [PATCH 065/126] Async getQuestionnairePages and Add progress bar to
 the 'Next' button

---
 .../fhir/datacapture/QuestionnaireFragment.kt |  1 +
 .../datacapture/QuestionnaireViewModel.kt     | 35 ++++++++++++++++---
 .../MoreQuestionnaireItemComponents.kt        | 26 +++++++++++++-
 .../fhirpath/ExpressionEvaluator.kt           |  9 +++--
 .../res/layout/pagination_navigation_view.xml | 15 ++++++++
 5 files changed, 77 insertions(+), 9 deletions(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt
index 457d8230ad..310fe641c0 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt
@@ -143,6 +143,7 @@ class QuestionnaireFragment : Fragment() {
 
     // Listen to updates from the view model.
     viewLifecycleOwner.lifecycleScope.launchWhenCreated {
+      viewModel.pages = viewModel.getQuestionnairePages()
       viewModel.questionnaireStateFlow.collect { state ->
         when (val displayMode = state.displayMode) {
           is DisplayMode.ReviewMode -> {
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
index 2951fa36f3..9cf52cc8ba 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
@@ -17,6 +17,7 @@
 package com.google.android.fhir.datacapture
 
 import android.app.Application
+import android.content.Context
 import android.net.Uri
 import androidx.annotation.VisibleForTesting
 import androidx.lifecycle.AndroidViewModel
@@ -38,6 +39,8 @@ import com.google.android.fhir.datacapture.extensions.filterByCodeInNameExtensio
 import com.google.android.fhir.datacapture.extensions.flattened
 import com.google.android.fhir.datacapture.extensions.hasDifferentAnswerSet
 import com.google.android.fhir.datacapture.extensions.isDisplayItem
+import com.google.android.fhir.datacapture.extensions.isEnableWhenReferencedBy
+import com.google.android.fhir.datacapture.extensions.isExpressionReferencedBy
 import com.google.android.fhir.datacapture.extensions.isHelpCode
 import com.google.android.fhir.datacapture.extensions.isHidden
 import com.google.android.fhir.datacapture.extensions.isPaginated
@@ -64,6 +67,7 @@ import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.datacapture.validation.ValidationResult
 import com.google.android.fhir.datacapture.views.QuestionTextConfiguration
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -324,6 +328,8 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
    */
   private val draftAnswerMap = mutableMapOf<QuestionnaireResponseItemComponent, Any>()
 
+  private val isLoadingNextPage = MutableStateFlow(true)
+
   /**
    * Callback function to update the view model after the answer(s) to a question have been changed.
    * This is passed to the [QuestionnaireViewItem] in its constructor so that it can invoke this
@@ -378,10 +384,28 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
           )
       }
       modifiedQuestionnaireResponseItemSet.add(questionnaireResponseItem)
+      viewModelScope.launch(Dispatchers.IO) {
+        var isReferenced = false
+        kotlin.run {
+          isReferenced = questionnaireItem.isExpressionReferencedBy(questionnaire)
+          if (isReferenced) return@run
+
+          questionnaire.item.flattened().forEach { item ->
+            isReferenced = questionnaireItem.isEnableWhenReferencedBy(item)
+            if (isReferenced) return@run
+
+            isReferenced = questionnaireItem.isExpressionReferencedBy(item)
+            if (isReferenced) return@run
+          }
+        }
+        if (isReferenced) isLoadingNextPage.value = true
+        modificationCount.update { it + 1 }
 
-      updateAnswerWithAffectedCalculatedExpression(questionnaireItem)
-
-      modificationCount.update { it + 1 }
+        updateAnswerWithAffectedCalculatedExpression(questionnaireItem)
+        pages = getQuestionnairePages()
+        isLoadingNextPage.value = false
+        modificationCount.update { it + 1 }
+      }
     }
 
   private val expressionEvaluator: ExpressionEvaluator =
@@ -582,6 +606,8 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
       .onEach {
         if (it.index == 0) {
           initializeCalculatedExpressions()
+          pages = getQuestionnairePages()
+          isLoadingNextPage.value = false
           modificationCount.update { count -> count + 1 }
         }
       }
@@ -711,7 +737,6 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
     // display all items.
     val questionnaireItemViewItems =
       if (!isReadOnly && !isInReviewModeFlow.value && questionnaire.isPaginated) {
-        pages = getQuestionnairePages()
         if (currentPageIndexFlow.value == null) {
           currentPageIndexFlow.value = pages!!.first { it.enabled && !it.hidden }.index
         }
@@ -1112,7 +1137,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
    * Gets a list of [QuestionnairePage]s for a paginated questionnaire, or `null` if the
    * questionnaire is not paginated.
    */
-  private suspend fun getQuestionnairePages(): List<QuestionnairePage>? =
+  internal suspend fun getQuestionnairePages(): List<QuestionnairePage>? =
     if (questionnaire.isPaginated) {
       questionnaire.item.zip(questionnaireResponse.item).mapIndexed {
         index,
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
index 55dd4e5738..6b663cf1de 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
@@ -685,6 +685,10 @@ internal val QuestionnaireItemComponent.calculatedExpression: Expression?
       it.castToExpression(it.value)
     }
 
+/** Returns list of extensions whose value is of type [Expression] */
+internal val Questionnaire.expressionBasedExtensions
+  get() = this.extension.filter { it.value is Expression }
+
 /** Returns list of extensions whose value is of type [Expression] */
 internal val QuestionnaireItemComponent.expressionBasedExtensions
   get() = this.extension.filter { it.value is Expression }
@@ -694,7 +698,7 @@ internal val QuestionnaireItemComponent.expressionBasedExtensions
  * (e.g. if [item] has an expression `%resource.item.where(linkId='this-question')` where
  * `this-question` is the link ID of the current questionnaire item).
  */
-internal fun QuestionnaireItemComponent.isReferencedBy(
+internal fun Questionnaire.QuestionnaireItemComponent.isExpressionReferencedBy(
   item: QuestionnaireItemComponent,
 ) =
   item.expressionBasedExtensions.any {
@@ -705,6 +709,26 @@ internal fun QuestionnaireItemComponent.isReferencedBy(
       .contains(Regex(".*linkId='${this.linkId}'.*"))
   }
 
+internal fun Questionnaire.QuestionnaireItemComponent.isExpressionReferencedBy(
+  questionnaire: Questionnaire,
+) =
+  questionnaire.expressionBasedExtensions.any {
+    it
+      .castToExpression(it.value)
+      .expression
+      .replace(" ", "")
+      .contains(Regex(".*linkId='${this.linkId}'.*"))
+  }
+
+/**
+ * Whether [item] has any expression directly referencing the current questionnaire item by link ID
+ * (e.g. if [item] has an expression `%resource.item.where(linkId='this-question')` where
+ * `this-question` is the link ID of the current questionnaire item).
+ */
+internal fun Questionnaire.QuestionnaireItemComponent.isEnableWhenReferencedBy(
+  item: Questionnaire.QuestionnaireItemComponent,
+) = item.enableWhen.any { it.question == this.linkId }
+
 internal val QuestionnaireItemComponent.answerExpression: Expression?
   get() =
     ToolingExtensions.getExtension(this, EXTENSION_ANSWER_EXPRESSION_URL)?.value?.let {
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt
index 97e74233e6..3c5f27c125 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt
@@ -20,8 +20,8 @@ import com.google.android.fhir.datacapture.XFhirQueryResolver
 import com.google.android.fhir.datacapture.extensions.calculatedExpression
 import com.google.android.fhir.datacapture.extensions.findVariableExpression
 import com.google.android.fhir.datacapture.extensions.flattened
+import com.google.android.fhir.datacapture.extensions.isExpressionReferencedBy
 import com.google.android.fhir.datacapture.extensions.isFhirPath
-import com.google.android.fhir.datacapture.extensions.isReferencedBy
 import com.google.android.fhir.datacapture.extensions.isXFhirQuery
 import com.google.android.fhir.datacapture.extensions.variableExpressions
 import org.hl7.fhir.exceptions.FHIRException
@@ -133,7 +133,10 @@ internal class ExpressionEvaluator(
           // no calculable item depending on current item should be used as dependency into current
           // item
           this.forEach { dependent ->
-            check(!(current.isReferencedBy(dependent) && dependent.isReferencedBy(current))) {
+            check(
+              !(current.isExpressionReferencedBy(dependent) &&
+                dependent.isExpressionReferencedBy(current)),
+            ) {
               "${current.linkId} and ${dependent.linkId} have cyclic dependency in expression based extension"
             }
           }
@@ -197,7 +200,7 @@ internal class ExpressionEvaluator(
         // Condition 1. item is calculable
         // Condition 2. item answer depends on the updated item answer OR has a variable dependency
         item.calculatedExpression != null &&
-          (questionnaireItem.isReferencedBy(item) ||
+          (questionnaireItem.isExpressionReferencedBy(item) ||
             findDependentVariables(item.calculatedExpression!!).isNotEmpty())
       }
       .map { item ->
diff --git a/datacapture/src/main/res/layout/pagination_navigation_view.xml b/datacapture/src/main/res/layout/pagination_navigation_view.xml
index 7174cfd5d0..54f29dd7e0 100644
--- a/datacapture/src/main/res/layout/pagination_navigation_view.xml
+++ b/datacapture/src/main/res/layout/pagination_navigation_view.xml
@@ -56,6 +56,21 @@
             app:layout_constraintBottom_toBottomOf="parent"
         />
 
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            android:id="@+id/pagination_next_button_progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:trackThickness="2dp"
+            app:indicatorSize="18dp"
+            app:layout_constraintTop_toTopOf="@id/pagination_next_button"
+            app:layout_constraintBottom_toBottomOf="@id/pagination_next_button"
+            app:layout_constraintStart_toStartOf="@id/pagination_next_button"
+            app:layout_constraintEnd_toEndOf="@id/pagination_next_button"
+            android:visibility="visible"
+            app:indicatorColor="@android:color/white"
+            android:indeterminate="true"
+        />
+
         <Button
             android:id="@+id/review_mode_button"
             style="?attr/questionnaireButtonStyle"

From e05493ef225f03240345d9eb56ee124e1bc87254 Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Sat, 27 Jul 2024 16:12:21 +0700
Subject: [PATCH 066/126] spotless

---
 .../QuestionnaireNavigationViewUIState.kt     |  3 ++-
 .../datacapture/QuestionnaireViewModel.kt     | 20 +++++++++++--------
 .../datacapture/views/NavigationViewHolder.kt | 19 ++++++++++--------
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireNavigationViewUIState.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireNavigationViewUIState.kt
index 1d566086b2..bfb7624af8 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireNavigationViewUIState.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireNavigationViewUIState.kt
@@ -29,5 +29,6 @@ data class QuestionnaireNavigationUIState(
   val navSubmit: QuestionnaireNavigationViewUIState = QuestionnaireNavigationViewUIState.Hidden,
   val navCancel: QuestionnaireNavigationViewUIState = QuestionnaireNavigationViewUIState.Hidden,
   val navReview: QuestionnaireNavigationViewUIState = QuestionnaireNavigationViewUIState.Hidden,
-  val navNextProgressBar: QuestionnaireNavigationViewUIState = QuestionnaireNavigationViewUIState.Hidden,
+  val navNextProgressBar: QuestionnaireNavigationViewUIState =
+    QuestionnaireNavigationViewUIState.Hidden,
 )
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
index 9cf52cc8ba..b136ca2ad1 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
@@ -826,8 +826,9 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
           when {
             questionnairePagination.isPaginated && questionnairePagination.hasPreviousPage -> {
               QuestionnaireNavigationViewUIState.Enabled(
-                labelText = (getApplication() as Context).getString(R.string.button_pagination_previous),
-                onClickAction = { goToPreviousPage() }
+                labelText =
+                  (getApplication() as Context).getString(R.string.button_pagination_previous),
+                onClickAction = { goToPreviousPage() },
               )
             }
             else -> {
@@ -836,15 +837,18 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
           },
         navNext =
           when {
-            questionnairePagination.isPaginated && questionnairePagination.hasNextPage && isLoadingNextPage.value -> {
+            questionnairePagination.isPaginated &&
+              questionnairePagination.hasNextPage &&
+              isLoadingNextPage.value -> {
               QuestionnaireNavigationViewUIState.Enabled(
                 labelText = null,
               )
             }
             questionnairePagination.isPaginated && questionnairePagination.hasNextPage -> {
               QuestionnaireNavigationViewUIState.Enabled(
-                labelText = (getApplication() as Context).getString(R.string.button_pagination_next),
-                onClickAction = { goToNextPage() }
+                labelText =
+                  (getApplication() as Context).getString(R.string.button_pagination_next),
+                onClickAction = { goToNextPage() },
               )
             }
             else -> {
@@ -855,7 +859,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
           if (showSubmitButton) {
             QuestionnaireNavigationViewUIState.Enabled(
               labelText = submitButtonText,
-              onClickAction = onSubmitButtonClickListener
+              onClickAction = onSubmitButtonClickListener,
             )
           } else {
             QuestionnaireNavigationViewUIState.Hidden
@@ -864,7 +868,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
           if (showReviewButton) {
             QuestionnaireNavigationViewUIState.Enabled(
               labelText = (getApplication() as Context).getString(R.string.button_review),
-              onClickAction = { setReviewMode(true) }
+              onClickAction = { setReviewMode(true) },
             )
           } else {
             QuestionnaireNavigationViewUIState.Hidden
@@ -873,7 +877,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
           if (showCancelButton) {
             QuestionnaireNavigationViewUIState.Enabled(
               labelText = (getApplication() as Context).getString(R.string.cancel_questionnaire),
-              onClickAction = onCancelButtonClickListener
+              onClickAction = onCancelButtonClickListener,
             )
           } else {
             QuestionnaireNavigationViewUIState.Hidden
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/NavigationViewHolder.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/NavigationViewHolder.kt
index bb43e00253..e0994a7c48 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/NavigationViewHolder.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/NavigationViewHolder.kt
@@ -61,14 +61,17 @@ class NavigationViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
     }
   }
 
-  private fun CircularProgressIndicator.updateState(navigationViewState: QuestionnaireNavigationViewUIState) {
-    visibility = when (navigationViewState) {
-      is QuestionnaireNavigationViewUIState.Enabled -> {
-        View.VISIBLE
-      }
-      QuestionnaireNavigationViewUIState.Hidden -> {
-        View.GONE
+  private fun CircularProgressIndicator.updateState(
+    navigationViewState: QuestionnaireNavigationViewUIState,
+  ) {
+    visibility =
+      when (navigationViewState) {
+        is QuestionnaireNavigationViewUIState.Enabled -> {
+          View.VISIBLE
+        }
+        QuestionnaireNavigationViewUIState.Hidden -> {
+          View.GONE
+        }
       }
-    }
   }
 }

From 63611001577df32272848c4a0181f126f14a3775 Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Mon, 29 Jul 2024 13:12:28 +0700
Subject: [PATCH 067/126] Apply image using setImageBitmap

---
 .../com/google/android/fhir/datacapture/views/MediaView.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/MediaView.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/MediaView.kt
index 9cd1a99c67..b2f2c0870c 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/MediaView.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/MediaView.kt
@@ -91,12 +91,12 @@ class MediaView(context: Context, attrs: AttributeSet?) : LinearLayout(context,
   }
 
   private fun loadImage(image: Bitmap) {
-    Glide.with(context).load(image).into(imageAttachment)
+    imageAttachment.setImageBitmap(image)
     imageAttachment.visibility = View.VISIBLE
   }
 
   private fun clearImage() {
-    Glide.with(context).clear(imageAttachment)
+    imageAttachment.setImageBitmap(null)
     imageAttachment.visibility = View.GONE
   }
 

From fccf01532b0815d960c03fe3e129ff7982158ee0 Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Tue, 30 Jul 2024 13:23:33 +0700
Subject: [PATCH 068/126] spotless

---
 .../com/google/android/fhir/datacapture/views/MediaView.kt     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/MediaView.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/MediaView.kt
index b2f2c0870c..a9df29e2fa 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/MediaView.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/MediaView.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2022-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.
@@ -24,7 +24,6 @@ import android.view.View
 import android.widget.ImageView
 import android.widget.LinearLayout
 import androidx.lifecycle.lifecycleScope
-import com.bumptech.glide.Glide
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.extensions.MimeType
 import com.google.android.fhir.datacapture.extensions.decodeToBitmap

From 20912f59716d4da8b8a0bda55796d91f5f7bc883 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Tue, 30 Jul 2024 19:41:14 +0300
Subject: [PATCH 069/126] SDK Release     - With unmerged PR
 https://github.com/opensrp/android-fhir/pull/9     - WUP PR
 https://github.com/google/android-fhir/pull/2178

- WUP https://github.com/google/android-fhir/pull/2652
- WUP https://github.com/google/android-fhir/pull/2521
- WUP https://github.com/google/android-fhir/pull/2645
- WUP https://github.com/google/android-fhir/pull/2648
- WUP https://github.com/google/android-fhir/pull/2650
---
 buildSrc/src/main/kotlin/Dependencies.kt | 2 +-
 buildSrc/src/main/kotlin/Releases.kt     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 3894398869..76e75ff766 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -132,7 +132,7 @@ object Dependencies {
   object Versions {
 
     const val androidFhirCommon = "0.1.0-alpha05-preview3-SNAPSHOT"
-    const val androidFhirEngine = "1.0.0-preview11-SNAPSHOT"    
+    const val androidFhirEngine = "1.0.0-preview12-SNAPSHOT"    
     const val androidFhirKnowledge = "0.1.0-alpha03-preview5-SNAPSHOT"
     const val apacheCommonsCompress = "1.21"
     const val desugarJdkLibs = "2.0.3"
diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index d304c779ff..f0bd994271 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,19 +48,19 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "1.0.0-preview11-SNAPSHOT"
+    override val version = "1.0.0-preview12-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.1.0-preview12-SNAPSHOT"
+    override val version = "1.1.0-preview13-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 
   object Workflow : LibraryArtifact {
     override val artifactId = "workflow"
-    override val version = "0.1.0-alpha04-preview10-SNAPSHOT"
+    override val version = "0.1.0-alpha04-preview11-SNAPSHOT"
     override val name = "Android FHIR Workflow Library"
   }
 

From 34121d6253c503e1664e2b16a836e6961cfc59eb Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <ndegwamartin@users.noreply.github.com>
Date: Wed, 31 Jul 2024 07:29:20 +0300
Subject: [PATCH 070/126] Add missing import

---
 .../google/android/fhir/datacapture/QuestionnaireViewModel.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
index 48b697608c..889994520a 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
@@ -36,6 +36,7 @@ import com.google.android.fhir.datacapture.extensions.cqfExpression
 import com.google.android.fhir.datacapture.extensions.createQuestionnaireResponseItem
 import com.google.android.fhir.datacapture.extensions.entryMode
 import com.google.android.fhir.datacapture.extensions.filterByCodeInNameExtension
+import com.google.android.fhir.datacapture.extensions.flattened
 import com.google.android.fhir.datacapture.extensions.forEachItemPair
 import com.google.android.fhir.datacapture.extensions.hasDifferentAnswerSet
 import com.google.android.fhir.datacapture.extensions.isDisplayItem

From db8ffbc87790e24c11d3b064d15aa71cc7839723 Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Fri, 2 Aug 2024 14:41:56 +0700
Subject: [PATCH 071/126] Allow style overriding for progress bar

---
 .../src/main/res/layout/pagination_navigation_view.xml    | 6 +-----
 datacapture/src/main/res/values/attrs.xml                 | 3 +++
 datacapture/src/main/res/values/styles.xml                | 8 ++++++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/datacapture/src/main/res/layout/pagination_navigation_view.xml b/datacapture/src/main/res/layout/pagination_navigation_view.xml
index 54f29dd7e0..9c55bb6ef8 100644
--- a/datacapture/src/main/res/layout/pagination_navigation_view.xml
+++ b/datacapture/src/main/res/layout/pagination_navigation_view.xml
@@ -58,17 +58,13 @@
 
         <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/pagination_next_button_progress_bar"
+            style="?attr/questionnaireNextButtonCircularProgressIndicatorStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:trackThickness="2dp"
-            app:indicatorSize="18dp"
             app:layout_constraintTop_toTopOf="@id/pagination_next_button"
             app:layout_constraintBottom_toBottomOf="@id/pagination_next_button"
             app:layout_constraintStart_toStartOf="@id/pagination_next_button"
             app:layout_constraintEnd_toEndOf="@id/pagination_next_button"
-            android:visibility="visible"
-            app:indicatorColor="@android:color/white"
-            android:indeterminate="true"
         />
 
         <Button
diff --git a/datacapture/src/main/res/values/attrs.xml b/datacapture/src/main/res/values/attrs.xml
index 46d076ed59..b15eab69b6 100644
--- a/datacapture/src/main/res/values/attrs.xml
+++ b/datacapture/src/main/res/values/attrs.xml
@@ -118,6 +118,9 @@
     <!--   Style for previous and next buttons in paginated layout. -->
     <attr name="questionnaireButtonStyle" format="reference" />
 
+    <!--   Style for for circular progress indicator for next button in paginated layout. -->
+    <attr name="questionnaireNextButtonCircularProgressIndicatorStyle" format="reference" />
+
     <!--   Style for submit button. -->
     <attr name="questionnaireSubmitButtonStyle" format="reference" />
 
diff --git a/datacapture/src/main/res/values/styles.xml b/datacapture/src/main/res/values/styles.xml
index d78007c0dd..e18b59148d 100644
--- a/datacapture/src/main/res/values/styles.xml
+++ b/datacapture/src/main/res/values/styles.xml
@@ -109,6 +109,7 @@
         >@style/Widget.Material3.Chip.Input</item>
         <item name="questionnaireButtonStyle">@style/Questionnaire.ButtonStyle
         </item>
+        <item name="questionnaireNextButtonCircularProgressIndicatorStyle">@style/Questionnaire.NextButtonCircularProgressIndicatorStyle</item>
         <item name="questionnaireErrorTextStyle">
             @style/Questionnaire.ErrorStyle
         </item>
@@ -441,6 +442,13 @@
         <item name="android:layout_height">wrap_content</item>
     </style>
 
+    <style name="Questionnaire.NextButtonCircularProgressIndicatorStyle" parent="Widget.Material3.CircularProgressIndicator">
+        <item name="trackThickness">2dp</item>
+        <item name="indicatorSize">18dp</item>
+        <item name="indicatorColor">@android:color/white</item>
+        <item name="android:indeterminate">true</item>
+    </style>
+
     <style
         name="Questionnaire.AttachmentTakePhotoButtonStyle"
         parent="Widget.Material3.Button.OutlinedButton"

From 64deedbcb07a0921b93ba1cd5f33cc0f6e78aae2 Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Fri, 2 Aug 2024 14:48:52 +0700
Subject: [PATCH 072/126] spotless

---
 datacapture/src/main/res/values/attrs.xml  | 5 ++++-
 datacapture/src/main/res/values/styles.xml | 9 +++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/datacapture/src/main/res/values/attrs.xml b/datacapture/src/main/res/values/attrs.xml
index b15eab69b6..0b6cd1efae 100644
--- a/datacapture/src/main/res/values/attrs.xml
+++ b/datacapture/src/main/res/values/attrs.xml
@@ -119,7 +119,10 @@
     <attr name="questionnaireButtonStyle" format="reference" />
 
     <!--   Style for for circular progress indicator for next button in paginated layout. -->
-    <attr name="questionnaireNextButtonCircularProgressIndicatorStyle" format="reference" />
+    <attr
+        name="questionnaireNextButtonCircularProgressIndicatorStyle"
+        format="reference"
+    />
 
     <!--   Style for submit button. -->
     <attr name="questionnaireSubmitButtonStyle" format="reference" />
diff --git a/datacapture/src/main/res/values/styles.xml b/datacapture/src/main/res/values/styles.xml
index e18b59148d..c818914603 100644
--- a/datacapture/src/main/res/values/styles.xml
+++ b/datacapture/src/main/res/values/styles.xml
@@ -109,7 +109,9 @@
         >@style/Widget.Material3.Chip.Input</item>
         <item name="questionnaireButtonStyle">@style/Questionnaire.ButtonStyle
         </item>
-        <item name="questionnaireNextButtonCircularProgressIndicatorStyle">@style/Questionnaire.NextButtonCircularProgressIndicatorStyle</item>
+        <item
+            name="questionnaireNextButtonCircularProgressIndicatorStyle"
+        >@style/Questionnaire.NextButtonCircularProgressIndicatorStyle</item>
         <item name="questionnaireErrorTextStyle">
             @style/Questionnaire.ErrorStyle
         </item>
@@ -442,7 +444,10 @@
         <item name="android:layout_height">wrap_content</item>
     </style>
 
-    <style name="Questionnaire.NextButtonCircularProgressIndicatorStyle" parent="Widget.Material3.CircularProgressIndicator">
+    <style
+        name="Questionnaire.NextButtonCircularProgressIndicatorStyle"
+        parent="Widget.Material3.CircularProgressIndicator"
+    >
         <item name="trackThickness">2dp</item>
         <item name="indicatorSize">18dp</item>
         <item name="indicatorColor">@android:color/white</item>

From bbb70514a757b446f6cd79988bbd4061b1ff6ebd Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Fri, 16 Aug 2024 13:03:47 +0700
Subject: [PATCH 073/126] Add missing response items to repeated group child
 items

---
 .../datacapture/QuestionnaireViewModel.kt     |  11 +-
 .../datacapture/QuestionnaireViewModelTest.kt | 135 ++++++++++++++++++
 2 files changed, 145 insertions(+), 1 deletion(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
index 95d75b8460..591abbd5f7 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
@@ -422,7 +422,8 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
    * might not contain answers to unanswered or disabled questions. Note : this only applies to
    * [QuestionnaireItemComponent]s nested under a group.
    */
-  private fun addMissingResponseItems(
+  @VisibleForTesting
+  internal fun addMissingResponseItems(
     questionnaireItems: List<QuestionnaireItemComponent>,
     responseItems: MutableList<QuestionnaireResponseItemComponent>,
   ) {
@@ -446,6 +447,14 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
             responseItems = responseItemMap[it.linkId]!!.single().item,
           )
         }
+        if (it.type == Questionnaire.QuestionnaireItemType.GROUP && it.repeats) {
+          responseItemMap[it.linkId]!!.forEach { rItem ->
+            addMissingResponseItems(
+              questionnaireItems = it.item,
+              responseItems = rItem.item,
+            )
+          }
+        }
         responseItems.addAll(responseItemMap[it.linkId]!!)
       }
     }
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
index f4de30897b..f364a198f0 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
@@ -1138,6 +1138,141 @@ class QuestionnaireViewModelTest {
     }
   }
 
+  @Test
+  fun `should add missing response item inside a repeated group`() {
+    val questionnaireString =
+      """
+          {
+            "resourceType": "Questionnaire",
+            "item": [
+              {
+                "linkId": "1",
+                "type": "group",
+                "text": "Repeated Group",
+                "repeats": true,
+                "item": [
+                  {
+                    "linkId": "1-1",
+                    "type": "date",
+                    "extension": [
+                      {
+                        "url": "http://hl7.org/fhir/StructureDefinition/entryFormat",
+                        "valueString": "yyyy-mm-dd"
+                      }
+                    ]
+                  },
+                  {
+                    "linkId": "1-2",
+                    "type": "boolean"
+                  }
+                ]
+              }
+            ]
+          }
+            """
+        .trimIndent()
+
+    val questionnaireResponseString =
+      """
+              {
+                "resourceType": "QuestionnaireResponse",
+                "item": [
+                  {
+                    "linkId": "1",
+                    "text": "Repeated Group",
+                    "item": [
+                      {
+                        "linkId": "1-1",
+                        "answer": [
+                          {
+                            "valueDate": "2023-06-14"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "linkId": "1",
+                    "text": "Repeated Group",
+                    "item": [
+                      {
+                        "linkId": "1-1",
+                        "answer": [
+                          {
+                            "valueDate": "2023-06-13"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              }
+            """
+        .trimIndent()
+
+    val expectedQuestionnaireResponseString =
+      """
+              {
+                "resourceType": "QuestionnaireResponse",
+                "item": [
+                  {
+                    "linkId": "1",
+                    "text": "Repeated Group",
+                    "item": [
+                      {
+                        "linkId": "1-1",
+                        "answer": [
+                          {
+                            "valueDate": "2023-06-14"
+                          }
+                        ]
+                      },
+                      {
+                        "linkId": "1-2"
+                      }
+                    ]
+                  },
+                  {
+                    "linkId": "1",
+                    "text": "Repeated Group",
+                    "item": [
+                      {
+                        "linkId": "1-1",
+                        "answer": [
+                          {
+                            "valueDate": "2023-06-13"
+                          }
+                        ]
+                      },
+                      {
+                        "linkId": "1-2"
+                      }
+                    ]
+                  }
+                ]
+              }
+            """
+        .trimIndent()
+
+    val questionnaire =
+      printer.parseResource(Questionnaire::class.java, questionnaireString) as Questionnaire
+
+    val response =
+      printer.parseResource(QuestionnaireResponse::class.java, questionnaireResponseString)
+        as QuestionnaireResponse
+
+    val expectedResponse =
+      printer.parseResource(QuestionnaireResponse::class.java, expectedQuestionnaireResponseString)
+        as QuestionnaireResponse
+
+    val viewModel = createQuestionnaireViewModel(questionnaire, response)
+
+    runTest {
+      viewModel.addMissingResponseItems(questionnaire.item, response.item)
+      assertResourceEquals(response, expectedResponse)
+    }
+  }
+
   // ==================================================================== //
   //                                                                      //
   //                       Questionnaire State Flow                       //

From df94004e7e165e839d10267199402eb812573bb8 Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Mon, 26 Aug 2024 11:20:39 +0700
Subject: [PATCH 074/126] Add lookup item control type

---
 catalog/src/main/assets/component_modal.json  | 57 +++++--------------
 .../MoreQuestionnaireItemComponents.kt        |  1 +
 2 files changed, 16 insertions(+), 42 deletions(-)

diff --git a/catalog/src/main/assets/component_modal.json b/catalog/src/main/assets/component_modal.json
index 99c24c2623..6ce9ee9170 100644
--- a/catalog/src/main/assets/component_modal.json
+++ b/catalog/src/main/assets/component_modal.json
@@ -2,6 +2,21 @@
   "resourceType": "Questionnaire",
   "item": [
     {
+      "extension": [
+        {
+          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+          "valueCodeableConcept": {
+            "coding": [
+              {
+                "system": "http://hl7.org/fhir/questionnaire-item-control",
+                "code": "lookup",
+                "display": "Lookup"
+              }
+            ],
+            "text": "Lookup"
+          }
+        }
+      ],
       "linkId": "1.1",
       "type": "choice",
       "repeats": true,
@@ -44,48 +59,6 @@
             "code": "diarrhoea",
             "display": "Diarrhoea"
           }
-        },
-        {
-          "valueCoding": {
-            "code": "fever",
-            "display": "Fever"
-          }
-        },
-        {
-          "valueCoding": {
-            "code": "injury",
-            "display": "Injury"
-          }
-        },
-        {
-          "valueCoding": {
-            "code": "jaundice",
-            "display": "Jaundice"
-          }
-        },
-        {
-          "valueCoding": {
-            "code": "mental-health",
-            "display": "Mental health"
-          }
-        },
-        {
-          "valueCoding": {
-            "code": "nausea",
-            "display": "Nausea"
-          }
-        },
-        {
-          "valueCoding": {
-            "code": "pain",
-            "display": "Pain"
-          }
-        },
-        {
-          "valueCoding": {
-            "code": "bleeding",
-            "display": "Bleeding"
-          }
         }
       ]
     }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
index 55dd4e5738..093cea4a28 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
@@ -188,6 +188,7 @@ enum class ItemControlTypes(
   CHECK_BOX("check-box", QuestionnaireViewHolderType.CHECK_BOX_GROUP),
   DROP_DOWN("drop-down", QuestionnaireViewHolderType.DROP_DOWN),
   OPEN_CHOICE("open-choice", QuestionnaireViewHolderType.DIALOG_SELECT),
+  LOOKUP("lookup", QuestionnaireViewHolderType.DIALOG_SELECT),
   RADIO_BUTTON("radio-button", QuestionnaireViewHolderType.RADIO_GROUP),
   SLIDER("slider", QuestionnaireViewHolderType.SLIDER),
   PHONE_NUMBER("phone-number", QuestionnaireViewHolderType.PHONE_NUMBER),

From 3e8fdb5a4025afcafee2a3bc2dcccae0511d1e76 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 4 Sep 2024 18:52:27 +0300
Subject: [PATCH 075/126] Sync HAPI FHIR Exceptions Logging for the FHIR SDK

---
 .../android/fhir/sync/FhirSyncWorker.kt       | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt b/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt
index 0f010bbcfc..cd7bb971d9 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt
@@ -164,26 +164,26 @@ abstract class FhirSyncWorker(appContext: Context, workerParams: WorkerParameter
 
   open fun onFailedSyncJobResult(failedSyncJobStatus: SyncJobStatus.Failed) {
     try {
-      CoroutineScope(Dispatchers.IO).launch {
-        val jsonParser = FhirContext.forR4().newJsonParser()
-
-        (failedSyncJobStatus).exceptions.filterIsInstance<HttpException>().forEach {
-          resourceSyncHTTPException ->
-          val operationOutcome =
-            jsonParser.parseResource(
-              IOUtils.toString(
-                resourceSyncHTTPException.response()?.errorBody()?.byteStream(),
-                StandardCharsets.UTF_8,
-              ),
-            ) as OperationOutcome
-
-          operationOutcome.issue.forEach { operationOutcome ->
-            Timber.e(
-              "SERVER ${operationOutcome.severity} - HTTP ${resourceSyncHTTPException.code()} | Code - ${operationOutcome.code} | Diagnostics - ${operationOutcome.diagnostics}",
-            )
-          }
+
+      val jsonParser = FhirContext.forR4().newJsonParser()
+      val exceptions = (failedSyncJobStatus).exceptions
+
+      exceptions.forEach{ resourceSyncException ->
+        val operationOutcome =
+          jsonParser.parseResource(
+            IOUtils.toString(
+              (resourceSyncException.exception as HttpException).response()?.errorBody()?.byteStream(),
+              StandardCharsets.UTF_8,
+            ),
+          ) as OperationOutcome
+
+        operationOutcome.issue.forEach { operationOutcome ->
+          Timber.e(
+            "SERVER ${operationOutcome.severity} - HTTP ${resourceSyncException.exception.code()} | Code - ${operationOutcome.code} | Diagnostics - ${operationOutcome.diagnostics}",
+          )
         }
       }
+
     } catch (e: Exception) {
       Timber.e(e)
     }

From 9d2f6d123298699588dacce7955cbe870911b1d6 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 4 Sep 2024 20:12:27 +0300
Subject: [PATCH 076/126] SDK Release - Engine, SDC, Knowledge, Workflow       
  - With unmerged PR https://github.com/opensrp/android-fhir/pull/9         -
 WUP PR https://github.com/google/android-fhir/pull/2178         - WUP
 https://github.com/google/android-fhir/pull/2650

---
 buildSrc/src/main/kotlin/Dependencies.kt | 4 ++--
 buildSrc/src/main/kotlin/Releases.kt     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 76e75ff766..11e948133a 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -132,8 +132,8 @@ object Dependencies {
   object Versions {
 
     const val androidFhirCommon = "0.1.0-alpha05-preview3-SNAPSHOT"
-    const val androidFhirEngine = "1.0.0-preview12-SNAPSHOT"    
-    const val androidFhirKnowledge = "0.1.0-alpha03-preview5-SNAPSHOT"
+    const val androidFhirEngine = "1.0.0-preview13-SNAPSHOT"
+    const val androidFhirKnowledge = "0.1.0-beta01-preview-SNAPSHOT"
     const val apacheCommonsCompress = "1.21"
     const val desugarJdkLibs = "2.0.3"
     const val caffeine = "2.9.1"
diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 84190a7d61..890d7b2fad 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,19 +48,19 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "1.0.0-preview12-SNAPSHOT"
+    override val version = "1.0.0-preview13-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.1.0-preview13-SNAPSHOT"
+    override val version = "1.1.0-preview14-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 
   object Workflow : LibraryArtifact {
     override val artifactId = "workflow"
-    override val version = "0.1.0-alpha04-preview11-SNAPSHOT"
+    override val version = "0.1.0-alpha04-preview12-SNAPSHOT"
     override val name = "Android FHIR Workflow Library"
   }
 
@@ -81,7 +81,7 @@ object Releases {
 
   object Knowledge : LibraryArtifact {
     override val artifactId = "knowledge"
-    override val version = "0.1.0-beta01"
+    override val version = "0.1.0-beta01-preview-SNAPSHOT"
     override val name = "Android FHIR Knowledge Manager Library"
   }
 

From 3fc46086e5ce15035f92897b1543279cd83825b9 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 4 Sep 2024 20:47:56 +0300
Subject: [PATCH 077/126] Remove duplicate FHIR Engine API Impl

---
 .../main/java/com/google/android/fhir/impl/FhirEngineImpl.kt  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
index 5c99f79912..000c336348 100644
--- a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
@@ -47,9 +47,7 @@ internal class FhirEngineImpl(private val database: Database, private val contex
   FhirEngine {
   override suspend fun create(vararg resource: Resource, isLocalOnly: Boolean): List<String> {
     return withContext(Dispatchers.IO) { if (isLocalOnly) database.insertLocalOnly(*resource) else database.insert(*resource) }
-  } 
-  override suspend fun create(vararg resource: Resource) =
-    withContext(Dispatchers.IO) { database.insert(*resource) }
+  }
 
   override suspend fun get(type: ResourceType, id: String) =
     withContext(Dispatchers.IO) { database.select(type, id) }

From 66b0963d073e39ff131705a869b9744a1bc4a809 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Tue, 10 Sep 2024 14:29:43 +0300
Subject: [PATCH 078/126] x

---
 .../java/com/google/android/fhir/sync/FhirSyncWorker.kt  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt b/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt
index cd7bb971d9..1855f8995c 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt
@@ -164,15 +164,17 @@ abstract class FhirSyncWorker(appContext: Context, workerParams: WorkerParameter
 
   open fun onFailedSyncJobResult(failedSyncJobStatus: SyncJobStatus.Failed) {
     try {
-
       val jsonParser = FhirContext.forR4().newJsonParser()
       val exceptions = (failedSyncJobStatus).exceptions
 
-      exceptions.forEach{ resourceSyncException ->
+      exceptions.forEach { resourceSyncException ->
         val operationOutcome =
           jsonParser.parseResource(
             IOUtils.toString(
-              (resourceSyncException.exception as HttpException).response()?.errorBody()?.byteStream(),
+              (resourceSyncException.exception as HttpException)
+                .response()
+                ?.errorBody()
+                ?.byteStream(),
               StandardCharsets.UTF_8,
             ),
           ) as OperationOutcome
@@ -183,7 +185,6 @@ abstract class FhirSyncWorker(appContext: Context, workerParams: WorkerParameter
           )
         }
       }
-
     } catch (e: Exception) {
       Timber.e(e)
     }

From 49921001a757d01ef1ed253b3c093079137ebd12 Mon Sep 17 00:00:00 2001
From: Jing Tang <jingtang@google.com>
Date: Fri, 2 Aug 2024 12:42:01 +0100
Subject: [PATCH 079/126] Rename install API to index for file in knowledge
 manager (#2634)

* Rename install to index for file

* Revert workflow unit tests since they use published knowledge manager

* Remove extra dependency in workflow build file

* Address review comments

* Fix smart immunizations test

* Update knowledge/src/main/java/com/google/android/fhir/knowledge/KnowledgeManager.kt

Co-authored-by: aditya-07 <aditya.pu2010@gmail.com>

* Update knowledge/src/main/java/com/google/android/fhir/knowledge/KnowledgeManager.kt

Co-authored-by: aditya-07 <aditya.pu2010@gmail.com>

* Run spotless

---------

Co-authored-by: aditya-07 <aditya.pu2010@gmail.com>
---
 .../fhir/knowledge/KnowledgeManager.kt        | 187 +++++++++++-------
 .../db/entities/ImplementationGuideEntity.kt  |   7 +-
 .../fhir/knowledge/KnowledgeManagerTest.kt    |  63 +++---
 .../care_plan.json                            |  12 +-
 .../med-request/med_request_careplan.json     |  10 +-
 .../benchmark/F_CqlEvaluatorBenchmark.kt      |   2 +-
 workflow/build.gradle.kts                     |  12 +-
 .../CarePlan/CarePlan.json                    |  10 +-
 .../FhirOperatorLibraryEvaluateTest.kt        |   8 +-
 .../workflow/SmartImmunizationAndroidTest.kt  |   4 +-
 .../FhirOperatorLibraryEvaluateJavaTest.kt    |   8 +-
 .../android/fhir/workflow/FhirOperatorTest.kt |   6 +-
 .../fhir/workflow/SmartImmunizationTest.kt    |   4 +-
 13 files changed, 194 insertions(+), 139 deletions(-)

diff --git a/knowledge/src/main/java/com/google/android/fhir/knowledge/KnowledgeManager.kt b/knowledge/src/main/java/com/google/android/fhir/knowledge/KnowledgeManager.kt
index e319fa79c9..3a3a956c6f 100644
--- a/knowledge/src/main/java/com/google/android/fhir/knowledge/KnowledgeManager.kt
+++ b/knowledge/src/main/java/com/google/android/fhir/knowledge/KnowledgeManager.kt
@@ -21,22 +21,19 @@ import androidx.room.Room
 import ca.uhn.fhir.context.FhirContext
 import ca.uhn.fhir.parser.IParser
 import com.google.android.fhir.knowledge.db.KnowledgeDatabase
+import com.google.android.fhir.knowledge.db.entities.ImplementationGuideEntity
 import com.google.android.fhir.knowledge.db.entities.ResourceMetadataEntity
-import com.google.android.fhir.knowledge.db.entities.toEntity
 import com.google.android.fhir.knowledge.files.NpmFileManager
 import com.google.android.fhir.knowledge.npm.NpmPackageDownloader
 import com.google.android.fhir.knowledge.npm.OkHttpNpmPackageDownloader
 import java.io.File
 import java.io.FileInputStream
-import java.io.FileOutputStream
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.hl7.fhir.instance.model.api.IBaseResource
 import org.hl7.fhir.r4.context.IWorkerContext
 import org.hl7.fhir.r4.context.SimpleWorkerContext
-import org.hl7.fhir.r4.model.IdType
 import org.hl7.fhir.r4.model.MetadataResource
-import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
 import org.hl7.fhir.utilities.npm.NpmPackage
 import timber.log.Timber
@@ -46,9 +43,20 @@ import timber.log.Timber
  * individually as JSON files or from FHIR NPM packages.
  *
  * Coordinates the management of knowledge artifacts by using the three following components:
- * - database: indexing knowledge artifacts stored in the local file system,
- * - file manager: managing files containing the knowledge artifacts, and
- * - NPM downloader: downloading from an NPM package server the knowledge artifacts.
+ * - knowledgeDatabase: indexing knowledge artifacts stored in the local file system,
+ * - npmFileManager: managing files containing the knowledge artifacts, and
+ * - npmPackageDownloader: downloading the knowledge artifacts from an NPM package server .
+ *
+ * Knowledge artifacts are scoped by the application. Multiple applications using the knowledge
+ * manager will not share the same sets of knowledge artifacts.
+ *
+ * See [Clinical Reasoning](https://hl7.org/fhir/R4/clinicalreasoning-module.html) for the formal
+ * definition of knowledge artifacts. In this implementation, however, knowledge artifacts are
+ * represented as [MetadataResource]s.
+ *
+ * **Note** that the list of resources implementing the [MetadataResource] class differs from the
+ * list of resources implementing the
+ * [MetadataResource interface](https://www.hl7.org/fhir/R5/metadataresource.html) in FHIR R5.
  */
 class KnowledgeManager
 internal constructor(
@@ -60,9 +68,11 @@ internal constructor(
   private val knowledgeDao = knowledgeDatabase.knowledgeDao()
 
   /**
-   * Checks if the [fhirNpmPackages] are present in DB. If necessary, downloads the dependencies
-   * from NPM and imports data from the package manager (populates the metadata of the FHIR
-   * Resources).
+   * Downloads and installs the [fhirNpmPackages] from the NPM package server with transitive
+   * dependencies. The NPM packages will be unzipped to a directory managed by the knowledge
+   * manager. The resources will be indexed in the database for future retrieval.
+   *
+   * FHIR NPM packages already present in the database will be skipped.
    */
   suspend fun install(vararg fhirNpmPackages: FhirNpmPackage) {
     fhirNpmPackages
@@ -81,7 +91,7 @@ internal constructor(
         try {
           val localFhirNpmPackageMetadata =
             npmFileManager.getLocalFhirNpmPackageMetadata(it.name, it.version)
-          install(it, localFhirNpmPackageMetadata.rootDirectory)
+          import(it, localFhirNpmPackageMetadata.rootDirectory)
           install(*localFhirNpmPackageMetadata.dependencies.toTypedArray())
         } catch (e: Exception) {
           Timber.w("Unable to install package ${it.name} ${it.version}")
@@ -90,35 +100,70 @@ internal constructor(
   }
 
   /**
-   * Checks if the [fhirNpmPackage] is present in DB. If necessary, populates the database with the
-   * metadata of FHIR Resource from the provided [rootDirectory].
+   * Imports the content of the [fhirNpmPackage] from the provided [rootDirectory] by indexing the
+   * metadata of the FHIR resources for future retrieval.
+   *
+   * FHIR NPM packages already present in the database will be skipped.
    */
-  suspend fun install(fhirNpmPackage: FhirNpmPackage, rootDirectory: File) {
+  suspend fun import(fhirNpmPackage: FhirNpmPackage, rootDirectory: File) {
     // TODO(ktarasenko) copy files to the safe space?
-    val igId = knowledgeDao.insert(fhirNpmPackage.toEntity(rootDirectory))
-    rootDirectory.listFiles()?.sorted()?.forEach { file ->
-      try {
-        val resource = jsonParser.parseResource(FileInputStream(file))
-        if (resource is Resource) {
-          val newId = indexResourceFile(igId, resource, file)
-          resource.setId(IdType(resource.resourceType.name, newId))
-
-          // Overrides the Id in the file
-          FileOutputStream(file).use {
-            it.write(jsonParser.encodeResourceToString(resource).toByteArray())
-          }
-        } else {
-          Timber.d("Unable to import file: %file")
-        }
-      } catch (exception: Exception) {
-        Timber.d(exception, "Unable to import file: %file")
-      }
+    val implementationGuideId =
+      knowledgeDao.insert(
+        ImplementationGuideEntity(
+          0L,
+          fhirNpmPackage.canonical ?: "",
+          fhirNpmPackage.name,
+          fhirNpmPackage.version,
+          rootDirectory,
+        ),
+      )
+    val files = rootDirectory.listFiles() ?: return
+    files.sorted().forEach { file ->
+      // Ignore files that are not meta resources instead of throwing exceptions since unzipped
+      // NPM package might contain other types of files e.g. package.json.
+      val resource = readMetadataResourceOrNull(file) ?: return@forEach
+      knowledgeDao.insertResource(
+        implementationGuideId,
+        ResourceMetadataEntity(
+          0,
+          resource.resourceType,
+          resource.url,
+          resource.name,
+          resource.version,
+          file,
+        ),
+      )
     }
   }
 
-  /** Imports the Knowledge Artifact from the provided [file] to the default dependency. */
-  suspend fun install(file: File) {
-    importFile(null, file)
+  /**
+   * Indexes a knowledge artifact as a JSON object in the provided [file].
+   *
+   * This creates a record of the knowledge artifact's metadata and the file's location. When the
+   * knowledge artifact is requested, knowledge manager will load the content of the file,
+   * deserialize it and return the resulting FHIR resource.
+   *
+   * This operation does not make a copy of the knowledge artifact, nor does it checksum the content
+   * of the file. Therefore, it cannot be guaranteed that subsequent retrievals of the knowledge
+   * artifact will produce the same result. Applications using this function must be aware of the
+   * risk of the content of the file being modified or corrupt, potentially resulting in incorrect
+   * or inaccurate result of decision support or measure evaluation.
+   *
+   * Use this API for knowledge artifacts in immutable files (e.g. in the app's `assets` folder).
+   */
+  suspend fun index(file: File) {
+    val resource = readMetadataResourceOrThrow(file)
+    knowledgeDao.insertResource(
+      null,
+      ResourceMetadataEntity(
+        0L,
+        resource.resourceType,
+        resource.url,
+        resource.name,
+        resource.version,
+        file,
+      ),
+    )
   }
 
   /** Loads resources from IGs listed in dependencies. */
@@ -141,7 +186,7 @@ internal constructor(
         name != null -> knowledgeDao.getResourcesWithName(resType, name)
         else -> knowledgeDao.getResources(resType)
       }
-    return resourceEntities.map { loadResource(it) }
+    return resourceEntities.map { readMetadataResourceOrThrow(it.resourceFile)!! }
   }
 
   /** Deletes Implementation Guide, cleans up files. */
@@ -155,43 +200,6 @@ internal constructor(
     }
   }
 
-  private suspend fun importFile(igId: Long?, file: File) {
-    val resource =
-      withContext(Dispatchers.IO) {
-        try {
-          FileInputStream(file).use(jsonParser::parseResource)
-        } catch (exception: Exception) {
-          Timber.d(exception, "Unable to import file: $file. Parsing to FhirResource failed.")
-        }
-      }
-    when (resource) {
-      is Resource -> {
-        val newId = indexResourceFile(igId, resource, file)
-        resource.setId(IdType(resource.resourceType.name, newId))
-
-        // Overrides the Id in the file
-        FileOutputStream(file).use {
-          it.write(jsonParser.encodeResourceToString(resource).toByteArray())
-        }
-      }
-    }
-  }
-
-  private suspend fun indexResourceFile(igId: Long?, resource: Resource, file: File): Long {
-    val metadataResource = resource as? MetadataResource
-    val res =
-      ResourceMetadataEntity(
-        0L,
-        resource.resourceType,
-        metadataResource?.url,
-        metadataResource?.name,
-        metadataResource?.version,
-        file,
-      )
-
-    return knowledgeDao.insertResource(igId, res)
-  }
-
   /**
    * Loads and initializes a worker context with the specified npm packages.
    *
@@ -220,8 +228,37 @@ internal constructor(
     }
   }
 
-  private fun loadResource(resourceEntity: ResourceMetadataEntity): IBaseResource {
-    return jsonParser.parseResource(FileInputStream(resourceEntity.resourceFile))
+  /**
+   * Parses and returns the content of a file containing a FHIR resource in JSON, or null if the
+   * file does not contain a FHIR resource.
+   */
+  private suspend fun readResourceOrNull(file: File): IBaseResource? =
+    withContext(Dispatchers.IO) {
+      try {
+        FileInputStream(file).use(jsonParser::parseResource)
+      } catch (e: Exception) {
+        Timber.e(e, "Unable to load resource from $file")
+        null
+      }
+    }
+
+  /**
+   * Parses and returns the content of a file containing a FHIR metadata resource in JSON, or null
+   * if the file does not contain a FHIR metadata resource.
+   */
+  private suspend fun readMetadataResourceOrNull(file: File) =
+    readResourceOrNull(file) as? MetadataResource
+
+  /**
+   * Parses and returns the content of a file containing a FHIR metadata resource in JSON, or throws
+   * an exception if the file does not contain a FHIR metadata resource.
+   */
+  private suspend fun readMetadataResourceOrThrow(file: File): MetadataResource {
+    val resource = readResourceOrNull(file)!!
+    check(resource is MetadataResource) {
+      "Resource ${resource.idElement} is not a MetadataResource"
+    }
+    return resource
   }
 
   companion object {
diff --git a/knowledge/src/main/java/com/google/android/fhir/knowledge/db/entities/ImplementationGuideEntity.kt b/knowledge/src/main/java/com/google/android/fhir/knowledge/db/entities/ImplementationGuideEntity.kt
index 8d2a1804e0..91e53a6d82 100644
--- a/knowledge/src/main/java/com/google/android/fhir/knowledge/db/entities/ImplementationGuideEntity.kt
+++ b/knowledge/src/main/java/com/google/android/fhir/knowledge/db/entities/ImplementationGuideEntity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 Google LLC
+ * Copyright 2022-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.
@@ -19,7 +19,6 @@ package com.google.android.fhir.knowledge.db.entities
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import com.google.android.fhir.knowledge.FhirNpmPackage
 import java.io.File
 
 /**
@@ -45,7 +44,3 @@ internal data class ImplementationGuideEntity(
   /** Directory where the Implementation Guide files are stored */
   val rootDirectory: File,
 )
-
-internal fun FhirNpmPackage.toEntity(rootFolder: File): ImplementationGuideEntity {
-  return ImplementationGuideEntity(0L, canonical ?: "", name, version, rootFolder)
-}
diff --git a/knowledge/src/test/java/com/google/android/fhir/knowledge/KnowledgeManagerTest.kt b/knowledge/src/test/java/com/google/android/fhir/knowledge/KnowledgeManagerTest.kt
index abef67cbee..48cdefd60f 100644
--- a/knowledge/src/test/java/com/google/android/fhir/knowledge/KnowledgeManagerTest.kt
+++ b/knowledge/src/test/java/com/google/android/fhir/knowledge/KnowledgeManagerTest.kt
@@ -25,11 +25,14 @@ import com.google.android.fhir.knowledge.db.KnowledgeDatabase
 import com.google.android.fhir.knowledge.files.NpmFileManager
 import com.google.common.truth.Truth.assertThat
 import java.io.File
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runTest
+import org.hl7.fhir.r4.model.BaseResource
 import org.hl7.fhir.r4.model.Library
-import org.hl7.fhir.r4.model.MetadataResource
+import org.hl7.fhir.r4.model.Patient
 import org.hl7.fhir.r4.model.PlanDefinition
 import org.junit.After
+import org.junit.Assert.assertThrows
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
@@ -65,7 +68,7 @@ internal class KnowledgeManagerTest {
 
   @Test
   fun `importing IG creates entries in DB`() = runTest {
-    knowledgeManager.install(fhirNpmPackage, dataFolder)
+    knowledgeManager.import(fhirNpmPackage, dataFolder)
     val implementationGuideId =
       knowledgeDb.knowledgeDao().getImplementationGuide("anc-cds", "0.3.0")!!.implementationGuideId
 
@@ -81,9 +84,10 @@ internal class KnowledgeManagerTest {
   @Test
   fun `deleting IG deletes files and DB entries`() = runTest {
     val igRoot = File(dataFolder.parentFile, "anc-cds.copy")
+    igRoot.deleteRecursively()
     igRoot.deleteOnExit()
     dataFolder.copyRecursively(igRoot)
-    knowledgeManager.install(fhirNpmPackage, igRoot)
+    knowledgeManager.import(fhirNpmPackage, igRoot)
 
     knowledgeManager.delete(fhirNpmPackage)
 
@@ -93,7 +97,7 @@ internal class KnowledgeManagerTest {
 
   @Test
   fun `imported entries are readable`() = runTest {
-    knowledgeManager.install(fhirNpmPackage, dataFolder)
+    knowledgeManager.import(fhirNpmPackage, dataFolder)
 
     assertThat(knowledgeManager.loadResources(resourceType = "Library", name = "WHOCommon"))
       .isNotNull()
@@ -112,7 +116,16 @@ internal class KnowledgeManagerTest {
   }
 
   @Test
-  fun `inserting a library of a different version creates new entry`() = runTest {
+  fun `indexing non metadata resource should throw an exception`() {
+    val patient = Patient().apply { id = "Patient/defaultA-A.1.0.0" }
+
+    assertThrows(IllegalStateException::class.java) {
+      runBlocking { knowledgeManager.index(writeToFile(patient)) }
+    }
+  }
+
+  @Test
+  fun `should index a library of a different version`() = runTest {
     val libraryAOld =
       Library().apply {
         id = "Library/defaultA-A.1.0.0"
@@ -128,8 +141,8 @@ internal class KnowledgeManagerTest {
         version = "A.1.0.1"
       }
 
-    knowledgeManager.install(writeToFile(libraryAOld))
-    knowledgeManager.install(writeToFile(libraryANew))
+    knowledgeManager.index(writeToFile(libraryAOld))
+    knowledgeManager.index(writeToFile(libraryANew))
 
     val resources = knowledgeDb.knowledgeDao().getResources()
     assertThat(resources).hasSize(2)
@@ -137,14 +150,14 @@ internal class KnowledgeManagerTest {
     val resourceA100 =
       knowledgeManager
         .loadResources(resourceType = "Library", name = "defaultA", version = "A.1.0.0")
-        .single()
-    assertThat(resourceA100.idElement.toString()).isEqualTo("Library/1")
+        .single() as Library
+    assertThat(resourceA100.version).isEqualTo("A.1.0.0")
 
     val resourceA101 =
       knowledgeManager
         .loadResources(resourceType = "Library", name = "defaultA", version = "A.1.0.1")
-        .single()
-    assertThat(resourceA101.idElement.toString()).isEqualTo("Library/2")
+        .single() as Library
+    assertThat(resourceA101.version.toString()).isEqualTo("A.1.0.1")
   }
 
   fun `installing from npmPackageManager`() = runTest {
@@ -182,19 +195,20 @@ internal class KnowledgeManagerTest {
         url = commonUrl
       }
 
-    knowledgeManager.install(writeToFile(libraryWithSameUrl))
-    knowledgeManager.install(writeToFile(planDefinitionWithSameUrl))
+    knowledgeManager.index(writeToFile(libraryWithSameUrl))
+    knowledgeManager.index(writeToFile(planDefinitionWithSameUrl))
 
     val resources = knowledgeDb.knowledgeDao().getResources()
     assertThat(resources).hasSize(2)
 
     val libraryLoadedByUrl =
-      knowledgeManager.loadResources(resourceType = "Library", url = commonUrl).single()
-    assertThat(libraryLoadedByUrl.idElement.toString()).isEqualTo("Library/1")
+      knowledgeManager.loadResources(resourceType = "Library", url = commonUrl).single() as Library
+    assertThat(libraryLoadedByUrl.name.toString()).isEqualTo("LibraryName")
 
     val planDefinitionLoadedByUrl =
       knowledgeManager.loadResources(resourceType = "PlanDefinition", url = commonUrl).single()
-    assertThat(planDefinitionLoadedByUrl.idElement.toString()).isEqualTo("PlanDefinition/2")
+        as PlanDefinition
+    assertThat(planDefinitionLoadedByUrl.name.toString()).isEqualTo("PlanDefinitionName")
   }
 
   @Test
@@ -215,25 +229,26 @@ internal class KnowledgeManagerTest {
         version = "0"
       }
 
-    knowledgeManager.install(writeToFile(libraryWithSameUrl))
-    knowledgeManager.install(writeToFile(planDefinitionWithSameUrl))
+    knowledgeManager.index(writeToFile(libraryWithSameUrl))
+    knowledgeManager.index(writeToFile(planDefinitionWithSameUrl))
 
     val resources = knowledgeDb.knowledgeDao().getResources()
     assertThat(resources).hasSize(2)
 
     val libraryLoadedByUrl =
-      knowledgeManager.loadResources(resourceType = "Library", url = commonUrl).single()
-    assertThat(libraryLoadedByUrl.idElement.toString()).isEqualTo("Library/1")
+      knowledgeManager.loadResources(resourceType = "Library", url = commonUrl).single() as Library
+    assertThat(libraryLoadedByUrl.name.toString()).isEqualTo("LibraryName")
 
     val planDefinitionLoadedByUrl =
       knowledgeManager.loadResources(resourceType = "PlanDefinition", url = commonUrl).single()
-    assertThat(planDefinitionLoadedByUrl.idElement.toString()).isEqualTo("PlanDefinition/2")
+        as PlanDefinition
+    assertThat(planDefinitionLoadedByUrl.name.toString()).isEqualTo("PlanDefinitionName")
   }
 
-  private fun writeToFile(metadataResource: MetadataResource): File {
-    return File(context.filesDir, metadataResource.id).apply {
+  private fun writeToFile(resource: BaseResource): File {
+    return File(context.filesDir, resource.id).apply {
       this.parentFile?.mkdirs()
-      writeText(jsonParser.encodeResourceToString(metadataResource))
+      writeText(jsonParser.encodeResourceToString(resource))
     }
   }
 }
diff --git a/workflow-testing/src/main/resources/plan-definition/cql-applicability-condition/care_plan.json b/workflow-testing/src/main/resources/plan-definition/cql-applicability-condition/care_plan.json
index 131bb2fc7d..3779b876d0 100644
--- a/workflow-testing/src/main/resources/plan-definition/cql-applicability-condition/care_plan.json
+++ b/workflow-testing/src/main/resources/plan-definition/cql-applicability-condition/care_plan.json
@@ -1,9 +1,9 @@
 {
   "resourceType": "CarePlan",
-  "id": "17",
+  "id": "Plan-Definition-Example",
   "contained": [ {
     "resourceType": "RequestGroup",
-    "id": "17",
+    "id": "Plan-Definition-Example",
     "instantiatesCanonical": [ "http://example.com/PlanDefinition/Plan-Definition-Example" ],
     "status": "draft",
     "intent": "proposal",
@@ -20,15 +20,15 @@
         }
       } ],
       "resource": {
-        "reference": "Task/16"
+        "reference": "Task/Activity-Example"
       }
     } ]
   }, {
     "resourceType": "Task",
-    "id": "16",
+    "id": "Activity-Example",
     "instantiatesCanonical": "http://example.com/ActivityDefinition/Activity-Example",
     "basedOn": [ {
-      "reference": "RequestGroup/17"
+      "reference": "RequestGroup/Plan-Definition-Example"
     } ],
     "status": "draft",
     "intent": "proposal",
@@ -45,7 +45,7 @@
   },
   "activity": [ {
     "reference": {
-      "reference": "#RequestGroup/17"
+      "reference": "#RequestGroup/Plan-Definition-Example"
     }
   } ]
 }
\ No newline at end of file
diff --git a/workflow-testing/src/main/resources/plan-definition/med-request/med_request_careplan.json b/workflow-testing/src/main/resources/plan-definition/med-request/med_request_careplan.json
index 8e7b401c7b..f152723d04 100644
--- a/workflow-testing/src/main/resources/plan-definition/med-request/med_request_careplan.json
+++ b/workflow-testing/src/main/resources/plan-definition/med-request/med_request_careplan.json
@@ -1,10 +1,10 @@
 {
   "resourceType": "CarePlan",
-  "id": "17",
+  "id": "MedRequest-Example",
   "contained": [
     {
       "resourceType": "RequestGroup",
-      "id": "17",
+      "id": "MedRequest-Example",
       "instantiatesCanonical": [
         "http://localhost/PlanDefinition/MedRequest-Example"
       ],
@@ -18,14 +18,14 @@
           "id": "medication-action-1",
           "title": "Administer Medication 1",
           "resource": {
-            "reference": "medication-action-1-16"
+            "reference": "medication-action-1-MedicationRequest-1"
           }
         }
       ]
     },
     {
       "resourceType": "MedicationRequest",
-      "id": "medication-action-1-16",
+      "id": "medication-action-1-MedicationRequest-1",
       "status": "draft",
       "intent": "order",
       "medicationCodeableConcept": {
@@ -50,7 +50,7 @@
   "activity": [
     {
       "reference": {
-        "reference": "#RequestGroup/17"
+        "reference": "#RequestGroup/MedRequest-Example"
       }
     }
   ]
diff --git a/workflow/benchmark/src/androidTest/java/com/google/android/fhir/workflow/benchmark/F_CqlEvaluatorBenchmark.kt b/workflow/benchmark/src/androidTest/java/com/google/android/fhir/workflow/benchmark/F_CqlEvaluatorBenchmark.kt
index dc63e1fc5c..4c3d40fbe1 100644
--- a/workflow/benchmark/src/androidTest/java/com/google/android/fhir/workflow/benchmark/F_CqlEvaluatorBenchmark.kt
+++ b/workflow/benchmark/src/androidTest/java/com/google/android/fhir/workflow/benchmark/F_CqlEvaluatorBenchmark.kt
@@ -68,7 +68,7 @@ class F_CqlEvaluatorBenchmark {
           for (entry in patientImmunizationHistory.entry) {
             fhirEngine.create(entry.resource)
           }
-          knowledgeManager.install(
+          knowledgeManager.index(
             File(context.filesDir, lib.name).apply {
               writeText(jsonParser.encodeResourceToString(lib))
             },
diff --git a/workflow/build.gradle.kts b/workflow/build.gradle.kts
index 83e5d49f56..3d2696e944 100644
--- a/workflow/build.gradle.kts
+++ b/workflow/build.gradle.kts
@@ -114,8 +114,18 @@ dependencies {
   testImplementation(libs.androidx.test.core)
   testImplementation(libs.junit)
   testImplementation(libs.truth)
-  testImplementation(project(mapOf("path" to ":knowledge")))
   testImplementation(project(":workflow-testing"))
+  testImplementation(project(":knowledge"))
+
+  configurations.all {
+    if (name.contains("test", ignoreCase = true)) {
+      resolutionStrategy.dependencySubstitution {
+        // To test the workflow library against the latest Knowledge Manager APIs, substitute the
+        // dependency on the released Knowledge Manager library with the current build.
+        substitute(module(Dependencies.androidFhirKnowledge)).using(project(":knowledge"))
+      }
+    }
+  }
 
   constraints {
     Dependencies.hapiFhirConstraints().forEach { (libName, constraints) ->
diff --git a/workflow/sampledata/smart-imm/tests/IMMZ-Patient-NoVaxeninfant-f/CarePlan/CarePlan.json b/workflow/sampledata/smart-imm/tests/IMMZ-Patient-NoVaxeninfant-f/CarePlan/CarePlan.json
index 8996cb92fc..50b5053423 100644
--- a/workflow/sampledata/smart-imm/tests/IMMZ-Patient-NoVaxeninfant-f/CarePlan/CarePlan.json
+++ b/workflow/sampledata/smart-imm/tests/IMMZ-Patient-NoVaxeninfant-f/CarePlan/CarePlan.json
@@ -1,10 +1,10 @@
 {
   "resourceType": "CarePlan",
-  "id": "26",
+  "id": "IMMZD2DTMeasles",
   "contained": [
     {
       "resourceType": "RequestGroup",
-      "id": "26",
+      "id": "IMMZD2DTMeasles",
       "instantiatesCanonical": [
         "http://fhir.org/guides/who/smart-immunization/PlanDefinition/IMMZD2DTMeasles|0.1.0"
       ],
@@ -28,14 +28,14 @@
             }
           ],
           "resource": {
-            "reference": "MedicationRequest/1"
+            "reference": "MedicationRequest/IMMZD2DTMeaslesMR"
           }
         }
       ]
     },
     {
       "resourceType": "MedicationRequest",
-      "id": "1",
+      "id": "IMMZD2DTMeaslesMR",
       "meta": {
         "profile": [
           "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-immunizationrequest"
@@ -77,7 +77,7 @@
   "activity": [
     {
       "reference": {
-        "reference": "#RequestGroup/26"
+        "reference": "#RequestGroup/IMMZD2DTMeasles"
       }
     }
   ]
diff --git a/workflow/src/androidTest/java/com/google/android/fhir/workflow/FhirOperatorLibraryEvaluateTest.kt b/workflow/src/androidTest/java/com/google/android/fhir/workflow/FhirOperatorLibraryEvaluateTest.kt
index 345bc28049..f42ecfb020 100644
--- a/workflow/src/androidTest/java/com/google/android/fhir/workflow/FhirOperatorLibraryEvaluateTest.kt
+++ b/workflow/src/androidTest/java/com/google/android/fhir/workflow/FhirOperatorLibraryEvaluateTest.kt
@@ -121,7 +121,7 @@ class FhirOperatorLibraryEvaluateTest {
     }
 
     // Load Library that checks if Patient has taken a vaccine
-    knowledgeManager.install(copy("/immunity-check/ImmunityCheck.json"))
+    knowledgeManager.index(copy("/immunity-check/ImmunityCheck.json"))
 
     // Evaluates a specific Patient
     val results =
@@ -142,8 +142,8 @@ class FhirOperatorLibraryEvaluateTest {
     }
 
     // Load Library that checks if Patient has taken a vaccine
-    knowledgeManager.install(copy("/immunity-check/ImmunityCheck.json"))
-    knowledgeManager.install(copy("/immunity-check/FhirHelpers.json"))
+    knowledgeManager.index(copy("/immunity-check/ImmunityCheck.json"))
+    knowledgeManager.index(copy("/immunity-check/FhirHelpers.json"))
 
     val location =
       """
@@ -185,7 +185,7 @@ class FhirOperatorLibraryEvaluateTest {
     }
 
     // Load Library that checks if Patient has taken a vaccine
-    knowledgeManager.install(copy("/immunity-check/ImmunityCheck.json"))
+    knowledgeManager.index(copy("/immunity-check/ImmunityCheck.json"))
 
     // Evaluates a specific Patient
     val results =
diff --git a/workflow/src/androidTest/java/com/google/android/fhir/workflow/SmartImmunizationAndroidTest.kt b/workflow/src/androidTest/java/com/google/android/fhir/workflow/SmartImmunizationAndroidTest.kt
index 32f88a275a..f562b3ae13 100644
--- a/workflow/src/androidTest/java/com/google/android/fhir/workflow/SmartImmunizationAndroidTest.kt
+++ b/workflow/src/androidTest/java/com/google/android/fhir/workflow/SmartImmunizationAndroidTest.kt
@@ -116,7 +116,7 @@ class SmartImmunizationAndroidTest {
 
     moveAllIGResourcesIntoFilesDir("smart-imm")
 
-    knowledgeManager.install(
+    knowledgeManager.import(
       FhirNpmPackage(
         "who.fhir.immunization",
         "1.0.0",
@@ -136,8 +136,6 @@ class SmartImmunizationAndroidTest {
         )
         .single()
 
-    assertThat(planDef.idElement.idPart).isEqualTo("26")
-
     val patient =
       load(
         "/smart-imm/tests/IMMZ-Patient-NoVaxeninfant-f/Patient/Patient-IMMZ-Patient-NoVaxeninfant-f.json",
diff --git a/workflow/src/test/java/com/google/android/fhir/workflow/FhirOperatorLibraryEvaluateJavaTest.kt b/workflow/src/test/java/com/google/android/fhir/workflow/FhirOperatorLibraryEvaluateJavaTest.kt
index be66a40615..96e6982b9d 100644
--- a/workflow/src/test/java/com/google/android/fhir/workflow/FhirOperatorLibraryEvaluateJavaTest.kt
+++ b/workflow/src/test/java/com/google/android/fhir/workflow/FhirOperatorLibraryEvaluateJavaTest.kt
@@ -110,8 +110,8 @@ class FhirOperatorLibraryEvaluateJavaTest {
     }
 
     // Load Library that checks if Patient has taken a vaccine
-    knowledgeManager.install(writeToFile(load("/immunity-check/ImmunityCheck.json") as Library))
-    knowledgeManager.install(writeToFile(load("/immunity-check/FhirHelpers.json") as Library))
+    knowledgeManager.index(writeToFile(load("/immunity-check/ImmunityCheck.json") as Library))
+    knowledgeManager.index(writeToFile(load("/immunity-check/FhirHelpers.json") as Library))
 
     // Evaluates a specific Patient
     val results =
@@ -137,7 +137,7 @@ class FhirOperatorLibraryEvaluateJavaTest {
 
     val library = CqlBuilder.assembleFhirLib(cql, null, null, "TestGetName", "1.0.0")
 
-    knowledgeManager.install(writeToFile(library))
+    knowledgeManager.index(writeToFile(library))
 
     // Evaluates expression without any extra data
     val results =
@@ -162,7 +162,7 @@ class FhirOperatorLibraryEvaluateJavaTest {
 
     val library = CqlBuilder.assembleFhirLib(cql, null, null, "TestSumWithParams", "1.0.0")
 
-    knowledgeManager.install(writeToFile(library))
+    knowledgeManager.index(writeToFile(library))
 
     val params =
       Parameters().apply {
diff --git a/workflow/src/test/java/com/google/android/fhir/workflow/FhirOperatorTest.kt b/workflow/src/test/java/com/google/android/fhir/workflow/FhirOperatorTest.kt
index 287faceef8..f9b4ff4ff2 100644
--- a/workflow/src/test/java/com/google/android/fhir/workflow/FhirOperatorTest.kt
+++ b/workflow/src/test/java/com/google/android/fhir/workflow/FhirOperatorTest.kt
@@ -61,7 +61,7 @@ class FhirOperatorTest {
 
     // Installing ANC CDS to the IGManager
     val rootDirectory = File(javaClass.getResource("/anc-cds")!!.file)
-    knowledgeManager.install(
+    knowledgeManager.import(
       FhirNpmPackage(
         "com.google.android.fhir",
         "1.0.0",
@@ -281,7 +281,9 @@ class FhirOperatorTest {
   }
 
   private suspend fun installToIgManager(resource: Resource) {
-    knowledgeManager.install(writeToFile(resource))
+    try {
+      knowledgeManager.index(writeToFile(resource))
+    } catch (_: Exception) {}
   }
 
   private fun writeToFile(resource: Resource): File {
diff --git a/workflow/src/test/java/com/google/android/fhir/workflow/SmartImmunizationTest.kt b/workflow/src/test/java/com/google/android/fhir/workflow/SmartImmunizationTest.kt
index 85d46f13d2..cdfde7e17f 100644
--- a/workflow/src/test/java/com/google/android/fhir/workflow/SmartImmunizationTest.kt
+++ b/workflow/src/test/java/com/google/android/fhir/workflow/SmartImmunizationTest.kt
@@ -63,7 +63,7 @@ class SmartImmunizationTest {
     // Installing SmartImmunizations IG into the IGManager
     val rootDirectory = File(javaClass.getResource("/smart-imm/ig/")!!.file)
 
-    knowledgeManager.install(
+    knowledgeManager.import(
       FhirNpmPackage(
         "who.fhir.immunization",
         "1.0.0",
@@ -83,8 +83,6 @@ class SmartImmunizationTest {
         )
         .firstOrNull()
 
-    assertThat(planDef?.idElement?.idPart).isEqualTo("26")
-
     loader.loadFile(
       "/smart-imm/tests/IMMZ-Patient-NoVaxeninfant-f/Patient/Patient-IMMZ-Patient-NoVaxeninfant-f.json",
       ::importToFhirEngine,

From ae0e4ce92acd71eeee73ef34b47fa2435a95f16b Mon Sep 17 00:00:00 2001
From: Kostia Tarasenko <konstantin.v.tarasenko@gmail.com>
Date: Tue, 20 Aug 2024 19:37:03 +0200
Subject: [PATCH 080/126] Update CODEOWNERS to use group instead of individuals
 (#2659)

* Update CODEOWNERS to use group instead of individuals

* Update CODEOWNERS - remove comment
---
 CODEOWNERS | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 512f12d413..f6c08701fd 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,14 +1,7 @@
 # This file lists people who get automatically added as Reviewers for Pull Requests.
-#
-# Note that we intentionally do NOT just include all committers here by using @google/android-fhir,
-# nor were we able to get it working using a group such as @google/android-fhir-reviewers;
-# details about why are described on https://github.com/google/android-fhir/issues/2320
-# and https://github.com/google/android-fhir/pull/2536.
-#
-# See https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
 # These people for *ALL* Pull Requests:
-* @aditya-07 @jingtang10 @MJ1998 @santosh-pingle 
+* @google/android-fhir-reviewers
 
 # These for anything documentation related:
 docs/* @vorburger

From 7522e984712e2e2616b6790cff9a5b650a5762bb Mon Sep 17 00:00:00 2001
From: Jing Tang <jingtang@google.com>
Date: Wed, 21 Aug 2024 11:36:01 +0100
Subject: [PATCH 081/126] Clean up UI navigation item (#2658)

---
 .../fhir/datacapture/QuestionnaireFragment.kt |   8 +-
 .../QuestionnaireNavigationViewUIState.kt     |   6 +-
 .../datacapture/QuestionnaireViewModel.kt     |  19 +-
 .../datacapture/QuestionnaireViewModelTest.kt | 277 +++++++-----------
 4 files changed, 123 insertions(+), 187 deletions(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt
index 457d8230ad..b6c357d107 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt
@@ -160,10 +160,10 @@ class QuestionnaireFragment : Fragment() {
               }
 
             // Set bottom navigation
-            if (state.bottomNavItems.isNotEmpty()) {
+            if (state.bottomNavItem != null) {
               bottomNavContainerFrame.visibility = View.VISIBLE
               NavigationViewHolder(bottomNavContainerFrame)
-                .bind(state.bottomNavItems.single().questionnaireNavigationUIState)
+                .bind(state.bottomNavItem.questionnaireNavigationUIState)
             } else {
               bottomNavContainerFrame.visibility = View.GONE
             }
@@ -179,10 +179,10 @@ class QuestionnaireFragment : Fragment() {
             reviewModeEditButton.visibility = View.GONE
 
             // Set bottom navigation
-            if (state.bottomNavItems.isNotEmpty()) {
+            if (state.bottomNavItem != null) {
               bottomNavContainerFrame.visibility = View.VISIBLE
               NavigationViewHolder(bottomNavContainerFrame)
-                .bind(state.bottomNavItems.single().questionnaireNavigationUIState)
+                .bind(state.bottomNavItem.questionnaireNavigationUIState)
             } else {
               bottomNavContainerFrame.visibility = View.GONE
             }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireNavigationViewUIState.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireNavigationViewUIState.kt
index c33a25785d..60bd9e1c7b 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireNavigationViewUIState.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireNavigationViewUIState.kt
@@ -16,11 +16,11 @@
 
 package com.google.android.fhir.datacapture
 
-sealed class QuestionnaireNavigationViewUIState(val isShown: Boolean, val isEnabled: Boolean) {
-  data object Hidden : QuestionnaireNavigationViewUIState(isShown = false, isEnabled = false)
+sealed interface QuestionnaireNavigationViewUIState {
+  data object Hidden : QuestionnaireNavigationViewUIState
 
   data class Enabled(val labelText: String? = null, val onClickAction: () -> Unit) :
-    QuestionnaireNavigationViewUIState(isShown = true, isEnabled = true)
+    QuestionnaireNavigationViewUIState
 }
 
 data class QuestionnaireNavigationUIState(
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
index 95d75b8460..fbf425a8bc 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
@@ -593,7 +593,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
           QuestionnaireState(
             items = emptyList(),
             displayMode = DisplayMode.InitMode,
-            bottomNavItems = emptyList(),
+            bottomNavItem = null,
           ),
       )
 
@@ -743,13 +743,12 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
               QuestionnaireNavigationViewUIState.Hidden
             },
         )
-      val bottomNavigationItems =
-        listOf(QuestionnaireAdapterItem.Navigation(bottomNavigationViewState))
+      val bottomNavigation = QuestionnaireAdapterItem.Navigation(bottomNavigationViewState)
 
       return QuestionnaireState(
         items =
           if (shouldSetNavigationInLongScroll) {
-            questionnaireItemViewItems + bottomNavigationItems
+            questionnaireItemViewItems + bottomNavigation
           } else {
             questionnaireItemViewItems
           },
@@ -758,8 +757,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
             showEditButton = !isReadOnly,
             showNavAsScroll = shouldSetNavigationInLongScroll,
           ),
-        bottomNavItems =
-          if (!shouldSetNavigationInLongScroll) bottomNavigationItems else emptyList(),
+        bottomNavItem = if (!shouldSetNavigationInLongScroll) bottomNavigation else null,
       )
     }
 
@@ -833,18 +831,17 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
             QuestionnaireNavigationViewUIState.Hidden
           },
       )
-    val bottomNavigationItems =
-      listOf(QuestionnaireAdapterItem.Navigation(bottomNavigationUiViewState))
+    val bottomNavigation = QuestionnaireAdapterItem.Navigation(bottomNavigationUiViewState)
 
     return QuestionnaireState(
       items =
         if (shouldSetNavigationInLongScroll) {
-          questionnaireItemViewItems + bottomNavigationItems
+          questionnaireItemViewItems + bottomNavigation
         } else {
           questionnaireItemViewItems
         },
       displayMode = DisplayMode.EditMode(questionnairePagination, shouldSetNavigationInLongScroll),
-      bottomNavItems = if (!shouldSetNavigationInLongScroll) bottomNavigationItems else emptyList(),
+      bottomNavItem = if (!shouldSetNavigationInLongScroll) bottomNavigation else null,
     )
   }
 
@@ -1136,7 +1133,7 @@ typealias ItemToParentMap = MutableMap<QuestionnaireItemComponent, Questionnaire
 internal data class QuestionnaireState(
   val items: List<QuestionnaireAdapterItem>,
   val displayMode: DisplayMode,
-  val bottomNavItems: List<QuestionnaireAdapterItem.Navigation>,
+  val bottomNavItem: QuestionnaireAdapterItem.Navigation?,
 )
 
 internal sealed class DisplayMode {
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
index f4de30897b..e31854a0af 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
@@ -997,8 +997,8 @@ class QuestionnaireViewModelTest {
             """
         .trimIndent()
 
-    state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, questionnaireString)
-    state.set(EXTRA_QUESTIONNAIRE_RESPONSE_JSON_STRING, questionnaireResponseString)
+    state[EXTRA_QUESTIONNAIRE_JSON_STRING] = questionnaireString
+    state[EXTRA_QUESTIONNAIRE_RESPONSE_JSON_STRING] = questionnaireResponseString
     val viewModel = QuestionnaireViewModel(context, state)
     runTest {
       val value = viewModel.getQuestionnaireResponse()
@@ -1125,8 +1125,8 @@ class QuestionnaireViewModelTest {
             """
         .trimIndent()
 
-    state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, questionnaireString)
-    state.set(EXTRA_QUESTIONNAIRE_RESPONSE_JSON_STRING, questionnaireResponseString)
+    state[EXTRA_QUESTIONNAIRE_JSON_STRING] = questionnaireString
+    state[EXTRA_QUESTIONNAIRE_RESPONSE_JSON_STRING] = questionnaireResponseString
     val viewModel = QuestionnaireViewModel(context, state)
     runTest {
       val value = viewModel.getQuestionnaireResponse()
@@ -1321,7 +1321,7 @@ class QuestionnaireViewModelTest {
       }
 
     val serializedQuestionnaire = printer.encodeResourceToString(questionnaire)
-    state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, serializedQuestionnaire)
+    state[EXTRA_QUESTIONNAIRE_JSON_STRING] = serializedQuestionnaire
 
     val viewModel = QuestionnaireViewModel(context, state)
 
@@ -1346,7 +1346,7 @@ class QuestionnaireViewModelTest {
         )
       }
     val serializedQuestionnaire = printer.encodeResourceToString(questionnaire)
-    state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, serializedQuestionnaire)
+    state[EXTRA_QUESTIONNAIRE_JSON_STRING] = serializedQuestionnaire
 
     val viewModel = QuestionnaireViewModel(context, state)
     viewModel.runViewModelBlocking {
@@ -1987,11 +1987,8 @@ class QuestionnaireViewModelTest {
         )
 
       assertThat(
-          questionnaireState.bottomNavItems
-            .single()
-            .questionnaireNavigationUIState
-            .navReview
-            .isShown,
+          questionnaireState.bottomNavItem!!.questionnaireNavigationUIState.navReview
+            is QuestionnaireNavigationViewUIState.Enabled,
         )
         .isTrue()
     }
@@ -2240,11 +2237,8 @@ class QuestionnaireViewModelTest {
           ),
         )
       assertThat(
-          questionnaireState.bottomNavItems
-            .single()
-            .questionnaireNavigationUIState
-            .navSubmit
-            .isShown,
+          questionnaireState.bottomNavItem!!.questionnaireNavigationUIState.navSubmit
+            is QuestionnaireNavigationViewUIState.Enabled,
         )
         .isTrue()
     }
@@ -2360,11 +2354,8 @@ class QuestionnaireViewModelTest {
           ),
         )
       assertThat(
-          questionnaireState1.bottomNavItems
-            .single()
-            .questionnaireNavigationUIState
-            .navSubmit
-            .isShown,
+          questionnaireState1.bottomNavItem!!.questionnaireNavigationUIState.navSubmit
+            is QuestionnaireNavigationViewUIState.Enabled,
         )
         .isTrue()
 
@@ -2382,11 +2373,8 @@ class QuestionnaireViewModelTest {
           ),
         )
       assertThat(
-          questionnaireState2.bottomNavItems
-            .single()
-            .questionnaireNavigationUIState
-            .navSubmit
-            .isShown,
+          questionnaireState2.bottomNavItem!!.questionnaireNavigationUIState.navSubmit
+            is QuestionnaireNavigationViewUIState.Enabled,
         )
         .isTrue()
     }
@@ -2414,13 +2402,10 @@ class QuestionnaireViewModelTest {
       val viewModel = createQuestionnaireViewModel(questionnaire, enableReviewPage = false)
       val questionnaireState = viewModel.questionnaireStateFlow.first()
       assertThat(
-          questionnaireState.bottomNavItems
-            .single()
-            .questionnaireNavigationUIState
-            .navReview
-            .isShown,
+          questionnaireState.bottomNavItem!!.questionnaireNavigationUIState.navReview
+            is QuestionnaireNavigationViewUIState.Hidden,
         )
-        .isFalse()
+        .isTrue()
     }
   }
 
@@ -2445,13 +2430,10 @@ class QuestionnaireViewModelTest {
         )
       val questionnaireState = viewModel.questionnaireStateFlow.first()
       assertThat(
-          questionnaireState.bottomNavItems
-            .single()
-            .questionnaireNavigationUIState
-            .navReview
-            .isShown,
+          questionnaireState.bottomNavItem!!.questionnaireNavigationUIState.navReview
+            is QuestionnaireNavigationViewUIState.Hidden,
         )
-        .isFalse()
+        .isTrue()
     }
   }
 
@@ -2471,11 +2453,8 @@ class QuestionnaireViewModelTest {
       val viewModel = createQuestionnaireViewModel(questionnaire, enableReviewPage = true)
       val questionnaireState = viewModel.questionnaireStateFlow.first()
       assertThat(
-          questionnaireState.bottomNavItems
-            .single()
-            .questionnaireNavigationUIState
-            .navReview
-            .isShown,
+          questionnaireState.bottomNavItem!!.questionnaireNavigationUIState.navReview
+            is QuestionnaireNavigationViewUIState.Enabled,
         )
         .isTrue()
     }
@@ -2580,13 +2559,11 @@ class QuestionnaireViewModelTest {
       viewModel.runViewModelBlocking {
         viewModel.goToNextPage()
         assertThat(
-            viewModel.questionnaireStateFlow.value.bottomNavItems
-              .single()
+            viewModel.questionnaireStateFlow.value.bottomNavItem!!
               .questionnaireNavigationUIState
-              .navReview
-              .isShown,
+              .navReview is QuestionnaireNavigationViewUIState.Hidden,
           )
-          .isFalse()
+          .isTrue()
       }
     }
 
@@ -2629,13 +2606,11 @@ class QuestionnaireViewModelTest {
       val viewModel = createQuestionnaireViewModel(questionnaire, enableReviewPage = false)
       viewModel.runViewModelBlocking {
         assertThat(
-            viewModel.questionnaireStateFlow.value.bottomNavItems
-              .single()
+            viewModel.questionnaireStateFlow.value.bottomNavItem!!
               .questionnaireNavigationUIState
-              .navReview
-              .isShown,
+              .navReview is QuestionnaireNavigationViewUIState.Hidden,
           )
-          .isFalse()
+          .isTrue()
       }
     }
 
@@ -2678,11 +2653,9 @@ class QuestionnaireViewModelTest {
       viewModel.runViewModelBlocking {
         viewModel.goToNextPage()
         assertThat(
-            viewModel.questionnaireStateFlow.value.bottomNavItems
-              .single()
+            viewModel.questionnaireStateFlow.value.bottomNavItem!!
               .questionnaireNavigationUIState
-              .navReview
-              .isShown,
+              .navReview is QuestionnaireNavigationViewUIState.Enabled,
           )
           .isTrue()
       }
@@ -2727,11 +2700,9 @@ class QuestionnaireViewModelTest {
       val viewModel = createQuestionnaireViewModel(questionnaire, enableReviewPage = true)
       viewModel.runViewModelBlocking {
         assertThat(
-            viewModel.questionnaireStateFlow.value.bottomNavItems
-              .single()
+            viewModel.questionnaireStateFlow.value.bottomNavItem!!
               .questionnaireNavigationUIState
-              .navReview
-              .isShown,
+              .navReview is QuestionnaireNavigationViewUIState.Enabled,
           )
           .isTrue()
       }
@@ -2755,11 +2726,9 @@ class QuestionnaireViewModelTest {
       assertThat(
           viewModel.questionnaireStateFlow
             .first()
-            .bottomNavItems
-            .single()
+            .bottomNavItem!!
             .questionnaireNavigationUIState
-            .navReview
-            .isShown,
+            .navReview is QuestionnaireNavigationViewUIState.Enabled,
         )
         .isTrue()
     }
@@ -2795,7 +2764,7 @@ class QuestionnaireViewModelTest {
       Questionnaire().apply {
         id = "a-questionnaire"
         addItem(
-          Questionnaire.QuestionnaireItemComponent().apply {
+          QuestionnaireItemComponent().apply {
             linkId = "a-linkId"
             type = Questionnaire.QuestionnaireItemType.BOOLEAN
           },
@@ -2849,7 +2818,7 @@ class QuestionnaireViewModelTest {
       Questionnaire().apply {
         id = "a-questionnaire"
         addItem(
-          Questionnaire.QuestionnaireItemComponent().apply {
+          QuestionnaireItemComponent().apply {
             linkId = "a-linkId"
             type = Questionnaire.QuestionnaireItemType.BOOLEAN
           },
@@ -2889,13 +2858,11 @@ class QuestionnaireViewModelTest {
     assertThat(
         viewModel.questionnaireStateFlow
           .first()
-          .bottomNavItems
-          .single()
+          .bottomNavItem!!
           .questionnaireNavigationUIState
-          .navSubmit
-          .isShown,
+          .navSubmit is QuestionnaireNavigationViewUIState.Hidden,
       )
-      .isFalse()
+      .isTrue()
   }
 
   @Test
@@ -2914,11 +2881,9 @@ class QuestionnaireViewModelTest {
     assertThat(
         viewModel.questionnaireStateFlow
           .first()
-          .bottomNavItems
-          .single()
+          .bottomNavItem!!
           .questionnaireNavigationUIState
-          .navSubmit
-          .isShown,
+          .navSubmit is QuestionnaireNavigationViewUIState.Enabled,
       )
       .isTrue()
   }
@@ -2939,11 +2904,9 @@ class QuestionnaireViewModelTest {
     assertThat(
         viewModel.questionnaireStateFlow
           .first()
-          .bottomNavItems
-          .single()
+          .bottomNavItem!!
           .questionnaireNavigationUIState
-          .navSubmit
-          .isShown,
+          .navSubmit is QuestionnaireNavigationViewUIState.Enabled,
       )
       .isTrue()
   }
@@ -2970,13 +2933,11 @@ class QuestionnaireViewModelTest {
     assertThat(
         viewModel.questionnaireStateFlow
           .first()
-          .bottomNavItems
-          .single()
+          .bottomNavItem!!
           .questionnaireNavigationUIState
-          .navCancel
-          .isShown,
+          .navCancel is QuestionnaireNavigationViewUIState.Hidden,
       )
-      .isFalse()
+      .isTrue()
   }
 
   @Test
@@ -2995,11 +2956,9 @@ class QuestionnaireViewModelTest {
     assertThat(
         viewModel.questionnaireStateFlow
           .first()
-          .bottomNavItems
-          .single()
+          .bottomNavItem!!
           .questionnaireNavigationUIState
-          .navCancel
-          .isShown,
+          .navCancel is QuestionnaireNavigationViewUIState.Enabled,
       )
       .isTrue()
   }
@@ -3020,13 +2979,11 @@ class QuestionnaireViewModelTest {
     assertThat(
         viewModel.questionnaireStateFlow
           .first()
-          .bottomNavItems
-          .single()
+          .bottomNavItem!!
           .questionnaireNavigationUIState
-          .navCancel
-          .isShown,
+          .navCancel is QuestionnaireNavigationViewUIState.Hidden,
       )
-      .isFalse()
+      .isTrue()
   }
 
   @Test
@@ -3068,13 +3025,11 @@ class QuestionnaireViewModelTest {
       assertThat(
           viewModel.questionnaireStateFlow
             .first()
-            .bottomNavItems
-            .single()
+            .bottomNavItem!!
             .questionnaireNavigationUIState
-            .navCancel
-            .isShown,
+            .navCancel is QuestionnaireNavigationViewUIState.Hidden,
         )
-        .isFalse()
+        .isTrue()
     }
 
   @Test
@@ -3116,11 +3071,9 @@ class QuestionnaireViewModelTest {
       assertThat(
           viewModel.questionnaireStateFlow
             .first()
-            .bottomNavItems
-            .single()
+            .bottomNavItem!!
             .questionnaireNavigationUIState
-            .navCancel
-            .isShown,
+            .navCancel is QuestionnaireNavigationViewUIState.Enabled,
         )
         .isTrue()
     }
@@ -3164,13 +3117,11 @@ class QuestionnaireViewModelTest {
       assertThat(
           viewModel.questionnaireStateFlow
             .first()
-            .bottomNavItems
-            .single()
+            .bottomNavItem!!
             .questionnaireNavigationUIState
-            .navCancel
-            .isShown,
+            .navCancel is QuestionnaireNavigationViewUIState.Hidden,
         )
-        .isFalse()
+        .isTrue()
     }
   // ==================================================================== //
   //                                                                      //
@@ -3185,7 +3136,7 @@ class QuestionnaireViewModelTest {
         Questionnaire().apply {
           id = "a-questionnaire"
           addItem(
-            Questionnaire.QuestionnaireItemComponent().apply {
+            QuestionnaireItemComponent().apply {
               linkId = "a-linkId"
               type = Questionnaire.QuestionnaireItemType.BOOLEAN
             },
@@ -3193,11 +3144,15 @@ class QuestionnaireViewModelTest {
         }
       val viewModel = createQuestionnaireViewModel(questionnaire, showNavigationInLongScroll = true)
       val questionnaireState = viewModel.questionnaireStateFlow.first()
-      assertThat(questionnaireState.bottomNavItems.isEmpty()).isTrue()
+      assertThat(questionnaireState.bottomNavItem).isNull()
       assertThat(questionnaireState.items.last())
         .isInstanceOf(QuestionnaireAdapterItem.Navigation::class.java)
       val navigationItem = questionnaireState.items.last() as QuestionnaireAdapterItem.Navigation
-      assertThat(navigationItem.questionnaireNavigationUIState.navSubmit.isEnabled).isTrue()
+      assertThat(
+          navigationItem.questionnaireNavigationUIState.navSubmit
+            is QuestionnaireNavigationViewUIState.Enabled,
+        )
+        .isTrue()
     }
 
   fun `EXTRA_SHOW_NAVIGATION_IN_DEFAULT_LONG_SCROLL not setting should not add navigation item to questionnaireState items`() =
@@ -3206,7 +3161,7 @@ class QuestionnaireViewModelTest {
         Questionnaire().apply {
           id = "a-questionnaire"
           addItem(
-            Questionnaire.QuestionnaireItemComponent().apply {
+            QuestionnaireItemComponent().apply {
               linkId = "a-linkId"
               type = Questionnaire.QuestionnaireItemType.BOOLEAN
             },
@@ -3216,13 +3171,9 @@ class QuestionnaireViewModelTest {
       val questionnaireState = viewModel.questionnaireStateFlow.first()
       assertThat(questionnaireState.items.map { it::class.java })
         .doesNotContain(QuestionnaireAdapterItem.Navigation::class.java)
-      assertThat(questionnaireState.bottomNavItems.isNotEmpty()).isTrue()
       assertThat(
-          questionnaireState.bottomNavItems
-            .single()
-            .questionnaireNavigationUIState
-            .navSubmit
-            .isEnabled,
+          questionnaireState.bottomNavItem!!.questionnaireNavigationUIState.navSubmit
+            is QuestionnaireNavigationViewUIState.Enabled,
         )
         .isTrue()
     }
@@ -3399,7 +3350,7 @@ class QuestionnaireViewModelTest {
           },
         )
       }
-    state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, printer.encodeResourceToString(questionnaire))
+    state[EXTRA_QUESTIONNAIRE_JSON_STRING] = printer.encodeResourceToString(questionnaire)
 
     val viewModel = QuestionnaireViewModel(context, state)
 
@@ -3444,7 +3395,7 @@ class QuestionnaireViewModelTest {
           },
         )
       }
-    state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, printer.encodeResourceToString(questionnaire))
+    state[EXTRA_QUESTIONNAIRE_JSON_STRING] = printer.encodeResourceToString(questionnaire)
 
     val viewModel = QuestionnaireViewModel(context, state)
 
@@ -3504,7 +3455,7 @@ class QuestionnaireViewModelTest {
           },
         )
       }
-    state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, printer.encodeResourceToString(questionnaire))
+    state[EXTRA_QUESTIONNAIRE_JSON_STRING] = printer.encodeResourceToString(questionnaire)
 
     val questionnaireResponse =
       QuestionnaireResponse().apply {
@@ -3530,10 +3481,8 @@ class QuestionnaireViewModelTest {
           },
         )
       }
-    state.set(
-      EXTRA_QUESTIONNAIRE_RESPONSE_JSON_STRING,
-      printer.encodeResourceToString(questionnaireResponse),
-    )
+    state[EXTRA_QUESTIONNAIRE_RESPONSE_JSON_STRING] =
+      printer.encodeResourceToString(questionnaireResponse)
 
     val viewModel = QuestionnaireViewModel(context, state)
 
@@ -4087,8 +4036,8 @@ class QuestionnaireViewModelTest {
             """
         .trimIndent()
 
-    state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, questionnaireString)
-    state.set(EXTRA_QUESTIONNAIRE_RESPONSE_JSON_STRING, questionnaireResponseString)
+    state[EXTRA_QUESTIONNAIRE_JSON_STRING] = questionnaireString
+    state[EXTRA_QUESTIONNAIRE_RESPONSE_JSON_STRING] = questionnaireResponseString
     val viewModel = QuestionnaireViewModel(context, state)
     runTest {
       val value = viewModel.getQuestionnaireResponse()
@@ -4185,8 +4134,8 @@ class QuestionnaireViewModelTest {
       """
         .trimIndent()
 
-    state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, questionnaireString)
-    state.set(EXTRA_QUESTIONNAIRE_RESPONSE_JSON_STRING, questionnaireResponseString)
+    state[EXTRA_QUESTIONNAIRE_JSON_STRING] = questionnaireString
+    state[EXTRA_QUESTIONNAIRE_RESPONSE_JSON_STRING] = questionnaireResponseString
     val viewModel = QuestionnaireViewModel(context, state)
     viewModel.clearAllAnswers()
     runTest {
@@ -4828,11 +4777,9 @@ class QuestionnaireViewModelTest {
           },
         )
       }
-    state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, printer.encodeResourceToString(questionnaire))
-    state.set(
-      EXTRA_QUESTIONNAIRE_LAUNCH_CONTEXT_MAP,
-      mapOf("patient" to printer.encodeResourceToString(patient)),
-    )
+    state[EXTRA_QUESTIONNAIRE_JSON_STRING] = printer.encodeResourceToString(questionnaire)
+    state[EXTRA_QUESTIONNAIRE_LAUNCH_CONTEXT_MAP] =
+      mapOf("patient" to printer.encodeResourceToString(patient))
 
     val viewModel = QuestionnaireViewModel(context, state)
     viewModel.runViewModelBlocking {
@@ -4886,7 +4833,7 @@ class QuestionnaireViewModelTest {
             },
           )
         }
-      state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, printer.encodeResourceToString(questionnaire))
+      state[EXTRA_QUESTIONNAIRE_JSON_STRING] = printer.encodeResourceToString(questionnaire)
 
       val viewModel = QuestionnaireViewModel(context, state)
       viewModel.runViewModelBlocking {
@@ -4930,7 +4877,7 @@ class QuestionnaireViewModelTest {
           },
         )
       }
-    state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, printer.encodeResourceToString(questionnaire))
+    state[EXTRA_QUESTIONNAIRE_JSON_STRING] = printer.encodeResourceToString(questionnaire)
     val viewModel = QuestionnaireViewModel(context, state)
     val exception =
       assertThrows(IllegalStateException::class.java) {
@@ -4987,7 +4934,7 @@ class QuestionnaireViewModelTest {
           )
         }
 
-      state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, printer.encodeResourceToString(questionnaire))
+      state[EXTRA_QUESTIONNAIRE_JSON_STRING] = printer.encodeResourceToString(questionnaire)
       val viewModel = QuestionnaireViewModel(context, state)
 
       viewModel.runViewModelBlocking {
@@ -5039,7 +4986,7 @@ class QuestionnaireViewModelTest {
           )
         }
 
-      state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, printer.encodeResourceToString(questionnaire))
+      state[EXTRA_QUESTIONNAIRE_JSON_STRING] = printer.encodeResourceToString(questionnaire)
       val viewModel = QuestionnaireViewModel(context, state)
 
       viewModel.runViewModelBlocking {
@@ -5091,7 +5038,7 @@ class QuestionnaireViewModelTest {
           )
         }
 
-      state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, printer.encodeResourceToString(questionnaire))
+      state[EXTRA_QUESTIONNAIRE_JSON_STRING] = printer.encodeResourceToString(questionnaire)
       val viewModel = QuestionnaireViewModel(context, state)
 
       viewModel.runViewModelBlocking {
@@ -5142,7 +5089,7 @@ class QuestionnaireViewModelTest {
           )
         }
 
-      state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, printer.encodeResourceToString(questionnaire))
+      state[EXTRA_QUESTIONNAIRE_JSON_STRING] = printer.encodeResourceToString(questionnaire)
       val viewModel = QuestionnaireViewModel(context, state)
 
       viewModel.runViewModelBlocking {
@@ -6883,7 +6830,7 @@ class QuestionnaireViewModelTest {
           },
         )
       }
-    state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, printer.encodeResourceToString(questionnaire))
+    state[EXTRA_QUESTIONNAIRE_JSON_STRING] = printer.encodeResourceToString(questionnaire)
 
     val viewModel = QuestionnaireViewModel(context, state)
     viewModel.runViewModelBlocking {
@@ -6933,7 +6880,7 @@ class QuestionnaireViewModelTest {
             },
           )
         }
-      state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, printer.encodeResourceToString(questionnaire))
+      state[EXTRA_QUESTIONNAIRE_JSON_STRING] = printer.encodeResourceToString(questionnaire)
 
       val viewModel = QuestionnaireViewModel(context, state)
       viewModel.runViewModelBlocking {
@@ -6988,7 +6935,7 @@ class QuestionnaireViewModelTest {
             },
           )
         }
-      state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, printer.encodeResourceToString(questionnaire))
+      state[EXTRA_QUESTIONNAIRE_JSON_STRING] = printer.encodeResourceToString(questionnaire)
 
       val viewModel = QuestionnaireViewModel(context, state)
       viewModel.runViewModelBlocking {
@@ -7043,7 +6990,7 @@ class QuestionnaireViewModelTest {
             },
           )
         }
-      state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, printer.encodeResourceToString(questionnaire))
+      state[EXTRA_QUESTIONNAIRE_JSON_STRING] = printer.encodeResourceToString(questionnaire)
 
       val viewModel = QuestionnaireViewModel(context, state)
       viewModel.runViewModelBlocking {
@@ -7170,10 +7117,8 @@ class QuestionnaireViewModelTest {
       }
     }
 
-    state.set(
-      EXTRA_QUESTIONNAIRE_JSON_STRING,
-      printer.encodeResourceToString(questionnaire(emptyList())),
-    )
+    state[EXTRA_QUESTIONNAIRE_JSON_STRING] =
+      printer.encodeResourceToString(questionnaire(emptyList()))
 
     // empty initial value
     var viewModel = QuestionnaireViewModel(context, state)
@@ -7187,16 +7132,14 @@ class QuestionnaireViewModelTest {
     }
 
     // initial value is set to false
-    state.set(
-      EXTRA_QUESTIONNAIRE_JSON_STRING,
+    state[EXTRA_QUESTIONNAIRE_JSON_STRING] =
       printer.encodeResourceToString(
         questionnaire(
           listOf(
             Questionnaire.QuestionnaireItemInitialComponent().apply { value = BooleanType(false) },
           ),
         ),
-      ),
-    )
+      )
 
     viewModel = QuestionnaireViewModel(context, state)
     var enabledDisplayItems: List<QuestionnaireItemComponent>
@@ -7211,16 +7154,14 @@ class QuestionnaireViewModelTest {
     }
 
     // initial value is set to true
-    state.set(
-      EXTRA_QUESTIONNAIRE_JSON_STRING,
+    state[EXTRA_QUESTIONNAIRE_JSON_STRING] =
       printer.encodeResourceToString(
         questionnaire(
           listOf(
             Questionnaire.QuestionnaireItemInitialComponent().apply { value = BooleanType(true) },
           ),
         ),
-      ),
-    )
+      )
 
     viewModel = QuestionnaireViewModel(context, state)
     viewModel.runViewModelBlocking {
@@ -7274,9 +7215,9 @@ class QuestionnaireViewModelTest {
 
       val job =
         this.launch {
-          viewModel.questionnaireStateFlow.collect {
+          viewModel.questionnaireStateFlow.collect { questionnaireState ->
             descriptionResponseItem =
-              it.items
+              questionnaireState.items
                 .find { it.asQuestion().questionnaireItem.linkId == "a-description" }!!
                 .asQuestion()
             this@launch.cancel()
@@ -7381,20 +7322,18 @@ class QuestionnaireViewModelTest {
     showCancelButton: Boolean? = null,
     showNavigationInLongScroll: Boolean = false,
   ): QuestionnaireViewModel {
-    state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, printer.encodeResourceToString(questionnaire))
+    state[EXTRA_QUESTIONNAIRE_JSON_STRING] = printer.encodeResourceToString(questionnaire)
 
     questionnaireResponse?.let {
-      state.set(
-        EXTRA_QUESTIONNAIRE_RESPONSE_JSON_STRING,
-        printer.encodeResourceToString(questionnaireResponse),
-      )
+      state[EXTRA_QUESTIONNAIRE_RESPONSE_JSON_STRING] =
+        printer.encodeResourceToString(questionnaireResponse)
     }
-    enableReviewPage.let { state.set(EXTRA_ENABLE_REVIEW_PAGE, it) }
-    showReviewPageFirst.let { state.set(EXTRA_SHOW_REVIEW_PAGE_FIRST, it) }
-    readOnlyMode.let { state.set(EXTRA_READ_ONLY, it) }
-    showSubmitButton?.let { state.set(EXTRA_SHOW_SUBMIT_BUTTON, it) }
-    showCancelButton?.let { state.set(EXTRA_SHOW_CANCEL_BUTTON, it) }
-    showNavigationInLongScroll.let { state.set(EXTRA_SHOW_NAVIGATION_IN_DEFAULT_LONG_SCROLL, it) }
+    enableReviewPage.let { state[EXTRA_ENABLE_REVIEW_PAGE] = it }
+    showReviewPageFirst.let { state[EXTRA_SHOW_REVIEW_PAGE_FIRST] = it }
+    readOnlyMode.let { state[EXTRA_READ_ONLY] = it }
+    showSubmitButton?.let { state[EXTRA_SHOW_SUBMIT_BUTTON] = it }
+    showCancelButton?.let { state[EXTRA_SHOW_CANCEL_BUTTON] = it }
+    showNavigationInLongScroll.let { state[EXTRA_SHOW_NAVIGATION_IN_DEFAULT_LONG_SCROLL] = it }
 
     return QuestionnaireViewModel(context, state)
   }

From cd6268ead762cff55665d656a4d7cc69680ee770 Mon Sep 17 00:00:00 2001
From: FikriMilano <fikrimilano1@gmail.com>
Date: Thu, 22 Aug 2024 23:02:49 +0700
Subject: [PATCH 082/126] Add missing response items to repeated group child
 items (#2657)

* Add missing response items to repeated group child items

* Update kdoc

* spotless
---
 .../datacapture/QuestionnaireViewModel.kt     |  15 +-
 .../datacapture/QuestionnaireViewModelTest.kt | 135 ++++++++++++++++++
 2 files changed, 147 insertions(+), 3 deletions(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
index fbf425a8bc..35ca593755 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
@@ -419,10 +419,11 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
    * Adds empty [QuestionnaireResponseItemComponent]s to `responseItems` so that each
    * [QuestionnaireItemComponent] in `questionnaireItems` has at least one corresponding
    * [QuestionnaireResponseItemComponent]. This is because user-provided [QuestionnaireResponse]
-   * might not contain answers to unanswered or disabled questions. Note : this only applies to
-   * [QuestionnaireItemComponent]s nested under a group.
+   * might not contain answers to unanswered or disabled questions. This function should only be
+   * used for unpacked questionnaire.
    */
-  private fun addMissingResponseItems(
+  @VisibleForTesting
+  internal fun addMissingResponseItems(
     questionnaireItems: List<QuestionnaireItemComponent>,
     responseItems: MutableList<QuestionnaireResponseItemComponent>,
   ) {
@@ -446,6 +447,14 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
             responseItems = responseItemMap[it.linkId]!!.single().item,
           )
         }
+        if (it.type == Questionnaire.QuestionnaireItemType.GROUP && it.repeats) {
+          responseItemMap[it.linkId]!!.forEach { rItem ->
+            addMissingResponseItems(
+              questionnaireItems = it.item,
+              responseItems = rItem.item,
+            )
+          }
+        }
         responseItems.addAll(responseItemMap[it.linkId]!!)
       }
     }
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
index e31854a0af..e644e4c6d6 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
@@ -1138,6 +1138,141 @@ class QuestionnaireViewModelTest {
     }
   }
 
+  @Test
+  fun `should add missing response item inside a repeated group`() {
+    val questionnaireString =
+      """
+          {
+            "resourceType": "Questionnaire",
+            "item": [
+              {
+                "linkId": "1",
+                "type": "group",
+                "text": "Repeated Group",
+                "repeats": true,
+                "item": [
+                  {
+                    "linkId": "1-1",
+                    "type": "date",
+                    "extension": [
+                      {
+                        "url": "http://hl7.org/fhir/StructureDefinition/entryFormat",
+                        "valueString": "yyyy-mm-dd"
+                      }
+                    ]
+                  },
+                  {
+                    "linkId": "1-2",
+                    "type": "boolean"
+                  }
+                ]
+              }
+            ]
+          }
+            """
+        .trimIndent()
+
+    val questionnaireResponseString =
+      """
+              {
+                "resourceType": "QuestionnaireResponse",
+                "item": [
+                  {
+                    "linkId": "1",
+                    "text": "Repeated Group",
+                    "item": [
+                      {
+                        "linkId": "1-1",
+                        "answer": [
+                          {
+                            "valueDate": "2023-06-14"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "linkId": "1",
+                    "text": "Repeated Group",
+                    "item": [
+                      {
+                        "linkId": "1-1",
+                        "answer": [
+                          {
+                            "valueDate": "2023-06-13"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              }
+            """
+        .trimIndent()
+
+    val expectedQuestionnaireResponseString =
+      """
+              {
+                "resourceType": "QuestionnaireResponse",
+                "item": [
+                  {
+                    "linkId": "1",
+                    "text": "Repeated Group",
+                    "item": [
+                      {
+                        "linkId": "1-1",
+                        "answer": [
+                          {
+                            "valueDate": "2023-06-14"
+                          }
+                        ]
+                      },
+                      {
+                        "linkId": "1-2"
+                      }
+                    ]
+                  },
+                  {
+                    "linkId": "1",
+                    "text": "Repeated Group",
+                    "item": [
+                      {
+                        "linkId": "1-1",
+                        "answer": [
+                          {
+                            "valueDate": "2023-06-13"
+                          }
+                        ]
+                      },
+                      {
+                        "linkId": "1-2"
+                      }
+                    ]
+                  }
+                ]
+              }
+            """
+        .trimIndent()
+
+    val questionnaire =
+      printer.parseResource(Questionnaire::class.java, questionnaireString) as Questionnaire
+
+    val response =
+      printer.parseResource(QuestionnaireResponse::class.java, questionnaireResponseString)
+        as QuestionnaireResponse
+
+    val expectedResponse =
+      printer.parseResource(QuestionnaireResponse::class.java, expectedQuestionnaireResponseString)
+        as QuestionnaireResponse
+
+    val viewModel = createQuestionnaireViewModel(questionnaire, response)
+
+    runTest {
+      viewModel.addMissingResponseItems(questionnaire.item, response.item)
+      assertResourceEquals(response, expectedResponse)
+    }
+  }
+
   // ==================================================================== //
   //                                                                      //
   //                       Questionnaire State Flow                       //

From e0cebb2400db45701f578e067d04e22e671f0d8d Mon Sep 17 00:00:00 2001
From: FikriMilano <fikrimilano1@gmail.com>
Date: Fri, 23 Aug 2024 00:45:11 +0700
Subject: [PATCH 083/126] Add flyover text as secondary dialog title (#2648)

* Add flyover text as secondary dialog title

* spotless

* Add doc
---
 .../views/factories/DialogSelectViewHolderFactory.kt         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt
index 123696c46f..92bc81c359 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt
@@ -92,7 +92,10 @@ internal object QuestionnaireItemDialogSelectViewHolderFactory :
           View.OnClickListener {
             val fragment =
               OptionSelectDialogFragment(
-                title = questionnaireItem.localizedTextSpanned ?: "",
+                // We use the question text for the dialog title. If there is no question text, we
+                // use flyover text as it is sometimes used in text fields instead of question text.
+                title = questionnaireItem.localizedTextSpanned
+                    ?: questionnaireItem.localizedFlyoverSpanned ?: "",
                 config = questionnaireItem.buildConfig(),
                 selectedOptions = selectedOptions,
               )

From 4f3bad553ccdf9d4dd158eaf94d2d89ef0241bb2 Mon Sep 17 00:00:00 2001
From: Madhuram Jajoo <madhuramjajoo10@gmail.com>
Date: Mon, 26 Aug 2024 15:11:07 +0530
Subject: [PATCH 084/126] Small changes for more code readability (#2656)

* Small changes for more code readability

* Updating more kdocs

* correcting kdoc format
---
 .../fhir/db/impl/dao/LocalChangeDaoTest.kt    |  4 +-
 .../com/google/android/fhir/db/Database.kt    | 12 ++--
 .../android/fhir/db/impl/DatabaseImpl.kt      | 36 ++++------
 .../fhir/db/impl/dao/LocalChangeDao.kt        | 72 ++++++++++++-------
 4 files changed, 71 insertions(+), 53 deletions(-)

diff --git a/engine/src/androidTest/java/com/google/android/fhir/db/impl/dao/LocalChangeDaoTest.kt b/engine/src/androidTest/java/com/google/android/fhir/db/impl/dao/LocalChangeDaoTest.kt
index d99c71d21d..b4280911c0 100644
--- a/engine/src/androidTest/java/com/google/android/fhir/db/impl/dao/LocalChangeDaoTest.kt
+++ b/engine/src/androidTest/java/com/google/android/fhir/db/impl/dao/LocalChangeDaoTest.kt
@@ -296,7 +296,7 @@ class LocalChangeDaoTest {
     localChangeDao.updateResourceIdAndReferences(
       resourceUuid = patientResourceUuid,
       oldResource = patient,
-      updatedResource = updatedPatient,
+      updatedResourceId = updatedPatient.logicalId,
     )
 
     // assert that Patient's new ID is reflected in the Patient Resource Change
@@ -387,7 +387,7 @@ class LocalChangeDaoTest {
         localChangeDao.updateResourceIdAndReferences(
           patientResourceUuid,
           oldResource = localPatient,
-          updatedResource = updatedLocalPatient,
+          updatedResourceId = updatedLocalPatient.logicalId,
         )
       assertThat(updatedReferences.size).isEqualTo(countAboveLimit)
     }
diff --git a/engine/src/main/java/com/google/android/fhir/db/Database.kt b/engine/src/main/java/com/google/android/fhir/db/Database.kt
index 251bf21b6c..2c72e0d401 100644
--- a/engine/src/main/java/com/google/android/fhir/db/Database.kt
+++ b/engine/src/main/java/com/google/android/fhir/db/Database.kt
@@ -125,11 +125,13 @@ internal interface Database {
   suspend fun deleteUpdates(resources: List<Resource>)
 
   /**
-   * Updates the [ResourceEntity.serializedResource] and [ResourceEntity.resourceId] corresponding
-   * to the updatedResource. Updates all the [LocalChangeEntity] for this updated resource as well
-   * as all the [LocalChangeEntity] referring to this resource in their [LocalChangeEntity.payload]
-   * Updates the [ResourceEntity.serializedResource] for all the resources which refer to this
-   * updated resource.
+   * Updates the existing resource identified by [currentResourceId] with the [updatedResource],
+   * ensuring all associated references in the database are also updated accordingly.
+   *
+   * Implementations of this function should perform the following steps within a transaction:
+   * 1. Update the corresponding [ResourceEntity].
+   * 2. Update associated [LocalChangeEntity] records.
+   * 3. Update the serialized representation of referring resources.
    */
   suspend fun updateResourceAndReferences(
     currentResourceId: String,
diff --git a/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt b/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
index 7bf364f4e9..cf8ab22c07 100644
--- a/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
@@ -290,11 +290,24 @@ internal class DatabaseImpl(
       val resourceUuid = currentResourceEntity.resourceUuid
       updateResourceEntity(resourceUuid, updatedResource)
 
+      /**
+       * Update LocalChange records and identify referring resources.
+       *
+       * We need to update LocalChange records first because they might contain references to the
+       * old resource ID that are not readily searchable or present in the latest version of the
+       * [ResourceEntity] itself. The [LocalChangeResourceReferenceEntity] table helps us identify
+       * these [LocalChangeEntity] records accurately.
+       *
+       * Once LocalChange records are updated, we can then safely update the corresponding
+       * ResourceEntity records to ensure data consistency. Hence, we obtain the
+       * [ResourceEntity.resourceUuid]s of the resources from the updated LocalChangeEntity records
+       * and use them in the next step.
+       */
       val uuidsOfReferringResources =
-        updateLocalChangeResourceIdAndReferences(
+        localChangeDao.updateResourceIdAndReferences(
           resourceUuid = resourceUuid,
           oldResource = oldResource,
-          updatedResource = updatedResource,
+          updatedResourceId = updatedResource.logicalId,
         )
 
       updateReferringResources(
@@ -312,25 +325,6 @@ internal class DatabaseImpl(
   private suspend fun updateResourceEntity(resourceUuid: UUID, updatedResource: Resource) =
     resourceDao.updateResourceWithUuid(resourceUuid, updatedResource)
 
-  /**
-   * Update the [LocalChange]s to reflect the change in the resource ID. This primarily includes
-   * modifying the [LocalChange.resourceId] for the changes of the affected resource. Also, update
-   * any references in the [LocalChange] which refer to the affected resource.
-   *
-   * The function returns a [List<[UUID]>] which corresponds to the [ResourceEntity.resourceUuid]
-   * which contain references to the affected resource.
-   */
-  private suspend fun updateLocalChangeResourceIdAndReferences(
-    resourceUuid: UUID,
-    oldResource: Resource,
-    updatedResource: Resource,
-  ) =
-    localChangeDao.updateResourceIdAndReferences(
-      resourceUuid = resourceUuid,
-      oldResource = oldResource,
-      updatedResource = updatedResource,
-    )
-
   /**
    * Update all [Resource] and their corresponding [ResourceEntity] which refer to the affected
    * resource. The update of the references in the [Resource] is also expected to reflect in the
diff --git a/engine/src/main/java/com/google/android/fhir/db/impl/dao/LocalChangeDao.kt b/engine/src/main/java/com/google/android/fhir/db/impl/dao/LocalChangeDao.kt
index a078f80b65..7201905aa9 100644
--- a/engine/src/main/java/com/google/android/fhir/db/impl/dao/LocalChangeDao.kt
+++ b/engine/src/main/java/com/google/android/fhir/db/impl/dao/LocalChangeDao.kt
@@ -328,14 +328,14 @@ internal abstract class LocalChangeDao {
 
   @Query(
     """
-        SELECT *
+        SELECT DISTINCT localChangeId
         FROM LocalChangeResourceReferenceEntity
         WHERE resourceReferenceValue = :resourceReferenceValue
     """,
   )
-  abstract suspend fun getLocalChangeReferencesWithValue(
+  abstract suspend fun getLocalChangeIdsWithReferenceValue(
     resourceReferenceValue: String,
-  ): List<LocalChangeResourceReferenceEntity>
+  ): List<Long>
 
   @Query(
     """
@@ -365,21 +365,29 @@ internal abstract class LocalChangeDao {
   )
 
   /**
-   * Updates the resource IDs of the [LocalChange] of the updated resource. Updates [LocalChange]
-   * with references to the updated resource.
+   * Updates the [LocalChangeEntity]s to reflect the change in the resource ID.
+   *
+   * This function performs the following steps:
+   * 1. Updates the `resourceId` in `LocalChange` entities directly related to the updated resource
+   * 2. Updates references within `LocalChange` payloads that point to the updated resource
+   *
+   * @param resourceUuid The UUID of the resource whose ID has changed
+   * @param oldResource The original resource with the old ID
+   * @param updatedResourceId The updated resource ID
+   * @return A list of UUIDs representing resources that reference the affected resource
    */
   suspend fun updateResourceIdAndReferences(
     resourceUuid: UUID,
     oldResource: Resource,
-    updatedResource: Resource,
+    updatedResourceId: String,
   ): List<UUID> {
     updateResourceIdInResourceLocalChanges(
       resourceUuid = resourceUuid,
-      updatedResourceId = updatedResource.logicalId,
+      updatedResourceId = updatedResourceId,
     )
     return updateReferencesInLocalChange(
       oldResource = oldResource,
-      updatedResource = updatedResource,
+      updatedResourceId = updatedResourceId,
     )
   }
 
@@ -396,37 +404,51 @@ internal abstract class LocalChangeDao {
     }
 
   /**
-   * Looks for [LocalChangeEntity] which refer to the updated resource through
-   * [LocalChangeResourceReferenceEntity]. For each [LocalChangeEntity] which contains reference to
-   * the updated resource in its payload, we update the payload with the reference and also update
-   * the corresponding [LocalChangeResourceReferenceEntity]. We delete the original
-   * [LocalChangeEntity] and create a new one with new [LocalChangeResourceReferenceEntity]s in its
-   * place. This method returns a list of the [ResourceEntity.resourceUuid] for all the resources
-   * whose [LocalChange] contained references to the oldResource
+   * Updates references within [LocalChangeEntity] payloads to reflect a resource ID change.
+   *
+   * This function performs the following steps:
+   * 1. Retrieves [LocalChangeEntity] records that reference the old resource.
+   * 2. For each [LocalChangeEntity]:
+   *     - Replaces the old resource reference with the new one in its payload.
+   *     - Creates updated [LocalChangeResourceReferenceEntity] objects.
+   *     - Deletes the original [LocalChangeEntity] record, which triggers a cascading delete in
+   *       [LocalChangeResourceReferenceEntity].
+   *     - Creates a new [LocalChangeEntity] record along with new
+   *       [LocalChangeResourceReferenceEntity] records.
+   *
+   * @param oldResource The original resource whose ID has been updated.
+   * @param updatedResource The updated resource with the new ID.
+   * @return A list of distinct resource UUIDs for all `LocalChangeEntity` records that referenced
+   *   the old resource.
    */
   private suspend fun updateReferencesInLocalChange(
     oldResource: Resource,
-    updatedResource: Resource,
+    updatedResourceId: String,
   ): List<UUID> {
     val oldReferenceValue = "${oldResource.resourceType.name}/${oldResource.logicalId}"
-    val updatedReferenceValue = "${updatedResource.resourceType.name}/${updatedResource.logicalId}"
-    val referringLocalChangeIds =
-      getLocalChangeReferencesWithValue(oldReferenceValue).map { it.localChangeId }.distinct()
-    val referringLocalChanges =
+    val updatedReferenceValue = "${oldResource.resourceType.name}/$updatedResourceId"
+
+    /**
+     * [getLocalChangeIdsWithReferenceValue] and [getLocalChanges] cannot be combined due to a
+     * limitation in Room. Fetching [LocalChangeEntity] in chunks is required to avoid the error
+     * documented in https://github.com/google/android-fhir/issues/2559.
+     */
+    val referringLocalChangeIds = getLocalChangeIdsWithReferenceValue(oldReferenceValue)
+    val localChangeEntitiesWithOldReferences =
       referringLocalChangeIds.chunked(SQLITE_LIMIT_MAX_VARIABLE_NUMBER).flatMap {
         getLocalChanges(it)
       }
 
-    referringLocalChanges.forEach { existingLocalChangeEntity ->
+    localChangeEntitiesWithOldReferences.forEach { localChangeEntityWithOldReferences ->
       val updatedLocalChangeEntity =
         replaceReferencesInLocalChangePayload(
-            localChange = existingLocalChangeEntity,
+            localChange = localChangeEntityWithOldReferences,
             oldReference = oldReferenceValue,
             updatedReference = updatedReferenceValue,
           )
           .copy(id = DEFAULT_ID_VALUE)
       val updatedLocalChangeReferences =
-        getReferencesForLocalChange(existingLocalChangeEntity.id).map {
+        getReferencesForLocalChange(localChangeEntityWithOldReferences.id).map {
           localChangeResourceReferenceEntity ->
           if (localChangeResourceReferenceEntity.resourceReferenceValue == oldReferenceValue) {
             LocalChangeResourceReferenceEntity(
@@ -442,10 +464,10 @@ internal abstract class LocalChangeDao {
             )
           }
         }
-      discardLocalChanges(existingLocalChangeEntity.id)
+      discardLocalChanges(localChangeEntityWithOldReferences.id)
       createLocalChange(updatedLocalChangeEntity, updatedLocalChangeReferences)
     }
-    return referringLocalChanges.map { it.resourceUuid }.distinct()
+    return localChangeEntitiesWithOldReferences.map { it.resourceUuid }.distinct()
   }
 
   private fun replaceReferencesInLocalChangePayload(

From 9a923af194407bca54c9e9195bc4e6dbe70dd19b Mon Sep 17 00:00:00 2001
From: FikriMilano <fikrimilano1@gmail.com>
Date: Tue, 27 Aug 2024 16:33:10 +0700
Subject: [PATCH 085/126] Add missing use of viewItem.questionText (#2665)

* Use questionnaireViewItem.questionText

* spotless
---
 .../contrib/views/barcode/BarCodeReaderViewHolderFactory.kt  | 3 +--
 .../views/factories/DialogSelectViewHolderFactory.kt         | 3 +--
 .../datacapture/views/factories/ReviewViewHolderFactory.kt   | 5 ++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/contrib/barcode/src/main/java/com/google/android/fhir/datacapture/contrib/views/barcode/BarCodeReaderViewHolderFactory.kt b/contrib/barcode/src/main/java/com/google/android/fhir/datacapture/contrib/views/barcode/BarCodeReaderViewHolderFactory.kt
index a37b545489..96a678b080 100644
--- a/contrib/barcode/src/main/java/com/google/android/fhir/datacapture/contrib/views/barcode/BarCodeReaderViewHolderFactory.kt
+++ b/contrib/barcode/src/main/java/com/google/android/fhir/datacapture/contrib/views/barcode/BarCodeReaderViewHolderFactory.kt
@@ -22,7 +22,6 @@ import android.widget.TextView
 import androidx.lifecycle.lifecycleScope
 import com.google.android.fhir.datacapture.contrib.views.barcode.mlkit.md.LiveBarcodeScanningFragment
 import com.google.android.fhir.datacapture.extensions.localizedPrefixSpanned
-import com.google.android.fhir.datacapture.extensions.localizedTextSpanned
 import com.google.android.fhir.datacapture.extensions.tryUnwrapContext
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolderDelegate
@@ -95,7 +94,7 @@ object BarCodeReaderViewHolderFactory :
         } else {
           prefixTextView.visibility = View.GONE
         }
-        textQuestion.text = questionnaireViewItem.questionnaireItem.localizedTextSpanned
+        textQuestion.text = questionnaireViewItem.questionText
         setInitial(questionnaireViewItem.answers.singleOrNull(), reScanView)
       }
 
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt
index 92bc81c359..85769b3679 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt
@@ -32,7 +32,6 @@ import com.google.android.fhir.datacapture.extensions.getRequiredOrOptionalText
 import com.google.android.fhir.datacapture.extensions.getValidationErrorMessage
 import com.google.android.fhir.datacapture.extensions.itemControl
 import com.google.android.fhir.datacapture.extensions.localizedFlyoverSpanned
-import com.google.android.fhir.datacapture.extensions.localizedTextSpanned
 import com.google.android.fhir.datacapture.extensions.tryUnwrapContext
 import com.google.android.fhir.datacapture.validation.ValidationResult
 import com.google.android.fhir.datacapture.views.HeaderView
@@ -94,7 +93,7 @@ internal object QuestionnaireItemDialogSelectViewHolderFactory :
               OptionSelectDialogFragment(
                 // We use the question text for the dialog title. If there is no question text, we
                 // use flyover text as it is sometimes used in text fields instead of question text.
-                title = questionnaireItem.localizedTextSpanned
+                title = questionnaireViewItem.questionText
                     ?: questionnaireItem.localizedFlyoverSpanned ?: "",
                 config = questionnaireItem.buildConfig(),
                 selectedOptions = selectedOptions,
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt
index 32a2de35c3..a6621b2aba 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 Google LLC
+ * Copyright 2022-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.
@@ -26,7 +26,6 @@ import com.google.android.fhir.datacapture.extensions.getHeaderViewVisibility
 import com.google.android.fhir.datacapture.extensions.getLocalizedInstructionsSpanned
 import com.google.android.fhir.datacapture.extensions.localizedFlyoverSpanned
 import com.google.android.fhir.datacapture.extensions.localizedPrefixSpanned
-import com.google.android.fhir.datacapture.extensions.localizedTextSpanned
 import com.google.android.fhir.datacapture.extensions.updateTextAndVisibility
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
@@ -66,7 +65,7 @@ internal object ReviewViewHolderFactory : QuestionnaireItemViewHolderFactory(R.l
           questionnaireViewItem.questionnaireItem.localizedPrefixSpanned,
         )
         question.updateTextAndVisibility(
-          questionnaireViewItem.questionnaireItem.localizedTextSpanned,
+          questionnaireViewItem.questionText,
         )
         hint.updateTextAndVisibility(
           questionnaireViewItem.enabledDisplayItems.getLocalizedInstructionsSpanned(),

From a0dab66c20e9c3056842174e6ec2db9989a685ad Mon Sep 17 00:00:00 2001
From: Jing Tang <jingtang@google.com>
Date: Wed, 28 Aug 2024 15:02:38 +0100
Subject: [PATCH 086/126] Load resources with url and optional version (#2666)

* Load resources with url and optional version

* Add back deprecated functions for build
---
 .../fhir/knowledge/KnowledgeManager.kt        | 61 +++++++++++++++
 .../fhir/knowledge/db/dao/KnowledgeDao.kt     | 12 +++
 .../fhir/knowledge/KnowledgeManagerTest.kt    | 76 +++++++++++--------
 3 files changed, 117 insertions(+), 32 deletions(-)

diff --git a/knowledge/src/main/java/com/google/android/fhir/knowledge/KnowledgeManager.kt b/knowledge/src/main/java/com/google/android/fhir/knowledge/KnowledgeManager.kt
index 3a3a956c6f..8066cda7d9 100644
--- a/knowledge/src/main/java/com/google/android/fhir/knowledge/KnowledgeManager.kt
+++ b/knowledge/src/main/java/com/google/android/fhir/knowledge/KnowledgeManager.kt
@@ -167,6 +167,7 @@ internal constructor(
   }
 
   /** Loads resources from IGs listed in dependencies. */
+  @Deprecated("Load resources using URLs only")
   suspend fun loadResources(
     resourceType: String,
     url: String? = null,
@@ -175,6 +176,7 @@ internal constructor(
     version: String? = null,
   ): Iterable<IBaseResource> {
     val resType = ResourceType.fromCode(resourceType)
+
     val resourceEntities =
       when {
         url != null && version != null ->
@@ -189,6 +191,65 @@ internal constructor(
     return resourceEntities.map { readMetadataResourceOrThrow(it.resourceFile)!! }
   }
 
+  /**
+   * Loads knowledge artifact by its canonical URL and an optional version.
+   *
+   * The version can either be passed as a parameter or as part of the URL (using pipe `|` to
+   * separate the URL and the version). For example, passing the URL
+   * `http://abc.xyz/fhir/Library|1.0.0` with no version is the same as passing the URL
+   * `http://abc.xyz/fhir/Library` and version `1.0.0`.
+   *
+   * However, if a version is specified both as a parameter and as part of the URL, the two must
+   * match.
+   *
+   * @throws IllegalArgumentException if the url contains more than one pipe `|`
+   * @throws IllegalArgumentException if the version specified in the URL and the explicit version
+   *   do not match
+   */
+  suspend fun loadResources(
+    url: String,
+    version: String? = null,
+  ): Iterable<IBaseResource> {
+    val (canonicalUrl, canonicalVersion) = canonicalizeUrlAndVersion(url, version ?: "")
+
+    val resourceEntities =
+      if (canonicalVersion == "") {
+        knowledgeDao.getResource(canonicalUrl)
+      } else {
+        listOfNotNull(knowledgeDao.getResource(canonicalUrl, canonicalVersion))
+      }
+    return resourceEntities.map { readMetadataResourceOrThrow(it.resourceFile) }
+  }
+
+  /**
+   * Canonicalizes the URL and version. It will extract the version as part of the URL separated by
+   * pipe `|`.
+   *
+   * For example, URL `http://abc.xyz/fhir/Library|1.0.0` will be canonicalized as URL
+   * `http://abc.xyz/fhir/Library` and version `1.0.0`.
+   *
+   * @throws IllegalArgumentException if the URL contains more than one pipe
+   * @throws IllegalArgumentException if the version specified in the URL and the explicit version
+   *   do not match
+   */
+  private fun canonicalizeUrlAndVersion(
+    url: String,
+    version: String,
+  ): Pair<String, String> {
+    if (!url.contains('|')) {
+      return Pair(url, version)
+    }
+
+    val parts = url.split('|')
+    require(parts.size == 2) { "URL $url contains too many parts separated by \"|\"" }
+
+    // If an explicit version is specified, it must match the one in the URL
+    require(version == "" || version == parts[1]) {
+      "Version specified in the URL $parts[1] and explicit version $version do not match"
+    }
+    return Pair(parts[0], parts[1])
+  }
+
   /** Deletes Implementation Guide, cleans up files. */
   suspend fun delete(vararg igDependencies: FhirNpmPackage) {
     igDependencies.forEach { igDependency ->
diff --git a/knowledge/src/main/java/com/google/android/fhir/knowledge/db/dao/KnowledgeDao.kt b/knowledge/src/main/java/com/google/android/fhir/knowledge/db/dao/KnowledgeDao.kt
index 204a39be50..c9d5cd3bd0 100644
--- a/knowledge/src/main/java/com/google/android/fhir/knowledge/db/dao/KnowledgeDao.kt
+++ b/knowledge/src/main/java/com/google/android/fhir/knowledge/db/dao/KnowledgeDao.kt
@@ -99,6 +99,7 @@ abstract class KnowledgeDao {
     url: String,
   ): ResourceMetadataEntity?
 
+  @Deprecated("Load resources using URLs")
   @Query(
     "SELECT * from ResourceMetadataEntity WHERE  resourceType = :resourceType AND name = :name",
   )
@@ -107,6 +108,17 @@ abstract class KnowledgeDao {
     name: String?,
   ): List<ResourceMetadataEntity>
 
+  @Query("SELECT * from ResourceMetadataEntity WHERE url = :url")
+  internal abstract suspend fun getResource(
+    url: String,
+  ): List<ResourceMetadataEntity>
+
+  @Query("SELECT * from ResourceMetadataEntity WHERE url = :url AND version = :version")
+  internal abstract suspend fun getResource(
+    url: String,
+    version: String,
+  ): ResourceMetadataEntity
+
   @Query(
     "SELECT * from ResourceMetadataEntity WHERE resourceMetadataId = :id",
   )
diff --git a/knowledge/src/test/java/com/google/android/fhir/knowledge/KnowledgeManagerTest.kt b/knowledge/src/test/java/com/google/android/fhir/knowledge/KnowledgeManagerTest.kt
index 48cdefd60f..c8a26d270e 100644
--- a/knowledge/src/test/java/com/google/android/fhir/knowledge/KnowledgeManagerTest.kt
+++ b/knowledge/src/test/java/com/google/android/fhir/knowledge/KnowledgeManagerTest.kt
@@ -99,20 +99,27 @@ internal class KnowledgeManagerTest {
   fun `imported entries are readable`() = runTest {
     knowledgeManager.import(fhirNpmPackage, dataFolder)
 
-    assertThat(knowledgeManager.loadResources(resourceType = "Library", name = "WHOCommon"))
-      .isNotNull()
-    assertThat(knowledgeManager.loadResources(resourceType = "Library", url = "FHIRCommon"))
-      .isNotNull()
-    assertThat(knowledgeManager.loadResources(resourceType = "Measure")).hasSize(1)
     assertThat(
         knowledgeManager.loadResources(
-          resourceType = "Measure",
+          url = "http://fhir.org/guides/who/anc-cds/Library/WHOCommon",
+          version = "0.3.0",
+        ),
+      )
+      .hasSize(1)
+    assertThat(
+        knowledgeManager.loadResources(
+          url = "http://fhir.org/guides/who/anc-cds/Library/FHIRCommon",
+          version = "0.3.0",
+        ),
+      )
+      .hasSize(1)
+    assertThat(
+        knowledgeManager.loadResources(
           url = "http://fhir.org/guides/who/anc-cds/Measure/ANCIND01",
+          version = "0.3.0",
         ),
       )
-      .isNotEmpty()
-    assertThat(knowledgeManager.loadResources(resourceType = "Measure", url = "Measure/ANCIND01"))
-      .isNotNull()
+      .hasSize(1)
   }
 
   @Test
@@ -130,14 +137,14 @@ internal class KnowledgeManagerTest {
       Library().apply {
         id = "Library/defaultA-A.1.0.0"
         name = "defaultA"
-        url = "www.exampleA.com"
+        url = "www.exampleA.com/Library/defaultA-A.1.0.0"
         version = "A.1.0.0"
       }
     val libraryANew =
       Library().apply {
         id = "Library/defaultA-A.1.0.1"
         name = "defaultA"
-        url = "www.exampleA.com"
+        url = "www.exampleA.com/Library/defaultA-A.1.0.1"
         version = "A.1.0.1"
       }
 
@@ -149,13 +156,13 @@ internal class KnowledgeManagerTest {
 
     val resourceA100 =
       knowledgeManager
-        .loadResources(resourceType = "Library", name = "defaultA", version = "A.1.0.0")
+        .loadResources(url = "www.exampleA.com/Library/defaultA-A.1.0.0", version = "A.1.0.0")
         .single() as Library
     assertThat(resourceA100.version).isEqualTo("A.1.0.0")
 
     val resourceA101 =
       knowledgeManager
-        .loadResources(resourceType = "Library", name = "defaultA", version = "A.1.0.1")
+        .loadResources(url = "www.exampleA.com/Library/defaultA-A.1.0.1", version = "A.1.0.1")
         .single() as Library
     assertThat(resourceA101.version.toString()).isEqualTo("A.1.0.1")
   }
@@ -163,36 +170,42 @@ internal class KnowledgeManagerTest {
   fun `installing from npmPackageManager`() = runTest {
     knowledgeManager.install(fhirNpmPackage)
 
-    assertThat(knowledgeManager.loadResources(resourceType = "Library", name = "WHOCommon"))
-      .isNotNull()
-    assertThat(knowledgeManager.loadResources(resourceType = "Library", url = "FHIRCommon"))
-      .isNotNull()
-    assertThat(knowledgeManager.loadResources(resourceType = "Measure")).hasSize(1)
     assertThat(
         knowledgeManager.loadResources(
-          resourceType = "Measure",
+          url = "http://fhir.org/guides/who/anc-cds/Library/WHOCommon",
+          version = "0.3.0",
+        ),
+      )
+      .hasSize(1)
+    assertThat(
+        knowledgeManager.loadResources(
+          url = "http://fhir.org/guides/who/anc-cds/Library/FHIRCommon",
+          version = "0.3.0",
+        ),
+      )
+      .hasSize(1)
+    assertThat(
+        knowledgeManager.loadResources(
           url = "http://fhir.org/guides/who/anc-cds/Measure/ANCIND01",
+          version = "0.3.0",
         ),
       )
-      .isNotEmpty()
-    assertThat(knowledgeManager.loadResources(resourceType = "Measure", url = "Measure/ANCIND01"))
-      .isNotNull()
+      .hasSize(1)
   }
 
   @Test
   fun `for different resources with URL loading by URL should be correct`() = runTest {
-    val commonUrl = "www.sample-url.com"
     val libraryWithSameUrl =
       Library().apply {
         id = "Library/lId"
         name = "LibraryName"
-        url = commonUrl
+        url = "www.sample-url.com/Library/lId"
       }
     val planDefinitionWithSameUrl =
       PlanDefinition().apply {
         id = "PlanDefinition/pdId"
         name = "PlanDefinitionName"
-        url = commonUrl
+        url = "www.sample-url.com/PlanDefinition/pdId"
       }
 
     knowledgeManager.index(writeToFile(libraryWithSameUrl))
@@ -202,30 +215,29 @@ internal class KnowledgeManagerTest {
     assertThat(resources).hasSize(2)
 
     val libraryLoadedByUrl =
-      knowledgeManager.loadResources(resourceType = "Library", url = commonUrl).single() as Library
+      knowledgeManager.loadResources(url = "www.sample-url.com/Library/lId").single() as Library
     assertThat(libraryLoadedByUrl.name.toString()).isEqualTo("LibraryName")
 
     val planDefinitionLoadedByUrl =
-      knowledgeManager.loadResources(resourceType = "PlanDefinition", url = commonUrl).single()
+      knowledgeManager.loadResources(url = "www.sample-url.com/PlanDefinition/pdId").single()
         as PlanDefinition
     assertThat(planDefinitionLoadedByUrl.name.toString()).isEqualTo("PlanDefinitionName")
   }
 
   @Test
   fun `for different resources with URL and Version loading by URL should be correct`() = runTest {
-    val commonUrl = "www.sample-url.com"
     val libraryWithSameUrl =
       Library().apply {
         id = "Library/lId"
         name = "LibraryName"
-        url = commonUrl
+        url = "www.sample-url.com/Library/lId"
         version = "0"
       }
     val planDefinitionWithSameUrl =
       PlanDefinition().apply {
         id = "PlanDefinition/pdId"
         name = "PlanDefinitionName"
-        url = commonUrl
+        url = "www.sample-url.com/PlanDefinition/pdId"
         version = "0"
       }
 
@@ -236,11 +248,11 @@ internal class KnowledgeManagerTest {
     assertThat(resources).hasSize(2)
 
     val libraryLoadedByUrl =
-      knowledgeManager.loadResources(resourceType = "Library", url = commonUrl).single() as Library
+      knowledgeManager.loadResources(url = "www.sample-url.com/Library/lId").single() as Library
     assertThat(libraryLoadedByUrl.name.toString()).isEqualTo("LibraryName")
 
     val planDefinitionLoadedByUrl =
-      knowledgeManager.loadResources(resourceType = "PlanDefinition", url = commonUrl).single()
+      knowledgeManager.loadResources(url = "www.sample-url.com/PlanDefinition/pdId").single()
         as PlanDefinition
     assertThat(planDefinitionLoadedByUrl.name.toString()).isEqualTo("PlanDefinitionName")
   }

From 2036be9f573d871141ed5e8cebe3eb86190147ac Mon Sep 17 00:00:00 2001
From: FikriMilano <fikrimilano1@gmail.com>
Date: Tue, 3 Sep 2024 17:25:30 +0700
Subject: [PATCH 087/126] Fix keyboard hiding bug (#2652)

* Fix keyboard hiding bug

* Update comment
---
 .../fhir/datacapture/views/OptionSelectDialogFragment.kt  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt
index 15ad260a81..cc1565af51 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt
@@ -107,12 +107,14 @@ internal class OptionSelectDialogFragment(
                 WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,
             )
             // Adjust the dialog after the keyboard is on so that OK-CANCEL buttons are visible.
-            // SOFT_INPUT_ADJUST_RESIZE is deprecated and the suggested alternative
-            // setDecorFitsSystemWindows is available api level 30 and above.
+            // Ideally SOFT_INPUT_ADJUST_RESIZE supposed to be used, but in some devices the
+            // keyboard immediately hide itself after being opened, that's why SOFT_INPUT_ADJUST_PAN
+            // is used instead. There's no issue with setDecorFitsSystemWindows and is only
+            // available for api level 30 and above.
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
               it.setDecorFitsSystemWindows(false)
             } else {
-              it.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
+              it.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN)
             }
           }
         }

From 8d64417674b005758191e8958d9c9b370c123563 Mon Sep 17 00:00:00 2001
From: FikriMilano <fikrimilano1@gmail.com>
Date: Wed, 4 Sep 2024 12:28:51 +0700
Subject: [PATCH 088/126] Add condition to not populate string value if it's
 empty (#2521)

* Add condition to not populate string value if it's empty

* Revert "Add condition to not populate string value if it's empty"

This reverts commit 6f652e1409b49c5de5fe840a6959824895c303df.

* Filter only non-empty text should be saved

* spotless

* Address review
---
 .../fhir/datacapture/views/OptionSelectDialogFragment.kt  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt
index cc1565af51..4fb0238ca0 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt
@@ -138,7 +138,13 @@ internal class OptionSelectDialogFragment(
         SelectedOptions(
           options = currentList.filterIsInstance<OptionSelectRow.Option>().map { it.option },
           otherOptions =
-            currentList.filterIsInstance<OptionSelectRow.OtherEditText>().map { it.currentText },
+            currentList
+              .filterIsInstance<OptionSelectRow.OtherEditText>()
+              .filter {
+                it.currentText.isNotEmpty()
+              } // Filters out empty answers when the user inputs nothing into a new option choice
+              // edit text field.
+              .map { it.currentText },
         ),
       )
     }

From 52c257ed85f8f8821ec263d32324b45ec7bdb198 Mon Sep 17 00:00:00 2001
From: Jing Tang <jingtang@google.com>
Date: Wed, 4 Sep 2024 12:51:23 +0100
Subject: [PATCH 089/126] Bump up knowledge manager version to beta01 (#2667)

* Bump up knowledge manager version to beta01

* Update api.md
---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 docs/use/api.md                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 89e5b6c34d..7b1e92f953 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -81,7 +81,7 @@ object Releases {
 
   object Knowledge : LibraryArtifact {
     override val artifactId = "knowledge"
-    override val version = "0.1.0-alpha03"
+    override val version = "0.1.0-beta01"
     override val name = "Android FHIR Knowledge Manager Library"
   }
 
diff --git a/docs/use/api.md b/docs/use/api.md
index d38c35816e..bf7e90c8f4 100644
--- a/docs/use/api.md
+++ b/docs/use/api.md
@@ -3,4 +3,4 @@
 * [Engine](api/engine/1.0.0/index.html)
 * [Data Capture](api/data-capture/1.1.0/index.html)
 * [Workflow](api/workflow/0.1.0-alpha04/index.html)
-* [Knowledge](api/knowledge/0.1.0-alpha03/index.html)
+* [Knowledge](api/knowledge/0.1.0-beta01/index.html)

From c1e6a956641f89123e0f043fa32ea06066150097 Mon Sep 17 00:00:00 2001
From: santosh-pingle <86107848+santosh-pingle@users.noreply.github.com>
Date: Wed, 4 Sep 2024 18:53:44 +0530
Subject: [PATCH 090/126] Per question custom style (#2636)

* per question custom style

* adding missing file.

* update default style.

* textAppearance support

* rename custom attributes.

* github documentation for custom style example.

* Address review comments.

* address review comment.

* update text format icon as component icon.

* code cleanup.

* Code refactoring and cleanup.

* custom style example with multiple question items.

* Address review comments.

* support prefix per question item custom style

* Revert dataconfig changes for custom style mapping.

* Address review comments.

* Address review comments.

* Address review comments.

* Address review comments.

* Address review comment.

---------

Co-authored-by: Santosh Pingle <spingle@google.com>
---
 .../component_per_question_custom_style.json  | 149 ++++++++++
 .../fhir/catalog/ComponentListViewModel.kt    |   6 +
 .../src/main/res/drawable/ic_location_on.xml  |   4 +-
 .../main/res/drawable/text_format_48dp.xml    |  15 +
 catalog/src/main/res/values-night/colors.xml  |  36 +++
 catalog/src/main/res/values/colors.xml        |  22 ++
 catalog/src/main/res/values/strings.xml       |   3 +
 catalog/src/main/res/values/styles.xml        | 171 ++++++++++-
 .../datacapture/extensions/MoreHeaderViews.kt |  38 +++
 .../extensions/MoreQuestionItemStyle.kt       | 267 ++++++++++++++++++
 .../MoreQuestionnaireItemComponents.kt        |  21 ++
 .../fhir/datacapture/views/GroupHeaderView.kt |   7 +
 .../fhir/datacapture/views/HeaderView.kt      |   7 +
 datacapture/src/main/res/values/attrs.xml     |  20 ++
 ...tomize-how-a-Questionnaire-is-displayed.md | 134 +++++++++
 15 files changed, 897 insertions(+), 3 deletions(-)
 create mode 100644 catalog/src/main/assets/component_per_question_custom_style.json
 create mode 100644 catalog/src/main/res/drawable/text_format_48dp.xml
 create mode 100644 catalog/src/main/res/values-night/colors.xml
 create mode 100644 datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionItemStyle.kt

diff --git a/catalog/src/main/assets/component_per_question_custom_style.json b/catalog/src/main/assets/component_per_question_custom_style.json
new file mode 100644
index 0000000000..2f2e8f3b86
--- /dev/null
+++ b/catalog/src/main/assets/component_per_question_custom_style.json
@@ -0,0 +1,149 @@
+{
+  "resourceType": "Questionnaire",
+  "item": [
+    {
+      "linkId": "1",
+      "text": "Custom style 1",
+      "type": "display",
+      "extension": [
+        {
+          "url": "https://github.com/google/android-fhir/tree/master/datacapture/android-style",
+          "extension": [
+            {
+              "url": "question_text_view",
+              "valueString": "CustomStyle_1"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "linkId": "2",
+      "text": "Custom style 2",
+      "type": "display",
+      "extension": [
+        {
+          "url": "https://github.com/google/android-fhir/tree/master/datacapture/android-style",
+          "extension": [
+            {
+              "url": "question_text_view",
+              "valueString": "CustomStyle_2"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "linkId": "3",
+      "text": "Custom style 3",
+      "type": "display",
+      "extension": [
+        {
+          "url": "https://github.com/google/android-fhir/tree/master/datacapture/android-style",
+          "extension": [
+            {
+              "url": "question_text_view",
+              "valueString": "CustomStyle_3"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "linkId": "4",
+      "text": "Custom style 4",
+      "type": "display",
+      "extension": [
+        {
+          "url": "https://github.com/google/android-fhir/tree/master/datacapture/android-style",
+          "extension": [
+            {
+              "url": "question_text_view",
+              "valueString": "CustomStyle_4"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "linkId": "5",
+      "text": "Custom style 5",
+      "type": "display",
+      "extension": [
+        {
+          "url": "https://github.com/google/android-fhir/tree/master/datacapture/android-style",
+          "extension": [
+            {
+              "url": "question_text_view",
+              "valueString": "CustomStyle_5"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "linkId": "6",
+      "text": "Custom style 6",
+      "type": "display",
+      "extension": [
+        {
+          "url": "https://github.com/google/android-fhir/tree/master/datacapture/android-style",
+          "extension": [
+            {
+              "url": "question_text_view",
+              "valueString": "CustomStyle_6"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "linkId": "7",
+      "text": "Custom style 7",
+      "type": "display",
+      "extension": [
+        {
+          "url": "https://github.com/google/android-fhir/tree/master/datacapture/android-style",
+          "extension": [
+            {
+              "url": "question_text_view",
+              "valueString": "CustomStyle_7"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "linkId": "8",
+      "text": "Custom style 8",
+      "type": "display",
+      "extension": [
+        {
+          "url": "https://github.com/google/android-fhir/tree/master/datacapture/android-style",
+          "extension": [
+            {
+              "url": "question_text_view",
+              "valueString": "CustomStyle_8"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "linkId": "9",
+      "text": "Custom style 9",
+      "type": "display",
+      "extension": [
+        {
+          "url": "https://github.com/google/android-fhir/tree/master/datacapture/android-style",
+          "extension": [
+            {
+              "url": "question_text_view",
+              "valueString": "CustomStyle_9"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/catalog/src/main/java/com/google/android/fhir/catalog/ComponentListViewModel.kt b/catalog/src/main/java/com/google/android/fhir/catalog/ComponentListViewModel.kt
index bdafbcd17a..d9e4637ada 100644
--- a/catalog/src/main/java/com/google/android/fhir/catalog/ComponentListViewModel.kt
+++ b/catalog/src/main/java/com/google/android/fhir/catalog/ComponentListViewModel.kt
@@ -152,6 +152,11 @@ class ComponentListViewModel(application: Application, private val state: SavedS
       R.string.component_name_location_widget,
       "component_location_widget.json",
     ),
+    QUESTION_ITEM_CUSTOM_STYLE(
+      R.drawable.text_format_48dp,
+      R.string.component_name_per_question_custom_style,
+      "component_per_question_custom_style.json",
+    ),
   }
 
   val viewItemList =
@@ -177,6 +182,7 @@ class ComponentListViewModel(application: Application, private val state: SavedS
       ViewItem.ComponentItem(Component.ITEM_ANSWER_MEDIA),
       ViewItem.ComponentItem(Component.INITIAL_VALUE),
       ViewItem.ComponentItem(Component.LOCATION_WIDGET),
+      ViewItem.ComponentItem(Component.QUESTION_ITEM_CUSTOM_STYLE),
     )
 
   fun isComponent(context: Context, title: String) =
diff --git a/catalog/src/main/res/drawable/ic_location_on.xml b/catalog/src/main/res/drawable/ic_location_on.xml
index 0f96a89039..9821fffba8 100644
--- a/catalog/src/main/res/drawable/ic_location_on.xml
+++ b/catalog/src/main/res/drawable/ic_location_on.xml
@@ -1,7 +1,7 @@
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
+    android:width="64dp"
+    android:height="64dp"
     android:tint="#1A73E8"
     android:viewportWidth="24"
     android:viewportHeight="24"
diff --git a/catalog/src/main/res/drawable/text_format_48dp.xml b/catalog/src/main/res/drawable/text_format_48dp.xml
new file mode 100644
index 0000000000..6a19bd5f8e
--- /dev/null
+++ b/catalog/src/main/res/drawable/text_format_48dp.xml
@@ -0,0 +1,15 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true"
+    android:height="64dp"
+    android:viewportHeight="960"
+    android:viewportWidth="960"
+    android:width="64dp"
+>
+      
+    <path
+        android:fillColor="#1A73E8"
+        android:pathData="M200,760v-60h560v60L200,760ZM276,600 L451,160h58l175,440h-55l-45,-119L376,481l-45,119h-55ZM393,436h174l-85,-222h-4l-85,222Z"
+    />
+    
+</vector>
diff --git a/catalog/src/main/res/values-night/colors.xml b/catalog/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000000..d80470737a
--- /dev/null
+++ b/catalog/src/main/res/values-night/colors.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ Copyright 2020 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.
+-->
+<resources>
+    <color name="custom_style_primary_100">#000000</color>
+    <color name="custom_style_primary_200">#0C0A20</color>
+    <color name="custom_style_primary_300">#201441</color>
+    <color name="custom_style_primary_400">#341F63</color>
+    <color name="custom_style_primary_500">#482A85</color>
+    <color name="custom_style_primary_600">#5C35A6</color>
+    <color name="custom_style_primary_700">#7F5FBA</color>
+    <color name="custom_style_primary_800">#A289CF</color>
+    <color name="custom_style_primary_900">#C5B3E3</color>
+    <color name="custom_style_on_primary_100">#FFFFFF</color>
+    <color name="custom_style_on_primary_200">#FFFFFF</color>
+    <color name="custom_style_on_primary_300">#FFFFFF</color>
+    <color name="custom_style_on_primary_400">#FFFFFF</color>
+    <color name="custom_style_on_primary_500">#FFFFFF</color>
+    <color name="custom_style_on_primary_600">#FFFFFF</color>
+    <color name="custom_style_on_primary_700">#FFFFFF</color>
+    <color name="custom_style_on_primary_800">#000000</color>
+    <color name="custom_style_on_primary_900">#000000</color>
+</resources>
diff --git a/catalog/src/main/res/values/colors.xml b/catalog/src/main/res/values/colors.xml
index 8a1561f3da..f9b63e732a 100644
--- a/catalog/src/main/res/values/colors.xml
+++ b/catalog/src/main/res/values/colors.xml
@@ -102,4 +102,26 @@
     <color name="onSurfaceVariant_neutral_variant_80">#C4C7C5</color>
 
     <color name="outline_neutral_variant_60">#8E918F</color>
+
+    <!--  colors for custom style example  -->
+    <color name="custom_style_primary_900">#7A9FFF</color>
+    <color name="custom_style_primary_800">#668FFF</color>
+    <color name="custom_style_primary_700">#5581FF</color>
+    <color name="custom_style_primary_600">#476FFF</color>
+    <color name="custom_style_primary_500">#3B5CFF</color>
+    <color name="custom_style_primary_400">#3249FF</color>
+    <color name="custom_style_primary_300">#2936FF</color>
+    <color name="custom_style_primary_200">#2024FF</color>
+    <color name="custom_style_primary_100">#1816FF</color>
+    <color name="custom_style_on_primary">#FFFFFF</color>
+    <color name="custom_style_on_primary_900">#FFFFFF</color>
+    <color name="custom_style_on_primary_800">#FFFFFF</color>
+    <color name="custom_style_on_primary_700">#FFFFFF</color>
+    <color name="custom_style_on_primary_600">#FFFFFF</color>
+    <color name="custom_style_on_primary_500">#FFFFFF</color>
+    <color name="custom_style_on_primary_400">#FFFFFF</color>
+    <color name="custom_style_on_primary_300">#FFFFFF</color>
+    <color name="custom_style_on_primary_200">#FFFFFF</color>
+    <color name="custom_style_on_primary_100">#FFFFFF</color>
+
 </resources>
diff --git a/catalog/src/main/res/values/strings.xml b/catalog/src/main/res/values/strings.xml
index 7e09047feb..ae47067784 100644
--- a/catalog/src/main/res/values/strings.xml
+++ b/catalog/src/main/res/values/strings.xml
@@ -37,6 +37,9 @@
     <string name="component_name_repeated_group">Repeated Group</string>
     <string name="component_name_attachment">Attachment</string>
     <string name="component_name_location_widget">Location Widget</string>
+    <string
+        name="component_name_per_question_custom_style"
+    >Per question custom style</string>
     <string name="layout_name_default_text">Default</string>
     <string name="layout_name_paginated">Paginated</string>
     <string name="layout_name_review">Review</string>
diff --git a/catalog/src/main/res/values/styles.xml b/catalog/src/main/res/values/styles.xml
index f88c5ea9fa..f2afa052f3 100644
--- a/catalog/src/main/res/values/styles.xml
+++ b/catalog/src/main/res/values/styles.xml
@@ -80,7 +80,10 @@
 
     <style name="Theme.MyQuestionnaire.PaginatedLayout">
         <item name="questionnaireQuestionTextStyle">
-            @style/TextAppearance.Material3.HeadlineMedium
+            @style/QuestionTextStyle
+        </item>
+        <item name="questionnaireSubtitleTextStyle">
+            @style/SubtitleTextStyle
         </item>
     </style>
 
@@ -98,4 +101,170 @@
         <item name="android:minLines">2</item>
     </style>
 
+    <style name="QuestionTextStyle">
+        <item
+            name="android:textAppearance"
+        >@style/TextAppearance.Material3.HeadlineMedium</item>
+        <item name="android:background">?attr/colorSurface</item>
+    </style>
+
+    <style name="SubtitleTextStyle">
+        <item
+            name="android:textAppearance"
+        >@style/TextAppearance.Material3.BodyMedium</item>
+        <item name="android:background">?attr/colorSurface</item>
+    </style>
+
+    <style name="CustomStyle_1">
+        <item
+            name="questionnaire_textAppearance"
+        >@style/CustomTextAppearance_1</item>
+                <item
+            name="questionnaire_background"
+        >@color/custom_style_primary_100</item>
+
+    </style>
+
+    <style
+        name="CustomTextAppearance_1"
+        parent="TextAppearance.Material3.DisplayLarge"
+    >
+        <item name="android:textColor">@color/custom_style_on_primary_100</item>
+    </style>
+
+    <style name="CustomStyle_2">
+        <item
+            name="questionnaire_textAppearance"
+        >@style/CustomTextAppearance_2</item>
+        <item
+            name="questionnaire_background"
+        >@color/custom_style_primary_200</item>
+
+    </style>
+
+    <style
+        name="CustomTextAppearance_2"
+        parent="TextAppearance.Material3.DisplayMedium"
+    >
+        <item name="android:textColor">@color/custom_style_on_primary_200</item>
+    </style>
+
+    <style name="CustomStyle_3">
+        <item
+            name="questionnaire_textAppearance"
+        >@style/CustomTextAppearance_3</item>
+        <item
+            name="questionnaire_background"
+        >@color/custom_style_primary_300</item>
+
+    </style>
+
+    <style
+        name="CustomTextAppearance_3"
+        parent="TextAppearance.Material3.DisplaySmall"
+    >
+        <item name="android:textColor">@color/custom_style_on_primary_300</item>
+    </style>
+
+    <style name="CustomStyle_4">
+        <item
+            name="questionnaire_textAppearance"
+        >@style/CustomTextAppearance_4</item>
+        <item
+            name="questionnaire_background"
+        >@color/custom_style_primary_400</item>
+
+    </style>
+
+    <style
+        name="CustomTextAppearance_4"
+        parent="TextAppearance.Material3.HeadlineLarge"
+    >
+        <item name="android:textColor">@color/custom_style_on_primary_400</item>
+    </style>
+
+    <style name="CustomStyle_5">
+        <item
+            name="questionnaire_textAppearance"
+        >@style/CustomTextAppearance_5</item>
+        <item
+            name="questionnaire_background"
+        >@color/custom_style_primary_500</item>
+
+    </style>
+
+    <style
+        name="CustomTextAppearance_5"
+        parent="TextAppearance.Material3.HeadlineMedium"
+    >
+        <item name="android:textColor">@color/custom_style_on_primary_500</item>
+    </style>
+
+    <style name="CustomStyle_6">
+        <item
+            name="questionnaire_textAppearance"
+        >@style/CustomTextAppearance_6</item>
+        <item
+            name="questionnaire_background"
+        >@color/custom_style_primary_600</item>
+
+    </style>
+
+    <style
+        name="CustomTextAppearance_6"
+        parent="TextAppearance.Material3.HeadlineSmall"
+    >
+        <item name="android:textColor">@color/custom_style_on_primary_600</item>
+    </style>
+
+    <style name="CustomStyle_7">
+        <item
+            name="questionnaire_textAppearance"
+        >@style/CustomTextAppearance_7</item>
+        <item
+            name="questionnaire_background"
+        >@color/custom_style_primary_700</item>
+
+    </style>
+
+    <style
+        name="CustomTextAppearance_7"
+        parent="TextAppearance.Material3.LabelLarge"
+    >
+        <item name="android:textColor">@color/custom_style_on_primary_700</item>
+    </style>
+
+    <style name="CustomStyle_8">
+        <item
+            name="questionnaire_textAppearance"
+        >@style/CustomTextAppearance_8</item>
+        <item
+            name="questionnaire_background"
+        >@color/custom_style_primary_800</item>
+
+    </style>
+
+    <style
+        name="CustomTextAppearance_8"
+        parent="TextAppearance.Material3.LabelMedium"
+    >
+        <item name="android:textColor">@color/custom_style_on_primary_800</item>
+    </style>
+
+    <style name="CustomStyle_9">
+        <item
+            name="questionnaire_textAppearance"
+        >@style/CustomTextAppearance_9</item>
+        <item
+            name="questionnaire_background"
+        >@color/custom_style_primary_900</item>
+
+    </style>
+
+    <style
+        name="CustomTextAppearance_9"
+        parent="TextAppearance.Material3.LabelSmall"
+    >
+        <item name="android:textColor">@color/custom_style_on_primary_900</item>
+    </style>
 </resources>
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreHeaderViews.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreHeaderViews.kt
index 022964c9db..fd4690ea26 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreHeaderViews.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreHeaderViews.kt
@@ -104,3 +104,41 @@ fun appendAsteriskToQuestionText(
     }
   }
 }
+
+internal fun applyCustomOrDefaultStyle(
+  questionnaireItem: Questionnaire.QuestionnaireItemComponent,
+  prefixTextView: TextView,
+  questionTextView: TextView,
+  instructionTextView: TextView,
+) {
+  applyCustomOrDefaultStyle(
+    context = prefixTextView.context,
+    view = prefixTextView,
+    customStyleName =
+      questionnaireItem.readCustomStyleExtension(
+        StyleUrl.PREFIX_TEXT_VIEW,
+      ),
+    defaultStyleResId =
+      getStyleResIdFromAttribute(questionTextView.context, R.attr.questionnaireQuestionTextStyle),
+  )
+  applyCustomOrDefaultStyle(
+    context = questionTextView.context,
+    view = questionTextView,
+    customStyleName =
+      questionnaireItem.readCustomStyleExtension(
+        StyleUrl.QUESTION_TEXT_VIEW,
+      ),
+    defaultStyleResId =
+      getStyleResIdFromAttribute(questionTextView.context, R.attr.questionnaireQuestionTextStyle),
+  )
+  applyCustomOrDefaultStyle(
+    context = instructionTextView.context,
+    view = instructionTextView,
+    customStyleName =
+      questionnaireItem.readCustomStyleExtension(
+        StyleUrl.SUBTITLE_TEXT_VIEW,
+      ),
+    defaultStyleResId =
+      getStyleResIdFromAttribute(questionTextView.context, R.attr.questionnaireSubtitleTextStyle),
+  )
+}
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionItemStyle.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionItemStyle.kt
new file mode 100644
index 0000000000..3067d969bd
--- /dev/null
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionItemStyle.kt
@@ -0,0 +1,267 @@
+/*
+ * 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.datacapture.extensions
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.view.View
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import com.google.android.fhir.datacapture.R
+
+/**
+ * Applies either a custom style or a default style to the given view based on the provided custom
+ * style name and default style resource ID.
+ *
+ * If the custom style resource name is valid, it applies the custom style to the view. If the
+ * custom style resource name is not valid or not found, it falls back to applying the default style
+ * defined by the given style resource ID. It sets the view's tag to resourceId to indicate that the
+ * custom style has been applied.
+ *
+ * @param context the context used to access resources.
+ * @param view the view to which the style should be applied.
+ * @param customStyleName the name of the custom style to apply.
+ * @param defaultStyleResId the default style resource ID to use if no custom style is found.
+ */
+internal fun applyCustomOrDefaultStyle(
+  context: Context,
+  view: View,
+  customStyleName: String?,
+  defaultStyleResId: Int,
+) {
+  val customStyleResId = customStyleName?.let { getStyleResIdByName(context, it) } ?: 0
+  when {
+    customStyleResId != 0 -> {
+      view.tag = customStyleResId
+      QuestionItemCustomStyle().applyStyle(context, view, customStyleResId)
+    }
+    defaultStyleResId != 0 -> {
+      applyDefaultStyleIfNotApplied(context, view, defaultStyleResId)
+    }
+  }
+}
+
+/**
+ * Applies the default style to the given view if the default style has not already been applied.
+ *
+ * This function checks the `view`'s tag to determine if a style has been previously applied. If the
+ * tag is an integer, it will apply the default style specified by `defaultStyleResId`. After
+ * applying the style, it resets the view's tag to `null` to indicate that the default style has
+ * been applied.
+ *
+ * @param context The context used to access resources and themes.
+ * @param view The view to which the default style will be applied.
+ * @param defaultStyleResId The resource ID of the default style to apply.
+ */
+private fun applyDefaultStyleIfNotApplied(
+  context: Context,
+  view: View,
+  defaultStyleResId: Int,
+) {
+  (view.tag as? Int)?.let {
+    QuestionItemDefaultStyle().applyStyle(context, view, defaultStyleResId)
+    view.tag = null
+  }
+}
+
+/**
+ * Retrieves the resource ID of a style given its name.
+ *
+ * This function uses the `getIdentifier` method to look up the style resource ID based on the style
+ * name provided. If the style name is not found, it returns 0.
+ *
+ * @param context The context used to access resources.
+ * @param styleName The name of the style whose resource ID is to be retrieved.
+ * @return The resource ID of the style, or 0 if the style name is not found.
+ */
+private fun getStyleResIdByName(context: Context, styleName: String): Int {
+  return context.resources.getIdentifier(styleName, "style", context.packageName)
+}
+
+/**
+ * Retrieves the style resource ID associated with a specific attribute from the current theme.
+ *
+ * This function obtains the style resource ID that is linked to a given attribute in the current
+ * theme. It uses the `obtainStyledAttributes` method to fetch the attributes and extract the
+ * resource ID.
+ *
+ * @param context The context to access the current theme and resources.
+ * @param attr The attribute whose associated style resource ID is to be retrieved.
+ * @return The resource ID of the style associated with the specified attribute, or 0 if not found.
+ */
+internal fun getStyleResIdFromAttribute(context: Context, attr: Int): Int {
+  val typedArray = context.theme.obtainStyledAttributes(intArrayOf(attr))
+  val styleResId = typedArray.getResourceId(0, 0)
+  typedArray.recycle()
+  return styleResId
+}
+
+internal abstract class QuestionItemStyle {
+
+  /**
+   * Applies a style to a view.
+   *
+   * @param context The context used to apply the style.
+   * @param view The view to which the style will be applied.
+   * @param styleResId The resource ID of the style to apply.
+   */
+  abstract fun applyStyle(context: Context, view: View, styleResId: Int)
+
+  /**
+   * Applies the style from a TypedArray to a view.
+   *
+   * @param context The context used to apply the style.
+   * @param view The view to which the style will be applied.
+   * @param typedArray The TypedArray containing the style attributes.
+   */
+  internal fun applyStyle(context: Context, view: View, typedArray: TypedArray) {
+    applyGenericViewStyle(context, view, typedArray)
+    if (view is TextView) {
+      applyTextViewSpecificStyle(view, typedArray)
+    }
+    typedArray.recycle()
+  }
+
+  /**
+   * Abstract function to apply generic view styles from a TypedArray.
+   *
+   * @param context The context used to apply the style.
+   * @param view The view to which the style will be applied.
+   * @param typedArray The TypedArray containing the style attributes.
+   */
+  abstract fun applyGenericViewStyle(context: Context, view: View, typedArray: TypedArray)
+
+  /**
+   * Abstract function to apply TextView-specific styles from a TypedArray.
+   *
+   * @param textView The TextView to which the style will be applied.
+   * @param typedArray The TypedArray containing the style attributes.
+   */
+  abstract fun applyTextViewSpecificStyle(textView: TextView, typedArray: TypedArray)
+
+  /**
+   * Applies the background color from a TypedArray to a view.
+   *
+   * @param context The context used to apply the background color.
+   * @param view The view to which the background color will be applied.
+   * @param typedArray The TypedArray containing the background color attribute.
+   * @param index The index of the background color attribute in the TypedArray.
+   */
+  protected fun applyBackgroundColor(
+    context: Context,
+    view: View,
+    typedArray: TypedArray,
+    index: Int,
+  ) {
+    val backgroundColor =
+      typedArray.getColor(index, ContextCompat.getColor(context, android.R.color.transparent))
+    view.setBackgroundColor(backgroundColor)
+  }
+
+  /**
+   * Applies the text appearance from a TypedArray to a TextView.
+   *
+   * @param textView The TextView to which the text appearance will be applied.
+   * @param typedArray The TypedArray containing the text appearance attribute.
+   * @param index The index of the text appearance attribute in the TypedArray.
+   */
+  protected fun applyTextAppearance(textView: TextView, typedArray: TypedArray, index: Int) {
+    val textAppearance = typedArray.getResourceId(index, -1)
+    if (textAppearance != -1) {
+      textView.setTextAppearance(textAppearance)
+    }
+  }
+}
+
+internal class QuestionItemCustomStyle : QuestionItemStyle() {
+  private enum class CustomStyleViewAttributes(val attrId: Int) {
+    TEXT_APPEARANCE(R.styleable.QuestionnaireCustomStyle_questionnaire_textAppearance),
+    BACKGROUND(R.styleable.QuestionnaireCustomStyle_questionnaire_background),
+  }
+
+  override fun applyStyle(context: Context, view: View, styleResId: Int) {
+    val typedArray =
+      context.obtainStyledAttributes(styleResId, R.styleable.QuestionnaireCustomStyle)
+    applyStyle(context, view, typedArray)
+  }
+
+  override fun applyGenericViewStyle(context: Context, view: View, typedArray: TypedArray) {
+    for (i in 0 until typedArray.indexCount) {
+      when (typedArray.getIndex(i)) {
+        CustomStyleViewAttributes.BACKGROUND.attrId -> {
+          applyBackgroundColor(context, view, typedArray, i)
+        }
+      }
+    }
+  }
+
+  override fun applyTextViewSpecificStyle(
+    textView: TextView,
+    typedArray: TypedArray,
+  ) {
+    for (i in 0 until typedArray.indexCount) {
+      when (typedArray.getIndex(i)) {
+        CustomStyleViewAttributes.TEXT_APPEARANCE.attrId -> {
+          applyTextAppearance(textView, typedArray, i)
+        }
+      }
+    }
+  }
+}
+
+internal class QuestionItemDefaultStyle : QuestionItemStyle() {
+  private enum class DefaultStyleViewAttributes(val attrId: Int) {
+    TEXT_APPEARANCE(android.R.attr.textAppearance),
+    BACKGROUND(android.R.attr.background),
+    // Add other attributes you want to apply
+  }
+
+  override fun applyStyle(context: Context, view: View, styleResId: Int) {
+    val attrs = DefaultStyleViewAttributes.values().map { it.attrId }.toIntArray()
+    val typedArray: TypedArray = context.obtainStyledAttributes(styleResId, attrs)
+    applyStyle(context, view, typedArray)
+  }
+
+  override fun applyGenericViewStyle(context: Context, view: View, typedArray: TypedArray) {
+    for (i in 0 until typedArray.indexCount) {
+      when (DefaultStyleViewAttributes.values()[i]) {
+        DefaultStyleViewAttributes.BACKGROUND -> {
+          applyBackgroundColor(context, view, typedArray, i)
+        }
+        else -> {
+          // Ignore view specific attributes.
+        }
+      }
+    }
+  }
+
+  override fun applyTextViewSpecificStyle(
+    textView: TextView,
+    typedArray: TypedArray,
+  ) {
+    for (i in 0 until typedArray.indexCount) {
+      when (DefaultStyleViewAttributes.values()[i]) {
+        DefaultStyleViewAttributes.TEXT_APPEARANCE -> {
+          applyTextAppearance(textView, typedArray, i)
+        }
+        else -> {
+          // applyGenericViewDefaultStyle for other attributes.
+        }
+      }
+    }
+  }
+}
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
index 55dd4e5738..0acd26c93f 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
@@ -61,6 +61,13 @@ internal const val EXTENSION_ITEM_CONTROL_URL_ANDROID_FHIR =
 internal const val EXTENSION_ITEM_CONTROL_SYSTEM_ANDROID_FHIR =
   "https://github.com/google/android-fhir/questionnaire-item-control"
 
+internal enum class StyleUrl(val url: String) {
+  BASE("https://github.com/google/android-fhir/tree/master/datacapture/android-style"),
+  PREFIX_TEXT_VIEW("prefix_text_view"),
+  QUESTION_TEXT_VIEW("question_text_view"),
+  SUBTITLE_TEXT_VIEW("subtitle_text_view"),
+}
+
 // Below URLs exist and are supported by HL7
 
 internal const val EXTENSION_ANSWER_EXPRESSION_URL: String =
@@ -1017,3 +1024,17 @@ val Resource.logicalId: String
   get() {
     return this.idElement?.idPart.orEmpty()
   }
+
+internal fun QuestionnaireItemComponent.readCustomStyleExtension(styleUrl: StyleUrl): String? {
+  // Find the base extension
+  val baseExtension = extension.find { it.url == StyleUrl.BASE.url }
+  baseExtension?.let { ext ->
+    // Extract nested extension based on the given StyleUrl
+    ext.extension.forEach { nestedExt ->
+      if (nestedExt.url == styleUrl.url) {
+        return nestedExt.value.asStringValue()
+      }
+    }
+  }
+  return null
+}
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt
index 4fff12a122..da85cbac4e 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt
@@ -23,6 +23,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import com.google.android.fhir.datacapture.QuestionnaireViewHolderType
 import com.google.android.fhir.datacapture.R
+import com.google.android.fhir.datacapture.extensions.applyCustomOrDefaultStyle
 import com.google.android.fhir.datacapture.extensions.getHeaderViewVisibility
 import com.google.android.fhir.datacapture.extensions.getLocalizedInstructionsSpanned
 import com.google.android.fhir.datacapture.extensions.initHelpViews
@@ -60,5 +61,11 @@ class GroupHeaderView(context: Context, attrs: AttributeSet?) : LinearLayout(con
       questionnaireViewItem.enabledDisplayItems.getLocalizedInstructionsSpanned(),
     )
     visibility = getHeaderViewVisibility(prefix, question, hint)
+    applyCustomOrDefaultStyle(
+      questionnaireViewItem.questionnaireItem,
+      prefixTextView = prefix,
+      questionTextView = question,
+      instructionTextView = hint,
+    )
   }
 }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt
index c48e546f38..7e5e77231d 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt
@@ -23,6 +23,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.extensions.appendAsteriskToQuestionText
+import com.google.android.fhir.datacapture.extensions.applyCustomOrDefaultStyle
 import com.google.android.fhir.datacapture.extensions.getHeaderViewVisibility
 import com.google.android.fhir.datacapture.extensions.getLocalizedInstructionsSpanned
 import com.google.android.fhir.datacapture.extensions.initHelpViews
@@ -64,6 +65,12 @@ class HeaderView(context: Context, attrs: AttributeSet?) : LinearLayout(context,
     // Make the entire view GONE if there is nothing to show. This is to avoid an empty row in the
     // questionnaire.
     visibility = getHeaderViewVisibility(prefix, question, hint)
+    applyCustomOrDefaultStyle(
+      questionnaireViewItem.questionnaireItem,
+      prefixTextView = prefix,
+      questionTextView = question,
+      instructionTextView = hint,
+    )
   }
 
   /**
diff --git a/datacapture/src/main/res/values/attrs.xml b/datacapture/src/main/res/values/attrs.xml
index 46d076ed59..42cc7e5fb1 100644
--- a/datacapture/src/main/res/values/attrs.xml
+++ b/datacapture/src/main/res/values/attrs.xml
@@ -188,4 +188,24 @@
              extend Theme.Questionnaire. If unspecified, Theme.Questionnaire will be used. -->
         <attr name="questionnaire_theme" format="reference" />
     </declare-styleable>
+
+    <!--
+        Declare custom styleable attributes for QuestionnaireCustomStyle.
+        These attributes can be used to customize the appearance of views in the questionnaire.
+    -->
+    <declare-styleable name="QuestionnaireCustomStyle">
+        <!--
+            Specifies the text appearance for the questionnaire text.
+            This should be a reference to a text appearance style resource.
+            Example: @style/TextAppearance.AppCompat.Headline
+        -->
+        <attr name="questionnaire_textAppearance" format="reference" />
+
+        <!--
+            Specifies the background for the questionnaire item.
+            This can be a reference to a drawable resource or a color value.
+            Example: @color/background_color or #FFFFFF
+        -->
+        <attr name="questionnaire_background" format="reference|color" />
+    </declare-styleable>
 </resources>
diff --git a/docs/use/SDCL/Customize-how-a-Questionnaire-is-displayed.md b/docs/use/SDCL/Customize-how-a-Questionnaire-is-displayed.md
index 3ed391bded..4ac8947ef7 100644
--- a/docs/use/SDCL/Customize-how-a-Questionnaire-is-displayed.md
+++ b/docs/use/SDCL/Customize-how-a-Questionnaire-is-displayed.md
@@ -67,6 +67,140 @@ the new theme you just created:
 </style>
 ```
 
+## Custom Style per Question Item
+
+With this change, you can apply individual custom styles per question item. If a custom style is not mentioned in the question item, the default style will be applied, which is present in the DataCapture module or overridden in the application.
+
+### Add a Custom Style Extension to the Question Item
+
+```json
+{
+  "extension": [
+    {
+      "url": "https://github.com/google/android-fhir/tree/master/datacapture/android-style",
+      "extension": [
+         {
+            "url": "prefix_text_view",
+            "valueString": "CustomStyle_1"
+         },
+        {
+          "url": "question_text_view",
+          "valueString": "CustomStyle_1"
+        },
+        {
+          "url": "subtitle_text_view",
+          "valueString": "CustomStyle_2"
+        }
+      ]
+    }
+  ]
+}
+```
+### Custom Style Extension URL
+"https://github.com/google/android-fhir/tree/master/datacapture/android-style"
+
+It identifies extensions for applying the custom style to a given questionnaire item.
+
+### Question Item View
+* `prefix_text_view`: Used to show the prefix value of the question item.
+* `question_text_view`: Used to show the text value of the question item.
+* `subtitle_text_view`: Used to show the instructions of the question item.
+  For more information about supported views, please see the [Question Item View](https://github.com/google/android-fhir/blob/master/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt).
+
+### Custom Style Values
+In the above example:
+
+`CustomStyle_1` is the custom style for prefix_text_view and question_text_view.
+`CustomStyle_2` is the custom style for subtitle_text_view.
+Both styles are defined in the application.
+
+### Custom Style Attributes
+* `questionnaire_textAppearance`: Specifies the text appearance for the questionnaire text. Example: `@style/TextAppearance.AppCompat.Headline`
+* `questionnaire_background`: Specifies the background for the view. Example: `@color/background_color or #FFFFFF`
+
+For more information on custom style attributes, please see the [QuestionnaireCustomStyle](https://github.com/google/android-fhir/blob/master/datacapture/src/main/res/values/attrs.xml)
+
+### Example Custom Styles
+
+```
+<style name="CustomStyle_1">
+   <item name="questionnaire_textAppearance">@style/CustomTextAppearance_1</item>
+</style>
+
+<style name="CustomStyle_2">
+   <item name="questionnaire_textAppearance">@style/CustomTextAppearance_2</item>
+</style>
+
+<style
+        name="CustomTextAppearance_1"
+        parent="TextAppearance.Material3.HeadlineLarge"
+    >
+        <item name="android:textColor">?attr/colorOnTertiaryContainer</item>
+    </style>
+
+    <style name="CustomStyle_2">
+        <item
+            name="questionnaire_textAppearance"
+        >@style/CustomTextAppearance_2</item>
+        <item name="questionnaire_background">?attr/colorSurfaceVariant</item>
+    </style>
+
+```
+
+The above custom styles are defined in the `res/values/styles.xml` of the application.
+
+### questionnaire.json with custom style
+```
+{
+  "resourceType": "Questionnaire",
+  "item": [
+    {
+      "linkId": "1",
+      "text": "Question text custom style",
+      "type": "display",
+      "extension": [
+        {
+          "url": "https://github.com/google/android-fhir/tree/master/datacapture/android-style",
+          "extension": [
+            {
+              "url": "prefix_text_view",
+              "valueString": "CustomStyle_1"
+            },
+            {
+              "url": "question_text_view",
+              "valueString": "CustomStyle_1"
+            },
+            {
+              "url": "subtitle_text_view",
+              "valueString": "CustomStyle_2"
+            }
+          ]
+        }
+      ],
+      "item": [
+        {
+          "extension": [
+            {
+              "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory",
+              "valueCodeableConcept": {
+                "coding": [
+                  {
+                    "system": "http://hl7.org/fhir/questionnaire-display-category",
+                    "code": "instructions"
+                  }
+                ]
+              }
+            }
+          ],
+          "linkId": "1.3",
+          "text": "Instructions custom style.",
+          "type": "display"
+        }
+      ]
+    }  ]
+}
+```
+
 ## Custom questionnaire components
 
 The Structured Data Capture Library uses

From 5787c7f619247bf41cb9d471a6075bf95b21e30c Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 4 Sep 2024 20:25:16 +0300
Subject: [PATCH 091/126] Remove eTag param override

---
 .../main/java/com/google/android/fhir/impl/FhirEngineImpl.kt    | 2 +-
 .../android/fhir/sync/upload/request/UploadRequestGenerator.kt  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
index 1c215bada4..284359436e 100644
--- a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
@@ -73,8 +73,8 @@ internal class FhirEngineImpl(private val database: Database, private val contex
   override suspend fun getLocalChanges(type: ResourceType, id: String) =
     withContext(Dispatchers.IO) { database.getLocalChanges(type, id) }
 
-
   override suspend fun getUnsyncedLocalChanges(): List<LocalChange> = database.getAllLocalChanges()
+
   override suspend fun purge(type: ResourceType, id: String, forcePurge: Boolean) =
     withContext(Dispatchers.IO) { database.purge(type, setOf(id), forcePurge) }
 
diff --git a/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt b/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt
index f54e1aabf3..86af7a4b64 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt
@@ -62,7 +62,6 @@ internal object UploadRequestGeneratorFactory {
           mode.httpVerbToUseForCreate,
           mode.httpVerbToUseForUpdate,
           mode.bundleSize,
-          useETagForUpload = false
         )
     }
 }

From d871fa3c1ef1ecef17fa7c0871c80734c6abcf9f Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 4 Sep 2024 20:34:12 +0300
Subject: [PATCH 092/126] Parallelize DB resource deserialization to Optimize
 Database API

---
 .../google/android/fhir/db/impl/DatabaseImpl.kt    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt b/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
index cf8ab22c07..ef8156e790 100644
--- a/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
@@ -40,6 +40,9 @@ import com.google.android.fhir.search.SearchQuery
 import com.google.android.fhir.toLocalChange
 import java.time.Instant
 import java.util.UUID
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
 import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
 
@@ -205,7 +208,7 @@ internal class DatabaseImpl(
     query: SearchQuery,
   ): List<ResourceWithUUID<R>> {
     return db.withTransaction {
-      resourceDao.getResources(SimpleSQLiteQuery(query.query, query.args.toTypedArray())).map {
+      resourceDao.getResources(SimpleSQLiteQuery(query.query, query.args.toTypedArray())).pmap {
         ResourceWithUUID(it.uuid, iParser.parseResource(it.serializedResource) as R)
       }
     }
@@ -217,7 +220,7 @@ internal class DatabaseImpl(
     return db.withTransaction {
       resourceDao
         .getForwardReferencedResources(SimpleSQLiteQuery(query.query, query.args.toTypedArray()))
-        .map {
+        .pmap {
           ForwardIncludeSearchResult(
             it.matchingIndex,
             it.baseResourceUUID,
@@ -233,7 +236,7 @@ internal class DatabaseImpl(
     return db.withTransaction {
       resourceDao
         .getReverseReferencedResources(SimpleSQLiteQuery(query.query, query.args.toTypedArray()))
-        .map {
+        .pmap {
           ReverseIncludeSearchResult(
             it.matchingIndex,
             it.baseResourceTypeAndId,
@@ -413,6 +416,11 @@ internal class DatabaseImpl(
     }
   }
 
+  /** Implementation of a parallelized map */
+  suspend fun <A, B> Iterable<A>.pmap(f: suspend (A) -> B): List<B> = coroutineScope {
+    map { async { f(it) } }.awaitAll()
+  }
+
   companion object {
     /**
      * The name for unencrypted database.

From 5720eb243678103f2220dfd55f504a67cd836456 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Fri, 6 Sep 2024 21:25:09 +0300
Subject: [PATCH 093/126] Revert "Expose overloaded API for evaluateMeasure"

This reverts commit 7097dfbbd144151fff231d69cee686f2caaecb07.
---
 .../FhirEngineR4MeasureProcessor.java         | 62 -------------------
 .../android/fhir/workflow/FhirOperator.kt     | 57 +----------------
 2 files changed, 3 insertions(+), 116 deletions(-)
 delete mode 100644 workflow/src/main/java/com/google/android/fhir/workflow/FhirEngineR4MeasureProcessor.java

diff --git a/workflow/src/main/java/com/google/android/fhir/workflow/FhirEngineR4MeasureProcessor.java b/workflow/src/main/java/com/google/android/fhir/workflow/FhirEngineR4MeasureProcessor.java
deleted file mode 100644
index a13540e501..0000000000
--- a/workflow/src/main/java/com/google/android/fhir/workflow/FhirEngineR4MeasureProcessor.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.google.android.fhir.workflow;
-
-import org.hl7.fhir.instance.model.api.IBaseBundle;
-import org.hl7.fhir.r4.model.Measure;
-import org.hl7.fhir.r4.model.MeasureReport;
-import org.opencds.cqf.fhir.api.Repository;
-import org.opencds.cqf.fhir.cr.measure.MeasureEvaluationOptions;
-import org.opencds.cqf.fhir.cr.measure.common.MeasureEvalType;
-import org.opencds.cqf.fhir.cr.measure.common.SubjectProvider;
-import org.opencds.cqf.fhir.cr.measure.r4.R4MeasureProcessor;
-import org.opencds.cqf.fhir.cr.measure.r4.R4RepositorySubjectProvider;
-import org.opencds.cqf.fhir.utility.repository.FederatedRepository;
-import org.opencds.cqf.fhir.utility.repository.InMemoryFhirRepository;
-
-import java.lang.reflect.Field;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class FhirEngineR4MeasureProcessor extends R4MeasureProcessor {
-    private static String FIELD_SUBJECT_PROVIDER="subjectProvider";
-    private Repository repository;
-
-    public FhirEngineR4MeasureProcessor(Repository repository, MeasureEvaluationOptions measureEvaluationOptions) {
-        super(repository, measureEvaluationOptions);
-        this.repository = repository;
-    }
-
-    public FhirEngineR4MeasureProcessor(Repository repository, MeasureEvaluationOptions measureEvaluationOptions, SubjectProvider subjectProvider) {
-        super(repository, measureEvaluationOptions, subjectProvider);
-        this.repository = repository;
-    }
-
-    @Override
-    public MeasureReport evaluateMeasure(Measure measure, String periodStart, String periodEnd, String reportType, List<String> subjectIds, IBaseBundle additionalData, MeasureEvalType evalType) {
-        var actualRepo = this.repository;
-        if (additionalData != null) {
-            actualRepo = new FederatedRepository(
-                    this.repository, new InMemoryFhirRepository(this.repository.fhirContext(), additionalData));
-        }
-
-        SubjectProvider subjectProvider = getSubjectProvider();
-        var subjects = subjectProvider.getSubjects(actualRepo, evalType, subjectIds).collect(Collectors.toList());
-        return super.evaluateMeasure( measure,  periodStart,  periodEnd,  reportType, subjects,  additionalData,  evalType) ;
-    }
-
-
-    /***
-     * We have two constructors that could result in different subject providers. So for this field we will use reflection
-     * @return [SubjectProvider] the SubjectProvider
-     */
-    public SubjectProvider getSubjectProvider(){
-        SubjectProvider subjectProvider;
-        try {
-            Field field = this.getClass().getSuperclass().getDeclaredField(FIELD_SUBJECT_PROVIDER);
-            field.setAccessible(true);
-            subjectProvider = (SubjectProvider) field.get(this);
-        }catch (Exception e){
-            subjectProvider = null;
-        }
-        return subjectProvider;
-    }
-}
diff --git a/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt b/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt
index bc1663fc11..7f04931fca 100644
--- a/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt
+++ b/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt
@@ -31,7 +31,6 @@ import org.hl7.fhir.instance.model.api.IBaseParameters
 import org.hl7.fhir.instance.model.api.IBaseResource
 import org.hl7.fhir.r4.model.CanonicalType
 import org.hl7.fhir.r4.model.IdType
-import org.hl7.fhir.r4.model.Measure
 import org.hl7.fhir.r4.model.MeasureReport
 import org.hl7.fhir.r4.model.Parameters
 import org.hl7.fhir.r4.model.PlanDefinition
@@ -39,9 +38,7 @@ import org.hl7.fhir.r4.model.Reference
 import org.opencds.cqf.fhir.cql.EvaluationSettings
 import org.opencds.cqf.fhir.cql.LibraryEngine
 import org.opencds.cqf.fhir.cr.measure.MeasureEvaluationOptions
-import org.opencds.cqf.fhir.cr.measure.common.MeasureEvalType
 import org.opencds.cqf.fhir.cr.measure.common.MeasureReportType
-import org.opencds.cqf.fhir.cr.plandefinition.r4.PlanDefinitionProcessor
 import org.opencds.cqf.fhir.cr.measure.r4.R4MeasureProcessor
 import org.opencds.cqf.fhir.cr.plandefinition.PlanDefinitionProcessor
 import org.opencds.cqf.fhir.utility.monad.Eithers
@@ -75,8 +72,9 @@ internal constructor(
     MeasureEvaluationOptions().apply { evaluationSettings = this@FhirOperator.evaluationSettings }
 
   private val libraryProcessor = LibraryEngine(repository, evaluationSettings)
-  private val measureProcessor: FhirEngineR4MeasureProcessor =
-    FhirEngineR4MeasureProcessor(repository, measureEvaluationOptions)
+
+  private val measureProcessor = R4MeasureProcessor(repository, measureEvaluationOptions)
+
   private val planDefinitionProcessor = PlanDefinitionProcessor(repository, evaluationSettings)
 
   /**
@@ -158,55 +156,6 @@ internal constructor(
     return report
   }
 
-  /**
-   * Generates a [MeasureReport] based on the provided inputs.
-   *
-   * NOTE: The API may internally result in a blocking IO operation. The user should call the API
-   * from a worker thread or it may throw [BlockingMainThreadException] exception.
-   */
-  @WorkerThread
-  fun evaluateMeasure(
-    measure: Measure,
-    start: String,
-    end: String,
-    reportType: String,
-    subjectId: String? = null,
-    practitioner: String? = null,
-    additionalData: IBaseBundle? = null,
-  ): MeasureReport {
-    val subject =
-      if (!practitioner.isNullOrBlank()) {
-        checkAndAddType(practitioner, "Practitioner")
-      } else if (!subjectId.isNullOrBlank()) {
-        checkAndAddType(subjectId, "Patient")
-      } else {
-        // List of null is required to run population-level measures
-        null
-      }
-    val evalType =
-      MeasureEvalType.fromCode(reportType)
-        .orElse(
-          if (!subjectId.isNullOrEmpty()) MeasureEvalType.SUBJECT else MeasureEvalType.POPULATION,
-        ) as MeasureEvalType
-
-    val report =
-      measureProcessor.evaluateMeasure(
-        /* measure = */ measure,
-        /* periodStart = */ start,
-        /* periodEnd = */ end,
-        /* reportType = */ reportType,
-        /* subjectIds = */ if (subject.isNullOrEmpty()) listOf() else listOf(subject),
-        /* additionalData = */ additionalData,
-        /* evalType = */ evalType,
-      )
-
-    // add subject reference for non-individual reportTypes
-    if (report.type.name == MeasureReportType.SUMMARY.name && !subject.isNullOrBlank()) {
-      report.setSubject(Reference(subject))
-    }
-    return report
-  }
-
   /**
    * Generates a [CarePlan] based on the provided inputs.
    *

From e1cf4c558a46c61435c169c578d32f79d36d0e54 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Tue, 10 Sep 2024 11:44:10 +0300
Subject: [PATCH 094/126] SDK Release - Engine, SDC, Knowledge, Workflow

FORK
         - With unmerged PR https://github.com/opensrp/android-fhir/pull/9
            - WUP  https://github.com/opensrp/android-fhir/pull/13

SDK
            - WUP https://github.com/google/android-fhir/pull/2178
            - WUP https://github.com/google/android-fhir/pull/2650
            - WUP https://github.com/google/android-fhir/pull/2663
PERF
- WUP https://github.com/google/android-fhir/pull/2669
- WUP https://github.com/google/android-fhir/pull/2565
- WUP https://github.com/google/android-fhir/issues/2561
- WUP https://github.com/google/android-fhir/pull/2535
---
 buildSrc/src/main/kotlin/Releases.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 890d7b2fad..a7eed4966d 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -48,7 +48,7 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "1.0.0-preview13-SNAPSHOT"
+    override val version = "1.0.0-preview14-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
@@ -60,7 +60,7 @@ object Releases {
 
   object Workflow : LibraryArtifact {
     override val artifactId = "workflow"
-    override val version = "0.1.0-alpha04-preview12-SNAPSHOT"
+    override val version = "0.1.0-alpha04-preview13-SNAPSHOT"
     override val name = "Android FHIR Workflow Library"
   }
 

From 5bc45d180648a2a1ac3b60c00d7fb620b4de9237 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Tue, 10 Sep 2024 12:10:24 +0300
Subject: [PATCH 095/126] Expose overloaded FHIR Operator API for
 evaluateMeasure

---
 .../FhirEngineR4MeasureProcessor.java         | 29 ++++++++++
 .../android/fhir/workflow/FhirOperator.kt     | 57 ++++++++++++++++++-
 2 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 workflow/src/main/java/com/google/android/fhir/workflow/FhirEngineR4MeasureProcessor.java

diff --git a/workflow/src/main/java/com/google/android/fhir/workflow/FhirEngineR4MeasureProcessor.java b/workflow/src/main/java/com/google/android/fhir/workflow/FhirEngineR4MeasureProcessor.java
new file mode 100644
index 0000000000..72bb431772
--- /dev/null
+++ b/workflow/src/main/java/com/google/android/fhir/workflow/FhirEngineR4MeasureProcessor.java
@@ -0,0 +1,29 @@
+package com.google.android.fhir.workflow;
+
+import org.hl7.fhir.instance.model.api.IBaseBundle;
+import org.hl7.fhir.r4.model.Measure;
+import org.hl7.fhir.r4.model.MeasureReport;
+import org.hl7.fhir.r4.model.Parameters;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.opencds.cqf.fhir.api.Repository;
+import org.opencds.cqf.fhir.cr.measure.MeasureEvaluationOptions;
+import org.opencds.cqf.fhir.cr.measure.common.MeasureEvalType;
+import org.opencds.cqf.fhir.cr.measure.common.SubjectProvider;
+import org.opencds.cqf.fhir.cr.measure.r4.R4MeasureProcessor;
+
+import java.util.List;
+
+public class FhirEngineR4MeasureProcessor extends R4MeasureProcessor {
+    public FhirEngineR4MeasureProcessor(Repository repository, MeasureEvaluationOptions measureEvaluationOptions) {
+        super(repository, measureEvaluationOptions);
+    }
+
+    public FhirEngineR4MeasureProcessor(Repository repository, MeasureEvaluationOptions measureEvaluationOptions, SubjectProvider subjectProvider) {
+        super(repository, measureEvaluationOptions, subjectProvider);
+    }
+
+    public MeasureReport evaluateMeasure(Measure measure, String periodStart, String periodEnd, String reportType, List<String> subjectIds, IBaseBundle additionalData, Parameters parameters, MeasureEvalType evalType) {
+        return super.evaluateMeasure(measure, periodStart, periodEnd, reportType, subjectIds, additionalData, parameters, evalType);
+    }
+}
diff --git a/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt b/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt
index 7ccdc1aea3..163f274af6 100644
--- a/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt
+++ b/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt
@@ -31,6 +31,7 @@ import org.hl7.fhir.instance.model.api.IBaseParameters
 import org.hl7.fhir.instance.model.api.IBaseResource
 import org.hl7.fhir.r4.model.CanonicalType
 import org.hl7.fhir.r4.model.IdType
+import org.hl7.fhir.r4.model.Measure
 import org.hl7.fhir.r4.model.MeasureReport
 import org.hl7.fhir.r4.model.Parameters
 import org.hl7.fhir.r4.model.PlanDefinition
@@ -38,8 +39,8 @@ import org.hl7.fhir.r4.model.Reference
 import org.opencds.cqf.fhir.cql.EvaluationSettings
 import org.opencds.cqf.fhir.cql.LibraryEngine
 import org.opencds.cqf.fhir.cr.measure.MeasureEvaluationOptions
+import org.opencds.cqf.fhir.cr.measure.common.MeasureEvalType
 import org.opencds.cqf.fhir.cr.measure.common.MeasureReportType
-import org.opencds.cqf.fhir.cr.measure.r4.R4MeasureProcessor
 import org.opencds.cqf.fhir.cr.plandefinition.PlanDefinitionProcessor
 import org.opencds.cqf.fhir.utility.monad.Eithers
 import org.opencds.cqf.fhir.utility.repository.ProxyRepository
@@ -72,8 +73,8 @@ internal constructor(
     MeasureEvaluationOptions().apply { evaluationSettings = this@FhirOperator.evaluationSettings }
 
   private val libraryProcessor = LibraryEngine(repository, evaluationSettings)
+  private val measureProcessor = FhirEngineR4MeasureProcessor(repository, measureEvaluationOptions)
   private val planDefinitionProcessor = PlanDefinitionProcessor(repository, evaluationSettings)
-  private val measureProcessor = R4MeasureProcessor(repository, measureEvaluationOptions)
 
   /**
    * The function evaluates a FHIR library against the database.
@@ -154,6 +155,58 @@ internal constructor(
     return report
   }
 
+  @WorkerThread
+  fun evaluateMeasure(
+    measure: Measure,
+    start: String,
+    end: String,
+    reportType: String,
+    subjectId: String? = null,
+    practitioner: String? = null,
+    additionalData: IBaseBundle? = null,
+    parameters: Parameters? = null,
+  ): MeasureReport {
+    val subject =
+      if (!practitioner.isNullOrBlank()) {
+        checkAndAddType(practitioner, "Practitioner")
+      } else if (!subjectId.isNullOrBlank()) {
+        checkAndAddType(subjectId, "Patient")
+      } else {
+        // List of null is required to run population-level measures
+        null
+      }
+
+    val subjectIds = if (subject == null) listOf() else listOf(subject)
+
+    val evalType =
+      MeasureEvalType.fromCode(reportType)
+        .orElse(
+          if (subjectIds.isNotEmpty()) {
+            MeasureEvalType.SUBJECT
+          } else {
+            MeasureEvalType.POPULATION
+          },
+        ) as MeasureEvalType
+
+    val report =
+      measureProcessor.evaluateMeasure(
+        /* measure = */ measure,
+        /* periodStart = */ start,
+        /* periodEnd = */ end,
+        /* reportType = */ reportType,
+        /* subjectIds = */ subjectIds,
+        /* additionalData = */ additionalData,
+        /* parameters = */ parameters,
+        /* evalType = */ evalType,
+      )
+
+    // add subject reference for non-individual reportTypes
+    if (report.type.name == MeasureReportType.SUMMARY.name && !subject.isNullOrBlank()) {
+      report.setSubject(Reference(subject))
+    }
+    return report
+  }
+
   /**
    * Generates a [CarePlan] based on the provided inputs.
    *

From 9b4c893170fa4aa432588cd5791949c52af99d1c Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <ndegwamartin@users.noreply.github.com>
Date: Fri, 13 Sep 2024 10:40:00 +0300
Subject: [PATCH 096/126] Reset FhirOperator.kt

All FHIR Operator changes are on this PR here - https://github.com/opensrp/android-fhir/pull/13
---
 .../java/com/google/android/fhir/workflow/FhirOperator.kt     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt b/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt
index 7f04931fca..7ccdc1aea3 100644
--- a/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt
+++ b/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt
@@ -72,10 +72,8 @@ internal constructor(
     MeasureEvaluationOptions().apply { evaluationSettings = this@FhirOperator.evaluationSettings }
 
   private val libraryProcessor = LibraryEngine(repository, evaluationSettings)
-
-  private val measureProcessor = R4MeasureProcessor(repository, measureEvaluationOptions)
-
   private val planDefinitionProcessor = PlanDefinitionProcessor(repository, evaluationSettings)
+  private val measureProcessor = R4MeasureProcessor(repository, measureEvaluationOptions)
 
   /**
    * The function evaluates a FHIR library against the database.

From 545aa69772cd94dfa4ee098e002328d1c293cffd Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Fri, 13 Sep 2024 16:36:40 +0300
Subject: [PATCH 097/126] Disable eTag for bundle uploads

---
 .../android/fhir/sync/upload/request/UploadRequestGenerator.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt b/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt
index 86af7a4b64..f54e1aabf3 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt
@@ -62,6 +62,7 @@ internal object UploadRequestGeneratorFactory {
           mode.httpVerbToUseForCreate,
           mode.httpVerbToUseForUpdate,
           mode.bundleSize,
+          useETagForUpload = false
         )
     }
 }

From ffb393ff6fab9e608d7a4b0941c3c3740f5f2656 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 18 Sep 2024 12:26:46 +0300
Subject: [PATCH 098/126] Refactor gradle configs, use same maven publication
 release

---
 buildSrc/src/main/kotlin/Dependencies.kt |  4 ++--
 buildSrc/src/main/kotlin/Releases.kt     | 14 +++++++-------
 common/build.gradle.kts                  | 10 ----------
 contrib/barcode/build.gradle.kts         | 10 ----------
 contrib/locationwidget/build.gradle.kts  | 10 ----------
 datacapture/build.gradle.kts             | 10 ----------
 engine/build.gradle.kts                  | 10 ----------
 knowledge/build.gradle.kts               | 10 ----------
 workflow/build.gradle.kts                | 10 ----------
 9 files changed, 9 insertions(+), 79 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 11e948133a..10f5817e27 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -84,9 +84,10 @@ object Dependencies {
       "com.google.mlkit:object-detection-custom:${Versions.Mlkit.objectDetectionCustom}"
   }
 
-  const val androidFhirGroup = "org.smartregister"
   const val playServicesLocation =
     "com.google.android.gms:play-services-location:${Versions.playServicesLocation}"
+
+  const val androidFhirGroup = "org.smartregister"
   const val androidFhirEngineModule = "engine"
   const val androidFhirKnowledgeModule = "knowledge"
   const val androidFhirCommon = "$androidFhirGroup:common:${Versions.androidFhirCommon}"
@@ -130,7 +131,6 @@ object Dependencies {
   const val xmlUnit = "org.xmlunit:xmlunit-core:${Versions.xmlUnit}"
 
   object Versions {
-
     const val androidFhirCommon = "0.1.0-alpha05-preview3-SNAPSHOT"
     const val androidFhirEngine = "1.0.0-preview13-SNAPSHOT"
     const val androidFhirKnowledge = "0.1.0-beta01-preview-SNAPSHOT"
diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index a7eed4966d..6ff7a18077 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -15,9 +15,11 @@
  */
 
 import org.gradle.api.Project
+import org.gradle.api.artifacts.repositories.PasswordCredentials
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.credentials
 import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.register
@@ -147,13 +149,11 @@ fun Project.publishArtifact(artifact: LibraryArtifact) {
                 }
               }
             }
-            // Weird quirk, build fails with this entry. Reverting to individual configuration per
-            // module
-            //            maven {
-            //              credentials(PasswordCredentials::class)
-            //              url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-            //              name = "sonatype"
-            //            }
+            maven {
+              credentials(PasswordCredentials::class)
+              url = uri("https://oss.sonatype.org/content/repositories/snapshots")
+              name = "sonatype"
+            }
           }
         }
       }
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index f28e108bf5..8cb024e599 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -7,16 +7,6 @@ plugins {
   jacoco
 }
 
-publishing {
-  repositories {
-    maven {
-      credentials(PasswordCredentials::class)
-      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-      name = "sonatype"
-    }
-  }
-}
-
 publishArtifact(Releases.Common)
 
 createJacocoTestReportTask()
diff --git a/contrib/barcode/build.gradle.kts b/contrib/barcode/build.gradle.kts
index 664d4dc3b9..426cd37624 100644
--- a/contrib/barcode/build.gradle.kts
+++ b/contrib/barcode/build.gradle.kts
@@ -7,16 +7,6 @@ plugins {
   jacoco
 }
 
-publishing {
-  repositories {
-    maven {
-      credentials(PasswordCredentials::class)
-      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-      name = "sonatype"
-    }
-  }
-}
-
 publishArtifact(Releases.Contrib.Barcode)
 
 createJacocoTestReportTask()
diff --git a/contrib/locationwidget/build.gradle.kts b/contrib/locationwidget/build.gradle.kts
index e6d2e96055..dc52ab95a7 100644
--- a/contrib/locationwidget/build.gradle.kts
+++ b/contrib/locationwidget/build.gradle.kts
@@ -7,16 +7,6 @@ plugins {
   jacoco
 }
 
-publishing {
-  repositories {
-    maven {
-      credentials(PasswordCredentials::class)
-      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-      name = "sonatype"
-    }
-  }
-}
-
 publishArtifact(Releases.Contrib.LocationWidget)
 
 createJacocoTestReportTask()
diff --git a/datacapture/build.gradle.kts b/datacapture/build.gradle.kts
index c0ccc118f3..8726fc504f 100644
--- a/datacapture/build.gradle.kts
+++ b/datacapture/build.gradle.kts
@@ -9,16 +9,6 @@ plugins {
   id(Plugins.BuildPlugins.dokka).version(Plugins.Versions.dokka)
 }
 
-publishing {
-  repositories {
-    maven {
-      credentials(PasswordCredentials::class)
-      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-      name = "sonatype"
-    }
-  }
-}
-
 publishArtifact(Releases.DataCapture)
 
 createJacocoTestReportTask()
diff --git a/engine/build.gradle.kts b/engine/build.gradle.kts
index a67ce7fa70..d18f5f60ed 100644
--- a/engine/build.gradle.kts
+++ b/engine/build.gradle.kts
@@ -10,16 +10,6 @@ plugins {
   id(Plugins.BuildPlugins.dokka).version(Plugins.Versions.dokka)
 }
 
-publishing {
-  repositories {
-    maven {
-      credentials(PasswordCredentials::class)
-      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-      name = "sonatype"
-    }
-  }
-}
-
 publishArtifact(Releases.Engine)
 
 createJacocoTestReportTask()
diff --git a/knowledge/build.gradle.kts b/knowledge/build.gradle.kts
index d09748bdad..0a1f5fed19 100644
--- a/knowledge/build.gradle.kts
+++ b/knowledge/build.gradle.kts
@@ -10,16 +10,6 @@ plugins {
   id(Plugins.BuildPlugins.dokka).version(Plugins.Versions.dokka)
 }
 
-publishing {
-  repositories {
-    maven {
-      credentials(PasswordCredentials::class)
-      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-      name = "sonatype"
-    }
-  }
-}
-
 publishArtifact(Releases.Knowledge)
 
 createJacocoTestReportTask()
diff --git a/workflow/build.gradle.kts b/workflow/build.gradle.kts
index a5506c7bc3..3d2696e944 100644
--- a/workflow/build.gradle.kts
+++ b/workflow/build.gradle.kts
@@ -9,16 +9,6 @@ plugins {
   id(Plugins.BuildPlugins.dokka).version(Plugins.Versions.dokka)
 }
 
-publishing {
-  repositories {
-    maven {
-      credentials(PasswordCredentials::class)
-      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-      name = "sonatype"
-    }
-  }
-}
-
 publishArtifact(Releases.Workflow)
 
 createJacocoTestReportTask()

From 45b96ff8318db470a49f137ac646c22259830151 Mon Sep 17 00:00:00 2001
From: Rkareko <rkareko@ona.io>
Date: Mon, 30 Sep 2024 12:44:36 +0300
Subject: [PATCH 099/126] Fix error validation highlighting not working when
 submit button is clicked bug bump updata capture lib version

---
 .../google/android/fhir/datacapture/QuestionnaireViewModel.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
index 35ca593755..de8a378ff4 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
@@ -1123,7 +1123,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
       // Results in a new questionnaire state being generated synchronously, i.e., the current
       // thread will be suspended until the new state is generated.
       modificationCount.update { it + 1 }
-      forceValidation = false
+      //forceValidation = false
     }
 
     if (

From 10e24efb674f15666a35ce86009a65663870d951 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 2 Oct 2024 11:30:55 +0300
Subject: [PATCH 100/126]     SDK Release - Engine, SDC, Knowledge, Workflow

    FORK
             - With unmerged PR https://github.com/opensrp/android-fhir/pull/9
                - WUP  https://github.com/opensrp/android-fhir/pull/13

    SDK
                - WUP https://github.com/google/android-fhir/pull/2178
                - WUP https://github.com/google/android-fhir/pull/2650
                - WUP https://github.com/google/android-fhir/pull/2663
    PERF
    - WUP https://github.com/google/android-fhir/pull/2669
    - WUP https://github.com/google/android-fhir/pull/2565
    - WUP https://github.com/google/android-fhir/issues/2561
    - WUP https://github.com/google/android-fhir/pull/2535
---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index f2c245ab37..ad0a7a3a3e 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -56,7 +56,7 @@ object Releases {
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.2.0"
+    override val version = "1.2.0-preview-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 

From 0d17139f678afccec100abfa1f40eee1d85ca850 Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Mon, 7 Oct 2024 15:08:37 +0700
Subject: [PATCH 101/126] Use toSpanned

---
 .../android/fhir/datacapture/extensions/MoreTypes.kt |  3 +++
 .../factories/CheckBoxGroupViewHolderFactory.kt      |  4 ++--
 .../views/factories/DropDownViewHolderFactory.kt     | 12 ++++++++----
 .../views/factories/RadioGroupViewHolderFactory.kt   |  4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreTypes.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreTypes.kt
index bf6a2b00bd..c51bfb8413 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreTypes.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreTypes.kt
@@ -17,6 +17,7 @@
 package com.google.android.fhir.datacapture.extensions
 
 import android.content.Context
+import android.text.Spanned
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.views.factories.localDate
 import com.google.android.fhir.datacapture.views.factories.localTime
@@ -57,6 +58,8 @@ fun Type.asStringValue(): String {
 fun Type.displayString(context: Context): String =
   getDisplayString(this, context) ?: context.getString(R.string.not_answered)
 
+fun Type.displayStringSpanned(context: Context): Spanned = displayString(context).toSpanned()
+
 /** Returns value as string depending on the [Type] of element. */
 fun Type.getValueAsString(context: Context): String =
   getValueString(this) ?: context.getString(R.string.not_answered)
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/CheckBoxGroupViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/CheckBoxGroupViewHolderFactory.kt
index 6e41ca6b9f..179eb7da79 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/CheckBoxGroupViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/CheckBoxGroupViewHolderFactory.kt
@@ -27,7 +27,7 @@ import androidx.lifecycle.lifecycleScope
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.extensions.ChoiceOrientationTypes
 import com.google.android.fhir.datacapture.extensions.choiceOrientation
-import com.google.android.fhir.datacapture.extensions.displayString
+import com.google.android.fhir.datacapture.extensions.displayStringSpanned
 import com.google.android.fhir.datacapture.extensions.itemAnswerOptionImage
 import com.google.android.fhir.datacapture.extensions.optionExclusive
 import com.google.android.fhir.datacapture.extensions.tryUnwrapContext
@@ -104,7 +104,7 @@ internal object CheckBoxGroupViewHolderFactory :
         val checkbox =
           checkboxLayout.findViewById<CheckBox>(R.id.check_box).apply {
             id = viewId
-            text = answerOption.value.displayString(header.context)
+            text = answerOption.value.displayStringSpanned(header.context)
             setCompoundDrawablesRelative(
               answerOption.itemAnswerOptionImage(checkboxGroup.context),
               null,
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt
index 1a3c581f1c..8bcfc54e31 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt
@@ -18,6 +18,7 @@ package com.google.android.fhir.datacapture.views.factories
 
 import android.content.Context
 import android.graphics.drawable.Drawable
+import android.text.Spanned
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -33,6 +34,7 @@ import com.google.android.fhir.datacapture.extensions.getValidationErrorMessage
 import com.google.android.fhir.datacapture.extensions.identifierString
 import com.google.android.fhir.datacapture.extensions.itemAnswerOptionImage
 import com.google.android.fhir.datacapture.extensions.localizedFlyoverSpanned
+import com.google.android.fhir.datacapture.extensions.toSpanned
 import com.google.android.fhir.datacapture.extensions.tryUnwrapContext
 import com.google.android.fhir.datacapture.validation.ValidationResult
 import com.google.android.fhir.datacapture.views.HeaderView
@@ -92,8 +94,8 @@ internal object DropDownViewHolderFactory :
         answerOptionList
           .firstOrNull { it.answerId == selectedAnswerIdentifier }
           ?.let {
-            autoCompleteTextView.setText(it.answerOptionString)
-            autoCompleteTextView.setSelection(it.answerOptionString.length)
+            autoCompleteTextView.setText(it.answerOptionStringSpanned())
+            autoCompleteTextView.setSelection(it.answerOptionStringSpanned().length)
             autoCompleteTextView.setCompoundDrawablesRelative(
               it.answerOptionImage,
               null,
@@ -105,7 +107,7 @@ internal object DropDownViewHolderFactory :
         autoCompleteTextView.onItemClickListener =
           AdapterView.OnItemClickListener { _, _, position, _ ->
             val selectedItem = adapter.getItem(position)
-            autoCompleteTextView.setText(selectedItem?.answerOptionString, false)
+            autoCompleteTextView.setText(selectedItem?.answerOptionStringSpanned(), false)
             autoCompleteTextView.setCompoundDrawablesRelative(
               adapter.getItem(position)?.answerOptionImage,
               null,
@@ -165,7 +167,7 @@ internal class AnswerOptionDropDownArrayAdapter(
       val answerOption: DropDownAnswerOption? = getItem(position)
       val answerOptionTextView =
         listItemView?.findViewById<View>(R.id.answer_option_textview) as TextView
-      answerOptionTextView.text = answerOption?.answerOptionString
+      answerOptionTextView.text = answerOption?.answerOptionStringSpanned()
       answerOptionTextView.setCompoundDrawablesRelative(
         answerOption?.answerOptionImage,
         null,
@@ -187,4 +189,6 @@ internal data class DropDownAnswerOption(
   override fun toString(): String {
     return this.answerOptionString
   }
+
+  fun answerOptionStringSpanned(): Spanned = answerOptionString.toSpanned()
 }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/RadioGroupViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/RadioGroupViewHolderFactory.kt
index 876a4f3ac6..f912560425 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/RadioGroupViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/RadioGroupViewHolderFactory.kt
@@ -28,7 +28,7 @@ import androidx.lifecycle.lifecycleScope
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.extensions.ChoiceOrientationTypes
 import com.google.android.fhir.datacapture.extensions.choiceOrientation
-import com.google.android.fhir.datacapture.extensions.displayString
+import com.google.android.fhir.datacapture.extensions.displayStringSpanned
 import com.google.android.fhir.datacapture.extensions.itemAnswerOptionImage
 import com.google.android.fhir.datacapture.extensions.tryUnwrapContext
 import com.google.android.fhir.datacapture.validation.Invalid
@@ -113,7 +113,7 @@ internal object RadioGroupViewHolderFactory :
         val radioButton =
           radioButtonItem.findViewById<RadioButton>(R.id.radio_button).apply {
             id = viewId
-            text = answerOption.value.displayString(header.context)
+            text = answerOption.value.displayStringSpanned(header.context)
             setCompoundDrawablesRelative(
               answerOption.itemAnswerOptionImage(radioGroup.context),
               null,

From 440d74ceeb3ffe3984df76d838f02f86faff975d Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Tue, 8 Oct 2024 11:23:21 +0700
Subject: [PATCH 102/126] Fix test

---
 .../views/factories/CheckBoxGroupViewHolderFactoryTest.kt   | 6 ++++--
 .../views/factories/RadioGroupViewHolderFactoryTest.kt      | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/CheckBoxGroupViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/CheckBoxGroupViewHolderFactoryTest.kt
index bc49267601..f5f361cc87 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/CheckBoxGroupViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/CheckBoxGroupViewHolderFactoryTest.kt
@@ -124,7 +124,8 @@ class CheckBoxGroupViewHolderFactoryTest {
     val checkBoxGroup = viewHolder.itemView.findViewById<ConstraintLayout>(R.id.checkbox_group)
     val children = checkBoxGroup.children.asIterable().filterIsInstance<CheckBox>()
     children.forEachIndexed { index, view ->
-      assertThat(view.text).isEqualTo(questionnaire.answerOption[index].valueCoding.display)
+      assertThat(view.text.toString())
+        .isEqualTo(questionnaire.answerOption[index].valueCoding.display)
       assertThat(view.layoutParams.width).isEqualTo(ViewGroup.LayoutParams.MATCH_PARENT)
     }
   }
@@ -161,7 +162,8 @@ class CheckBoxGroupViewHolderFactoryTest {
     val checkBoxGroup = viewHolder.itemView.findViewById<ConstraintLayout>(R.id.checkbox_group)
     val children = checkBoxGroup.children.asIterable().filterIsInstance<CheckBox>()
     children.forEachIndexed { index, view ->
-      assertThat(view.text).isEqualTo(questionnaire.answerOption[index].valueCoding.display)
+      assertThat(view.text.toString())
+        .isEqualTo(questionnaire.answerOption[index].valueCoding.display)
       assertThat(view.layoutParams.width).isEqualTo(ViewGroup.LayoutParams.WRAP_CONTENT)
     }
   }
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/RadioGroupViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/RadioGroupViewHolderFactoryTest.kt
index cb2d536d58..6f4bc8a3e4 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/RadioGroupViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/RadioGroupViewHolderFactoryTest.kt
@@ -118,7 +118,8 @@ class RadioGroupViewHolderFactoryTest {
     val radioGroup = viewHolder.itemView.findViewById<ConstraintLayout>(R.id.radio_group)
     val children = radioGroup.children.asIterable().filterIsInstance<RadioButton>()
     children.forEachIndexed { index, view ->
-      assertThat(view.text).isEqualTo(questionnaire.answerOption[index].valueCoding.display)
+      assertThat(view.text.toString())
+        .isEqualTo(questionnaire.answerOption[index].valueCoding.display)
       assertThat(view.layoutParams.width).isEqualTo(ViewGroup.LayoutParams.MATCH_PARENT)
     }
   }
@@ -154,7 +155,8 @@ class RadioGroupViewHolderFactoryTest {
     val radioGroup = viewHolder.itemView.findViewById<ConstraintLayout>(R.id.radio_group)
     val children = radioGroup.children.asIterable().filterIsInstance<RadioButton>()
     children.forEachIndexed { index, view ->
-      assertThat(view.text).isEqualTo(questionnaire.answerOption[index].valueCoding.display)
+      assertThat(view.text.toString())
+        .isEqualTo(questionnaire.answerOption[index].valueCoding.display)
       assertThat(view.layoutParams.width).isEqualTo(ViewGroup.LayoutParams.WRAP_CONTENT)
     }
   }

From c6715e69b93687a34e95ec8c4cead6febf6601be Mon Sep 17 00:00:00 2001
From: Rkareko <rkareko@ona.io>
Date: Thu, 10 Oct 2024 09:45:38 +0300
Subject: [PATCH 103/126] Add empty questionnaire response items for repeat
 groups without answers

---
 .../extensions/MoreQuestionnaireItemComponents.kt            | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
index 0acd26c93f..e6b25e085f 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
@@ -941,13 +941,10 @@ internal fun QuestionnaireItemComponent.createQuestionnaireResponseItem():
     ) {
       this.copyNestedItemsToChildlessAnswers(this@createQuestionnaireResponseItem)
     } else if (
-      this@createQuestionnaireResponseItem.type == Questionnaire.QuestionnaireItemType.GROUP &&
-        !repeats
+      this@createQuestionnaireResponseItem.type == Questionnaire.QuestionnaireItemType.GROUP
     ) {
       this@createQuestionnaireResponseItem.item.forEach {
-        if (!it.isRepeatedGroup) {
           this.addItem(it.createQuestionnaireResponseItem())
-        }
       }
     }
   }

From 8eb678167fb79d16211e4204ab3c6a13cfdad631 Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Mon, 14 Oct 2024 23:08:56 +0700
Subject: [PATCH 104/126] Remove toString

---
 .../views/factories/AutoCompleteViewHolderFactory.kt        | 6 +-----
 .../views/factories/DropDownViewHolderFactory.kt            | 3 ---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AutoCompleteViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AutoCompleteViewHolderFactory.kt
index 149185aeb3..fa48859821 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AutoCompleteViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AutoCompleteViewHolderFactory.kt
@@ -242,8 +242,4 @@ internal object AutoCompleteViewHolderFactory :
  * An answer option that would show up as a dropdown item in an [AutoCompleteViewHolderFactory]
  * textview
  */
-internal data class AutoCompleteViewAnswerOption(val answerId: String, val answerDisplay: String) {
-  override fun toString(): String {
-    return this.answerDisplay
-  }
-}
+internal data class AutoCompleteViewAnswerOption(val answerId: String, val answerDisplay: String)
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt
index 8bcfc54e31..a9462c6d2c 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt
@@ -186,9 +186,6 @@ internal data class DropDownAnswerOption(
   val answerOptionString: String,
   val answerOptionImage: Drawable? = null,
 ) {
-  override fun toString(): String {
-    return this.answerOptionString
-  }
 
   fun answerOptionStringSpanned(): Spanned = answerOptionString.toSpanned()
 }

From c0217711712776ae5f1317f8cef23f04a8440a83 Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Tue, 15 Oct 2024 05:56:24 +0700
Subject: [PATCH 105/126] Add toSpanned for review mode

---
 .../views/factories/ReviewViewHolderFactory.kt         |  3 ++-
 .../views/factories/ReviewViewHolderFactoryTest.kt     | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt
index a6621b2aba..cb69258760 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt
@@ -26,6 +26,7 @@ import com.google.android.fhir.datacapture.extensions.getHeaderViewVisibility
 import com.google.android.fhir.datacapture.extensions.getLocalizedInstructionsSpanned
 import com.google.android.fhir.datacapture.extensions.localizedFlyoverSpanned
 import com.google.android.fhir.datacapture.extensions.localizedPrefixSpanned
+import com.google.android.fhir.datacapture.extensions.toSpanned
 import com.google.android.fhir.datacapture.extensions.updateTextAndVisibility
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
@@ -90,7 +91,7 @@ internal object ReviewViewHolderFactory : QuestionnaireItemViewHolderFactory(R.l
             answerView.visibility = GONE
           }
           else -> {
-            answerView.text = questionnaireViewItem.answerString(answerView.context)
+            answerView.text = questionnaireViewItem.answerString(answerView.context).toSpanned()
             answerView.visibility = VISIBLE
             if (questionnaireViewItem.validationResult is Invalid) {
               errorView.findViewById<TextView>(R.id.error_text_view).text =
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactoryTest.kt
index cfa8ea2408..3e43a24d3d 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactoryTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-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.
@@ -180,7 +180,7 @@ class ReviewViewHolderFactoryTest {
       ),
     )
 
-    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.answer_text_view).text)
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.answer_text_view).text.toString())
       .isEqualTo(
         ApplicationProvider.getApplicationContext<Application>().getString(R.string.not_answered),
       )
@@ -206,7 +206,7 @@ class ReviewViewHolderFactoryTest {
       ),
     )
 
-    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.answer_text_view).text)
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.answer_text_view).text.toString())
       .isEqualTo(ApplicationProvider.getApplicationContext<Application>().getString(R.string.yes))
   }
 
@@ -321,7 +321,7 @@ class ReviewViewHolderFactoryTest {
       ),
     )
 
-    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.answer_text_view).text)
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.answer_text_view).text.toString())
       .isEqualTo("Yes")
   }
 
@@ -340,7 +340,7 @@ class ReviewViewHolderFactoryTest {
       ),
     )
 
-    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.answer_text_view).text)
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.answer_text_view).text.toString())
       .isEqualTo("Not Answered")
   }
 

From 3181613e6ffbaf6e6548e2b260b16efbd85aebd6 Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Wed, 30 Oct 2024 08:29:58 +0700
Subject: [PATCH 106/126] Add toSpanned for dialog

---
 .../fhir/datacapture/views/OptionSelectDialogFragment.kt     | 3 ++-
 .../views/factories/DialogSelectViewHolderFactory.kt         | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt
index 4fb0238ca0..ab40dc3eb1 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt
@@ -41,6 +41,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.extensions.itemAnswerOptionImage
 import com.google.android.fhir.datacapture.extensions.optionExclusive
+import com.google.android.fhir.datacapture.extensions.toSpanned
 import com.google.android.fhir.datacapture.views.factories.OptionSelectOption
 import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemDialogSelectViewModel
 import com.google.android.fhir.datacapture.views.factories.SelectedOptions
@@ -208,7 +209,7 @@ private class OptionSelectAdapter(val multiSelectEnabled: Boolean) :
           } else {
             (holder as OptionSelectViewHolder.OptionSingle).radioButton
           }
-        compoundButton.text = item.option.displayString
+        compoundButton.text = item.option.displayString.toSpanned()
         compoundButton.setCompoundDrawablesRelative(
           item.option.item.itemAnswerOptionImage(compoundButton.context),
           null,
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt
index 85769b3679..206a4b77e2 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt
@@ -32,6 +32,7 @@ import com.google.android.fhir.datacapture.extensions.getRequiredOrOptionalText
 import com.google.android.fhir.datacapture.extensions.getValidationErrorMessage
 import com.google.android.fhir.datacapture.extensions.itemControl
 import com.google.android.fhir.datacapture.extensions.localizedFlyoverSpanned
+import com.google.android.fhir.datacapture.extensions.toSpanned
 import com.google.android.fhir.datacapture.extensions.tryUnwrapContext
 import com.google.android.fhir.datacapture.validation.ValidationResult
 import com.google.android.fhir.datacapture.views.HeaderView
@@ -76,12 +77,12 @@ internal object QuestionnaireItemDialogSelectViewHolderFactory :
 
         val questionnaireItem = questionnaireViewItem.questionnaireItem
         val selectedOptions = questionnaireViewItem.extractInitialOptions(holder.header.context)
-        holder.summary.text = selectedOptions.selectedSummary
+        holder.summary.text = selectedOptions.selectedSummary.toSpanned()
         selectedOptionsJob =
           activity.lifecycleScope.launch {
             // Listen for changes to selected options to update summary + FHIR data model
             viewModel.getSelectedOptionsFlow(questionnaireItem.linkId).collect { selectedOptions ->
-              holder.summary.text = selectedOptions.selectedSummary
+              holder.summary.text = selectedOptions.selectedSummary.toSpanned()
               updateAnswers(selectedOptions)
             }
           }

From 7300429419b966725226bed30b5db061ecb63ebf Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Wed, 30 Oct 2024 23:24:53 +0700
Subject: [PATCH 107/126] Revert "Remove toString"

This reverts commit 8eb678167fb79d16211e4204ab3c6a13cfdad631.
---
 .../views/factories/AutoCompleteViewHolderFactory.kt        | 6 +++++-
 .../views/factories/DropDownViewHolderFactory.kt            | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AutoCompleteViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AutoCompleteViewHolderFactory.kt
index fa48859821..149185aeb3 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AutoCompleteViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AutoCompleteViewHolderFactory.kt
@@ -242,4 +242,8 @@ internal object AutoCompleteViewHolderFactory :
  * An answer option that would show up as a dropdown item in an [AutoCompleteViewHolderFactory]
  * textview
  */
-internal data class AutoCompleteViewAnswerOption(val answerId: String, val answerDisplay: String)
+internal data class AutoCompleteViewAnswerOption(val answerId: String, val answerDisplay: String) {
+  override fun toString(): String {
+    return this.answerDisplay
+  }
+}
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt
index a9462c6d2c..8bcfc54e31 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt
@@ -186,6 +186,9 @@ internal data class DropDownAnswerOption(
   val answerOptionString: String,
   val answerOptionImage: Drawable? = null,
 ) {
+  override fun toString(): String {
+    return this.answerOptionString
+  }
 
   fun answerOptionStringSpanned(): Spanned = answerOptionString.toSpanned()
 }

From d43a0e89b75cc6ae8a40ffd57b1b7ac641b08987 Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Thu, 31 Oct 2024 16:37:17 +0700
Subject: [PATCH 108/126] Trigger CI


From 855b580c9dc8ff7286431ce5ac315cd4f73d7f9b Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Thu, 31 Oct 2024 17:20:43 +0700
Subject: [PATCH 109/126] Use dialog extension instead of dialog item-control

---
 catalog/src/main/assets/component_modal.json  |  9 ++-
 .../datacapture/QuestionnaireEditAdapter.kt   |  6 +-
 .../MoreQuestionnaireItemComponents.kt        | 11 +++
 .../QuestionnaireEditAdapterTest.kt           | 79 +++++++++++++++++++
 4 files changed, 101 insertions(+), 4 deletions(-)

diff --git a/catalog/src/main/assets/component_modal.json b/catalog/src/main/assets/component_modal.json
index 6ce9ee9170..e8cf2a1c50 100644
--- a/catalog/src/main/assets/component_modal.json
+++ b/catalog/src/main/assets/component_modal.json
@@ -9,12 +9,15 @@
             "coding": [
               {
                 "system": "http://hl7.org/fhir/questionnaire-item-control",
-                "code": "lookup",
-                "display": "Lookup"
+                "code": "check-box",
+                "display": "Check Box"
               }
             ],
-            "text": "Lookup"
+            "text": "Check box"
           }
+        },
+        {
+          "url": "https://github.com/google/android-fhir/dialog"
         }
       ],
       "linkId": "1.1",
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapter.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapter.kt
index 2b2ea328cf..369ec1d866 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapter.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapter.kt
@@ -25,6 +25,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.android.fhir.datacapture.contrib.views.PhoneNumberViewHolderFactory
 import com.google.android.fhir.datacapture.extensions.inflate
 import com.google.android.fhir.datacapture.extensions.itemControl
+import com.google.android.fhir.datacapture.extensions.shouldUseDialog
 import com.google.android.fhir.datacapture.views.NavigationViewHolder
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.fhir.datacapture.views.factories.AttachmentViewHolderFactory
@@ -242,7 +243,10 @@ internal class QuestionnaireEditAdapter(
     val questionnaireItem = questionnaireViewItem.questionnaireItem
 
     // Use the view type that the client wants if they specified an itemControl
-    return questionnaireItem.itemControl?.viewHolderType
+    return when {
+      questionnaireItem.shouldUseDialog -> QuestionnaireViewHolderType.DIALOG_SELECT
+      else -> questionnaireItem.itemControl?.viewHolderType
+    }
     // Otherwise, choose a sensible UI element automatically
     ?: run {
         val numOptions = questionnaireViewItem.enabledAnswerOptions.size
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
index 093cea4a28..15948c8e92 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
@@ -61,6 +61,8 @@ internal const val EXTENSION_ITEM_CONTROL_URL_ANDROID_FHIR =
 internal const val EXTENSION_ITEM_CONTROL_SYSTEM_ANDROID_FHIR =
   "https://github.com/google/android-fhir/questionnaire-item-control"
 
+internal const val EXTENSION_DIALOG_URL_ANDROID_FHIR = "https://github.com/google/android-fhir/dialog"
+
 // Below URLs exist and are supported by HL7
 
 internal const val EXTENSION_ANSWER_EXPRESSION_URL: String =
@@ -231,6 +233,15 @@ val QuestionnaireItemComponent.itemControlCode: String?
 val QuestionnaireItemComponent.itemControl: ItemControlTypes?
   get() = ItemControlTypes.values().firstOrNull { it.extensionCode == itemControlCode }
 
+private val QuestionnaireItemComponent.hasDialogExtension: Boolean
+  get() = this.extension.any { it.url == EXTENSION_DIALOG_URL_ANDROID_FHIR }
+
+val QuestionnaireItemComponent.shouldUseDialog: Boolean
+  get() =
+    this.hasDialogExtension &&
+      (this.itemControl?.viewHolderType == QuestionnaireViewHolderType.CHECK_BOX_GROUP ||
+        this.itemControl?.viewHolderType == QuestionnaireViewHolderType.RADIO_GROUP)
+
 /**
  * The desired orientation for the list of choices.
  *
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapterTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapterTest.kt
index 6dd1a3e33d..8532bb0d92 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapterTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapterTest.kt
@@ -19,6 +19,7 @@ package com.google.android.fhir.datacapture
 import android.os.Build
 import android.widget.FrameLayout
 import androidx.test.core.app.ApplicationProvider
+import com.google.android.fhir.datacapture.extensions.EXTENSION_DIALOG_URL_ANDROID_FHIR
 import com.google.android.fhir.datacapture.extensions.EXTENSION_ITEM_CONTROL_SYSTEM
 import com.google.android.fhir.datacapture.extensions.EXTENSION_ITEM_CONTROL_SYSTEM_ANDROID_FHIR
 import com.google.android.fhir.datacapture.extensions.EXTENSION_ITEM_CONTROL_URL
@@ -496,6 +497,84 @@ class QuestionnaireEditAdapterTest {
       .isEqualTo(QuestionnaireViewHolderType.DROP_DOWN.value)
   }
 
+  @Suppress("ktlint:standard:max-line-length")
+  @Test
+  fun getItemViewType_choiceItemType_itemControlExtensionWithRadioButton_andDialogExtension_shouldReturnDialogSelectViewHolderType() {
+    val questionnaireEditAdapter = QuestionnaireEditAdapter()
+    val questionnaireItem =
+      Questionnaire.QuestionnaireItemComponent().setType(Questionnaire.QuestionnaireItemType.CHOICE)
+    questionnaireItem.apply {
+      addExtension(
+        Extension()
+          .setUrl(EXTENSION_ITEM_CONTROL_URL)
+          .setValue(
+            CodeableConcept()
+              .addCoding(
+                Coding()
+                  .setCode(ItemControlTypes.RADIO_BUTTON.extensionCode)
+                  .setDisplay("Radio Button")
+                  .setSystem(EXTENSION_ITEM_CONTROL_SYSTEM),
+              ),
+          ),
+      )
+      addExtension(Extension().setUrl(EXTENSION_DIALOG_URL_ANDROID_FHIR))
+    }
+    questionnaireEditAdapter.submitList(
+      listOf(
+        QuestionnaireAdapterItem.Question(
+          QuestionnaireViewItem(
+            questionnaireItem,
+            QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+            validationResult = NotValidated,
+            answersChangedCallback = { _, _, _, _ -> },
+          ),
+        ),
+      ),
+    )
+
+    assertThat(questionnaireEditAdapter.getItemViewType(0))
+      .isEqualTo(QuestionnaireViewHolderType.DIALOG_SELECT.value)
+  }
+
+  @Suppress("ktlint:standard:max-line-length")
+  @Test
+  fun getItemViewType_choiceItemType_itemControlExtensionWithCheckBox_andDialogExtension_shouldReturnDialogSelectViewHolderType() {
+    val questionnaireEditAdapter = QuestionnaireEditAdapter()
+    val questionnaireItem =
+      Questionnaire.QuestionnaireItemComponent().setType(Questionnaire.QuestionnaireItemType.CHOICE)
+    questionnaireItem.apply {
+      addExtension(
+        Extension()
+          .setUrl(EXTENSION_ITEM_CONTROL_URL)
+          .setValue(
+            CodeableConcept()
+              .addCoding(
+                Coding()
+                  .setCode(ItemControlTypes.CHECK_BOX.extensionCode)
+                  .setDisplay("Check Box")
+                  .setSystem(EXTENSION_ITEM_CONTROL_SYSTEM),
+              ),
+          ),
+      )
+      addExtension(Extension().setUrl(EXTENSION_DIALOG_URL_ANDROID_FHIR))
+    }
+    questionnaireEditAdapter.submitList(
+      listOf(
+        QuestionnaireAdapterItem.Question(
+          QuestionnaireViewItem(
+            questionnaireItem,
+            QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+            validationResult = NotValidated,
+            answersChangedCallback = { _, _, _, _ -> },
+          ),
+        ),
+      ),
+    )
+
+    assertThat(questionnaireEditAdapter.getItemViewType(0))
+      .isEqualTo(QuestionnaireViewHolderType.DIALOG_SELECT.value)
+  }
+
   // TODO: test errors thrown for unsupported types
 
   @Test

From 2a95708ea197c32772c86c8cacd14716fb24688f Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Thu, 31 Oct 2024 17:24:05 +0700
Subject: [PATCH 110/126] Update comment

---
 .../google/android/fhir/datacapture/QuestionnaireEditAdapter.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapter.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapter.kt
index 369ec1d866..90f43a53c6 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapter.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapter.kt
@@ -242,7 +242,7 @@ internal class QuestionnaireEditAdapter(
   ): QuestionnaireViewHolderType {
     val questionnaireItem = questionnaireViewItem.questionnaireItem
 
-    // Use the view type that the client wants if they specified an itemControl
+    // Use the view type that the client wants if they specified an itemControl or dialog extension
     return when {
       questionnaireItem.shouldUseDialog -> QuestionnaireViewHolderType.DIALOG_SELECT
       else -> questionnaireItem.itemControl?.viewHolderType

From bd478701b8f8e35485745a7e27ab112c745e98cd Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Thu, 31 Oct 2024 17:33:30 +0700
Subject: [PATCH 111/126] spotless

---
 .../datacapture/extensions/MoreQuestionnaireItemComponents.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
index 15948c8e92..b3a15e5902 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
@@ -61,7 +61,8 @@ internal const val EXTENSION_ITEM_CONTROL_URL_ANDROID_FHIR =
 internal const val EXTENSION_ITEM_CONTROL_SYSTEM_ANDROID_FHIR =
   "https://github.com/google/android-fhir/questionnaire-item-control"
 
-internal const val EXTENSION_DIALOG_URL_ANDROID_FHIR = "https://github.com/google/android-fhir/dialog"
+internal const val EXTENSION_DIALOG_URL_ANDROID_FHIR =
+  "https://github.com/google/android-fhir/dialog"
 
 // Below URLs exist and are supported by HL7
 

From 3e733d7e73ad095bf3bd8d62a2e780bda6d370cf Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Thu, 31 Oct 2024 17:47:57 +0700
Subject: [PATCH 112/126] Revert lookup item control

---
 .../datacapture/extensions/MoreQuestionnaireItemComponents.kt    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
index b3a15e5902..be321ebc89 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
@@ -191,7 +191,6 @@ enum class ItemControlTypes(
   CHECK_BOX("check-box", QuestionnaireViewHolderType.CHECK_BOX_GROUP),
   DROP_DOWN("drop-down", QuestionnaireViewHolderType.DROP_DOWN),
   OPEN_CHOICE("open-choice", QuestionnaireViewHolderType.DIALOG_SELECT),
-  LOOKUP("lookup", QuestionnaireViewHolderType.DIALOG_SELECT),
   RADIO_BUTTON("radio-button", QuestionnaireViewHolderType.RADIO_GROUP),
   SLIDER("slider", QuestionnaireViewHolderType.SLIDER),
   PHONE_NUMBER("phone-number", QuestionnaireViewHolderType.PHONE_NUMBER),

From 0abb05d55998e03b01288e94d3c36c543c9f67b4 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Mon, 4 Nov 2024 18:03:26 +0300
Subject: [PATCH 113/126] SDK Release - Engine, SDC, Workflow

FORK
                - With unmerged PR https://github.com/opensrp/android-fhir/pull/9
                - WUP  https://github.com/opensrp/android-fhir/pull/13

SDK
                - WUP https://github.com/google/android-fhir/pull/2178
                - WUP https://github.com/google/android-fhir/pull/2650
                - WUP https://github.com/google/android-fhir/pull/2663
                - WUP https://github.com/google/android-fhir/pull/2689
---
 buildSrc/src/main/kotlin/Releases.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 46f7ab98ea..5c50f80b7b 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -50,19 +50,19 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "1.0.0-preview14-SNAPSHOT"
+    override val version = "1.0.0-preview15-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.2.0-preview-SNAPSHOT"
+    override val version = "1.2.0-preview2-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 
   object Workflow : LibraryArtifact {
     override val artifactId = "workflow"
-    override val version = "0.1.0-beta01"
+    override val version = "0.1.0-beta01-preview-SNAPSHOT"
     override val name = "Android FHIR Workflow Library"
   }
 

From fbb0b0aebd914ad4ab8bcd148624650b22799784 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Tue, 5 Nov 2024 10:32:32 +0300
Subject: [PATCH 114/126]     SDK Release - Engine, SDC, Workflow

    FORK
                    - With unmerged PR https://github.com/opensrp/android-fhir/pull/9
                    - WUP  https://github.com/opensrp/android-fhir/pull/13

    SDK
                    - WUP https://github.com/google/android-fhir/pull/2178
                    - WUP https://github.com/google/android-fhir/pull/2650
                    - WUP https://github.com/google/android-fhir/pull/2663
                    - WUP https://github.com/google/android-fhir/pull/2689
                    - WUP https://github.com/google/android-fhir/pull/2645
---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 5c50f80b7b..ee520410ec 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -56,7 +56,7 @@ object Releases {
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.2.0-preview2-SNAPSHOT"
+    override val version = "1.2.0-preview3-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 

From ffed82ab6341ba26dbf7c0db2291cee49f9a0201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=E2=89=A1ZRS?= <12814349+LZRS@users.noreply.github.com>
Date: Fri, 8 Nov 2024 21:36:59 +0300
Subject: [PATCH 115/126] Move the parallelized mapping outside db transaction

---
 .../android/fhir/db/impl/DatabaseImpl.kt      | 65 ++++++++++---------
 1 file changed, 35 insertions(+), 30 deletions(-)

diff --git a/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt b/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
index 40de8d320b..d995b2fbbf 100644
--- a/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
@@ -229,49 +229,54 @@ internal class DatabaseImpl(
   override suspend fun <R : Resource> search(
     query: SearchQuery,
   ): List<ResourceWithUUID<R>> {
-    return db.withTransaction {
-      resourceDao.getResources(SimpleSQLiteQuery(query.query, query.args.toTypedArray())).pmap(
-        Dispatchers.Default,
-      ) {
-        ResourceWithUUID(
-          it.uuid,
-          FhirContext.forR4Cached().newJsonParser().parseResource(it.serializedResource) as R,
-        )
+    val dbResult =
+      db.withTransaction {
+        resourceDao.getResources(SimpleSQLiteQuery(query.query, query.args.toTypedArray()))
       }
+
+    return dbResult.pmap(
+      Dispatchers.Default,
+    ) {
+      ResourceWithUUID(
+        it.uuid,
+        FhirContext.forR4Cached().newJsonParser().parseResource(it.serializedResource) as R,
+      )
     }
   }
 
   override suspend fun searchForwardReferencedResources(
     query: SearchQuery,
   ): List<ForwardIncludeSearchResult> {
-    return db.withTransaction {
-      resourceDao
-        .getForwardReferencedResources(SimpleSQLiteQuery(query.query, query.args.toTypedArray()))
-        .pmap(Dispatchers.Default) {
-          ForwardIncludeSearchResult(
-            it.matchingIndex,
-            it.baseResourceUUID,
-            FhirContext.forR4Cached().newJsonParser().parseResource(it.serializedResource)
-              as Resource,
-          )
-        }
+    val dbResult =
+      db.withTransaction {
+        resourceDao.getForwardReferencedResources(
+          SimpleSQLiteQuery(query.query, query.args.toTypedArray()),
+        )
+      }
+    return dbResult.pmap(Dispatchers.Default) {
+      ForwardIncludeSearchResult(
+        it.matchingIndex,
+        it.baseResourceUUID,
+        FhirContext.forR4Cached().newJsonParser().parseResource(it.serializedResource) as Resource,
+      )
     }
   }
 
   override suspend fun searchReverseReferencedResources(
     query: SearchQuery,
   ): List<ReverseIncludeSearchResult> {
-    return db.withTransaction {
-      resourceDao
-        .getReverseReferencedResources(SimpleSQLiteQuery(query.query, query.args.toTypedArray()))
-        .pmap(Dispatchers.Default) {
-          ReverseIncludeSearchResult(
-            it.matchingIndex,
-            it.baseResourceTypeAndId,
-            FhirContext.forR4Cached().newJsonParser().parseResource(it.serializedResource)
-              as Resource,
-          )
-        }
+    val dbResult =
+      db.withTransaction {
+        resourceDao.getReverseReferencedResources(
+          SimpleSQLiteQuery(query.query, query.args.toTypedArray()),
+        )
+      }
+    return dbResult.pmap(Dispatchers.Default) {
+      ReverseIncludeSearchResult(
+        it.matchingIndex,
+        it.baseResourceTypeAndId,
+        FhirContext.forR4Cached().newJsonParser().parseResource(it.serializedResource) as Resource,
+      )
     }
   }
 

From c1abadbc2034a8ac943d6a2d74814d8c8c3b19c8 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Tue, 12 Nov 2024 09:35:43 +0300
Subject: [PATCH 116/126]         SDK Release - SDC

        FORK
                        - With unmerged PR https://github.com/opensrp/android-fhir/pull/9
                        - WUP  https://github.com/opensrp/android-fhir/pull/13

        SDK
                        - WUP https://github.com/google/android-fhir/pull/2178
                        - WUP https://github.com/google/android-fhir/pull/2650
                        - WUP https://github.com/google/android-fhir/pull/2663
                        - WUP https://github.com/google/android-fhir/pull/2645
---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index ee520410ec..35ca2e0dd7 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -56,7 +56,7 @@ object Releases {
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.2.0-preview3-SNAPSHOT"
+    override val version = "1.2.0-preview4-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 

From cd4606bc9951fc07f52a312b4fb5fc1a0e03fb59 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Tue, 12 Nov 2024 09:35:43 +0300
Subject: [PATCH 117/126]         SDK Release - SDC, Engine

        FORK
                        - With unmerged PR https://github.com/opensrp/android-fhir/pull/9
                        - WUP  https://github.com/opensrp/android-fhir/pull/13

        SDK
                        - WUP https://github.com/google/android-fhir/pull/2178
                        - WUP https://github.com/google/android-fhir/pull/2650
                        - WUP https://github.com/google/android-fhir/pull/2663
                        - WUP https://github.com/google/android-fhir/pull/2645
                        - WUP https://github.com/google/android-fhir/pull/2715
---
 buildSrc/src/main/kotlin/Releases.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index ee520410ec..68c7bbe12f 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -50,13 +50,13 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "1.0.0-preview15-SNAPSHOT"
+    override val version = "1.0.0-preview16-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.2.0-preview3-SNAPSHOT"
+    override val version = "1.2.0-preview4-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 

From 6033cd21c26e8694a9e36edbdbd1424932430eb6 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Thu, 21 Nov 2024 19:46:03 +0300
Subject: [PATCH 118/126] RC 2 release

---
 buildSrc/src/main/kotlin/Releases.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 68c7bbe12f..35c2d00d43 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -50,7 +50,7 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "1.0.0-preview16-SNAPSHOT"
+    override val version = "1.0.0-preview16.1-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 

From 89417fdb4f5df4484cc79a5435bfb945089bc177 Mon Sep 17 00:00:00 2001
From: Simon Njoroge <snjoroge@ona.io>
Date: Wed, 27 Nov 2024 19:27:42 +0300
Subject: [PATCH 119/126] Overload FhirEngine.get()

---
 .../com/google/android/fhir/FhirEngine.kt     | 24 +++++++++++++++++++
 .../android/fhir/impl/FhirEngineImpl.kt       |  3 +++
 .../google/android/fhir/testing/Utilities.kt  |  4 ++++
 3 files changed, 31 insertions(+)

diff --git a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
index 4b7ff2cb45..2ddf88ea0f 100644
--- a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
+++ b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
@@ -83,6 +83,17 @@ interface FhirEngine {
   @Throws(ResourceNotFoundException::class)
   suspend fun get(type: ResourceType, id: String): Resource
 
+  /**
+   * Loads multiple FHIR resources given [ResourceType] and logical IDs.
+   *
+   * @param type The type of the resource to load.
+   * @param ids The logical IDs of the resources.
+   * @return The list of requested FHIR resources.
+   * @throws ResourceNotFoundException if the resources are not found.
+   */
+  @Throws(ResourceNotFoundException::class)
+  suspend fun get(type: ResourceType, vararg ids: String): List<Resource>
+
   /**
    * Updates one or more FHIR [Resource]s in the local storage.
    *
@@ -227,6 +238,19 @@ suspend inline fun <reified R : Resource> FhirEngine.get(id: String): R {
   return get(getResourceType(R::class.java), id) as R
 }
 
+/**
+ * Retrieves FHIR resources of type [R] with the given [ids] from the local storage.
+ *
+ * @param R The type of the FHIR resource to retrieve.
+ * @param ids The logical IDs of the resources to retrieve.
+ * @return The list of requested FHIR resources.
+ * @throws ResourceNotFoundException if the resource is not found.
+ */
+@Throws(ResourceNotFoundException::class)
+suspend inline fun <reified R : Resource> FhirEngine.get(vararg ids: String): List<R> {
+  return ids.map { id -> get(getResourceType(R::class.java), id) as R }
+}
+
 /**
  * Deletes a FHIR resource of type [R] with the given [id] from the local storage.
  *
diff --git a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
index 595f433d9d..daf1e039fc 100644
--- a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
@@ -52,6 +52,9 @@ internal class FhirEngineImpl(private val database: Database, private val contex
   override suspend fun get(type: ResourceType, id: String) =
     withContext(Dispatchers.IO) { database.select(type, id) }
 
+  override suspend fun get(type: ResourceType, vararg ids: String) =
+    withContext(Dispatchers.IO) { ids.map { id -> database.select(type, id) } }
+
   override suspend fun update(vararg resource: Resource) =
     withContext(Dispatchers.IO) { database.update(*resource) }
 
diff --git a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
index 1b85a71382..3727ad0629 100644
--- a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
+++ b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
@@ -151,6 +151,10 @@ internal object TestFhirEngineImpl : FhirEngine {
     return Patient()
   }
 
+  override suspend fun get(type: ResourceType, vararg ids: String): List<Resource> {
+    return ids.map { Patient().apply { id = it } }
+  }
+
   override suspend fun delete(type: ResourceType, id: String) {}
 
   override suspend fun <R : Resource> search(search: Search): List<SearchResult<R>> {

From 68afe18b0b3c5c70f6e15c896499052eac9af809 Mon Sep 17 00:00:00 2001
From: Simon Njoroge <snjoroge@ona.io>
Date: Thu, 28 Nov 2024 11:04:43 +0300
Subject: [PATCH 120/126] Replace get() with variable arguments

---
 .../com/google/android/fhir/FhirEngine.kt     | 24 -------------------
 .../android/fhir/impl/FhirEngineImpl.kt       |  3 ---
 .../google/android/fhir/testing/Utilities.kt  |  4 ----
 3 files changed, 31 deletions(-)

diff --git a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
index 2ddf88ea0f..d416e9205b 100644
--- a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
+++ b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
@@ -72,17 +72,6 @@ interface FhirEngine {
    */
   suspend fun create(vararg resource: Resource): List<String>
 
-  /**
-   * Loads a FHIR resource given its [ResourceType] and logical ID.
-   *
-   * @param type The type of the resource to load.
-   * @param id The logical ID of the resource.
-   * @return The requested FHIR resource.
-   * @throws ResourceNotFoundException if the resource is not found.
-   */
-  @Throws(ResourceNotFoundException::class)
-  suspend fun get(type: ResourceType, id: String): Resource
-
   /**
    * Loads multiple FHIR resources given [ResourceType] and logical IDs.
    *
@@ -225,19 +214,6 @@ interface FhirEngine {
   suspend fun withTransaction(block: suspend FhirEngine.() -> Unit)
 }
 
-/**
- * Retrieves a FHIR resource of type [R] with the given [id] from the local storage.
- *
- * @param R The type of the FHIR resource to retrieve.
- * @param id The logical ID of the resource to retrieve.
- * @return The requested FHIR resource.
- * @throws ResourceNotFoundException if the resource is not found.
- */
-@Throws(ResourceNotFoundException::class)
-suspend inline fun <reified R : Resource> FhirEngine.get(id: String): R {
-  return get(getResourceType(R::class.java), id) as R
-}
-
 /**
  * Retrieves FHIR resources of type [R] with the given [ids] from the local storage.
  *
diff --git a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
index daf1e039fc..ad49289546 100644
--- a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
@@ -49,9 +49,6 @@ internal class FhirEngineImpl(private val database: Database, private val contex
   override suspend fun create(vararg resource: Resource) =
     withContext(Dispatchers.IO) { database.insert(*resource) }
 
-  override suspend fun get(type: ResourceType, id: String) =
-    withContext(Dispatchers.IO) { database.select(type, id) }
-
   override suspend fun get(type: ResourceType, vararg ids: String) =
     withContext(Dispatchers.IO) { ids.map { id -> database.select(type, id) } }
 
diff --git a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
index 3727ad0629..155f482cc2 100644
--- a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
+++ b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
@@ -147,10 +147,6 @@ internal object TestFhirEngineImpl : FhirEngine {
 
   override suspend fun update(vararg resource: Resource) {}
 
-  override suspend fun get(type: ResourceType, id: String): Resource {
-    return Patient()
-  }
-
   override suspend fun get(type: ResourceType, vararg ids: String): List<Resource> {
     return ids.map { Patient().apply { id = it } }
   }

From 200428ac6dc8cd49dbb61fc5ad9cda0bbe48aa39 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Thu, 28 Nov 2024 16:30:38 +0300
Subject: [PATCH 121/126]             SDK Release - SDC, Engine

            FORK
                            - With unmerged PR https://github.com/opensrp/android-fhir/pull/9
                            - WUP  https://github.com/opensrp/android-fhir/pull/13

            SDK
                            - WUP https://github.com/google/android-fhir/pull/2178
                            - WUP https://github.com/google/android-fhir/pull/2650
                            - WUP https://github.com/google/android-fhir/pull/2645
---
 buildSrc/src/main/kotlin/Releases.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 68c7bbe12f..2fbceb4df1 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -50,13 +50,13 @@ object Releases {
 
   object Engine : LibraryArtifact {
     override val artifactId = "engine"
-    override val version = "1.0.0-preview16-SNAPSHOT"
+    override val version = "1.0.0-preview17-SNAPSHOT"
     override val name = "Android FHIR Engine Library"
   }
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "1.2.0-preview4-SNAPSHOT"
+    override val version = "1.2.0-preview5-SNAPSHOT"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 

From c9ad2284ae632758a18ba6fd21da640559af0df8 Mon Sep 17 00:00:00 2001
From: Simon Njoroge <snjoroge@ona.io>
Date: Fri, 29 Nov 2024 14:44:27 +0300
Subject: [PATCH 122/126] Retain fetch single resource

---
 .../com/google/android/fhir/FhirEngine.kt     | 26 ++++++++++++++++++-
 .../com/google/android/fhir/db/Database.kt    |  9 +++++++
 .../android/fhir/db/impl/DatabaseImpl.kt      |  8 ++++++
 .../android/fhir/db/impl/dao/ResourceDao.kt   | 11 ++++++++
 .../android/fhir/impl/FhirEngineImpl.kt       |  5 +++-
 .../google/android/fhir/testing/Utilities.kt  |  6 ++++-
 6 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
index d416e9205b..36a2dda53e 100644
--- a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
+++ b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
@@ -72,6 +72,17 @@ interface FhirEngine {
    */
   suspend fun create(vararg resource: Resource): List<String>
 
+  /**
+   * Loads a FHIR resource given its [ResourceType] and logical ID.
+   *
+   * @param type The type of the resource to load.
+   * @param id The logical ID of the resource.
+   * @return The requested FHIR resource.
+   * @throws ResourceNotFoundException if the resource is not found.
+   */
+  @Throws(ResourceNotFoundException::class)
+  suspend fun get(type: ResourceType, id: String): Resource
+
   /**
    * Loads multiple FHIR resources given [ResourceType] and logical IDs.
    *
@@ -214,6 +225,19 @@ interface FhirEngine {
   suspend fun withTransaction(block: suspend FhirEngine.() -> Unit)
 }
 
+/**
+ * Retrieves a FHIR resource of type [R] with the given [id] from the local storage.
+ *
+ * @param R The type of the FHIR resource to retrieve.
+ * @param id The logical ID of the resource to retrieve.
+ * @return The requested FHIR resource.
+ * @throws ResourceNotFoundException if the resource is not found.
+ */
+@Throws(ResourceNotFoundException::class)
+suspend inline fun <reified R : Resource> FhirEngine.get(id: String): R {
+  return get(getResourceType(R::class.java), id) as R
+}
+
 /**
  * Retrieves FHIR resources of type [R] with the given [ids] from the local storage.
  *
@@ -224,7 +248,7 @@ interface FhirEngine {
  */
 @Throws(ResourceNotFoundException::class)
 suspend inline fun <reified R : Resource> FhirEngine.get(vararg ids: String): List<R> {
-  return ids.map { id -> get(getResourceType(R::class.java), id) as R }
+  return get(getResourceType(R::class.java), *ids).map { it as R }
 }
 
 /**
diff --git a/engine/src/main/java/com/google/android/fhir/db/Database.kt b/engine/src/main/java/com/google/android/fhir/db/Database.kt
index 24e5c300f0..6f6ad512f1 100644
--- a/engine/src/main/java/com/google/android/fhir/db/Database.kt
+++ b/engine/src/main/java/com/google/android/fhir/db/Database.kt
@@ -84,6 +84,15 @@ internal interface Database {
   @Throws(ResourceNotFoundException::class)
   suspend fun select(type: ResourceType, id: String): Resource
 
+  /**
+   * Selects the FHIR resources of type `clazz` with `ids`.
+   *
+   * @param <R> The resource type
+   * @throws ResourceNotFoundException if the resources are not found in the database
+   */
+  @Throws(ResourceNotFoundException::class)
+  suspend fun selectResources(type: ResourceType, vararg ids: String): List<Resource>
+
   /**
    * Selects the saved `ResourceEntity` of type `clazz` with `id`.
    *
diff --git a/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt b/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
index 40de8d320b..b30fd85ad6 100644
--- a/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
@@ -206,6 +206,14 @@ internal class DatabaseImpl(
       ?: throw ResourceNotFoundException(type.name, id)
   }
 
+  override suspend fun selectResources(type: ResourceType, vararg ids: String): List<Resource> {
+    val resources =
+      resourceDao.getResources(resourceIds = ids, resourceType = type)
+        ?: throw ResourceNotFoundException(type.name, ids.joinToString(","))
+
+    return resources.map { iParser.parseResource(it) as Resource }
+  }
+
   override suspend fun insertSyncedResources(resources: List<Resource>) {
     db.withTransaction { insertRemote(*resources.toTypedArray()) }
   }
diff --git a/engine/src/main/java/com/google/android/fhir/db/impl/dao/ResourceDao.kt b/engine/src/main/java/com/google/android/fhir/db/impl/dao/ResourceDao.kt
index 0f219d84dd..754b27db70 100644
--- a/engine/src/main/java/com/google/android/fhir/db/impl/dao/ResourceDao.kt
+++ b/engine/src/main/java/com/google/android/fhir/db/impl/dao/ResourceDao.kt
@@ -200,6 +200,17 @@ internal abstract class ResourceDao {
   )
   abstract suspend fun getResource(resourceId: String, resourceType: ResourceType): String?
 
+  @Query(
+    """
+        SELECT serializedResource
+        FROM ResourceEntity
+        WHERE resourceId IN (:resourceIds) AND resourceType = :resourceType""",
+  )
+  abstract suspend fun getResources(
+    vararg resourceIds: String,
+    resourceType: ResourceType,
+  ): List<String>?
+
   @Query(
     """
         SELECT *
diff --git a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
index ad49289546..334d9695b5 100644
--- a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
@@ -49,8 +49,11 @@ internal class FhirEngineImpl(private val database: Database, private val contex
   override suspend fun create(vararg resource: Resource) =
     withContext(Dispatchers.IO) { database.insert(*resource) }
 
+  override suspend fun get(type: ResourceType, id: String) =
+    withContext(Dispatchers.IO) { database.select(type, id) }
+
   override suspend fun get(type: ResourceType, vararg ids: String) =
-    withContext(Dispatchers.IO) { ids.map { id -> database.select(type, id) } }
+    withContext(Dispatchers.IO) { database.selectResources(type, *ids) }
 
   override suspend fun update(vararg resource: Resource) =
     withContext(Dispatchers.IO) { database.update(*resource) }
diff --git a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
index 155f482cc2..498ada17dc 100644
--- a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
+++ b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
@@ -147,8 +147,12 @@ internal object TestFhirEngineImpl : FhirEngine {
 
   override suspend fun update(vararg resource: Resource) {}
 
+  override suspend fun get(type: ResourceType, id: String): Resource {
+    return Patient()
+  }
+
   override suspend fun get(type: ResourceType, vararg ids: String): List<Resource> {
-    return ids.map { Patient().apply { id = it } }
+    return ids.map { Patient() }
   }
 
   override suspend fun delete(type: ResourceType, id: String) {}

From 83cb9361c4d47b79a6755fd331d339d19490b3cd Mon Sep 17 00:00:00 2001
From: Simon Njoroge <snjoroge@ona.io>
Date: Mon, 13 Jan 2025 13:22:37 +0300
Subject: [PATCH 123/126] Refactor FhirEngine.get to FhirEngine.getResources

- Add unit tests
---
 .../android/fhir/db/impl/DatabaseImplTest.kt  | 24 ++++++++-
 .../com/google/android/fhir/FhirEngine.kt     | 10 ++--
 .../fhir/db/ResourceNotFoundException.kt      |  9 +++-
 .../android/fhir/db/impl/DatabaseImpl.kt      | 11 ++++-
 .../android/fhir/impl/FhirEngineImpl.kt       |  8 +--
 .../google/android/fhir/testing/Utilities.kt  |  6 +--
 .../android/fhir/impl/FhirEngineImplTest.kt   | 49 ++++++++++++++++++-
 7 files changed, 103 insertions(+), 14 deletions(-)

diff --git a/engine/src/androidTest/java/com/google/android/fhir/db/impl/DatabaseImplTest.kt b/engine/src/androidTest/java/com/google/android/fhir/db/impl/DatabaseImplTest.kt
index 1807b4b2d6..7c2e93c03d 100644
--- a/engine/src/androidTest/java/com/google/android/fhir/db/impl/DatabaseImplTest.kt
+++ b/engine/src/androidTest/java/com/google/android/fhir/db/impl/DatabaseImplTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -5206,6 +5206,28 @@ class DatabaseImplTest {
     assertThat(searchResults.size).isEqualTo(980)
   }
 
+  @Test
+  fun getResources_shouldReturnListOfResources() = runBlocking {
+    val patients = ArrayList<Patient>()
+    patients.add(TEST_PATIENT_1)
+    patients.add(TEST_PATIENT_2)
+    database.insert(*patients.toTypedArray())
+    assertThat(
+        database.selectResources(ResourceType.Patient, TEST_PATIENT_1_ID, TEST_PATIENT_2_ID).size,
+      )
+      .isEqualTo(2)
+  }
+
+  @Test
+  fun getResources_shouldThrowResourceNotFoundExceptionIfAllResourcesNotFound() = runBlocking {
+    val resourceNotFoundException =
+      assertThrows(ResourceNotFoundException::class.java) {
+        runBlocking { database.selectResources(ResourceType.Patient, "id1", "id2") }
+      }
+    assertThat(resourceNotFoundException.message)
+      .isEqualTo("Resources not found with type Patient and ids id1,id2!")
+  }
+
   private companion object {
     const val mockEpochTimeStamp = 1628516301000
     const val TEST_PATIENT_1_ID = "test_patient_1"
diff --git a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
index 21a41d9313..d99f7d6b1c 100644
--- a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
+++ b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import com.google.android.fhir.sync.upload.SyncUploadProgress
 import com.google.android.fhir.sync.upload.UploadRequestResult
 import com.google.android.fhir.sync.upload.UploadStrategy
 import java.time.OffsetDateTime
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
@@ -66,6 +67,7 @@ interface FhirEngine {
    * [create], the resource created in `FhirEngine` will have the same `id`. If no `id` is
    * specified, `FhirEngine` will generate a UUID as that resource's `id` and include it in the
    * returned list of IDs.
+   *
    * @param resource The FHIR resources to create.
    * @param isLocalOnly - Setting the value to [true] instructs engine that the resource and its
    *   subsequent updates should never be synced to the server.
@@ -93,7 +95,7 @@ interface FhirEngine {
    * @throws ResourceNotFoundException if the resources are not found.
    */
   @Throws(ResourceNotFoundException::class)
-  suspend fun get(type: ResourceType, vararg ids: String): List<Resource>
+  suspend fun getResources(type: ResourceType, vararg ids: String): List<Resource>
 
   /**
    * Updates one or more FHIR [Resource]s in the local storage.
@@ -250,8 +252,8 @@ suspend inline fun <reified R : Resource> FhirEngine.get(id: String): R {
  * @throws ResourceNotFoundException if the resource is not found.
  */
 @Throws(ResourceNotFoundException::class)
-suspend inline fun <reified R : Resource> FhirEngine.get(vararg ids: String): List<R> {
-  return get(getResourceType(R::class.java), *ids).map { it as R }
+suspend inline fun <reified R : Resource> FhirEngine.getResources(vararg ids: String): List<R> {
+  return getResources(getResourceType(R::class.java), *ids).pmap(Dispatchers.Default) { it as R }
 }
 
 /**
diff --git a/engine/src/main/java/com/google/android/fhir/db/ResourceNotFoundException.kt b/engine/src/main/java/com/google/android/fhir/db/ResourceNotFoundException.kt
index a97c90c879..83b7055d93 100644
--- a/engine/src/main/java/com/google/android/fhir/db/ResourceNotFoundException.kt
+++ b/engine/src/main/java/com/google/android/fhir/db/ResourceNotFoundException.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Google LLC
+ * Copyright 2021-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,13 @@ class ResourceNotFoundException : Exception {
     this.id = id
   }
 
+  constructor(
+    type: String,
+    vararg ids: String,
+  ) : super("Resources not found with type $type and ids ${ids.joinToString(",")}!") {
+    this.type = type
+  }
+
   constructor(
     uuid: UUID,
   ) : super("Resource not found with UUID $uuid!") {
diff --git a/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt b/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
index 1e8333ea5b..3f24105277 100644
--- a/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -199,6 +199,15 @@ internal class DatabaseImpl(
       ?: throw ResourceNotFoundException(type.name, id)
   }
 
+  override suspend fun selectResources(type: ResourceType, vararg ids: String): List<Resource> {
+    val resources =
+      resourceDao.getResources(resourceIds = ids, resourceType = type)?.takeIf { it.isNotEmpty() }
+        ?: throw ResourceNotFoundException(type.name, *ids)
+    return resources.pmap(Dispatchers.Default) {
+      FhirContext.forR4Cached().newJsonParser().parseResource(it) as Resource
+    }
+  }
+
   override suspend fun insertSyncedResources(resources: List<Resource>) {
     db.withTransaction { insertRemote(*resources.toTypedArray()) }
   }
diff --git a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
index 3904bc0ffd..817b6d721d 100644
--- a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,13 +47,15 @@ import org.hl7.fhir.r4.model.ResourceType
 internal class FhirEngineImpl(private val database: Database, private val context: Context) :
   FhirEngine {
   override suspend fun create(vararg resource: Resource, isLocalOnly: Boolean): List<String> {
-    return withContext(Dispatchers.IO) { if (isLocalOnly) database.insertLocalOnly(*resource) else database.insert(*resource) }
+    return withContext(Dispatchers.IO) {
+      if (isLocalOnly) database.insertLocalOnly(*resource) else database.insert(*resource)
+    }
   }
 
   override suspend fun get(type: ResourceType, id: String) =
     withContext(Dispatchers.IO) { database.select(type, id) }
 
-  override suspend fun get(type: ResourceType, vararg ids: String) =
+  override suspend fun getResources(type: ResourceType, vararg ids: String) =
     withContext(Dispatchers.IO) { database.selectResources(type, *ids) }
 
   override suspend fun update(vararg resource: Resource) =
diff --git a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
index f8bff688f3..2649d94f08 100644
--- a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
+++ b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -141,7 +141,7 @@ internal open class TestDownloadManagerImpl(
     return listOf(patient)
   }
 }
- 
+
 internal object TestFhirEngineImpl : FhirEngine {
   override suspend fun create(vararg resource: Resource, isLocalOnly: Boolean) = emptyList<String>()
 
@@ -151,7 +151,7 @@ internal object TestFhirEngineImpl : FhirEngine {
     return Patient()
   }
 
-  override suspend fun get(type: ResourceType, vararg ids: String): List<Resource> {
+  override suspend fun getResources(type: ResourceType, vararg ids: String): List<Resource> {
     return ids.map { Patient() }
   }
 
diff --git a/engine/src/test/java/com/google/android/fhir/impl/FhirEngineImplTest.kt b/engine/src/test/java/com/google/android/fhir/impl/FhirEngineImplTest.kt
index 27abb3fc68..5e8080d62b 100644
--- a/engine/src/test/java/com/google/android/fhir/impl/FhirEngineImplTest.kt
+++ b/engine/src/test/java/com/google/android/fhir/impl/FhirEngineImplTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,11 +20,13 @@ import androidx.test.core.app.ApplicationProvider
 import ca.uhn.fhir.context.FhirContext
 import ca.uhn.fhir.rest.gclient.TokenClientParam
 import ca.uhn.fhir.rest.param.ParamPrefixEnum
+import com.google.android.fhir.FhirEngine
 import com.google.android.fhir.FhirServices.Companion.builder
 import com.google.android.fhir.LocalChange
 import com.google.android.fhir.LocalChange.Type
 import com.google.android.fhir.db.ResourceNotFoundException
 import com.google.android.fhir.get
+import com.google.android.fhir.getResources
 import com.google.android.fhir.lastUpdated
 import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.LOCAL_LAST_UPDATED_PARAM
@@ -68,6 +70,8 @@ import org.junit.Assert.assertThrows
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.Mockito.`when`
+import org.mockito.kotlin.mock
 import org.robolectric.RobolectricTestRunner
 
 /** Unit tests for [FhirEngineImpl]. */
@@ -922,6 +926,49 @@ class FhirEngineImplTest {
     }
   }
 
+  @Test
+  fun `get returns a single resource`() = runTest {
+    val fhirEngine = mock<FhirEngine>()
+    val expectedPatient = Patient().apply { id = TEST_PATIENT_1_ID }
+
+    `when`(fhirEngine.get(ResourceType.Patient, TEST_PATIENT_1_ID)).thenReturn(expectedPatient)
+
+    assertThat(fhirEngine.get<Patient>(TEST_PATIENT_1_ID)).isEqualTo(expectedPatient)
+  }
+
+  @Test
+  fun `get throws ResourceNotFoundException when resource is not found`() = runTest {
+    val resourceNotFoundException =
+      assertThrows(ResourceNotFoundException::class.java) {
+        runBlocking { fhirEngine.get<Patient>("id1") }
+      }
+    assertThat(resourceNotFoundException.message)
+      .isEqualTo("Resource not found with type Patient and id id1!")
+  }
+
+  @Test
+  fun `getResources returns a list of resources`() = runTest {
+    val patientIds = arrayOf(TEST_PATIENT_1_ID, TEST_PATIENT_2_ID)
+    val expectedPatients = listOf(Patient(), Patient())
+    val fhirEngine = mock<FhirEngine>()
+
+    `when`(fhirEngine.getResources(ResourceType.Patient, *patientIds)).thenReturn(expectedPatients)
+
+    val resources = fhirEngine.getResources<Patient>(*patientIds)
+    assertThat(resources).isEqualTo(expectedPatients)
+  }
+
+  @Test
+  fun `getResources throws ResourceNotFoundException when no resources with ids are found`() =
+    runTest {
+      val resourceNotFoundException =
+        assertThrows(ResourceNotFoundException::class.java) {
+          runBlocking { fhirEngine.getResources<Patient>("id1", "id2") }
+        }
+      assertThat(resourceNotFoundException.message)
+        .isEqualTo("Resources not found with type Patient and ids id1,id2!")
+    }
+
   companion object {
     private const val TEST_PATIENT_1_ID = "test_patient_1"
     private var TEST_PATIENT_1 =

From a2adcd46d945390db24667a1500499fb9d91af3b Mon Sep 17 00:00:00 2001
From: Simon Njoroge <snjoroge@ona.io>
Date: Mon, 13 Jan 2025 13:24:13 +0300
Subject: [PATCH 124/126] Run spotlessApply

---
 .../google/android/fhir/datacapture/QuestionnaireFragment.kt  | 2 +-
 .../fhir/datacapture/QuestionnaireNavigationViewUIState.kt    | 2 +-
 .../datacapture/extensions/MoreQuestionnaireItemComponents.kt | 4 ++--
 .../android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt  | 2 +-
 .../com/google/android/fhir/datacapture/views/MediaView.kt    | 2 +-
 .../android/fhir/datacapture/views/NavigationViewHolder.kt    | 2 +-
 .../extensions/MoreQuestionnaireItemComponentsTest.kt         | 2 +-
 engine/src/main/java/com/google/android/fhir/db/Database.kt   | 2 +-
 .../java/com/google/android/fhir/db/impl/dao/ResourceDao.kt   | 2 +-
 .../main/java/com/google/android/fhir/sync/FhirSyncWorker.kt  | 2 +-
 .../fhir/sync/upload/request/UploadRequestGenerator.kt        | 4 ++--
 .../java/com/google/android/fhir/workflow/FhirOperator.kt     | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt
index 45e07cc557..8fa44df079 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireNavigationViewUIState.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireNavigationViewUIState.kt
index 6f5e3e9222..ef5f2ad19c 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireNavigationViewUIState.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireNavigationViewUIState.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
index 46c04161a2..60a396e10b 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -980,7 +980,7 @@ internal fun QuestionnaireItemComponent.createQuestionnaireResponseItem():
       this@createQuestionnaireResponseItem.type == Questionnaire.QuestionnaireItemType.GROUP
     ) {
       this@createQuestionnaireResponseItem.item.forEach {
-          this.addItem(it.createQuestionnaireResponseItem())
+        this.addItem(it.createQuestionnaireResponseItem())
       }
     }
   }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt
index 3c5f27c125..7b078d6fe0 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/MediaView.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/MediaView.kt
index a9df29e2fa..29b5bd38e2 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/MediaView.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/MediaView.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 Google LLC
+ * Copyright 2022-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/NavigationViewHolder.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/NavigationViewHolder.kt
index e0994a7c48..76889b7bc3 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/NavigationViewHolder.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/NavigationViewHolder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponentsTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponentsTest.kt
index beaf16d400..e8f1ce7290 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponentsTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponentsTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/engine/src/main/java/com/google/android/fhir/db/Database.kt b/engine/src/main/java/com/google/android/fhir/db/Database.kt
index 5988a46db0..a7e48878b9 100644
--- a/engine/src/main/java/com/google/android/fhir/db/Database.kt
+++ b/engine/src/main/java/com/google/android/fhir/db/Database.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/engine/src/main/java/com/google/android/fhir/db/impl/dao/ResourceDao.kt b/engine/src/main/java/com/google/android/fhir/db/impl/dao/ResourceDao.kt
index 17190359c1..beba6557f8 100644
--- a/engine/src/main/java/com/google/android/fhir/db/impl/dao/ResourceDao.kt
+++ b/engine/src/main/java/com/google/android/fhir/db/impl/dao/ResourceDao.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt b/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt
index c6051d2c14..88df417efe 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt b/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt
index f54e1aabf3..d1962aa180 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,7 +62,7 @@ internal object UploadRequestGeneratorFactory {
           mode.httpVerbToUseForCreate,
           mode.httpVerbToUseForUpdate,
           mode.bundleSize,
-          useETagForUpload = false
+          useETagForUpload = false,
         )
     }
 }
diff --git a/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt b/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt
index 163f274af6..b013dd4056 100644
--- a/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt
+++ b/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From e9721d7b42005262fbc8105ffaf510eb6ac38d21 Mon Sep 17 00:00:00 2001
From: Simon Njoroge <snjoroge@ona.io>
Date: Mon, 13 Jan 2025 13:47:22 +0300
Subject: [PATCH 125/126] Revert merge

---
 .../fhir/datacapture/QuestionnaireFragment.kt |  3 +-
 .../QuestionnaireNavigationViewUIState.kt     |  6 +-
 .../MoreQuestionnaireItemComponents.kt        | 35 +++--------
 .../fhirpath/ExpressionEvaluator.kt           | 11 ++--
 .../fhir/datacapture/views/MediaView.kt       |  7 ++-
 .../datacapture/views/NavigationViewHolder.kt | 24 ++------
 .../res/layout/pagination_navigation_view.xml | 11 ----
 datacapture/src/main/res/values/attrs.xml     |  6 --
 datacapture/src/main/res/values/strings.xml   |  2 +-
 datacapture/src/main/res/values/styles.xml    | 13 ----
 .../android/fhir/sync/FhirSyncWorker.kt       | 37 +-----------
 .../upload/request/UploadRequestGenerator.kt  |  3 +-
 .../google/android/fhir/testing/Utilities.kt  |  6 +-
 .../android/fhir/workflow/FhirOperator.kt     | 59 +------------------
 14 files changed, 29 insertions(+), 194 deletions(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt
index 8fa44df079..b84a625a10 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 Google LLC
+ * Copyright 2023-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.
@@ -155,7 +155,6 @@ class QuestionnaireFragment : Fragment() {
 
     // Listen to updates from the view model.
     viewLifecycleOwner.lifecycleScope.launchWhenCreated {
-      viewModel.pages = viewModel.getQuestionnairePages()
       viewModel.questionnaireStateFlow.collect { state ->
         when (val displayMode = state.displayMode) {
           is DisplayMode.ReviewMode -> {
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireNavigationViewUIState.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireNavigationViewUIState.kt
index ef5f2ad19c..60bd9e1c7b 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireNavigationViewUIState.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireNavigationViewUIState.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 Google LLC
+ * Copyright 2023-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.
@@ -19,7 +19,7 @@ package com.google.android.fhir.datacapture
 sealed interface QuestionnaireNavigationViewUIState {
   data object Hidden : QuestionnaireNavigationViewUIState
 
-  data class Enabled(val labelText: String? = null, val onClickAction: () -> Unit = {}) :
+  data class Enabled(val labelText: String? = null, val onClickAction: () -> Unit) :
     QuestionnaireNavigationViewUIState
 }
 
@@ -29,6 +29,4 @@ data class QuestionnaireNavigationUIState(
   val navSubmit: QuestionnaireNavigationViewUIState = QuestionnaireNavigationViewUIState.Hidden,
   val navCancel: QuestionnaireNavigationViewUIState = QuestionnaireNavigationViewUIState.Hidden,
   val navReview: QuestionnaireNavigationViewUIState = QuestionnaireNavigationViewUIState.Hidden,
-  val navNextProgressBar: QuestionnaireNavigationViewUIState =
-    QuestionnaireNavigationViewUIState.Hidden,
 )
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
index 60a396e10b..a29e0151e8 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 Google LLC
+ * Copyright 2023-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.
@@ -704,10 +704,6 @@ internal val QuestionnaireItemComponent.calculatedExpression: Expression?
       it.castToExpression(it.value)
     }
 
-/** Returns list of extensions whose value is of type [Expression] */
-internal val Questionnaire.expressionBasedExtensions
-  get() = this.extension.filter { it.value is Expression }
-
 /** Returns list of extensions whose value is of type [Expression] */
 internal val QuestionnaireItemComponent.expressionBasedExtensions
   get() = this.extension.filter { it.value is Expression }
@@ -717,7 +713,7 @@ internal val QuestionnaireItemComponent.expressionBasedExtensions
  * (e.g. if [item] has an expression `%resource.item.where(linkId='this-question')` where
  * `this-question` is the link ID of the current questionnaire item).
  */
-internal fun Questionnaire.QuestionnaireItemComponent.isExpressionReferencedBy(
+internal fun QuestionnaireItemComponent.isReferencedBy(
   item: QuestionnaireItemComponent,
 ) =
   item.expressionBasedExtensions.any {
@@ -728,26 +724,6 @@ internal fun Questionnaire.QuestionnaireItemComponent.isExpressionReferencedBy(
       .contains(Regex(".*linkId='${this.linkId}'.*"))
   }
 
-internal fun Questionnaire.QuestionnaireItemComponent.isExpressionReferencedBy(
-  questionnaire: Questionnaire,
-) =
-  questionnaire.expressionBasedExtensions.any {
-    it
-      .castToExpression(it.value)
-      .expression
-      .replace(" ", "")
-      .contains(Regex(".*linkId='${this.linkId}'.*"))
-  }
-
-/**
- * Whether [item] has any expression directly referencing the current questionnaire item by link ID
- * (e.g. if [item] has an expression `%resource.item.where(linkId='this-question')` where
- * `this-question` is the link ID of the current questionnaire item).
- */
-internal fun Questionnaire.QuestionnaireItemComponent.isEnableWhenReferencedBy(
-  item: Questionnaire.QuestionnaireItemComponent,
-) = item.enableWhen.any { it.question == this.linkId }
-
 internal val QuestionnaireItemComponent.answerExpression: Expression?
   get() =
     ToolingExtensions.getExtension(this, EXTENSION_ANSWER_EXPRESSION_URL)?.value?.let {
@@ -977,10 +953,13 @@ internal fun QuestionnaireItemComponent.createQuestionnaireResponseItem():
     ) {
       this.copyNestedItemsToChildlessAnswers(this@createQuestionnaireResponseItem)
     } else if (
-      this@createQuestionnaireResponseItem.type == Questionnaire.QuestionnaireItemType.GROUP
+      this@createQuestionnaireResponseItem.type == Questionnaire.QuestionnaireItemType.GROUP &&
+        !repeats
     ) {
       this@createQuestionnaireResponseItem.item.forEach {
-        this.addItem(it.createQuestionnaireResponseItem())
+        if (!it.isRepeatedGroup) {
+          this.addItem(it.createQuestionnaireResponseItem())
+        }
       }
     }
   }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt
index 7b078d6fe0..97e74233e6 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 Google LLC
+ * Copyright 2023-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.
@@ -20,8 +20,8 @@ import com.google.android.fhir.datacapture.XFhirQueryResolver
 import com.google.android.fhir.datacapture.extensions.calculatedExpression
 import com.google.android.fhir.datacapture.extensions.findVariableExpression
 import com.google.android.fhir.datacapture.extensions.flattened
-import com.google.android.fhir.datacapture.extensions.isExpressionReferencedBy
 import com.google.android.fhir.datacapture.extensions.isFhirPath
+import com.google.android.fhir.datacapture.extensions.isReferencedBy
 import com.google.android.fhir.datacapture.extensions.isXFhirQuery
 import com.google.android.fhir.datacapture.extensions.variableExpressions
 import org.hl7.fhir.exceptions.FHIRException
@@ -133,10 +133,7 @@ internal class ExpressionEvaluator(
           // no calculable item depending on current item should be used as dependency into current
           // item
           this.forEach { dependent ->
-            check(
-              !(current.isExpressionReferencedBy(dependent) &&
-                dependent.isExpressionReferencedBy(current)),
-            ) {
+            check(!(current.isReferencedBy(dependent) && dependent.isReferencedBy(current))) {
               "${current.linkId} and ${dependent.linkId} have cyclic dependency in expression based extension"
             }
           }
@@ -200,7 +197,7 @@ internal class ExpressionEvaluator(
         // Condition 1. item is calculable
         // Condition 2. item answer depends on the updated item answer OR has a variable dependency
         item.calculatedExpression != null &&
-          (questionnaireItem.isExpressionReferencedBy(item) ||
+          (questionnaireItem.isReferencedBy(item) ||
             findDependentVariables(item.calculatedExpression!!).isNotEmpty())
       }
       .map { item ->
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/MediaView.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/MediaView.kt
index 29b5bd38e2..9cd1a99c67 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/MediaView.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/MediaView.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2025 Google LLC
+ * Copyright 2022 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import android.view.View
 import android.widget.ImageView
 import android.widget.LinearLayout
 import androidx.lifecycle.lifecycleScope
+import com.bumptech.glide.Glide
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.extensions.MimeType
 import com.google.android.fhir.datacapture.extensions.decodeToBitmap
@@ -90,12 +91,12 @@ class MediaView(context: Context, attrs: AttributeSet?) : LinearLayout(context,
   }
 
   private fun loadImage(image: Bitmap) {
-    imageAttachment.setImageBitmap(image)
+    Glide.with(context).load(image).into(imageAttachment)
     imageAttachment.visibility = View.VISIBLE
   }
 
   private fun clearImage() {
-    imageAttachment.setImageBitmap(null)
+    Glide.with(context).clear(imageAttachment)
     imageAttachment.visibility = View.GONE
   }
 
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/NavigationViewHolder.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/NavigationViewHolder.kt
index 76889b7bc3..171990ba05 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/NavigationViewHolder.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/NavigationViewHolder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 Google LLC
+ * Copyright 2023-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.
@@ -22,7 +22,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.android.fhir.datacapture.QuestionnaireNavigationUIState
 import com.google.android.fhir.datacapture.QuestionnaireNavigationViewUIState
 import com.google.android.fhir.datacapture.R
-import com.google.android.material.progressindicator.CircularProgressIndicator
 
 class NavigationViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
@@ -42,9 +41,6 @@ class NavigationViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
     itemView
       .findViewById<Button>(R.id.submit_questionnaire)
       .updateState(questionnaireNavigationUIState.navSubmit)
-    itemView
-      .findViewById<CircularProgressIndicator>(R.id.pagination_next_button_progress_bar)
-      .updateState(questionnaireNavigationUIState.navNextProgressBar)
   }
 
   private fun Button.updateState(navigationViewState: QuestionnaireNavigationViewUIState) {
@@ -52,7 +48,9 @@ class NavigationViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
       is QuestionnaireNavigationViewUIState.Enabled -> {
         visibility = View.VISIBLE
         isEnabled = true
-        text = navigationViewState.labelText
+        if (navigationViewState.labelText.isNullOrBlank().not() && this is Button) {
+          text = navigationViewState.labelText
+        }
         setOnClickListener { navigationViewState.onClickAction() }
       }
       QuestionnaireNavigationViewUIState.Hidden -> {
@@ -60,18 +58,4 @@ class NavigationViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
       }
     }
   }
-
-  private fun CircularProgressIndicator.updateState(
-    navigationViewState: QuestionnaireNavigationViewUIState,
-  ) {
-    visibility =
-      when (navigationViewState) {
-        is QuestionnaireNavigationViewUIState.Enabled -> {
-          View.VISIBLE
-        }
-        QuestionnaireNavigationViewUIState.Hidden -> {
-          View.GONE
-        }
-      }
-  }
 }
diff --git a/datacapture/src/main/res/layout/pagination_navigation_view.xml b/datacapture/src/main/res/layout/pagination_navigation_view.xml
index 9c55bb6ef8..7174cfd5d0 100644
--- a/datacapture/src/main/res/layout/pagination_navigation_view.xml
+++ b/datacapture/src/main/res/layout/pagination_navigation_view.xml
@@ -56,17 +56,6 @@
             app:layout_constraintBottom_toBottomOf="parent"
         />
 
-        <com.google.android.material.progressindicator.CircularProgressIndicator
-            android:id="@+id/pagination_next_button_progress_bar"
-            style="?attr/questionnaireNextButtonCircularProgressIndicatorStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toTopOf="@id/pagination_next_button"
-            app:layout_constraintBottom_toBottomOf="@id/pagination_next_button"
-            app:layout_constraintStart_toStartOf="@id/pagination_next_button"
-            app:layout_constraintEnd_toEndOf="@id/pagination_next_button"
-        />
-
         <Button
             android:id="@+id/review_mode_button"
             style="?attr/questionnaireButtonStyle"
diff --git a/datacapture/src/main/res/values/attrs.xml b/datacapture/src/main/res/values/attrs.xml
index 340f81a367..42cc7e5fb1 100644
--- a/datacapture/src/main/res/values/attrs.xml
+++ b/datacapture/src/main/res/values/attrs.xml
@@ -118,12 +118,6 @@
     <!--   Style for previous and next buttons in paginated layout. -->
     <attr name="questionnaireButtonStyle" format="reference" />
 
-    <!--   Style for for circular progress indicator for next button in paginated layout. -->
-    <attr
-        name="questionnaireNextButtonCircularProgressIndicatorStyle"
-        format="reference"
-    />
-
     <!--   Style for submit button. -->
     <attr name="questionnaireSubmitButtonStyle" format="reference" />
 
diff --git a/datacapture/src/main/res/values/strings.xml b/datacapture/src/main/res/values/strings.xml
index cfac9e3382..79fa579348 100644
--- a/datacapture/src/main/res/values/strings.xml
+++ b/datacapture/src/main/res/values/strings.xml
@@ -10,7 +10,7 @@
     <string name="review_answers_text">Review answers</string>
     <string name="button_review">Review</string>
     <string name="submit_questionnaire">Submit</string>
-    <string name="cancel_questionnaire">Cancel</string>
+    <string name="cancel_questionnaire">@android:string/cancel</string>
 
     <!-- 1.2 Submit Pop-up -->
     <string name="questionnaire_validation_error_headline">Errors found</string>
diff --git a/datacapture/src/main/res/values/styles.xml b/datacapture/src/main/res/values/styles.xml
index c818914603..d78007c0dd 100644
--- a/datacapture/src/main/res/values/styles.xml
+++ b/datacapture/src/main/res/values/styles.xml
@@ -109,9 +109,6 @@
         >@style/Widget.Material3.Chip.Input</item>
         <item name="questionnaireButtonStyle">@style/Questionnaire.ButtonStyle
         </item>
-        <item
-            name="questionnaireNextButtonCircularProgressIndicatorStyle"
-        >@style/Questionnaire.NextButtonCircularProgressIndicatorStyle</item>
         <item name="questionnaireErrorTextStyle">
             @style/Questionnaire.ErrorStyle
         </item>
@@ -444,16 +441,6 @@
         <item name="android:layout_height">wrap_content</item>
     </style>
 
-    <style
-        name="Questionnaire.NextButtonCircularProgressIndicatorStyle"
-        parent="Widget.Material3.CircularProgressIndicator"
-    >
-        <item name="trackThickness">2dp</item>
-        <item name="indicatorSize">18dp</item>
-        <item name="indicatorColor">@android:color/white</item>
-        <item name="android:indeterminate">true</item>
-    </style>
-
     <style
         name="Questionnaire.AttachmentTakePhotoButtonStyle"
         parent="Widget.Material3.Button.OutlinedButton"
diff --git a/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt b/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt
index 88df417efe..45320ce810 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 Google LLC
+ * Copyright 2023-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.
@@ -21,7 +21,6 @@ import androidx.work.CoroutineWorker
 import androidx.work.Data
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
-import ca.uhn.fhir.context.FhirContext
 import com.google.android.fhir.FhirEngine
 import com.google.android.fhir.FhirEngineProvider
 import com.google.android.fhir.OffsetDateTimeTypeAdapter
@@ -33,15 +32,11 @@ import com.google.android.fhir.sync.upload.request.UploadRequestGeneratorFactory
 import com.google.gson.ExclusionStrategy
 import com.google.gson.FieldAttributes
 import com.google.gson.GsonBuilder
-import java.nio.charset.StandardCharsets
 import java.time.OffsetDateTime
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
-import org.apache.commons.io.IOUtils
-import org.hl7.fhir.r4.model.OperationOutcome
-import retrofit2.HttpException
 import timber.log.Timber
 
 /**
@@ -136,8 +131,6 @@ abstract class FhirSyncWorker(appContext: Context, workerParams: WorkerParameter
       }
 
     val result = synchronizer.synchronize()
-    if (result is SyncJobStatus.Failed) onFailedSyncJobResult(result)
-
     val output = buildWorkData(result)
 
     // await/join is needed to collect states completely
@@ -158,34 +151,6 @@ abstract class FhirSyncWorker(appContext: Context, workerParams: WorkerParameter
     }
   }
 
-  open fun onFailedSyncJobResult(failedSyncJobStatus: SyncJobStatus.Failed) {
-    try {
-      val jsonParser = FhirContext.forR4().newJsonParser()
-      val exceptions = (failedSyncJobStatus).exceptions
-
-      exceptions.forEach { resourceSyncException ->
-        val operationOutcome =
-          jsonParser.parseResource(
-            IOUtils.toString(
-              (resourceSyncException.exception as HttpException)
-                .response()
-                ?.errorBody()
-                ?.byteStream(),
-              StandardCharsets.UTF_8,
-            ),
-          ) as OperationOutcome
-
-        operationOutcome.issue.forEach { operationOutcome ->
-          Timber.e(
-            "SERVER ${operationOutcome.severity} - HTTP ${resourceSyncException.exception.code()} | Code - ${operationOutcome.code} | Diagnostics - ${operationOutcome.diagnostics}",
-          )
-        }
-      }
-    } catch (e: Exception) {
-      Timber.e(e)
-    }
-  }
-
   private fun buildWorkData(state: SyncJobStatus): Data {
     return workDataOf(
       // send serialized state and type so that consumer can convert it back
diff --git a/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt b/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt
index d1962aa180..86af7a4b64 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 Google LLC
+ * Copyright 2023-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.
@@ -62,7 +62,6 @@ internal object UploadRequestGeneratorFactory {
           mode.httpVerbToUseForCreate,
           mode.httpVerbToUseForUpdate,
           mode.bundleSize,
-          useETagForUpload = false,
         )
     }
 }
diff --git a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
index 2649d94f08..51abe6218c 100644
--- a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
+++ b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
@@ -143,7 +143,7 @@ internal open class TestDownloadManagerImpl(
 }
 
 internal object TestFhirEngineImpl : FhirEngine {
-  override suspend fun create(vararg resource: Resource, isLocalOnly: Boolean) = emptyList<String>()
+  override suspend fun create(vararg resource: Resource) = emptyList<String>()
 
   override suspend fun update(vararg resource: Resource) {}
 
@@ -207,10 +207,6 @@ internal object TestFhirEngineImpl : FhirEngine {
     )
   }
 
-  override suspend fun getUnsyncedLocalChanges(): List<LocalChange> {
-    TODO("Not yet implemented")
-  }
-
   override suspend fun purge(type: ResourceType, id: String, forcePurge: Boolean) {}
 
   override suspend fun purge(type: ResourceType, ids: Set<String>, forcePurge: Boolean) {}
diff --git a/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt b/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt
index b013dd4056..7ccdc1aea3 100644
--- a/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt
+++ b/workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 Google LLC
+ * Copyright 2023-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.
@@ -31,7 +31,6 @@ import org.hl7.fhir.instance.model.api.IBaseParameters
 import org.hl7.fhir.instance.model.api.IBaseResource
 import org.hl7.fhir.r4.model.CanonicalType
 import org.hl7.fhir.r4.model.IdType
-import org.hl7.fhir.r4.model.Measure
 import org.hl7.fhir.r4.model.MeasureReport
 import org.hl7.fhir.r4.model.Parameters
 import org.hl7.fhir.r4.model.PlanDefinition
@@ -39,8 +38,8 @@ import org.hl7.fhir.r4.model.Reference
 import org.opencds.cqf.fhir.cql.EvaluationSettings
 import org.opencds.cqf.fhir.cql.LibraryEngine
 import org.opencds.cqf.fhir.cr.measure.MeasureEvaluationOptions
-import org.opencds.cqf.fhir.cr.measure.common.MeasureEvalType
 import org.opencds.cqf.fhir.cr.measure.common.MeasureReportType
+import org.opencds.cqf.fhir.cr.measure.r4.R4MeasureProcessor
 import org.opencds.cqf.fhir.cr.plandefinition.PlanDefinitionProcessor
 import org.opencds.cqf.fhir.utility.monad.Eithers
 import org.opencds.cqf.fhir.utility.repository.ProxyRepository
@@ -73,8 +72,8 @@ internal constructor(
     MeasureEvaluationOptions().apply { evaluationSettings = this@FhirOperator.evaluationSettings }
 
   private val libraryProcessor = LibraryEngine(repository, evaluationSettings)
-  private val measureProcessor = FhirEngineR4MeasureProcessor(repository, measureEvaluationOptions)
   private val planDefinitionProcessor = PlanDefinitionProcessor(repository, evaluationSettings)
+  private val measureProcessor = R4MeasureProcessor(repository, measureEvaluationOptions)
 
   /**
    * The function evaluates a FHIR library against the database.
@@ -155,58 +154,6 @@ internal constructor(
     return report
   }
 
-  @WorkerThread
-  fun evaluateMeasure(
-    measure: Measure,
-    start: String,
-    end: String,
-    reportType: String,
-    subjectId: String? = null,
-    practitioner: String? = null,
-    additionalData: IBaseBundle? = null,
-    parameters: Parameters? = null,
-  ): MeasureReport {
-    val subject =
-      if (!practitioner.isNullOrBlank()) {
-        checkAndAddType(practitioner, "Practitioner")
-      } else if (!subjectId.isNullOrBlank()) {
-        checkAndAddType(subjectId, "Patient")
-      } else {
-        // List of null is required to run population-level measures
-        null
-      }
-
-    val subjectIds = if (subject == null) listOf() else listOf(subject)
-
-    val evalType =
-      MeasureEvalType.fromCode(reportType)
-        .orElse(
-          if (subjectIds.isNotEmpty()) {
-            MeasureEvalType.SUBJECT
-          } else {
-            MeasureEvalType.POPULATION
-          },
-        ) as MeasureEvalType
-
-    val report =
-      measureProcessor.evaluateMeasure(
-        /* measure = */ measure,
-        /* periodStart = */ start,
-        /* periodEnd = */ end,
-        /* reportType = */ reportType,
-        /* subjectIds = */ subjectIds,
-        /* additionalData = */ additionalData,
-        /* parameters = */ parameters,
-        /* evalType = */ evalType,
-      )
-
-    // add subject reference for non-individual reportTypes
-    if (report.type.name == MeasureReportType.SUMMARY.name && !subject.isNullOrBlank()) {
-      report.setSubject(Reference(subject))
-    }
-    return report
-  }
-
   /**
    * Generates a [CarePlan] based on the provided inputs.
    *

From d1b6875ccb739823b05fe7e88d06ce74c407bc9f Mon Sep 17 00:00:00 2001
From: Simon Njoroge <snjoroge@ona.io>
Date: Mon, 13 Jan 2025 13:53:26 +0300
Subject: [PATCH 126/126] Revert updates from fork

---
 .../com/google/android/fhir/FhirEngine.kt     |  6 +---
 .../com/google/android/fhir/db/Database.kt    |  9 ------
 .../android/fhir/impl/FhirEngineImpl.kt       |  9 ++----
 .../FhirEngineR4MeasureProcessor.java         | 29 -------------------
 4 files changed, 3 insertions(+), 50 deletions(-)
 delete mode 100644 workflow/src/main/java/com/google/android/fhir/workflow/FhirEngineR4MeasureProcessor.java

diff --git a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
index d99f7d6b1c..ea348beec9 100644
--- a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
+++ b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
@@ -69,11 +69,9 @@ interface FhirEngine {
    * returned list of IDs.
    *
    * @param resource The FHIR resources to create.
-   * @param isLocalOnly - Setting the value to [true] instructs engine that the resource and its
-   *   subsequent updates should never be synced to the server.
    * @return A list of logical IDs of the newly created resources.
    */
-  suspend fun create(vararg resource: Resource, isLocalOnly: Boolean = false): List<String>
+  suspend fun create(vararg resource: Resource): List<String>
 
   /**
    * Loads a FHIR resource given its [ResourceType] and logical ID.
@@ -192,8 +190,6 @@ interface FhirEngine {
    */
   suspend fun getLocalChanges(type: ResourceType, id: String): List<LocalChange>
 
-  suspend fun getUnsyncedLocalChanges(): List<LocalChange>
-
   /**
    * Purges a resource from the database without deleting data from the server.
    *
diff --git a/engine/src/main/java/com/google/android/fhir/db/Database.kt b/engine/src/main/java/com/google/android/fhir/db/Database.kt
index a7e48878b9..677228253c 100644
--- a/engine/src/main/java/com/google/android/fhir/db/Database.kt
+++ b/engine/src/main/java/com/google/android/fhir/db/Database.kt
@@ -39,15 +39,6 @@ internal interface Database {
    */
   suspend fun <R : Resource> insert(vararg resource: R): List<String>
 
-  /**
-   * Inserts a list of local `resources` into the FHIR resource database. If any of the resources
-   * already exists, it will be overwritten.
-   *
-   * @param <R> The resource type
-   * @return the logical IDs of the newly created resources.
-   */
-  suspend fun <R : Resource> insertLocalOnly(vararg resource: R): List<String>
-
   /**
    * Inserts a list of remote `resources` into the FHIR resource database. If any of the resources
    * already exists, it will be overwritten.
diff --git a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
index 817b6d721d..4fc5223724 100644
--- a/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt
@@ -46,11 +46,8 @@ import org.hl7.fhir.r4.model.ResourceType
 /** Implementation of [FhirEngine]. */
 internal class FhirEngineImpl(private val database: Database, private val context: Context) :
   FhirEngine {
-  override suspend fun create(vararg resource: Resource, isLocalOnly: Boolean): List<String> {
-    return withContext(Dispatchers.IO) {
-      if (isLocalOnly) database.insertLocalOnly(*resource) else database.insert(*resource)
-    }
-  }
+  override suspend fun create(vararg resource: Resource) =
+    withContext(Dispatchers.IO) { database.insert(*resource) }
 
   override suspend fun get(type: ResourceType, id: String) =
     withContext(Dispatchers.IO) { database.select(type, id) }
@@ -80,8 +77,6 @@ internal class FhirEngineImpl(private val database: Database, private val contex
   override suspend fun getLocalChanges(type: ResourceType, id: String) =
     withContext(Dispatchers.IO) { database.getLocalChanges(type, id) }
 
-  override suspend fun getUnsyncedLocalChanges(): List<LocalChange> = database.getAllLocalChanges()
-
   override suspend fun purge(type: ResourceType, id: String, forcePurge: Boolean) =
     withContext(Dispatchers.IO) { database.purge(type, setOf(id), forcePurge) }
 
diff --git a/workflow/src/main/java/com/google/android/fhir/workflow/FhirEngineR4MeasureProcessor.java b/workflow/src/main/java/com/google/android/fhir/workflow/FhirEngineR4MeasureProcessor.java
deleted file mode 100644
index 72bb431772..0000000000
--- a/workflow/src/main/java/com/google/android/fhir/workflow/FhirEngineR4MeasureProcessor.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.google.android.fhir.workflow;
-
-import org.hl7.fhir.instance.model.api.IBaseBundle;
-import org.hl7.fhir.r4.model.Measure;
-import org.hl7.fhir.r4.model.MeasureReport;
-import org.hl7.fhir.r4.model.Parameters;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.opencds.cqf.fhir.api.Repository;
-import org.opencds.cqf.fhir.cr.measure.MeasureEvaluationOptions;
-import org.opencds.cqf.fhir.cr.measure.common.MeasureEvalType;
-import org.opencds.cqf.fhir.cr.measure.common.SubjectProvider;
-import org.opencds.cqf.fhir.cr.measure.r4.R4MeasureProcessor;
-
-import java.util.List;
-
-public class FhirEngineR4MeasureProcessor extends R4MeasureProcessor {
-    public FhirEngineR4MeasureProcessor(Repository repository, MeasureEvaluationOptions measureEvaluationOptions) {
-        super(repository, measureEvaluationOptions);
-    }
-
-    public FhirEngineR4MeasureProcessor(Repository repository, MeasureEvaluationOptions measureEvaluationOptions, SubjectProvider subjectProvider) {
-        super(repository, measureEvaluationOptions, subjectProvider);
-    }
-
-    public MeasureReport evaluateMeasure(Measure measure, String periodStart, String periodEnd, String reportType, List<String> subjectIds, IBaseBundle additionalData, Parameters parameters, MeasureEvalType evalType) {
-        return super.evaluateMeasure(measure, periodStart, periodEnd, reportType, subjectIds, additionalData, parameters, evalType);
-    }
-}