ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-02 12:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create ExtendedColors to define more colors.

Browse Source
This commit is contained in:
Benoit Marty
2023-01-25 16:09:31 +01:00
committed by Benoit Marty
parent 35e204ca48
commit 78544357e8
4 changed files with 59 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/MessageEventBubble.kt
+4 -22
View File
@@ -30,13 +30,7 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.unit.dp
import io.element.android.features.messages.timeline.model.MessagesItemGroupPosition
import io.element.android.libraries.designsystem.LocalIsDarkTheme
import io.element.android.libraries.designsystem.MessageHighlightDark
import io.element.android.libraries.designsystem.MessageHighlightLight
import io.element.android.libraries.designsystem.SystemGrey5Dark
import io.element.android.libraries.designsystem.SystemGrey5Light
import io.element.android.libraries.designsystem.SystemGrey6Dark
import io.element.android.libraries.designsystem.SystemGrey6Light
import io.element.android.libraries.designsystem.LocalExtendedColors
private val BUBBLE_RADIUS = 16.dp
@@ -88,24 +82,12 @@ fun MessageEventBubble(
}
val backgroundBubbleColor = if (isHighlighted) {
if (LocalIsDarkTheme.current) {
MessageHighlightDark
} else {
MessageHighlightLight
}
LocalExtendedColors.current.messageHighlightedBackground
} else {
if (isMine) {
if (LocalIsDarkTheme.current) {
SystemGrey5Dark
} else {
SystemGrey5Light
}
LocalExtendedColors.current.messageFromMeBackground
} else {
if (LocalIsDarkTheme.current) {
SystemGrey6Dark
} else {
SystemGrey6Light
}
LocalExtendedColors.current.messageFromOtherBackground
}
}
val bubbleShape = bubbleShape()