-
Notifications
You must be signed in to change notification settings - Fork 121
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into cleanup-taskData
- Loading branch information
Showing
13 changed files
with
340 additions
and
500 deletions.
There are no files selected for viewing
94 changes: 0 additions & 94 deletions
94
...com/google/android/ground/ui/datacollection/tasks/multiplechoice/MultipleChoiceAdapter.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
172 changes: 172 additions & 0 deletions
172
...om/google/android/ground/ui/datacollection/tasks/multiplechoice/MultipleChoiceItemView.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,172 @@ | ||
| /* | ||
| * Copyright 2024 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.google.android.ground.ui.datacollection.tasks.multiplechoice | ||
|
|
||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.text.ClickableText | ||
| import androidx.compose.material3.Checkbox | ||
| import androidx.compose.material3.HorizontalDivider | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.RadioButton | ||
| import androidx.compose.material3.TextField | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.platform.testTag | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.AnnotatedString | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.google.android.ground.ExcludeFromJacocoGeneratedReport | ||
| import com.google.android.ground.R | ||
| import com.google.android.ground.model.task.MultipleChoice | ||
| import com.google.android.ground.model.task.Option | ||
| import com.google.android.ground.ui.theme.AppTheme | ||
|
|
||
| const val MULTIPLE_CHOICE_ITEM_TEST_TAG = "multiple choice item test tag" | ||
| const val OTHER_INPUT_TEXT_TEST_TAG = "other input test tag" | ||
| const val SELECT_MULTIPLE_RADIO_TEST_TAG = "select multiple radio test tag" | ||
|
|
||
| /** | ||
| * A composable function that displays a single item in a multiple-choice list. | ||
| * | ||
| * This composable provides a visually consistent and interactive way to present an option within a | ||
| * list of choices where the user can select one or more items. It typically includes a text label | ||
| * and a selectable indicator (e.g., a checkbox). | ||
| */ | ||
| @Composable | ||
| fun MultipleChoiceItemView( | ||
| item: MultipleChoiceItem, | ||
| modifier: Modifier = Modifier, | ||
| isLastIndex: Boolean = false, | ||
| toggleItem: (item: MultipleChoiceItem) -> Unit = {}, | ||
| otherValueChanged: (text: String) -> Unit = {}, | ||
| ) { | ||
| Column(modifier = Modifier.testTag(MULTIPLE_CHOICE_ITEM_TEST_TAG)) { | ||
| Row(modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { | ||
| when (item.cardinality) { | ||
| MultipleChoice.Cardinality.SELECT_ONE -> { | ||
| RadioButton( | ||
| modifier = Modifier.testTag(SELECT_MULTIPLE_RADIO_TEST_TAG), | ||
| selected = item.isSelected, | ||
| onClick = { toggleItem(item) }, | ||
| ) | ||
| } | ||
|
|
||
| MultipleChoice.Cardinality.SELECT_MULTIPLE -> { | ||
| Checkbox(checked = item.isSelected, onCheckedChange = { toggleItem(item) }) | ||
| } | ||
| } | ||
|
|
||
| ClickableText( | ||
| text = item.toTextLabel(), | ||
| modifier = modifier, | ||
| style = MaterialTheme.typography.bodyLarge, | ||
| onClick = { toggleItem(item) }, | ||
| ) | ||
| } | ||
|
|
||
| if (item.isOtherOption) { | ||
| Row(modifier = modifier.padding(horizontal = 48.dp)) { | ||
| TextField( | ||
| value = item.otherText, | ||
| textStyle = MaterialTheme.typography.bodyLarge, | ||
| onValueChange = { otherValueChanged(it) }, | ||
| modifier = Modifier.testTag(OTHER_INPUT_TEXT_TEST_TAG), | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| if (!isLastIndex) { | ||
| HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| private fun MultipleChoiceItem.toTextLabel() = | ||
| AnnotatedString(if (isOtherOption) stringResource(id = R.string.other) else option.label) | ||
|
|
||
| @Preview(backgroundColor = 0xFFFFFFFF, showBackground = true) | ||
| @Composable | ||
| @ExcludeFromJacocoGeneratedReport | ||
| fun SelectOneListItemPreview() { | ||
| AppTheme { | ||
| MultipleChoiceItemView( | ||
| item = | ||
| MultipleChoiceItem( | ||
| Option(id = "id", code = "code", label = "Option 1"), | ||
| cardinality = MultipleChoice.Cardinality.SELECT_ONE, | ||
| isSelected = false, | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Preview(backgroundColor = 0xFFFFFFFF, showBackground = true) | ||
| @Composable | ||
| @ExcludeFromJacocoGeneratedReport | ||
| fun SelectMultipleListItemPreview() { | ||
| AppTheme { | ||
| MultipleChoiceItemView( | ||
| item = | ||
| MultipleChoiceItem( | ||
| Option(id = "id", code = "code", label = "Option 2"), | ||
| cardinality = MultipleChoice.Cardinality.SELECT_MULTIPLE, | ||
| isSelected = false, | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Preview(backgroundColor = 0xFFFFFFFF, showBackground = true) | ||
| @Composable | ||
| @ExcludeFromJacocoGeneratedReport | ||
| fun SelectOneOtherListItemPreview() { | ||
| AppTheme { | ||
| MultipleChoiceItemView( | ||
| item = | ||
| MultipleChoiceItem( | ||
| Option(id = "id", code = "code", label = "Option 3"), | ||
| cardinality = MultipleChoice.Cardinality.SELECT_ONE, | ||
| isSelected = true, | ||
| isOtherOption = true, | ||
| otherText = "Other text", | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Preview(backgroundColor = 0xFFFFFFFF, showBackground = true) | ||
| @Composable | ||
| @ExcludeFromJacocoGeneratedReport | ||
| fun SelectMultipleOtherListItemPreview() { | ||
| AppTheme { | ||
| MultipleChoiceItemView( | ||
| item = | ||
| MultipleChoiceItem( | ||
| Option(id = "id", code = "code", label = "Option 4"), | ||
| cardinality = MultipleChoice.Cardinality.SELECT_MULTIPLE, | ||
| isSelected = true, | ||
| isOtherOption = true, | ||
| otherText = "Other text", | ||
| ) | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.