Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Content description set null #280

Merged
merged 3 commits into from
Nov 13, 2024
Merged

Content description set null #280

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fdd1e08
Set contentDescription null when no need it.
Jaehwa-Noh Nov 2, 2024
40b418b
Fix spotless.
Jaehwa-Noh Nov 2, 2024
6b298dd
Merge branch 'main' into content-description-set-null
temcguir Nov 12, 2024
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
24 changes: 14 additions & 10 deletions ...view/src/main/java/com/google/jetpackcamera/feature/preview/ui/PreviewScreenComponents.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,21 +442,25 @@ fun StabilizationIcon(
painter = when (stabilizationMode) {
StabilizationMode.AUTO ->
painterResource(R.drawable.video_stable_auto_filled_icon)

StabilizationMode.HIGH_QUALITY ->
painterResource(R.drawable.video_stable_hq_filled_icon)

else -> rememberVectorPainter(Icons.Filled.VideoStable)
},
// previewStabilization will not be on for high quality
contentDescription = stringResource(
when (stabilizationMode) {
StabilizationMode.AUTO -> R.string.stabilization_icon_description_auto
StabilizationMode.ON ->
R.string.stabilization_icon_description_preview_and_video
StabilizationMode.HIGH_QUALITY ->
R.string.stabilization_icon_description_video_only
else -> 0
}
),
contentDescription = when (stabilizationMode) {
StabilizationMode.AUTO -> stringResource(
R.string.stabilization_icon_description_auto
)
StabilizationMode.ON ->
stringResource(R.string.stabilization_icon_description_preview_and_video)

StabilizationMode.HIGH_QUALITY ->
stringResource(R.string.stabilization_icon_description_video_only)

else -> null
},
modifier = modifier
)
}
Expand Down