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

Clearing the old state of date and date-time ViewHolders #1581

Merged
merged 5 commits into from
Sep 12, 2022
Merged

Clearing the old state of date and date-time ViewHolders #1581

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f482b83
Clearing the old state of date and date-time ViewHolders when it is r…
aditya-07 Sep 5, 2022
dcb9346
Added tests
aditya-07 Sep 6, 2022
2218c38
Changed the way to stop text updates
aditya-07 Sep 9, 2022
f58a198
Merge branch 'master' into ak/bugfix-1580-date-picker
aditya-07 Sep 9, 2022
fc43e2b
Review changes
aditya-07 Sep 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ...com/google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ internal object QuestionnaireItemDatePickerViewHolderFactory :
private lateinit var textInputLayout: TextInputLayout
private lateinit var textInputEditText: TextInputEditText
override lateinit var questionnaireItemViewItem: QuestionnaireItemViewItem
private var previousQuestionnaireItemViewItem: QuestionnaireItemViewItem? = null
private var textWatcher: TextWatcher? = null
// Medium and long format styles use alphabetical month names which are difficult for the user
// to input. Use short format style which is always numerical.
Expand Down Expand Up @@ -102,6 +103,13 @@ internal object QuestionnaireItemDatePickerViewHolderFactory :
header.bind(questionnaireItemViewItem.questionnaireItem)
textInputLayout.hint = localePattern
textInputEditText.removeTextChangedListener(textWatcher)
// Cleanup old state when the ViewHolder is now being used for a different questionnaireItem
if (previousQuestionnaireItemViewItem?.questionnaireItem !=
questionnaireItemViewItem.questionnaireItem
) {
textInputEditText.text = null
}
previousQuestionnaireItemViewItem = questionnaireItemViewItem

if (textInputEditText.text.isNullOrEmpty()) {
textInputEditText.setText(
Expand Down
15 changes: 12 additions & 3 deletions ...google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
private lateinit var timeInputLayout: TextInputLayout
private lateinit var timeInputEditText: TextInputEditText
override lateinit var questionnaireItemViewItem: QuestionnaireItemViewItem
private var previousQuestionnaireItemViewItem: QuestionnaireItemViewItem? = null
private var localDate: LocalDate? = null
private var localTime: LocalTime? = null
private var textWatcher: TextWatcher? = null
Expand Down Expand Up @@ -142,7 +143,6 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
clearPreviousState()
header.bind(questionnaireItemViewItem.questionnaireItem)
dateInputLayout.hint = localeDatePattern
dateInputEditText.removeTextChangedListener(textWatcher)
val dateTime = questionnaireItemViewItem.answers.singleOrNull()?.valueDateTimeType
updateDateTimeInput(
dateTime?.let {
Expand Down Expand Up @@ -272,9 +272,18 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
}

private fun clearPreviousState() {
localDate = null
localTime = null
setReadOnlyInternal(isReadOnly = false)
dateInputEditText.removeTextChangedListener(textWatcher)
// Cleanup old state when the ViewHolder is now being used for a different questionnaireItem
if (previousQuestionnaireItemViewItem?.questionnaireItem !=
questionnaireItemViewItem.questionnaireItem
) {
dateInputEditText.text = null
timeInputEditText.text = null
localDate = null
localTime = null
}
previousQuestionnaireItemViewItem = questionnaireItemViewItem
}

private fun enableOrDisableTimePicker(enableIt: Boolean) {
Expand Down