Skip to content

Commit

Permalink
Light chat bubbles
Browse files Browse the repository at this point in the history
  • Loading branch information
vitorpamplona committed Nov 23, 2024
1 parent 308048c commit 04e77da
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -274,7 +274,7 @@ fun ChatBubbleLayout(
inner: @Composable (MutableState<Color>) -> Unit,
) {
val loggedInColors = MaterialTheme.colorScheme.mediumImportanceLink
val otherColors = MaterialTheme.colorScheme.subtleBorder
val otherColors = MaterialTheme.colorScheme.chatBackground
val defaultBackground = MaterialTheme.colorScheme.background

val backgroundBubbleColor =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 04e77da

Please sign in to comment.