Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update questionnaire buttons in xml fragment #2384

Merged
merged 18 commits into from
Feb 27, 2024

Conversation

sharon2719
Copy link
Contributor

@sharon2719 sharon2719 commented Dec 20, 2023

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

Fixes #2353

Description
The submit button has been made configurable and the layout can be changed based on one's use case. The rest of the buttons previous, next and review have also been made configurable as well based on the designs in the issue above.

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?

Type
Choose one:Feature

Screenshots (if applicable)
Screenshot from 2023-12-22 12-40-38

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).

@sharon2719 sharon2719 force-pushed the questionnaire-content-customization branch from d56b1c7 to 29150cc Compare December 21, 2023 12:19
@sharon2719
Copy link
Contributor Author

@MJ1998 Update has been made

@MJ1998
Copy link
Collaborator

MJ1998 commented Dec 21, 2023

Thanks. Please add a description to the solution!

@sharon2719
Copy link
Contributor Author

@MJ1998 I did further testing and noted that if the @style is not added then it fails with this error Android resource linking failed com.google.android.fhir.demo-mergeDebugResources-60:/values/values.xml:7034: error: expected reference but got (raw string) Questionnaire.ButtonStyle. error: failed linking references.. However when its added it works just fine

@MJ1998
Copy link
Collaborator

MJ1998 commented Dec 24, 2023

@sharon2719

You are right! My IDE was throwing some error. After invalidate-restart its good.

Copy link
Collaborator

@MJ1998 MJ1998 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@sharon2719
Copy link
Contributor Author

@MJ1998 Kindly prompt kokoro

datacapture/src/main/res/values/styles.xml Show resolved Hide resolved
datacapture/src/main/res/values/styles.xml Outdated Show resolved Hide resolved
datacapture/src/main/res/values/styles.xml Outdated Show resolved Hide resolved
datacapture/src/main/res/values/styles.xml Outdated Show resolved Hide resolved
datacapture/src/main/res/values/styles.xml Outdated Show resolved Hide resolved
maimoonak and others added 3 commits February 6, 2024 11:17
* Add fhirpath supplements

* Add unit tests

* Update datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt

Co-authored-by: Jing Tang <[email protected]>

* Update datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt

Co-authored-by: Jing Tang <[email protected]>

* Resolve feedback and test issues

* Fix compile issue

* Update datacapture/src/test/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluatorTest.kt

Co-authored-by: Jing Tang <[email protected]>

* Rename tests

---------

Co-authored-by: Jing Tang <[email protected]>
@sharon2719 sharon2719 force-pushed the questionnaire-content-customization branch from b76cef5 to be1bcb2 Compare February 6, 2024 08:37
@jingtang10 jingtang10 enabled auto-merge (squash) February 6, 2024 09:37
Copy link
Collaborator

@ellykits ellykits left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Collaborator

@santosh-pingle santosh-pingle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can remove the visibility attribute change, as it get handled through the flags in the configuration.

datacapture/src/main/res/values/styles.xml Outdated Show resolved Hide resolved
datacapture/src/main/res/values/styles.xml Outdated Show resolved Hide resolved
@MJ1998
Copy link
Collaborator

MJ1998 commented Feb 14, 2024

Build fails on spotless apply.
Can you run spotless and raise a commit ?
Thanks @sharon2719

auto-merge was automatically disabled February 14, 2024 12:34

Head branch was pushed to by a user without write access

@sharon2719 sharon2719 force-pushed the questionnaire-content-customization branch from 70e9cbe to c2c78ad Compare February 14, 2024 12:34
@jingtang10 jingtang10 enabled auto-merge (squash) February 23, 2024 14:32
@jingtang10 jingtang10 merged commit d4747e5 into google:master Feb 27, 2024
3 checks passed
@jingtang10 jingtang10 deleted the questionnaire-content-customization branch February 27, 2024 17:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Complete
Development

Successfully merging this pull request may close these issues.

Questionnaire content style customization
7 participants