From ec7df7e26f10cad5844b417a567b734c9715828b Mon Sep 17 00:00:00 2001 From: ialokim <ialokim@mailbox.org> Date: Mon, 16 May 2022 21:31:35 +0200 Subject: [PATCH] send button: darker green color for light theme --- .../briar/desktop/conversation/ConversationInput.kt | 3 ++- .../kotlin/org/briarproject/briar/desktop/theme/Colors.kt | 5 +++-- .../kotlin/org/briarproject/briar/desktop/theme/Theme.kt | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationInput.kt b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationInput.kt index 407e3d1f9e..5e9a735de7 100644 --- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationInput.kt +++ b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationInput.kt @@ -51,6 +51,7 @@ import androidx.compose.ui.input.pointer.pointerHoverIcon import androidx.compose.ui.res.ResourceLoader import androidx.compose.ui.res.loadImageBitmap import androidx.compose.ui.unit.dp +import org.briarproject.briar.desktop.theme.sendButton import org.briarproject.briar.desktop.ui.ColoredIconButton import org.briarproject.briar.desktop.ui.HorizontalDivider import org.briarproject.briar.desktop.ui.LocalWindowScope @@ -136,7 +137,7 @@ fun ConversationInput( Icon( Icons.Filled.Send, i18n("access.message.send"), - tint = MaterialTheme.colors.secondary, + tint = MaterialTheme.colors.sendButton, modifier = Modifier.size(24.dp) ) } diff --git a/src/main/kotlin/org/briarproject/briar/desktop/theme/Colors.kt b/src/main/kotlin/org/briarproject/briar/desktop/theme/Colors.kt index 7ff1bedee6..47e93d38f3 100644 --- a/src/main/kotlin/org/briarproject/briar/desktop/theme/Colors.kt +++ b/src/main/kotlin/org/briarproject/briar/desktop/theme/Colors.kt @@ -51,8 +51,9 @@ val Blue500 = Color(0xff1f78d1) // todo: unused in Android val Blue600 = Color(0xff1b69b6) val Blue800 = Color(0xff134a81) -val Lime300 = Color(0xff95DE2D) -val Lime500 = Color(0xff74B816) +val Lime300 = Color(0xff95de2d) +val Lime500 = Color(0xff74b816) +val Lime700 = Color(0xff53830e) val TextPrimaryMaterialDark = Color(0xffffffff) val TextPrimaryMaterialLight = Color(0xde000000) diff --git a/src/main/kotlin/org/briarproject/briar/desktop/theme/Theme.kt b/src/main/kotlin/org/briarproject/briar/desktop/theme/Theme.kt index 69d6ae7d85..b52d76067f 100644 --- a/src/main/kotlin/org/briarproject/briar/desktop/theme/Theme.kt +++ b/src/main/kotlin/org/briarproject/briar/desktop/theme/Theme.kt @@ -52,6 +52,7 @@ val Colors.buttonTextNegative: Color get() = Red500 val Colors.buttonTextPositive: Color get() = Blue400 val Colors.warningBackground get() = Red500 val Colors.warningForeground get() = Color.White +val Colors.sendButton get() = if (isLight) Lime700 else Lime500 val DarkColors = darkColors( primary = Blue500, -- GitLab