Migrate expression evaluators to Kotlin multi platform by ellykits · Pull Request #2932 · ohs-foundation/android-fhir

ellykits · 2026-01-06T10:19:08Z

IMPORTANT: All PRs must be linked to an issue (except for extremely trivial and straightforward changes).

Description
Clear and concise code change description.

Alternative(s) considered
Have you considered any alternatives? And if so, why have you chosen the approach in this PR?

Screenshots (if applicable)

Checklist

I have read and acknowledged the Code of conduct.
I have read the Contributing page.
I have signed the Google Individual CLA, or I am covered by my company's Corporate CLA.
I have discussed my proposed solution with code owners in the linked issue(s) and we have agreed upon the general approach.
I have run ./gradlew spotlessApply and ./gradlew spotlessCheck to check my code follows the style guide of this project.
I have run ./gradlew check and ./gradlew connectedCheck to test my changes locally.
I have built and run the demo app(s) to verify my change fixes the issue and/or does not break the demo app(s).

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Fix compose build issues kmp

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

- Build success - Android run success - Web run success - iOS not tested yet

- Able to open form in compose - Logs QR on submission - Migrate from R5 to R4 in sdc-kmp-demo - Create QuestionnaireComposeable.kt public API for simpler access to datacapture-kmp

Add datacapture KMP demo application #3

Run spotlessApply to fix code formating issues. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Issue resolved by upgrading dependencies. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Fix issues to do with answer comparison and object creation. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Kotlin-FHIRPath now supports custom variables in expressions. Refactor implementation to provide custom variable during fhirpath evaluation. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

to be resoled with PR ohs-foundation#2932

.../src/commonMain/kotlin/com/google/android/fhir/datacapture/enablement/EnablementEvaluator.kt

...src/commonMain/kotlin/com/google/android/fhir/datacapture/enablement/FhirValueComparators.kt

...c/commonMain/kotlin/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItems.kt

...ommonMain/kotlin/com/google/android/fhir/datacapture/validation/MaxDecimalPlacesValidator.kt

...p/src/commonMain/kotlin/com/google/android/fhir/datacapture/validation/MaxLengthValidator.kt

...ture-kmp/src/commonMain/kotlin/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt

gradle/libs.versions.toml

…#2935) * Move BooleanChoiceViewFactory * Move RadioGroupViewFactory * Add kmp desktopTest to CI * Move CheckBoxGroupViewFactory to kmp * Update getting answer option display string * Move dialog select view factory to kmp * Replace getString in tests to fix HeadlessException in CI Desktop tests in ci fail with the following error seemingly targeting a UI environment java.awt.HeadlessException at java.desktop/sun.awt.HeadlessToolkit.getScreenResolution(HeadlessToolkit.java:122) at org.jetbrains.compose.resources.ResourceEnvironment_desktopKt.getSystemEnvironment(ResourceEnvironment.desktop.kt:12) at org.jetbrains.compose.resources.ResourceEnvironmentKt$getResourceEnvironment$1.invoke(ResourceEnvironment.kt:81) at org.jetbrains.compose.resources.ResourceEnvironmentKt$getResourceEnvironment$1.invoke(ResourceEnvironment.kt:81) at org.jetbrains.compose.resources.ResourceEnvironmentKt.getSystemResourceEnvironment(ResourceEnvironment.kt:87) at org.jetbrains.compose.resources.StringResourcesKt.getString(StringResources.kt:42) * Address PR comments * Address PR comments * Temporarily disable enabledAnswerOptions to be resoled with PR #2932 * Address PR comments

Clean up code and improve exception handling Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

ellykits and others added 30 commits November 3, 2025 13:14

Refactor gradle dependencies to use toml file

1a11fb9

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Migrate gradle plugins to toml file

57fc39b

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Merge branch 'master' into dependency-management

adec2c6

Order dependencies declarations lexographically

0b98d35

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Merge branch 'master' into dependency-management

977a39e

Restore necessary comment

1a5a374

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Add datacapture kmp module

5d12ae6

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Fix MediaItem to suit CMP

1e15fb5

Remove AndroidView used in Header compose

81468cb

Merge pull request #1 from LZRS/migrate-sdc-kmp

a644091

Fix compose build issues kmp

Move more code to commonMain package

e47bd6c

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Resolve build issues

1890b40

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Use platform specific DataCapture

4b7b2d6

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Init sdc-kmp-demo module

78ebf17

- Build success - Android run success - Web run success - iOS not tested yet

Add QuestionnaireScreen

938ea9c

- Able to open form in compose - Logs QR on submission - Migrate from R5 to R4 in sdc-kmp-demo - Create QuestionnaireComposeable.kt public API for simpler access to datacapture-kmp

Use fhirR4Json

a051949

Display QR on UI

f34d0a0

Fix answer not showing on submission

2676fd4

Add horizontal scroll in QuestionnaireResponseScreen

6cf4e07

Add missing Cancel word

6154cb2

Remove not needed comment

10b4822

Update sample questionnaire

5e62f3c

Merge pull request #3 from opensrp/sdc-kmp-demo

f1470ba

Add datacapture KMP demo application #3

Add wasm target for datacapture kmp

548917b

Run spotlessApply to fix code formating issues. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Add missing actuals to expect functions

f9f59c7

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Add missing expect/actual function

c1eae1f

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Resolve runing wasm target

8156e64

Issue resolved by upgrading dependencies. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Run spotless and refactor hardcoded string

86cf4ee

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Fix launching questionnaire on jvm targets

9a91614

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Add migrated Compose QuestionnaireTheme

e728d17

ellykits added 7 commits January 7, 2026 17:46

Migrate validation classes to multiplatform

33f0292

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Correct validation type check

6801801

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Fix QuestionnaireResponse.Item.Answer.Value comparison

53ac40e

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Fix handling skip logic

e0698d5

Fix issues to do with answer comparison and object creation. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Return answer options immediately to avoid re-executing of query

0e72814

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Add tests for EnablementEvaluator class

480e966

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Merge branch 'master' into fhirpath-evaluation

ebbebb7

ellykits marked this pull request as ready for review January 20, 2026 14:55

ellykits requested a review from a team as a code owner January 20, 2026 14:55

ellykits requested review from jingtang10 and removed request for a team January 20, 2026 14:55

ellykits added 4 commits January 26, 2026 18:07

Update kotlin-fhirpath version

a817e60

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Test validator classes

c023b9e

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Enable expression evaluation with custom variables

3c71588

Kotlin-FHIRPath now supports custom variables in expressions. Refactor implementation to provide custom variable during fhirpath evaluation. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Merge branch 'master' into fhirpath-evaluation

64dc9d2

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

LZRS added a commit to LZRS/android-fhir that referenced this pull request Jan 29, 2026

Temporarily disable enabledAnswerOptions

65ed9e7

to be resoled with PR ohs-foundation#2932

LZRS added a commit to LZRS/android-fhir that referenced this pull request Jan 29, 2026

Temporarily disable enabledAnswerOptions

c5c28bc

to be resoled with PR ohs-foundation#2932

LZRS requested changes Feb 9, 2026

View reviewed changes

github-project-automation bot moved this from New to PR under Review in Android FHIR SDK Feb 9, 2026

ellykits added 2 commits February 11, 2026 17:02

Address PR feedback

bff8115

Clean up code and improve exception handling Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Merge branch 'master' into fhirpath-evaluation

e9e18bd

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

LZRS approved these changes Feb 11, 2026

View reviewed changes

ellykits added 3 commits February 11, 2026 17:32

Format code

56b9927

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Merge branch 'master' into fhirpath-evaluation

7aee5e5

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Update CI workflow task for running datacapture kmp desktop test

e001e3f

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

ellykits enabled auto-merge (squash) February 12, 2026 16:36

LZRS approved these changes Feb 12, 2026

View reviewed changes

ellykits merged commit 28bb831 into ohs-foundation:master Feb 12, 2026
9 checks passed

github-project-automation bot moved this from PR under Review to Complete in Android FHIR SDK Feb 12, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate expression evaluators to Kotlin multi platform #2932

Migrate expression evaluators to Kotlin multi platform #2932
ellykits merged 66 commits intoohs-foundation:masterfrom
ellykits:fhirpath-evaluation

ellykits commented Jan 6, 2026 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

ellykits commented Jan 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ellykits commented Jan 6, 2026 •

edited

Loading