redesign: updated card buttons style

This commit is contained in:
2026-06-22 08:24:23 +03:00
parent 0a383573e2
commit 25c38418a3
@@ -49,6 +49,7 @@ import androidx.compose.ui.Modifier.Companion
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shape import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
@@ -163,12 +164,14 @@ fun TopBar(text: String, innerPadding: PaddingValues, openMenuButton: (@Composab
@Composable @Composable
fun CardButton(cardInfo: CardInfo, onDeleteCard: (Int) -> Unit) { fun CardButton(cardInfo: CardInfo, onDeleteCard: (Int) -> Unit) {
val context = LocalContext.current val context = LocalContext.current
var menuExpanded by remember { mutableStateOf(false) } var menuExpanded by remember { mutableStateOf(false) }
Box(modifier = Modifier.fillMaxWidth()) { Box(modifier = Modifier.fillMaxWidth()) {
Surface( Surface(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.height(64.dp)
.pointerInput(Unit) { .pointerInput(Unit) {
detectTapGestures( detectTapGestures(
onTap = { onTap = {
@@ -181,32 +184,21 @@ fun CardButton(cardInfo: CardInfo, onDeleteCard: (Int) -> Unit) {
} }
) )
}, },
shape = ButtonDefaults.shape, shape = RoundedCornerShape(12.dp),
color = MaterialTheme.colorScheme.primaryContainer, color = (if (cardInfo.color == null) MaterialTheme.colorScheme.primaryContainer else Color(cardInfo.color.toColorInt())).copy(0.425f),
tonalElevation = 2.dp tonalElevation = 2.dp,
) { ) {
Row( Row(
modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Min), modifier = Modifier.fillMaxSize(),
horizontalArrangement = Arrangement.SpaceBetween verticalAlignment = Alignment.CenterVertically
) { ) {
Box(
modifier = Modifier
.fillMaxHeight()
.width(32.dp)
.background(
if (cardInfo.color == null) MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.625f)
else Color(cardInfo.color.toColorInt()).copy(alpha = 0.625f)
)
)
Text( Text(
cardInfo.name, cardInfo.name,
fontSize = 16.sp, fontSize = 16.sp,
color = MaterialTheme.colorScheme.onPrimaryContainer, color = MaterialTheme.colorScheme.onPrimaryContainer,
modifier = Modifier modifier = Modifier
.padding(16.dp) .padding(16.dp)
.fillMaxWidth() .fillMaxWidth(),
.weight(1f),
textAlign = TextAlign.Start textAlign = TextAlign.Start
) )
} }