diff --git a/liquid-glass/src/main/java/com/kyant/liquidglass/highlight/GlassHighlight.kt b/liquid-glass/src/main/java/com/kyant/liquidglass/highlight/GlassHighlight.kt index 7a0cef4..b3f75cd 100644 --- a/liquid-glass/src/main/java/com/kyant/liquidglass/highlight/GlassHighlight.kt +++ b/liquid-glass/src/main/java/com/kyant/liquidglass/highlight/GlassHighlight.kt @@ -61,9 +61,9 @@ sealed interface GlassHighlight { */ @Immutable data class Solid( - override val width: Dp = 1f.dp, - override val color: Color = Color.White.copy(alpha = 0.4f), - override val blendMode: BlendMode = BlendMode.Plus + override val width: Dp = DefaultHighlightWidth, + override val color: Color = DefaultHighlightColor, + override val blendMode: BlendMode = DefaultHighlightBlendMode ) : GlassHighlight /** @@ -80,9 +80,9 @@ sealed interface GlassHighlight { */ @Immutable data class Soft( - override val width: Dp = 1f.dp, - override val color: Color = Color.White.copy(alpha = 0.4f), - override val blendMode: BlendMode = BlendMode.Plus + override val width: Dp = DefaultHighlightWidth, + override val color: Color = DefaultHighlightColor, + override val blendMode: BlendMode = DefaultHighlightBlendMode ) : GlassHighlight { override fun createRenderEffect(size: Size, density: Density, cornerRadius: Float): RenderEffect? { @@ -123,9 +123,9 @@ sealed interface GlassHighlight { */ @Immutable data class Dynamic( - override val width: Dp = 1f.dp, - override val color: Color = Color.White.copy(alpha = 0.4f), - override val blendMode: BlendMode = BlendMode.Plus, + override val width: Dp = DefaultHighlightWidth, + override val color: Color = DefaultHighlightColor, + override val blendMode: BlendMode = DefaultHighlightBlendMode, val angle: Float = 45f, @param:FloatRange(from = 0.0) val falloff: Float = 1f ) : GlassHighlight { @@ -187,3 +187,7 @@ sealed interface GlassHighlight { val Soft: Soft = Soft() } } + +private val DefaultHighlightWidth = 1f.dp +private val DefaultHighlightColor = Color.White.copy(alpha = 0.3f) +private val DefaultHighlightBlendMode = BlendMode.Plus diff --git a/liquid-glass/src/main/java/com/kyant/liquidglass/material/GlassMaterial.kt b/liquid-glass/src/main/java/com/kyant/liquidglass/material/GlassMaterial.kt index 54278eb..4f44b9a 100644 --- a/liquid-glass/src/main/java/com/kyant/liquidglass/material/GlassMaterial.kt +++ b/liquid-glass/src/main/java/com/kyant/liquidglass/material/GlassMaterial.kt @@ -40,7 +40,7 @@ data class GlassMaterial( companion object { @Stable - val DefaultColorFilter: ColorFilter = simpleColorFilter(contrast = 1.5f, saturation = 1.5f) + val DefaultColorFilter: ColorFilter = simpleColorFilter(saturation = 1.5f) @Stable val Default: GlassMaterial = GlassMaterial() diff --git a/liquid-glass/src/main/java/com/kyant/liquidglass/utils/GlassShaders.kt b/liquid-glass/src/main/java/com/kyant/liquidglass/utils/GlassShaders.kt index d3f61ba..97834ce 100644 --- a/liquid-glass/src/main/java/com/kyant/liquidglass/utils/GlassShaders.kt +++ b/liquid-glass/src/main/java/com/kyant/liquidglass/utils/GlassShaders.kt @@ -143,8 +143,8 @@ half4 main(float2 coord) { float2 grad = gradSdRoundedRectangle(centeredCoord, halfSize, min(halfSize.x, halfSize.y)); float2 normal = float2(-cos(angle), -sin(angle)); - float fraction = pow(abs(dot(normal, grad)), falloff); + float intensity = pow(abs(dot(normal, grad)), falloff); - return image.eval(coord) * fraction; + return image.eval(coord) * intensity; }""" }