diff --git a/apps/flipcash/shared/transaction-history/src/main/kotlin/com/flipcash/shared/transactionhistory/TransactionDetailsContent.kt b/apps/flipcash/shared/transaction-history/src/main/kotlin/com/flipcash/shared/transactionhistory/TransactionDetailsContent.kt index 9afafdbbb..e8516184f 100644 --- a/apps/flipcash/shared/transaction-history/src/main/kotlin/com/flipcash/shared/transactionhistory/TransactionDetailsContent.kt +++ b/apps/flipcash/shared/transaction-history/src/main/kotlin/com/flipcash/shared/transactionhistory/TransactionDetailsContent.kt @@ -106,7 +106,10 @@ fun TransactionDetailsContent( CodeButton( modifier = Modifier.fillMaxWidth(), text = stringResource(R.string.action_txnDetails_viewInChat), - buttonState = ButtonState.Filled10, + buttonState = ButtonState.Filled05, + // [DetailsCard]'s radius, not CodeButton's default 8dp — the fill alone is + // not enough to read as one more card if the corners disagree. + shape = CodeTheme.shapes.extraSmall, onClick = onViewInChat, ) } diff --git a/ui/components/src/main/kotlin/com/getcode/ui/theme/CodeButton.kt b/ui/components/src/main/kotlin/com/getcode/ui/theme/CodeButton.kt index 511f5f181..9eb809335 100644 --- a/ui/components/src/main/kotlin/com/getcode/ui/theme/CodeButton.kt +++ b/ui/components/src/main/kotlin/com/getcode/ui/theme/CodeButton.kt @@ -62,6 +62,7 @@ import com.getcode.theme.Black50 import com.getcode.theme.CodeTheme import com.getcode.theme.Transparent import com.getcode.theme.White +import com.getcode.theme.White05 import com.getcode.theme.White10 import com.getcode.theme.White20 import com.getcode.theme.White50 @@ -76,6 +77,7 @@ enum class ButtonState { Filled50, Filled20, Filled10, + Filled05, BgBlur20, Subtle, ; @@ -89,6 +91,7 @@ enum class ButtonState { Filled50 -> White50 Filled20 -> White20 Filled10 -> White10 + Filled05 -> White05 Subtle -> White BgBlur20 -> White20 } @@ -134,6 +137,15 @@ enum class ButtonState { contentColor = textColor.takeOrElse { White }, ) + // The card fill, for a button meant to read as one more card in a stack rather than + // as a control sitting on top of them. + Filled05 -> + ButtonDefaults.outlinedButtonColors( + backgroundColor = White05, + disabledContentColor = White50, + contentColor = textColor.takeOrElse { White }, + ) + Subtle -> ButtonDefaults.outlinedButtonColors( backgroundColor = Transparent,