Skip to content

Refactor: Remove inset shadow from PrimaryButton #715

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahmeddsamii merged 2 commits into from
Aug 20, 2025
Merged

Refactor: Remove inset shadow from PrimaryButton #715

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a1282b
Refactor: Remove inset shadow from PrimaryButton
ahmeddsamii Aug 20, 2025
7c9401d
Merge branch 'develop' into hotfix/primary-button-glow
ahmeddsamii Aug 20, 2025
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
50 changes: 1 addition & 49 deletions designSystem/src/main/java/com/london/designsystem/component/button/PrimaryButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.london.designsystem.component.button

import android.annotation.SuppressLint
import android.graphics.BlurMaskFilter
import androidx.annotation.DrawableRes
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Spacer
Expand All @@ -17,13 +15,7 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.drawWithCache
import androidx.compose.ui.graphics.BlendMode
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Paint
import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.london.designsystem.R
import com.london.designsystem.theme.NovixTheme
Expand All @@ -45,8 +37,7 @@ fun PrimaryButton(
enabled = enabled,
modifier = modifier
.heightIn(48.dp)
.defaultMinSize(minWidth = 52.dp)
.insetShadow(),
.defaultMinSize(minWidth = 52.dp),
shape = RoundedCornerShape(12.dp),
colors = ButtonDefaults.buttonColors(
containerColor = NovixTheme.colors.primary,
Expand All @@ -55,7 +46,6 @@ fun PrimaryButton(
disabledContentColor = NovixTheme.colors.onPrimaryHint
),
contentPadding = PaddingValues(horizontal = 16.dp, vertical = 8.dp),
elevation = ButtonDefaults.buttonElevation(defaultElevation = 2.dp)
) {

if (hasLabel && text != null) {
Expand Down Expand Up @@ -88,44 +78,6 @@ fun PrimaryButton(
}
}

@SuppressLint("SuspiciousModifierThen")
private fun Modifier.insetShadow(
color: Color = Color(0x1F0D0608),
offsetX: Dp = 2.dp,
offsetY: Dp = 4.dp,
blurRadius: Dp = 12.dp,
cornerRadius: Dp = 12.dp
) = this.then(
drawWithCache {
val paint = Paint().apply {
this.color = color
this.blendMode = BlendMode.SrcOver
}

val pxBlurRadius = blurRadius.toPx()
val pxCornerRadius = cornerRadius.toPx()

onDrawWithContent {
drawContent()
drawIntoCanvas { canvas ->
canvas.drawRoundRect(
left = 0f,
top = 0f,
right = size.width,
bottom = size.height,
radiusX = pxCornerRadius,
radiusY = pxCornerRadius,
paint = paint.apply {
asFrameworkPaint().apply {
maskFilter = BlurMaskFilter(pxBlurRadius, BlurMaskFilter.Blur.NORMAL)
}
}
)
}
}
}
)

@ThemePreviews
@Composable
private fun PreviewPrimaryNormal() {
Expand Down
Loading