forked from melod1n/fast-messenger
fix bubble colors and favorites icon tint
This commit is contained in:
+1
-1
@@ -134,7 +134,7 @@ fun ConversationItem(
|
|||||||
.size(32.dp),
|
.size(32.dp),
|
||||||
painter = painterResource(id = UiR.drawable.ic_round_bookmark_border_24),
|
painter = painterResource(id = UiR.drawable.ic_round_bookmark_border_24),
|
||||||
contentDescription = "Favorites icon",
|
contentDescription = "Favorites icon",
|
||||||
tint = Color.White
|
tint = MaterialTheme.colorScheme.onPrimary
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
+15
-8
@@ -23,17 +23,23 @@ fun MessageBubble(
|
|||||||
date: String?,
|
date: String?,
|
||||||
edited: Boolean,
|
edited: Boolean,
|
||||||
) {
|
) {
|
||||||
Box(
|
val backgroundColor = if (!isOut) {
|
||||||
modifier = modifier
|
|
||||||
.widthIn(min = 56.dp)
|
|
||||||
.clip(RoundedCornerShape(24.dp))
|
|
||||||
.background(
|
|
||||||
if (isOut) {
|
|
||||||
MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
|
MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
|
||||||
} else {
|
} else {
|
||||||
MaterialTheme.colorScheme.primaryContainer
|
MaterialTheme.colorScheme.primaryContainer
|
||||||
}
|
}
|
||||||
)
|
|
||||||
|
val textColor = if (!isOut) {
|
||||||
|
MaterialTheme.colorScheme.onSurface
|
||||||
|
} else {
|
||||||
|
MaterialTheme.colorScheme.onPrimaryContainer
|
||||||
|
}
|
||||||
|
|
||||||
|
Box(
|
||||||
|
modifier = modifier
|
||||||
|
.widthIn(min = 56.dp)
|
||||||
|
.clip(RoundedCornerShape(24.dp))
|
||||||
|
.background(backgroundColor)
|
||||||
.padding(
|
.padding(
|
||||||
horizontal = 8.dp,
|
horizontal = 8.dp,
|
||||||
vertical = 6.dp
|
vertical = 6.dp
|
||||||
@@ -45,7 +51,8 @@ fun MessageBubble(
|
|||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.padding(2.dp)
|
.padding(2.dp)
|
||||||
.align(Alignment.Center)
|
.align(Alignment.Center)
|
||||||
.animateContentSize()
|
.animateContentSize(),
|
||||||
|
color = textColor
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user