From d8fdbabd27494d7453e1172f24b4d2aa15677112 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 29 Jun 2023 10:52:09 +0200 Subject: [PATCH] Fix send attachment icon color (and remove useless Box) --- .../libraries/textcomposer/TextComposer.kt | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt index 1bd2e3c32a..915488d15e 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt @@ -316,24 +316,22 @@ private fun AttachmentButton( onClick: () -> Unit, modifier: Modifier = Modifier ) { - Box(modifier) { - Surface( - Modifier - .size(30.dp) - .clickable(true, onClick = onClick), - shape = CircleShape, - color = MaterialTheme.colorScheme.primary - ) { - Image( - modifier = Modifier.size(12.5f.dp), - painter = painterResource(R.drawable.ic_add_attachment), - contentDescription = null, - contentScale = ContentScale.Inside, - colorFilter = ColorFilter.tint( - LocalContentColor.current - ) + Surface( + modifier + .size(30.dp) + .clickable(onClick = onClick), + shape = CircleShape, + color = ElementTheme.colors.iconPrimary + ) { + Image( + modifier = Modifier.size(12.5f.dp), + painter = painterResource(R.drawable.ic_add_attachment), + contentDescription = null, + contentScale = ContentScale.Inside, + colorFilter = ColorFilter.tint( + LocalContentColor.current ) - } + ) } }