Skip to content

Commit 317931d

Browse files
authored
Merge pull request #4000 from element-hq/feature/fga/send_button_update
feat(design) : update send button background
2 parents 522d105 + 2cddb32 commit 317931d

File tree

67 files changed

+137
-151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+137
-151
lines changed

libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/SendButton.kt

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ import androidx.compose.ui.Modifier
1818
import androidx.compose.ui.draw.clip
1919
import androidx.compose.ui.draw.drawWithCache
2020
import androidx.compose.ui.geometry.Offset
21-
import androidx.compose.ui.graphics.BlendMode
2221
import androidx.compose.ui.graphics.Color
2322
import androidx.compose.ui.graphics.LinearGradientShader
24-
import androidx.compose.ui.graphics.RadialGradientShader
2523
import androidx.compose.ui.graphics.ShaderBrush
2624
import androidx.compose.ui.res.stringResource
2725
import androidx.compose.ui.unit.dp
@@ -39,6 +37,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
3937
/**
4038
* Send button for the message composer.
4139
* Figma: https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=1956-37575&node-type=frame&m=dev
40+
* Temporary Figma : https://www.figma.com/design/Ni6Ii8YKtmXCKYNE90cC67/Timeline-(new)?node-id=2274-39944&m=dev
4241
*/
4342
@Composable
4443
internal fun SendButton(
@@ -105,30 +104,17 @@ private fun buttonBackgroundModifier() = Modifier.drawWithCache {
105104
from = Offset(0f, 0f),
106105
to = Offset(0f, height),
107106
colors = listOf(
108-
Color(0xFF0BC491),
109-
Color(0xFF0467DD),
110-
)
111-
)
112-
)
113-
val radialGradientBrush = ShaderBrush(
114-
RadialGradientShader(
115-
center = Offset(height / 2f, height / 2f),
116-
radius = height / 2f,
117-
colors = listOf(
118-
Color(0xFF0BC491),
119-
Color(0xFF0467DD),
107+
Color(0xFF79DD98),
108+
Color(0xFF0DBD8B),
109+
Color(0xFF128585),
110+
Color(0xFF24446B),
120111
)
121112
)
122113
)
123114
onDrawBehind {
124115
drawRect(
125116
brush = verticalGradientBrush,
126117
)
127-
drawRect(
128-
brush = radialGradientBrush,
129-
alpha = 0.4f,
130-
blendMode = BlendMode.Overlay,
131-
)
132118
}
133119
}
134120

Lines changed: 2 additions & 2 deletions
Lines changed: 2 additions & 2 deletions
Lines changed: 2 additions & 2 deletions
Lines changed: 2 additions & 2 deletions
Lines changed: 2 additions & 2 deletions
Lines changed: 2 additions & 2 deletions
Lines changed: 2 additions & 2 deletions
Lines changed: 2 additions & 2 deletions
Lines changed: 2 additions & 2 deletions

0 commit comments

Comments
 (0)