Skip to content

Commit ff18e30

Browse files
LZRSLZRS
committed
Migrate Timepicker
1 parent b63fa79 commit ff18e30

File tree

8 files changed

+431
-206
lines changed

8 files changed

+431
-206
lines changed

‎datacapture/src/test/java/com/google/android/fhir/datacapture/views/TimePickerViewHolderFactoryTest.kt‎ renamed to ‎datacapture/src/androidTest/java/com/google/android/fhir/datacapture/test/views/TimePickerViewHolderFactoryTest.kt‎

Lines changed: 56 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 Google LLC
2+
* Copyright 2025 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,39 +14,55 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.android.fhir.datacapture.views
17+
package com.google.android.fhir.datacapture.test.views
1818

19+
import android.text.format.DateFormat
1920
import android.widget.FrameLayout
2021
import android.widget.TextView
21-
import androidx.appcompat.app.AppCompatActivity
22+
import androidx.compose.ui.test.assertTextEquals
23+
import androidx.compose.ui.test.junit4.createEmptyComposeRule
24+
import androidx.compose.ui.test.onNodeWithTag
25+
import androidx.test.ext.junit.rules.ActivityScenarioRule
26+
import androidx.test.ext.junit.runners.AndroidJUnit4
27+
import androidx.test.platform.app.InstrumentationRegistry
2228
import com.google.android.fhir.datacapture.R
29+
import com.google.android.fhir.datacapture.test.TestActivity
2330
import com.google.android.fhir.datacapture.validation.NotValidated
31+
import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
32+
import com.google.android.fhir.datacapture.views.compose.TIME_PICKER_INPUT_FIELD
2433
import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolder
2534
import com.google.android.fhir.datacapture.views.factories.TimePickerViewHolderFactory
2635
import com.google.common.truth.Truth.assertThat
2736
import org.hl7.fhir.r4.model.Questionnaire
2837
import org.hl7.fhir.r4.model.QuestionnaireResponse
2938
import org.hl7.fhir.r4.model.TimeType
39+
import org.junit.Before
40+
import org.junit.Rule
3041
import org.junit.Test
3142
import org.junit.runner.RunWith
32-
import org.robolectric.Robolectric
33-
import org.robolectric.RobolectricTestRunner
34-
import org.robolectric.shadows.ShadowSettings
3543

36-
@RunWith(RobolectricTestRunner::class)
44+
@RunWith(AndroidJUnit4::class)
3745
class TimePickerViewHolderFactoryTest {
38-
private val context =
39-
Robolectric.buildActivity(AppCompatActivity::class.java).create().get().apply {
40-
setTheme(com.google.android.material.R.style.Theme_Material3_DayNight)
41-
}
42-
private val parent = FrameLayout(context)
43-
private val viewHolder = TimePickerViewHolderFactory.create(parent)
46+
@get:Rule
47+
val activityScenarioRule: ActivityScenarioRule<TestActivity> =
48+
ActivityScenarioRule(TestActivity::class.java)
49+
50+
@get:Rule val composeTestRule = createEmptyComposeRule()
51+
52+
private lateinit var viewHolder: QuestionnaireItemViewHolder
53+
private lateinit var parent: FrameLayout
4454

45-
private val QuestionnaireItemViewHolder.timeInputView: TextView
46-
get() {
47-
return itemView.findViewById(R.id.text_input_edit_text)
55+
@Before
56+
fun setUp() {
57+
activityScenarioRule.scenario.onActivity { activity ->
58+
parent = FrameLayout(activity)
59+
viewHolder = TimePickerViewHolderFactory.create(parent)
60+
activity.setContentView(viewHolder.itemView)
4861
}
4962

63+
InstrumentationRegistry.getInstrumentation().waitForIdleSync()
64+
}
65+
5066
@Test
5167
fun shouldSetQuestionHeader() {
5268
viewHolder.bind(
@@ -57,6 +73,8 @@ class TimePickerViewHolderFactoryTest {
5773
answersChangedCallback = { _, _, _, _ -> },
5874
),
5975
)
76+
// Synchronize
77+
composeTestRule.waitForIdle()
6078

6179
assertThat(viewHolder.itemView.findViewById<TextView>(R.id.question).text.toString())
6280
.isEqualTo("Question?")
@@ -73,60 +91,56 @@ class TimePickerViewHolderFactoryTest {
7391
),
7492
)
7593

76-
assertThat(viewHolder.timeInputView.text.toString()).isEqualTo("")
94+
composeTestRule
95+
.onNodeWithTag(TIME_PICKER_INPUT_FIELD, useUnmergedTree = true)
96+
.assertTextEquals("")
7797
}
7898

7999
@Test
80-
fun `should show AM time when set time format is 12 hrs`() {
81-
ShadowSettings.set24HourTimeFormat(false)
82-
viewHolder.bind(
83-
QuestionnaireViewItem(
84-
Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
85-
QuestionnaireResponse.QuestionnaireResponseItemComponent()
86-
.addAnswer(
87-
QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()
88-
.setValue(TimeType("10:10")),
89-
),
90-
validationResult = NotValidated,
91-
answersChangedCallback = { _, _, _, _ -> },
92-
),
93-
)
94-
assertThat(viewHolder.timeInputView.text.toString()).isEqualTo("10:10 AM")
95-
}
100+
fun shouldDisplayAMTimeInCorrectFormat_dependingOnSystemSettings() {
101+
val context = viewHolder.itemView.context
102+
val is24Hour = DateFormat.is24HourFormat(context)
96103

97-
@Test
98-
fun `should show PM time when set time format is 12 hrs`() {
99-
ShadowSettings.set24HourTimeFormat(false)
100104
viewHolder.bind(
101105
QuestionnaireViewItem(
102106
Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
103107
QuestionnaireResponse.QuestionnaireResponseItemComponent()
104108
.addAnswer(
105109
QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()
106-
.setValue(TimeType("22:10:10")),
110+
.setValue(TimeType("10:10:00")),
107111
),
108112
validationResult = NotValidated,
109113
answersChangedCallback = { _, _, _, _ -> },
110114
),
111115
)
112-
assertThat(viewHolder.timeInputView.text.toString()).isEqualTo("10:10 PM")
116+
117+
val expectedTime = if (is24Hour) "10:10" else "10:10 AM"
118+
composeTestRule
119+
.onNodeWithTag(TIME_PICKER_INPUT_FIELD, useUnmergedTree = true)
120+
.assertTextEquals(expectedTime)
113121
}
114122

115123
@Test
116-
fun `should show time when set time format is 24 hrs`() {
117-
ShadowSettings.set24HourTimeFormat(true)
124+
fun shouldDisplayPMTimeInCorrectFormat_dependingOnSystemSettings() {
125+
val context = viewHolder.itemView.context
126+
val is24Hour = DateFormat.is24HourFormat(context)
127+
118128
viewHolder.bind(
119129
QuestionnaireViewItem(
120130
Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
121131
QuestionnaireResponse.QuestionnaireResponseItemComponent()
122132
.addAnswer(
123133
QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()
124-
.setValue(TimeType("22:10")),
134+
.setValue(TimeType("22:10:00")),
125135
),
126136
validationResult = NotValidated,
127137
answersChangedCallback = { _, _, _, _ -> },
128138
),
129139
)
130-
assertThat(viewHolder.timeInputView.text.toString()).isEqualTo("22:10")
140+
141+
val expectedTime = if (is24Hour) "22:10" else "10:10 PM"
142+
composeTestRule
143+
.onNodeWithTag(TIME_PICKER_INPUT_FIELD, useUnmergedTree = true)
144+
.assertTextEquals(expectedTime)
131145
}
132146
}

‎datacapture/src/main/java/com/google/android/fhir/datacapture/views/compose/TimePickerDialog.kt‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
/*
2+
* Copyright 2025 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.google.android.fhir.datacapture.views.compose
18+
19+
import androidx.compose.foundation.layout.Arrangement
20+
import androidx.compose.foundation.layout.Column
21+
import androidx.compose.foundation.layout.Row
22+
import androidx.compose.foundation.layout.fillMaxWidth
23+
import androidx.compose.material3.AlertDialog
24+
import androidx.compose.material3.ExperimentalMaterial3Api
25+
import androidx.compose.material3.Icon
26+
import androidx.compose.material3.IconButton
27+
import androidx.compose.material3.Text
28+
import androidx.compose.material3.TextButton
29+
import androidx.compose.material3.TimeInput
30+
import androidx.compose.material3.TimePicker
31+
import androidx.compose.material3.rememberTimePickerState
32+
import androidx.compose.runtime.Composable
33+
import androidx.compose.runtime.getValue
34+
import androidx.compose.runtime.mutableStateOf
35+
import androidx.compose.runtime.remember
36+
import androidx.compose.runtime.setValue
37+
import androidx.compose.ui.Alignment
38+
import androidx.compose.ui.Modifier
39+
import androidx.compose.ui.res.painterResource
40+
import androidx.compose.ui.res.stringResource
41+
import androidx.compose.ui.tooling.preview.Preview
42+
import com.google.android.fhir.datacapture.R
43+
44+
@OptIn(ExperimentalMaterial3Api::class)
45+
@Composable
46+
fun TimePickerDialog(
47+
type: TimeInputMode,
48+
onDismiss: () -> Unit,
49+
onConfirm: (Int, Int) -> Unit,
50+
) {
51+
val timePickerState = rememberTimePickerState()
52+
var inputType by remember(type) { mutableStateOf(type) }
53+
54+
AlertDialog(
55+
onDismissRequest = onDismiss,
56+
confirmButton = {
57+
TextButton(
58+
onClick = {
59+
onConfirm(timePickerState.hour, timePickerState.minute)
60+
onDismiss()
61+
},
62+
) {
63+
Text("OK")
64+
}
65+
},
66+
dismissButton = { TextButton(onClick = onDismiss) { Text("Cancel") } },
67+
text = {
68+
Column(
69+
verticalArrangement = Arrangement.Center,
70+
horizontalAlignment = Alignment.CenterHorizontally,
71+
) {
72+
if (inputType == TimeInputMode.CLOCK) {
73+
TimePicker(state = timePickerState)
74+
} else {
75+
TimeInput(state = timePickerState)
76+
}
77+
78+
Row(
79+
modifier = Modifier.fillMaxWidth(),
80+
horizontalArrangement = Arrangement.Start,
81+
verticalAlignment = Alignment.CenterVertically,
82+
) {
83+
IconButton(
84+
onClick = {
85+
inputType =
86+
if (inputType == TimeInputMode.CLOCK) {
87+
TimeInputMode.KEYBOARD
88+
} else {
89+
TimeInputMode.CLOCK
90+
}
91+
},
92+
) {
93+
val iconRes =
94+
if (inputType == TimeInputMode.CLOCK) {
95+
R.drawable.ic_keyboard
96+
} else {
97+
R.drawable.ic_access_time
98+
}
99+
Icon(
100+
painterResource(iconRes),
101+
contentDescription =
102+
if (inputType == TimeInputMode.CLOCK) {
103+
"Switch to text input"
104+
} else {
105+
"Switch to clock input"
106+
},
107+
)
108+
}
109+
}
110+
}
111+
},
112+
title = { Text(stringResource(R.string.select_time)) },
113+
)
114+
}
115+
116+
sealed interface TimeInputMode {
117+
object KEYBOARD : TimeInputMode
118+
119+
object CLOCK : TimeInputMode
120+
}
121+
122+
@Preview
123+
@Composable
124+
fun TimePickerDialogPreview() {
125+
TimePickerDialog(onDismiss = {}, type = TimeInputMode.KEYBOARD, onConfirm = { _, _ -> })
126+
}

0 commit comments

Comments
 (0)