diff --git a/wear/build.gradle.kts b/wear/build.gradle.kts index df27e94..9ef4211 100644 --- a/wear/build.gradle.kts +++ b/wear/build.gradle.kts @@ -34,6 +34,9 @@ android { "proguard-rules.pro" ) } + debug { + applicationIdSuffix = ".debug" + } } compileOptions { sourceCompatibility = JavaVersion.VERSION_11 diff --git a/wear/src/main/java/ru/omni_devel/cards/presentation/Elements.kt b/wear/src/main/java/ru/omni_devel/cards/presentation/Elements.kt index 4c14ef1..aa80edc 100644 --- a/wear/src/main/java/ru/omni_devel/cards/presentation/Elements.kt +++ b/wear/src/main/java/ru/omni_devel/cards/presentation/Elements.kt @@ -33,7 +33,7 @@ fun CardButton(cardInfo: CardInfo) { Button( modifier = Modifier.fillMaxWidth(), colors = ButtonDefaults.buttonColors( - containerColor = MaterialTheme.colorScheme.primaryContainer + containerColor = (if (cardInfo.color == null) MaterialTheme.colorScheme.primaryContainer else Color(cardInfo.color.toColorInt())).copy(0.425f) ), contentPadding = PaddingValues(0.dp), onClick = { @@ -50,17 +50,6 @@ fun CardButton(cardInfo: CardInfo) { .height(IntrinsicSize.Min) .clip(ButtonDefaults.shape) ) { - 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( cardInfo.name, fontSize = 16.sp,