From fdd1e082cf73aa05aa5afe57d71e5a6f26151ed5 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Sat, 2 Nov 2024 19:39:02 +0900 Subject: [PATCH 1/2] Set contentDescription null when no need it. --- .../preview/ui/PreviewScreenComponents.kt | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/ui/PreviewScreenComponents.kt b/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/ui/PreviewScreenComponents.kt index a3a68d1d9..93b026521 100644 --- a/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/ui/PreviewScreenComponents.kt +++ b/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/ui/PreviewScreenComponents.kt @@ -449,16 +449,18 @@ fun StabilizationIcon( 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 ) } From 40b418b03d8f05714241011d6aa9449f58df5be2 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Sat, 2 Nov 2024 19:39:09 +0900 Subject: [PATCH 2/2] Fix spotless. --- .../jetpackcamera/feature/preview/ui/PreviewScreenComponents.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/ui/PreviewScreenComponents.kt b/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/ui/PreviewScreenComponents.kt index 93b026521..60bf4ff73 100644 --- a/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/ui/PreviewScreenComponents.kt +++ b/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/ui/PreviewScreenComponents.kt @@ -444,8 +444,10 @@ 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