From 314be0de36fa9316f57eaa9530e271fe03fa8a62 Mon Sep 17 00:00:00 2001 From: kangyuri1114 Date: Sun, 17 Mar 2024 18:10:17 +0900 Subject: [PATCH 1/3] =?UTF-8?q?add=20:=20Icon=EC=97=90=20contentDescriptio?= =?UTF-8?q?n=20=EC=86=8D=EC=84=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/system/compose/base/Icon.kt | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/compose/src/main/java/com/yourssu/design/system/compose/base/Icon.kt b/compose/src/main/java/com/yourssu/design/system/compose/base/Icon.kt index 3e28c94a..6f31f571 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/base/Icon.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/base/Icon.kt @@ -14,6 +14,10 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.rememberVectorPainter import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.res.vectorResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.role +import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.yourssu.design.system.compose.foundation.LocalYdsContentColor @@ -29,40 +33,53 @@ sealed class IconSize(val value: Dp) { fun Icon( @DrawableRes id: Int, modifier: Modifier = Modifier, + contentDescription: String? = null, iconSize: IconSize = IconSize.Medium, tint: Color = LocalYdsContentColor.current, ) { Icon( imageVector = ImageVector.vectorResource(id = id), modifier = modifier, + contentDescription = contentDescription, iconSize = iconSize, - tint = tint + tint = tint, ) } @Composable fun Icon( imageVector: ImageVector, + contentDescription: String?, modifier: Modifier = Modifier, iconSize: IconSize = IconSize.Medium, tint: Color = LocalYdsContentColor.current, ) { Icon( painter = rememberVectorPainter(imageVector), + contentDescription = contentDescription, modifier = modifier, iconSize = iconSize, - tint = tint + tint = tint, ) } @Composable fun Icon( painter: Painter, + contentDescription: String?, modifier: Modifier = Modifier, iconSize: IconSize = IconSize.Medium, tint: Color = LocalYdsContentColor.current, ) { val colorFilter = ColorFilter.tint(tint) + val semantics = if (contentDescription != null) { + Modifier.semantics { + this.contentDescription = contentDescription + this.role = Role.Image + } + } else { + Modifier + } Box( modifier .toolingGraphicsLayer() @@ -70,7 +87,7 @@ fun Icon( .paint( painter = painter, colorFilter = colorFilter, - contentScale = ContentScale.Fit - ) + contentScale = ContentScale.Fit, + ).then(semantics), ) } From 6e8222a1c28e3d785c855f32c4a391d50580bdcb Mon Sep 17 00:00:00 2001 From: kangyuri1114 Date: Sun, 17 Mar 2024 18:15:42 +0900 Subject: [PATCH 2/3] =?UTF-8?q?chore=20:=20versionName=202.5.6=20->=202.5.?= =?UTF-8?q?7=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index a5298d29..761f7661 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -versionName=2.5.6 +versionName=2.5.7 #자동 배포를 위해서 버전은 여기 한 군데에서 관리하면 된다 From 5854fd0ede6f675c6e09d075fe4952bbff321733 Mon Sep 17 00:00:00 2001 From: kangyuri1114 Date: Tue, 19 Mar 2024 18:24:44 +0900 Subject: [PATCH 3/3] =?UTF-8?q?chore=20:=20imageVector=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=20Icon=20contentDescription=20default=20=EA=B0=92=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yourssu/design/system/compose/base/Icon.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/src/main/java/com/yourssu/design/system/compose/base/Icon.kt b/compose/src/main/java/com/yourssu/design/system/compose/base/Icon.kt index 6f31f571..3f751802 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/base/Icon.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/base/Icon.kt @@ -49,8 +49,8 @@ fun Icon( @Composable fun Icon( imageVector: ImageVector, - contentDescription: String?, modifier: Modifier = Modifier, + contentDescription: String? = null, iconSize: IconSize = IconSize.Medium, tint: Color = LocalYdsContentColor.current, ) {