Update default highlight color and default material color filter

This commit is contained in:
Kyant0 committed 2025-09-12 14:07:34 +08:00
1 parent 78d4393908
commit d07e755fd6
3 files changed
+16 -12

No files matched your search

@@ -61,9 +61,9 @@ sealed interface GlassHighlight {
*/ */
@Immutable @Immutable
data class Solid( data class Solid(
override val width: Dp = 1f.dp, override val width: Dp = DefaultHighlightWidth,
override val color: Color = Color.White.copy(alpha = 0.4f), override val color: Color = DefaultHighlightColor,
override val blendMode: BlendMode = BlendMode.Plus override val blendMode: BlendMode = DefaultHighlightBlendMode
) : GlassHighlight ) : GlassHighlight
/** /**
@@ -80,9 +80,9 @@ sealed interface GlassHighlight {
*/ */
@Immutable @Immutable
data class Soft( data class Soft(
override val width: Dp = 1f.dp, override val width: Dp = DefaultHighlightWidth,
override val color: Color = Color.White.copy(alpha = 0.4f), override val color: Color = DefaultHighlightColor,
override val blendMode: BlendMode = BlendMode.Plus override val blendMode: BlendMode = DefaultHighlightBlendMode
) : GlassHighlight { ) : GlassHighlight {
override fun createRenderEffect(size: Size, density: Density, cornerRadius: Float): RenderEffect? { override fun createRenderEffect(size: Size, density: Density, cornerRadius: Float): RenderEffect? {
@@ -123,9 +123,9 @@ sealed interface GlassHighlight {
*/ */
@Immutable @Immutable
data class Dynamic( data class Dynamic(
override val width: Dp = 1f.dp, override val width: Dp = DefaultHighlightWidth,
override val color: Color = Color.White.copy(alpha = 0.4f), override val color: Color = DefaultHighlightColor,
override val blendMode: BlendMode = BlendMode.Plus, override val blendMode: BlendMode = DefaultHighlightBlendMode,
val angle: Float = 45f, val angle: Float = 45f,
@param:FloatRange(from = 0.0) val falloff: Float = 1f @param:FloatRange(from = 0.0) val falloff: Float = 1f
) : GlassHighlight { ) : GlassHighlight {
@@ -187,3 +187,7 @@ sealed interface GlassHighlight {
val Soft: Soft = Soft() val Soft: Soft = Soft()
} }
} }
private val DefaultHighlightWidth = 1f.dp
private val DefaultHighlightColor = Color.White.copy(alpha = 0.3f)
private val DefaultHighlightBlendMode = BlendMode.Plus
@@ -40,7 +40,7 @@ data class GlassMaterial(
companion object { companion object {
@Stable @Stable
val DefaultColorFilter: ColorFilter = simpleColorFilter(contrast = 1.5f, saturation = 1.5f) val DefaultColorFilter: ColorFilter = simpleColorFilter(saturation = 1.5f)
@Stable @Stable
val Default: GlassMaterial = GlassMaterial() val Default: GlassMaterial = GlassMaterial()
@@ -143,8 +143,8 @@ half4 main(float2 coord) {
float2 grad = gradSdRoundedRectangle(centeredCoord, halfSize, min(halfSize.x, halfSize.y)); float2 grad = gradSdRoundedRectangle(centeredCoord, halfSize, min(halfSize.x, halfSize.y));
float2 normal = float2(-cos(angle), -sin(angle)); 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;
}""" }"""
} }