diff --git a/backdrop/src/main/java/com/kyant/backdrop/effects/Lens.kt b/backdrop/src/main/java/com/kyant/backdrop/effects/Lens.kt index 878361d..e1946d4 100644 --- a/backdrop/src/main/java/com/kyant/backdrop/effects/Lens.kt +++ b/backdrop/src/main/java/com/kyant/backdrop/effects/Lens.kt @@ -12,9 +12,9 @@ import com.kyant.backdrop.RoundedRectRefractionWithDispersionShaderString fun BackdropEffectScope.lens( refractionHeight: Float, - refractionAmount: Float = refractionHeight, - hasDepthEffect: Boolean = false, - chromaticAberration: Offset = Offset.Zero + refractionAmount: Float, + chromaticAberration: Offset = Offset.Zero, + depthEffect: Boolean = false ) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return if (refractionHeight <= 0f || refractionAmount <= 0f) return @@ -29,7 +29,7 @@ fun BackdropEffectScope.lens( setFloatUniform("cornerRadii", cornerRadii) setFloatUniform("refractionHeight", refractionHeight) setFloatUniform("refractionAmount", -refractionAmount) - setFloatUniform("depthEffect", if (hasDepthEffect) 1f else 0f) + setFloatUniform("depthEffect", if (depthEffect) 1f else 0f) } } else { obtainRuntimeShader( @@ -40,7 +40,7 @@ fun BackdropEffectScope.lens( setFloatUniform("cornerRadii", cornerRadii) setFloatUniform("refractionHeight", refractionHeight) setFloatUniform("refractionAmount", -refractionAmount) - setFloatUniform("depthEffect", if (hasDepthEffect) 1f else 0f) + setFloatUniform("depthEffect", if (depthEffect) 1f else 0f) setFloatUniform("chromaticAberration", chromaticAberration.x, chromaticAberration.y) } } diff --git a/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/AdaptiveLuminanceGlassContent.kt b/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/AdaptiveLuminanceGlassContent.kt index c2178a0..c339c72 100644 --- a/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/AdaptiveLuminanceGlassContent.kt +++ b/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/AdaptiveLuminanceGlassContent.kt @@ -115,7 +115,7 @@ fun AdaptiveLuminanceGlassContent() { if (l > 0f) lerp(8f.dp.toPx(), 16f.dp.toPx(), l) else lerp(8f.dp.toPx(), 2f.dp.toPx(), -l) ) - lens(24f.dp.toPx(), size.minDimension / 2f, true) + lens(24f.dp.toPx(), size.minDimension / 2f, depthEffect = true) }, layerBlock = { val offset = offsetAnimation.value diff --git a/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/ControlCenterContent.kt b/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/ControlCenterContent.kt index 3b9bd0e..1e351a9 100644 --- a/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/ControlCenterContent.kt +++ b/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/ControlCenterContent.kt @@ -119,7 +119,7 @@ fun ControlCenterContent() { lens( 24f.dp.toPx() * progress, 48f.dp.toPx() * progress, - true + depthEffect = true ) } diff --git a/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/DialogContent.kt b/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/DialogContent.kt index a1f97d0..1660972 100644 --- a/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/DialogContent.kt +++ b/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/DialogContent.kt @@ -67,7 +67,7 @@ fun DialogContent() { saturation = 1.5f ) blur(if (isLightTheme) 16f.dp.toPx() else 8f.dp.toPx()) - lens(24f.dp.toPx(), 48f.dp.toPx(), true) + lens(24f.dp.toPx(), 48f.dp.toPx(), depthEffect = true) }, onDrawSurface = { drawRect(containerColor) } ) diff --git a/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/GlassPlaygroundContent.kt b/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/GlassPlaygroundContent.kt index e54762a..bb4b95d 100644 --- a/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/GlassPlaygroundContent.kt +++ b/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/GlassPlaygroundContent.kt @@ -74,7 +74,7 @@ fun GlassPlaygroundContent() { lens( refractionHeight = refractionHeightFrac * minDimension * 0.5f, refractionAmount = refractionAmountFrac * minDimension, - hasDepthEffect = true, + depthEffect = true, chromaticAberration = Offset(chromaticAberration, chromaticAberration) ) }, diff --git a/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/LockScreenContent.kt b/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/LockScreenContent.kt index 55871c4..7bf765d 100644 --- a/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/LockScreenContent.kt +++ b/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/LockScreenContent.kt @@ -54,7 +54,7 @@ fun LockScreenContent() { effects = { vibrancy() blur(4f.dp.toPx()) - lens(12f.dp.toPx(), 24f.dp.toPx(), true) + lens(12f.dp.toPx(), 24f.dp.toPx(), depthEffect = true) }, onDrawSurface = { drawRect(Color.White.copy(0.1f)) }, contentEffects = { diff --git a/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/MagnifierContent.kt b/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/MagnifierContent.kt index d6ecbcf..d035499 100644 --- a/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/MagnifierContent.kt +++ b/catalog/src/main/java/com/kyant/backdrop/catalog/destinations/MagnifierContent.kt @@ -89,7 +89,7 @@ fun MagnifierContent() { lens( 8f.dp.toPx(), 24f.dp.toPx(), - hasDepthEffect = true, + depthEffect = true, chromaticAberration = DefaultChromaticAberration ) },