Skip to content

Commit cd4f819

Browse files
style(mentions): Improve mention coloring in general and specifically in dark mode and internal padding-end in of the chip
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
1 parent b973586 commit cd4f819

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

app/src/main/java/com/nextcloud/talk/ui/chat/MentionEnrichedText.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,12 +269,12 @@ private fun MentionChip(mention: MentionChipModel, textStyle: TextStyle, isMulti
269269
val backgroundColor = if (mention.isSelfMention) {
270270
viewThemeUtils.getColorScheme(context).primary
271271
} else {
272-
Color.White.copy(alpha = 0.87f)
272+
MaterialTheme.colorScheme.surfaceContainerHighest
273273
}
274274
val textColor = if (mention.isSelfMention) {
275-
colorResource(R.color.textColorOnPrimaryBackground)
275+
viewThemeUtils.getColorScheme(context).onPrimary
276276
} else {
277-
colorResource(R.color.high_emphasis_text)
277+
MaterialTheme.colorScheme.onSurface
278278
}
279279
val fallbackIcon = resolveMentionFallbackIcon(mention)
280280
val verticalPadding = if (isMultilineLayout) multilineChipVerticalPadding else chipVerticalPadding
@@ -305,6 +305,8 @@ private fun MentionChip(mention: MentionChipModel, textStyle: TextStyle, isMulti
305305
text = mention.name,
306306
color = textColor,
307307
maxLines = 1,
308+
modifier = Modifier
309+
.padding(end = 3.dp),
308310
style = textStyle.copy(
309311
color = textColor,
310312
fontSize = chipTextSize,

0 commit comments

Comments
 (0)