From 04e77daaab28d6dc0a74739f30f863950c6ad9f0 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Fri, 22 Nov 2024 19:17:50 -0500 Subject: [PATCH] Light chat bubbles --- .../screen/loggedIn/chatrooms/ChatroomMessageCompose.kt | 4 ++-- .../java/com/vitorpamplona/amethyst/ui/theme/Theme.kt | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chatrooms/ChatroomMessageCompose.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chatrooms/ChatroomMessageCompose.kt index 9dc270ab1..e593cdef8 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chatrooms/ChatroomMessageCompose.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chatrooms/ChatroomMessageCompose.kt @@ -95,11 +95,11 @@ import com.vitorpamplona.amethyst.ui.theme.Size20dp import com.vitorpamplona.amethyst.ui.theme.Size5Modifier import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer import com.vitorpamplona.amethyst.ui.theme.chatAuthorBox +import com.vitorpamplona.amethyst.ui.theme.chatBackground import com.vitorpamplona.amethyst.ui.theme.incognitoIconModifier import com.vitorpamplona.amethyst.ui.theme.mediumImportanceLink import com.vitorpamplona.amethyst.ui.theme.messageBubbleLimits import com.vitorpamplona.amethyst.ui.theme.placeholderText -import com.vitorpamplona.amethyst.ui.theme.subtleBorder import com.vitorpamplona.quartz.events.ChannelCreateEvent import com.vitorpamplona.quartz.events.ChannelMetadataEvent import com.vitorpamplona.quartz.events.ChatMessageEvent @@ -274,7 +274,7 @@ fun ChatBubbleLayout( inner: @Composable (MutableState) -> Unit, ) { val loggedInColors = MaterialTheme.colorScheme.mediumImportanceLink - val otherColors = MaterialTheme.colorScheme.subtleBorder + val otherColors = MaterialTheme.colorScheme.chatBackground val defaultBackground = MaterialTheme.colorScheme.background val backgroundBubbleColor = diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt index be46269fc..83bb81c0c 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt @@ -115,7 +115,10 @@ private val DarkSubtleButton = DarkColorPalette.onSurface.copy(alpha = 0.22f) private val LightSubtleButton = LightColorPalette.onSurface.copy(alpha = 0.22f) private val DarkSubtleBorder = DarkColorPalette.onSurface.copy(alpha = 0.12f) -private val LightSubtleBorder = LightColorPalette.onSurface.copy(alpha = 0.12f) +private val LightSubtleBorder = LightColorPalette.onSurface.copy(alpha = 0.05f) + +private val DarkChatBackground = DarkColorPalette.onSurface.copy(alpha = 0.12f) +private val LightChatBackground = LightColorPalette.onSurface.copy(alpha = 0.08f) private val DarkOverPictureBackground = DarkColorPalette.background.copy(0.62f) private val LightOverPictureBackground = LightColorPalette.background.copy(0.62f) @@ -382,6 +385,9 @@ val ColorScheme.grayText: Color val ColorScheme.subtleBorder: Color get() = if (isLight) LightSubtleBorder else DarkSubtleBorder +val ColorScheme.chatBackground: Color + get() = if (isLight) LightChatBackground else DarkChatBackground + val ColorScheme.subtleButton: Color get() = if (isLight) LightSubtleButton else DarkSubtleButton