update: setted corner radius for card icons
This commit is contained in:
@@ -59,6 +59,7 @@ import androidx.compose.runtime.rememberCoroutineScope
|
|||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
|
import androidx.compose.ui.draw.clip
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.graphics.ImageBitmap
|
import androidx.compose.ui.graphics.ImageBitmap
|
||||||
import androidx.compose.ui.graphics.graphicsLayer
|
import androidx.compose.ui.graphics.graphicsLayer
|
||||||
@@ -274,19 +275,18 @@ fun CardIcon(icon: ImageBitmap?, cardColor: Color, isLoading: Boolean = false) {
|
|||||||
cardColor.copy(0.525f),
|
cardColor.copy(0.525f),
|
||||||
RoundedCornerShape(12.dp)
|
RoundedCornerShape(12.dp)
|
||||||
)
|
)
|
||||||
.padding(8.dp)
|
.padding(8.dp),
|
||||||
.size(32.dp),
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
horizontalArrangement = Arrangement.Center
|
horizontalArrangement = Arrangement.Center
|
||||||
) {
|
) {
|
||||||
if (isLoading) {
|
if (isLoading) {
|
||||||
CircularProgressIndicator(
|
CircularProgressIndicator(
|
||||||
modifier = Modifier.size(24.dp),
|
modifier = Modifier.size(32.dp),
|
||||||
color = MaterialTheme.colorScheme.primary
|
color = MaterialTheme.colorScheme.primary
|
||||||
)
|
)
|
||||||
} else if (icon == null) {
|
} else if (icon == null) {
|
||||||
Icon(
|
Icon(
|
||||||
modifier = Modifier.size(24.dp),
|
modifier = Modifier.size(32.dp),
|
||||||
imageVector = Icons.Outlined.QrCode,
|
imageVector = Icons.Outlined.QrCode,
|
||||||
tint = MaterialTheme.colorScheme.onPrimaryContainer,
|
tint = MaterialTheme.colorScheme.onPrimaryContainer,
|
||||||
contentDescription = null
|
contentDescription = null
|
||||||
@@ -295,7 +295,7 @@ fun CardIcon(icon: ImageBitmap?, cardColor: Color, isLoading: Boolean = false) {
|
|||||||
Image(
|
Image(
|
||||||
bitmap = icon,
|
bitmap = icon,
|
||||||
contentDescription = null,
|
contentDescription = null,
|
||||||
modifier = Modifier.size(32.dp)
|
modifier = Modifier.size(36.dp).clip(RoundedCornerShape(12.dp))
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user