From f669e4c68ebaee69fca29f3fbb414d984827d053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Rychnovsk=C3=BD?= Date: Mon, 24 Jun 2024 09:52:57 +0200 Subject: [PATCH] [#1487] Change Tertiary button disable color Closes #1487 --- .gitignore | 1 + .../zcash/ui/design/component/Button.kt | 26 +++++++++++++++++++ .../ui/design/theme/internal/ButtonColors.kt | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f92e8c89..773b95b7 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ syntax: glob .idea/deploymentTargetSelector.xml .idea/migrations.xml .idea/studiobot.xml +.idea/material_theme_project_new.xml .settings *.iml bin/ diff --git a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Button.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Button.kt index 6b32ffa7..c6a46549 100644 --- a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Button.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Button.kt @@ -44,6 +44,8 @@ import androidx.compose.ui.unit.dp import androidx.constraintlayout.compose.ConstraintLayout import co.electriccoin.zcash.ui.design.theme.ZcashTheme import co.electriccoin.zcash.ui.design.theme.internal.ButtonColors +import co.electriccoin.zcash.ui.design.theme.internal.DarkTertiaryButtonColors +import co.electriccoin.zcash.ui.design.theme.internal.LightTertiaryButtonColors @Preview @Composable @@ -61,6 +63,18 @@ private fun ButtonComposablePreview() { PrimaryButton(onClick = { }, text = "Primary Disabled", enabled = false) SecondaryButton(onClick = { }, text = "Secondary Basic") SecondaryButton(onClick = { }, text = "Secondary Disabled", enabled = false) + PrimaryButton( + onClick = { }, + text = "Tertiary Colors Basic", + buttonColors = LightTertiaryButtonColors() + ) + PrimaryButton( + onClick = { }, + text = "Tertiary Colors Disabled", + enabled = false, + showProgressBar = true, + buttonColors = LightTertiaryButtonColors() + ) } Spacer(modifier = Modifier.height(24.dp)) @@ -96,6 +110,18 @@ private fun ButtonComposableDarkPreview() { PrimaryButton(onClick = { }, text = "Primary Disabled", enabled = false) SecondaryButton(onClick = { }, text = "Secondary Basic") SecondaryButton(onClick = { }, text = "Secondary Disabled", enabled = false) + PrimaryButton( + onClick = { }, + text = "Tertiary Colors Basic", + buttonColors = DarkTertiaryButtonColors() + ) + PrimaryButton( + onClick = { }, + text = "Tertiary Colors Disabled", + enabled = false, + showProgressBar = true, + buttonColors = DarkTertiaryButtonColors() + ) } Spacer(modifier = Modifier.height(24.dp)) diff --git a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/internal/ButtonColors.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/internal/ButtonColors.kt index 9b6ea4e4..d2405b58 100644 --- a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/internal/ButtonColors.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/internal/ButtonColors.kt @@ -111,7 +111,7 @@ internal data class DarkSecondaryButtonColors( @Immutable internal data class DarkTertiaryButtonColors( override val containerColor: Color = Color(0xFFFFFFFF), - override val disabledContainerColor: Color = Color(0xFFFFFFFF), + override val disabledContainerColor: Color = Color(0xFFB7B7B7), override val shadowColor: Color = Color(0xFF000000), override val disabledShadowColor: Color = Color(0xFFFFFFFF), override val textColor: Color = Color(0xFF000000),