[#1487] Change Tertiary button disable color

Closes #1487
This commit is contained in:
Honza Rychnovský 2024-06-24 09:52:57 +02:00 committed by GitHub
parent f4a17e9219
commit f669e4c68e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 28 additions and 1 deletions

1
.gitignore vendored
View File

@ -12,6 +12,7 @@ syntax: glob
.idea/deploymentTargetSelector.xml .idea/deploymentTargetSelector.xml
.idea/migrations.xml .idea/migrations.xml
.idea/studiobot.xml .idea/studiobot.xml
.idea/material_theme_project_new.xml
.settings .settings
*.iml *.iml
bin/ bin/

View File

@ -44,6 +44,8 @@ import androidx.compose.ui.unit.dp
import androidx.constraintlayout.compose.ConstraintLayout import androidx.constraintlayout.compose.ConstraintLayout
import co.electriccoin.zcash.ui.design.theme.ZcashTheme 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.ButtonColors
import co.electriccoin.zcash.ui.design.theme.internal.DarkTertiaryButtonColors
import co.electriccoin.zcash.ui.design.theme.internal.LightTertiaryButtonColors
@Preview @Preview
@Composable @Composable
@ -61,6 +63,18 @@ private fun ButtonComposablePreview() {
PrimaryButton(onClick = { }, text = "Primary Disabled", enabled = false) PrimaryButton(onClick = { }, text = "Primary Disabled", enabled = false)
SecondaryButton(onClick = { }, text = "Secondary Basic") SecondaryButton(onClick = { }, text = "Secondary Basic")
SecondaryButton(onClick = { }, text = "Secondary Disabled", enabled = false) 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)) Spacer(modifier = Modifier.height(24.dp))
@ -96,6 +110,18 @@ private fun ButtonComposableDarkPreview() {
PrimaryButton(onClick = { }, text = "Primary Disabled", enabled = false) PrimaryButton(onClick = { }, text = "Primary Disabled", enabled = false)
SecondaryButton(onClick = { }, text = "Secondary Basic") SecondaryButton(onClick = { }, text = "Secondary Basic")
SecondaryButton(onClick = { }, text = "Secondary Disabled", enabled = false) 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)) Spacer(modifier = Modifier.height(24.dp))

View File

@ -111,7 +111,7 @@ internal data class DarkSecondaryButtonColors(
@Immutable @Immutable
internal data class DarkTertiaryButtonColors( internal data class DarkTertiaryButtonColors(
override val containerColor: Color = Color(0xFFFFFFFF), 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 shadowColor: Color = Color(0xFF000000),
override val disabledShadowColor: Color = Color(0xFFFFFFFF), override val disabledShadowColor: Color = Color(0xFFFFFFFF),
override val textColor: Color = Color(0xFF000000), override val textColor: Color = Color(0xFF000000),