Skip to content

expose test tags as resId for settings alert dialog containers #494

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

Merged
Kimblebee merged 2 commits into from
Apr 17, 2026
+13 −3
Merged

expose test tags as resId for settings alert dialog containers #494

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1e7b65
expose test tags as resId for settings alert dialog containers
Kimblebee Apr 17, 2026
ff6a607
apply testtags as resource ID to entire AlertDialog semantic tree
Kimblebee Apr 17, 2026
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
16 changes: 13 additions & 3 deletions feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.stateDescription
import androidx.compose.ui.semantics.testTagsAsResourceId
import androidx.compose.ui.text.font.FontStyle
import androidx.compose.ui.text.intl.Locale
import androidx.compose.ui.text.toUpperCase
Expand Down Expand Up @@ -197,7 +198,8 @@ fun DefaultCameraFacing(
}
)
SwitchSettingUI(
modifier = modifier.testTag(BTN_SWITCH_SETTING_LENS_FACING_TAG)
modifier = modifier
.testTag(BTN_SWITCH_SETTING_LENS_FACING_TAG)
.semantics {
stateDescription = description
},
Expand Down Expand Up @@ -241,6 +243,7 @@ fun FlashModeSetting(
id = R.string.flash_mode_description_llb
)
}

is FlashUiState.Disabled -> stringResource(
flashUiState.disabledRationale.reasonTextResId,
stringResource(flashUiState.disabledRationale.affectedSettingNameResId)
Expand Down Expand Up @@ -306,8 +309,12 @@ fun AspectRatioSetting(
id = R.string.aspect_ratio_description_9_16
)

AspectRatio.THREE_FOUR -> stringResource(id = R.string.aspect_ratio_description_3_4)
AspectRatio.ONE_ONE -> stringResource(id = R.string.aspect_ratio_description_1_1)
AspectRatio.THREE_FOUR -> stringResource(
id = R.string.aspect_ratio_description_3_4
)
AspectRatio.ONE_ONE -> stringResource(
id = R.string.aspect_ratio_description_1_1
)
}
} else {
TODO("aspect ratio currently has no disabled criteria")
Expand Down Expand Up @@ -842,9 +849,11 @@ fun RecordingAudioSetting(
is AudioUiState.Enabled.On -> {
stringResource(R.string.audio_selector_on)
}

is AudioUiState.Enabled.Mute -> {
stringResource(R.string.audio_selector_off)
}

is AudioUiState.Disabled -> {
disabledRationaleString(disabledRationale = audioUiState.disabledRationale)
}
Expand Down Expand Up @@ -905,6 +914,7 @@ fun BasicPopupSetting(
)
if (popupStatus.value) {
AlertDialog(
modifier = Modifier.semantics { testTagsAsResourceId = true },
onDismissRequest = { popupStatus.value = false },
confirmButton = {
Text(
Expand Down
Loading