Skip to content

Rename the liquid glass button internals to match Figma #3137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StylianosGakis merged 1 commit into from
Sep 8, 2026
Merged

Rename the liquid glass button internals to match Figma #3137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions ...ign-system-hedvig/src/commonMain/kotlin/com/hedvig/android/design/system/hedvig/Button.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ import com.hedvig.android.design.system.hedvig.ButtonDefaults.ButtonSize
import com.hedvig.android.design.system.hedvig.tokens.ButtonTokens
import com.hedvig.android.design.system.hedvig.tokens.GhostStyleButtonTokens
import com.hedvig.android.design.system.hedvig.tokens.LargeSizeButtonTokens
import com.hedvig.android.design.system.hedvig.tokens.LiquidGlassButtonTokens
import com.hedvig.android.design.system.hedvig.tokens.MediumSizeButtonTokens
import com.hedvig.android.design.system.hedvig.tokens.MiniSizeButtonTokens
import com.hedvig.android.design.system.hedvig.tokens.PrimaryAltStyleButtonTokens
import com.hedvig.android.design.system.hedvig.tokens.PrimaryStyleButtonTokens
import com.hedvig.android.design.system.hedvig.tokens.RedStyleButtonTokens
import com.hedvig.android.design.system.hedvig.tokens.RoundedLargeSizeButtonTokens
import com.hedvig.android.design.system.hedvig.tokens.RoundedLiquidGlassStyleButtonTokens
import com.hedvig.android.design.system.hedvig.tokens.RoundedPrimaryStyleButtonTokens
import com.hedvig.android.design.system.hedvig.tokens.SecondaryAltStyleButtonTokens
Expand Down Expand Up @@ -334,8 +334,8 @@ private val ButtonDefaults.ButtonStyle.style: Style
ButtonDefaults.ButtonStyle.SecondaryAlt -> Style.SecondaryAlt
ButtonDefaults.ButtonStyle.Ghost -> Style.Ghost
ButtonDefaults.ButtonStyle.Red -> Style.Red
ButtonDefaults.ButtonStyle.RoundedPrimary -> Style.RoundedPrimary
ButtonDefaults.ButtonStyle.RoundedLiquidGlass -> Style.RoundedLiquidGlass
ButtonDefaults.ButtonStyle.RoundedPrimary -> Style.LiquidGlassTinted
ButtonDefaults.ButtonStyle.RoundedLiquidGlass -> Style.LiquidGlassRegular
}

private val ButtonSize.size: Size
Expand All @@ -351,9 +351,12 @@ private val ButtonSize.size: Size
* [ButtonSize.Large]; at every smaller size they fall back to the standard button metrics. Corner
* radius is not part of this: every button is a pill, see [ButtonTokens.ContainerShape].
*/
// TODO: that fallback is a silent one, and Figma draws the liquid glass buttons at one fixed size
// rather than across the size scale. Lift them off the size axis so the combination stops being
// expressible.
@Composable
private fun ButtonSize.sizeIn(style: Style): Size = when {
style.glassMaterial != null && this == ButtonSize.Large -> Size.LargeRounded
style.glassMaterial != null && this == ButtonSize.Large -> Size.LiquidGlass
else -> size
}

Expand Down Expand Up @@ -407,18 +410,18 @@ private sealed interface Size {
get() = LargeSizeButtonTokens.LabelTextFont.value
}

object LargeRounded : Size {
object LiquidGlass : Size {
override val contentPadding: PaddingValues = PaddingValues(
top = RoundedLargeSizeButtonTokens.TopPadding,
bottom = RoundedLargeSizeButtonTokens.BottomPadding,
start = RoundedLargeSizeButtonTokens.HorizontalPadding,
end = RoundedLargeSizeButtonTokens.HorizontalPadding,
top = LiquidGlassButtonTokens.TopPadding,
bottom = LiquidGlassButtonTokens.BottomPadding,
start = LiquidGlassButtonTokens.HorizontalPadding,
end = LiquidGlassButtonTokens.HorizontalPadding,
)

override val textStyle: TextStyle
@Composable
@ReadOnlyComposable
get() = RoundedLargeSizeButtonTokens.LabelTextFont.value
get() = LiquidGlassButtonTokens.LabelTextFont.value
}

object Medium : Size {
Expand Down Expand Up @@ -573,7 +576,7 @@ private sealed interface Style {
}
}

data object RoundedPrimary : Style {
data object LiquidGlassTinted : Style {
// The fill inverts between themes: near-black on light, opaque white on dark.
override val glassMaterial: GlassMaterial
@Composable
Expand All @@ -598,7 +601,7 @@ private sealed interface Style {
}
}

data object RoundedLiquidGlass : Style {
data object LiquidGlassRegular : Style {
override val glassMaterial: GlassMaterial
@Composable
get() = liquidGlassMaterial
Expand Down
6 changes: 3 additions & 3 deletions ...dvig/src/commonMain/kotlin/com/hedvig/android/design/system/hedvig/tokens/ButtonTokens.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ internal object LargeSizeButtonTokens {
val LabelTextFont = TypographyKeyTokens.BodySmall
}

// TODO: the glass button styles are only designed at the large size. Every smaller size falls back to
// the standard button metrics above until design provides them.
internal object RoundedLargeSizeButtonTokens {
// The metrics of the liquid glass buttons, which Figma draws at one fixed size rather than across
// the size scale. 20/12/12 around a 24dp line box gives the 48dp pill height the design specifies.
internal object LiquidGlassButtonTokens {
val HorizontalPadding = 20.dp
val TopPadding = 12.dp
val BottomPadding = 12.dp
Expand Down
Loading