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.

Sign up for GitHub

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

Jump to bottom

Complete Question is shown now as TextView with Dropdown #272

Merged
merged 4 commits into from
Feb 24, 2021
Merged

Complete Question is shown now as TextView with Dropdown #272

merged 4 commits into from
Feb 24, 2021

Conversation

MuhammadSalman-7214
Copy link
Contributor

No description provided.

joiskash
joiskash previously requested changes Feb 22, 2021
View reviewed changes
Copy link
Collaborator

@joiskash joiskash left a comment

Choose a reason for hiding this comment

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

Good work ! Just a few comments and please fix the Unit tests too.

...java/com/google/android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactory.kt Outdated Show resolved Hide resolved
datacapture/src/main/res/layout/questionnaire_item_drop_down_view.xml Outdated Show resolved Hide resolved
@jingtang10
Copy link
Collaborator

Thanks @MuhammadSalman-7214. Please address @joiskash 's comment and I will approve.

Additionallly, I think you'll need to fix this for the edit text layout as well: https://github.com/google/android-fhir/blob/master/datacapture/src/main/res/layout/questionnaire_item_edit_text_view.xml

Can be done in a follow-up PR.

@MuhammadSalman-7214
Copy link
Contributor Author

sure, will complete @joiskash comments and then push the PR

@jingtang10
Copy link
Collaborator

sure, will complete @joiskash comments and then push the PR

thanks! please let the reviewers know once you're done. also just a note, you won't be able to merge the PR until it is 1) approved by one the code owners and 2) all checks are passing.

@MuhammadSalman-7214
Copy link
Contributor Author

Changes done @jingtang10 and @joiskash. Both of you can review the changes.

jingtang10
jingtang10 requested changes Feb 23, 2021
View reviewed changes
...android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactoryInstrumentedTest.kt Outdated
viewHolder.itemView.findViewById<TextInputLayout>(R.id.dropdown_menu)
.hint
viewHolder.itemView.findViewById<TextView>(R.id.dropdown_question_title)
.text
Copy link
Collaborator

Choose a reason for hiding this comment

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

same line

Copy link
Contributor Author

Choose a reason for hiding this comment

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

okay

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

...android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactoryInstrumentedTest.kt
@@ -46,7 +46,7 @@ class QuestionnaireItemDropDownViewHolderFactoryInstrumentedTest {
@Before
fun setUp() {
context = ContextThemeWrapper(
InstrumentationRegistry.getInstrumentation().getTargetContext(),
InstrumentationRegistry.getInstrumentation().targetContext,
Copy link
Collaborator

Choose a reason for hiding this comment

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

thanks for fixing this -- can you do this for other files too?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

okay

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@jingtang10
Copy link
Collaborator

Thanks - just a couple of nits

@MuhammadSalman-7214
Copy link
Contributor Author

@jingtang10 both nits done

jingtang10
jingtang10 approved these changes Feb 23, 2021
View reviewed changes
Copy link
Collaborator

@jingtang10 jingtang10 left a comment

Choose a reason for hiding this comment

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

Thanks @MuhammadSalman-7214!

🚀

@MuhammadSalman-7214
Copy link
Contributor Author

MuhammadSalman-7214 commented Feb 24, 2021 •
edited
Loading

your welcome @jingtang10 👍

@MuhammadSalman-7214 MuhammadSalman-7214 dismissed joiskash’s stale review February 24, 2021 11:32

Changes requested have been implemented

@MuhammadSalman-7214 MuhammadSalman-7214 merged commit 5ab6849 into master Feb 24, 2021
@MuhammadSalman-7214 MuhammadSalman-7214 deleted the ms/show-complete-question branch February 24, 2021 11:32
@jingtang10 jingtang10 linked an issue Feb 24, 2021 that may be closed by this pull request
Questions which have multiline text cannot be read completely in the dropdown and edittext widget #226
Closed
@Tarun-Bhardwaj Tarun-Bhardwaj added the type:bug Something isn't working label Sep 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jingtang10 jingtang10 jingtang10 approved these changes

@deepankarb deepankarb Awaiting requested review from deepankarb

@pankajkatoch pankajkatoch Awaiting requested review from pankajkatoch

@yigit yigit Awaiting requested review from yigit

@joiskash joiskash Awaiting requested review from joiskash

Assignees
No one assigned
Labels
type:bug Something isn't working
Projects
Android FHIR SDK
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Questions which have multiline text cannot be read completely in the dropdown and edittext widget
4 participants
@MuhammadSalman-7214 @jingtang10 @joiskash @Tarun-Bhardwaj