@@ -2,11 +2,9 @@ package to.bitkit.ui.shared.util
22
33import androidx.compose.animation.core.animateFloatAsState
44import androidx.compose.foundation.background
5- import androidx.compose.foundation.border
65import androidx.compose.foundation.clickable
76import androidx.compose.foundation.interaction.MutableInteractionSource
87import androidx.compose.foundation.interaction.collectIsPressedAsState
9- import androidx.compose.foundation.layout.Box
108import androidx.compose.foundation.layout.WindowInsets
119import androidx.compose.foundation.layout.fillMaxSize
1210import androidx.compose.foundation.layout.systemBars
@@ -21,16 +19,15 @@ import androidx.compose.ui.Modifier
2119import androidx.compose.ui.composed
2220import androidx.compose.ui.draw.clip
2321import androidx.compose.ui.draw.drawWithContent
22+ import androidx.compose.ui.draw.shadow
2423import androidx.compose.ui.geometry.Offset
2524import androidx.compose.ui.geometry.Size
26- import androidx.compose.ui.draw.shadow
2725import androidx.compose.ui.graphics.Brush
2826import androidx.compose.ui.graphics.Color
2927import androidx.compose.ui.graphics.Shape
3028import androidx.compose.ui.graphics.graphicsLayer
3129import androidx.compose.ui.input.pointer.pointerInput
3230import androidx.compose.ui.unit.dp
33- import to.bitkit.ui.theme.ButtonGradients
3431import to.bitkit.ui.theme.Colors
3532
3633/* *
@@ -109,7 +106,6 @@ fun Modifier.screen(
109106 .then(if (insets == null ) Modifier else Modifier .windowInsetsPadding(insets))
110107
111108fun Modifier.primaryButtonStyle (
112- isPressed : Boolean ,
113109 isEnabled : Boolean ,
114110 shape : Shape
115111): Modifier {
@@ -132,9 +128,17 @@ fun Modifier.primaryButtonStyle(
132128 .then(
133129 if (isEnabled) {
134130 Modifier .drawWithContent {
135- // Draw the main gradient background
136- val mainBrush = if (isPressed) ButtonGradients .Pressed else ButtonGradients .Active
137- drawRect(brush = mainBrush)
131+ // Draw the main gradient background filling entire button
132+ val mainBrush = Brush .verticalGradient(
133+ colors = listOf (Color (0xFF2A2A2A ), Color (0xFF1C1C1C )),
134+ startY = 0f ,
135+ endY = size.height
136+ )
137+ drawRect(
138+ brush = mainBrush,
139+ topLeft = Offset .Zero ,
140+ size = size
141+ )
138142
139143 // Draw top border highlight (2dp gradient fade)
140144 val borderHeight = 2 .dp.toPx()
0 commit comments