Configure Review layout for SDC catalog application #2783
Conversation
There was a problem hiding this comment.
Can we directly launch the review mode by providing both the questionnaire JSON and the questionnaire response? This way, when the layout is displayed in review mode, it will show the pre-filled answers. If the user wants to edit those answers, they can click on the edit button at the top.
catalog/src/main/java/com/google/android/fhir/catalog/DemoQuestionnaireFragment.kt
Show resolved
Hide resolved
| ), | ||
| REVIEW(R.drawable.ic_reviewlayout, R.string.layout_name_review, ""), | ||
| READ_ONLY(R.drawable.ic_readonlylayout, R.string.layout_name_read_only, ""), | ||
| REVIEW(R.drawable.ic_reviewlayout, R.string.layout_name_review, "layout_review.json", true), |
There was a problem hiding this comment.
@santosh-pingle fyi
I was asking santosh to see if there's a way to use lambda to configure this.. it's sort of annoying to keep adding new arguments to this. @rahulmalhotra can you think of a way to do this?
santosh has a similar pr as well #2803
There was a problem hiding this comment.
This is done. I introduced another data class named LayoutConfig and converted this configuration to use lambda. Please take a look and let me know if this looks good?
rahulmalhotra
force-pushed
the
rm/review-layout-catalog-app
branch
from
4a503f0 to
372ed61
Compare
| @DrawableRes val iconId: Int, | ||
| @StringRes val textId: Int, | ||
| val questionnaireFileName: String, | ||
| val enableReviewMode: Boolean, |
There was a problem hiding this comment.
| val enableReviewMode: Boolean, | |
| val lambda: QuestionnaireFragment.(), |
| iconId = R.drawable.ic_defaultlayout | ||
| textId = R.string.layout_name_default_text | ||
| questionnaireFileName = "layout_default.json" | ||
| enableReviewMode = false |
There was a problem hiding this comment.
| enableReviewMode = false | |
| {}, |
catalog/src/main/java/com/google/android/fhir/catalog/LayoutListViewModel.kt
Show resolved
Hide resolved
catalog/src/main/java/com/google/android/fhir/catalog/LayoutListViewModel.kt
Show resolved
Hide resolved
| showReviewPageBeforeSubmit(args.enableReviewMode) | ||
| showReviewPageFirst(true) |
There was a problem hiding this comment.
| showReviewPageBeforeSubmit(args.enableReviewMode) | |
| showReviewPageFirst(true) |
| @@ -89,6 +89,11 @@ | |||
| app:nullable="true" | |||
| android:defaultValue="@null" | |||
| /> | |||
| <argument | |||
There was a problem hiding this comment.
Hi @jingtang10 we cannot pass lambda as an argument in these navigation parameters as it only supports primitive data types. Do you have any recommendation for it?
Some of the solutions me and @MJ1998 discussed were:
- Defining a map of string -> key and lambda and passing the key as an argument and retrieving the lambda by accessing the map in demoquestionnairefragment.
- Using a shared view model to for LayoutListFragment as wel as DemoQuestionnaireFragment
Though I think both the approaches are somewhat different to what's happening at the moment. Please let me know your thoughts on how to proceed here.
There was a problem hiding this comment.
We can also serialize it to pass it as a string parameter but I don't think that should be a good way to move forward either.
IMPORTANT: All PRs must be linked to an issue (except for extremely trivial and straightforward changes).
Fixes #2777
Description
This change configures Review layout for SDC Catalog Application. It consist of the following updates:
enableReviewModeto Layout enum underLayoutListViewModel.ktand pass it astruefor the REVIEW enum value along withlayout_review.jsonto render questionnaireDemoQuestionnaireFragment.ktand use it to show Review Page when its value istruelayout_review.jsonto render questionnaire properlyAlternative(s) considered
N/A
Type
Bug fix
Screenshots (if applicable)
Checklist
./gradlew spotlessApplyand./gradlew spotlessCheckto check my code follows the style guide of this project../gradlew checkand./gradlew connectedCheckto test my changes locally.