diff --git a/README.md b/README.md index 653c178..5f6c012 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Box( shape = CornerShape.large, innerRefraction = InnerRefraction( height = RefractionValue(8.dp), - amount = RefractionValue.Full + amount = RefractionValue.Full // or any negative value like RefractionValue((-16).dp) ), material = GlassMaterial( blurRadius = 8.dp, diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 79f8fc3..0a214d9 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm index 6543279..54ca763 100644 Binary files a/app/release/baselineProfiles/0/app-release.dm and b/app/release/baselineProfiles/0/app-release.dm differ diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm index d4be8dc..41f9a17 100644 Binary files a/app/release/baselineProfiles/1/app-release.dm and b/app/release/baselineProfiles/1/app-release.dm differ diff --git a/app/src/main/java/com/kyant/glass/playground/ConfigurationBottomSheet.kt b/app/src/main/java/com/kyant/glass/playground/ConfigurationBottomSheet.kt index c29f87a..a77f34c 100644 --- a/app/src/main/java/com/kyant/glass/playground/ConfigurationBottomSheet.kt +++ b/app/src/main/java/com/kyant/glass/playground/ConfigurationBottomSheet.kt @@ -60,8 +60,7 @@ fun ConfigurationBottomSheet( material = GlassMaterial( blurRadius = 8.dp, tint = surface.copy(alpha = 0.6f), - whitePoint = if (isDark) -0.25f else 0.25f, - chromaMultiplier = 1.5f + whitePoint = if (isDark) -0.25f else 0.25f ) ) ) diff --git a/app/src/main/java/com/kyant/glass/playground/SliderChip.kt b/app/src/main/java/com/kyant/glass/playground/SliderChip.kt index 6a8f436..88434ef 100644 --- a/app/src/main/java/com/kyant/glass/playground/SliderChip.kt +++ b/app/src/main/java/com/kyant/glass/playground/SliderChip.kt @@ -25,7 +25,6 @@ import com.kyant.expressa.prelude.* import com.kyant.expressa.ui.LocalTextStyle import com.kyant.expressa.ui.ProvideTextStyle import com.kyant.expressa.ui.Text -import com.kyant.liquidglass.GlassMaterial import com.kyant.liquidglass.LiquidGlassProviderState import com.kyant.liquidglass.LiquidGlassStyle import com.kyant.liquidglass.liquidGlass @@ -49,10 +48,7 @@ fun > SliderChip( modifier .liquidGlass( providerState, - LiquidGlassStyle( - CornerShape.extraLarge, - material = GlassMaterial(chromaMultiplier = 1.5f) - ) + LiquidGlassStyle(CornerShape.extraLarge) ) .clip(CornerShape.full) .background(surfaceBright.copy(alpha = 0.85f)) diff --git a/liquid-glass/build/outputs/aar/liquid-glass-release.aar b/liquid-glass/build/outputs/aar/liquid-glass-release.aar index c1ed647..f45e912 100644 Binary files a/liquid-glass/build/outputs/aar/liquid-glass-release.aar and b/liquid-glass/build/outputs/aar/liquid-glass-release.aar differ diff --git a/liquid-glass/src/main/java/com/kyant/liquidglass/GlassMaterial.kt b/liquid-glass/src/main/java/com/kyant/liquidglass/GlassMaterial.kt index b0b2749..0b4652d 100644 --- a/liquid-glass/src/main/java/com/kyant/liquidglass/GlassMaterial.kt +++ b/liquid-glass/src/main/java/com/kyant/liquidglass/GlassMaterial.kt @@ -13,7 +13,7 @@ data class GlassMaterial( val tint: Color = Color.Unspecified, @param:FloatRange(from = -1.0, to = 1.0) val contrast: Float = 0f, @param:FloatRange(from = -1.0, to = 1.0) val whitePoint: Float = 0f, - @param:FloatRange(from = 0.5, to = 2.0) val chromaMultiplier: Float = 1f + @param:FloatRange(from = 0.0, to = 2.0) val chromaMultiplier: Float = 1.5f ) { companion object { diff --git a/liquid-glass/src/main/java/com/kyant/liquidglass/Refraction.kt b/liquid-glass/src/main/java/com/kyant/liquidglass/Refraction.kt index c8852bd..e55c788 100644 --- a/liquid-glass/src/main/java/com/kyant/liquidglass/Refraction.kt +++ b/liquid-glass/src/main/java/com/kyant/liquidglass/Refraction.kt @@ -26,7 +26,7 @@ data class InnerRefraction( InnerRefraction( height = RefractionValue(8.dp), amount = RefractionValue((-16).dp), - eccentricFactor = 0.25f + eccentricFactor = 1f ) } }