From 797fb33fe77c417b8224c1340a7a84c21980649a Mon Sep 17 00:00:00 2001 From: HamBP Date: Tue, 14 Jan 2025 00:10:34 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20painter=20->=20image=20vector=20?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nexters/boolti/presentation/component/CircleBgIcon.kt | 5 +++-- .../nexters/boolti/presentation/screen/qr/QrScanScreen.kt | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/presentation/src/main/java/com/nexters/boolti/presentation/component/CircleBgIcon.kt b/presentation/src/main/java/com/nexters/boolti/presentation/component/CircleBgIcon.kt index 3c68a133f..5e5959e0f 100644 --- a/presentation/src/main/java/com/nexters/boolti/presentation/component/CircleBgIcon.kt +++ b/presentation/src/main/java/com/nexters/boolti/presentation/component/CircleBgIcon.kt @@ -9,11 +9,12 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.graphics.vector.ImageVector @Composable fun CircleBgIcon( modifier: Modifier = Modifier, - painter: Painter, + imageVector: ImageVector, bgColor: Color, ) { Box( @@ -21,6 +22,6 @@ fun CircleBgIcon( .clip(CircleShape) .background(bgColor) ) { - Icon(painter = painter, contentDescription = null) + Icon(imageVector = imageVector, contentDescription = null) } } diff --git a/presentation/src/main/java/com/nexters/boolti/presentation/screen/qr/QrScanScreen.kt b/presentation/src/main/java/com/nexters/boolti/presentation/screen/qr/QrScanScreen.kt index 8826976ce..fc23e62ad 100644 --- a/presentation/src/main/java/com/nexters/boolti/presentation/screen/qr/QrScanScreen.kt +++ b/presentation/src/main/java/com/nexters/boolti/presentation/screen/qr/QrScanScreen.kt @@ -31,8 +31,10 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp @@ -172,7 +174,7 @@ fun QrScanScreen( leadingIcon = { snackbarIconId?.let { CircleBgIcon( - painter = painterResource(it), + imageVector = ImageVector.vectorResource(it), bgColor = when (it) { R.drawable.ic_check -> Success R.drawable.ic_error -> Error