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

Cleanup and moved Date and Time pickers to material #1312

Merged
merged 10 commits into from
Apr 29, 2022
Merged

Cleanup and moved Date and Time pickers to material #1312

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b081ce2
Cleanup and moved Date and Time pickers to material
aditya-07 Apr 19, 2022
888d0ca
Updated title for the time picker
aditya-07 Apr 19, 2022
0fe4b1d
Review comment changes
aditya-07 Apr 21, 2022
efa9429
Merge branch 'master' into ak/datetime-picker-to-material
aditya-07 Apr 21, 2022
68cf230
Merge branch 'master' into ak/datetime-picker-to-material
aditya-07 Apr 28, 2022
37c7fce
Review comments changes
aditya-07 Apr 28, 2022
8e1182a
spotless
aditya-07 Apr 28, 2022
089f701
Fixed failing tests
aditya-07 Apr 28, 2022
6478a85
Merge branch 'master' into ak/datetime-picker-to-material
aditya-07 Apr 29, 2022
78c9b3c
Review comment fix
aditya-07 Apr 29, 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
Prev Previous commit
Next Next commit
Review comment changes
  • Loading branch information
@aditya-07
aditya-07 committed Apr 21, 2022
commit 0fe4b1d638d5b984d6b7567ea953df05a496cb0e
66 changes: 0 additions & 66 deletions ...pture/src/main/java/com/google/android/fhir/datacapture/views/DatePickerDialogFragment.kt
View file
Open in desktop

This file was deleted.

39 changes: 23 additions & 16 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 @@ -17,7 +17,9 @@
package com.google.android.fhir.datacapture.views

import android.annotation.SuppressLint
import android.content.Context
import android.text.InputType
import android.text.format.DateFormat
import android.view.View
import com.google.android.fhir.datacapture.R
import com.google.android.fhir.datacapture.entryFormat
Expand Down Expand Up @@ -64,10 +66,10 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
createMaterialDatePicker()
.apply {
addOnPositiveButtonClickListener { epochMilli ->
localDate = Instant.ofEpochMilli(epochMilli).atZone(ZONE_ID_UTC).toLocalDate()
localDate?.let {
dateInputEditText.setText(it.format(LOCAL_DATE_FORMATTER))
generateLocalDateTime(it, localTime)?.let {
with(Instant.ofEpochMilli(epochMilli).atZone(ZONE_ID_UTC).toLocalDate()) {
localDate = this
dateInputEditText.setText(this.format(LOCAL_DATE_FORMATTER))
aditya-07 marked this conversation as resolved.
Show resolved Hide resolved
generateLocalDateTime(this, localTime)?.let {
updateDateTimeInput(it)
updateDateTimeAnswer(it)
}
Expand All @@ -88,21 +90,21 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
// necessary to access the base context twice to retrieve the application object
// from the view's context.
val context = itemView.context.tryUnwrapContext()!!
createMaterialTimePicker()
createMaterialTimePicker(context)
.apply {
addOnPositiveButtonClickListener {
localTime = LocalTime.of(this.hour, this.minute, 0)
localTime?.let {
timeInputEditText.setText(it.format(LOCAL_TIME_FORMATTER))
generateLocalDateTime(localDate, it)?.let {
with(LocalTime.of(this.hour, this.minute, 0)) {
localTime = this
timeInputEditText.setText(this.format(LOCAL_TIME_FORMATTER))
aditya-07 marked this conversation as resolved.
Show resolved Hide resolved
generateLocalDateTime(localDate, this)?.let {
updateDateTimeInput(it)
updateDateTimeAnswer(it)
}
timeInputEditText.clearFocus()
}
timeInputEditText.clearFocus()
}
}
.show(context.supportFragmentManager, "time-picker")
.show(context.supportFragmentManager, TAG_TIME_PICKER)
}
}

Expand Down Expand Up @@ -212,16 +214,19 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
.build()
}

private fun createMaterialTimePicker(): MaterialTimePicker {
private fun createMaterialTimePicker(context: Context): MaterialTimePicker {
val selectedTime =
questionnaireItemViewItem.singleAnswerOrNull?.valueDateTimeType?.localTime
?: LocalTime.now()

return MaterialTimePicker.Builder()
.setTitleText(R.string.select_time)
.setTimeFormat(TimeFormat.CLOCK_12H)
.setHour(selectedTime.hour)
.setMinute(selectedTime.minute)
.apply {
setTitleText(R.string.select_time)
setHour(selectedTime.hour)
setMinute(selectedTime.minute)
if (DateFormat.is24HourFormat(context)) setTimeFormat(TimeFormat.CLOCK_24H)
else setTimeFormat(TimeFormat.CLOCK_12H)
aditya-07 marked this conversation as resolved.
Show resolved Hide resolved
}
.build()
}
}
Expand All @@ -231,6 +236,8 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
val LOCAL_TIME_FORMATTER = DateTimeFormatter.ISO_LOCAL_TIME!!
}

private const val TAG_TIME_PICKER = "time-picker"

internal val DateTimeType.localDate
get() =
LocalDate.of(
Expand Down
53 changes: 0 additions & 53 deletions ...pture/src/main/java/com/google/android/fhir/datacapture/views/TimePickerDialogFragment.kt
View file
Open in desktop

This file was deleted.