devol
/
smalltalk-matrix
mirror of https://github.com/ouchadam/small-talk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

using bubble colour with alpha for the reply background + some tweaks to padding and corners

This commit is contained in:
Adam Brown 2022-10-02 15:42:26 +01:00
parent 8d7a15e758
commit 7f9f761eab
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
features/messenger/src/main/kotlin/app/dapk/st/messenger/MessengerScreen.kt
View File

@ -477,8 +477,8 @@ private fun ReplyBubbleContent(content: BubbleContent<RoomEvent.Reply>) {
Column( Column(
Modifier Modifier
.fillMaxWidth() .fillMaxWidth()
.background(if (content.isNotSelf) SmallTalkTheme.extendedColors.otherBubbleReplyBackground else SmallTalkTheme.extendedColors.selfBubbleReplyBackground) .background(if (content.isNotSelf) SmallTalkTheme.extendedColors.onOthersBubble.copy(alpha = 0.1f) else SmallTalkTheme.extendedColors.onSelfBubble.copy(alpha = 0.2f), RoundedCornerShape(12.dp))
.padding(4.dp) .padding(8.dp)
) { ) {
val replyName = if (!content.isNotSelf && content.message.replyingToSelf) "You" else content.message.replyingTo.author.displayName val replyName = if (!content.isNotSelf && content.message.replyingToSelf) "You" else content.message.replyingTo.author.displayName
?: content.message.replyingTo.author.id.value ?: content.message.replyingTo.author.id.value
@ -488,12 +488,13 @@ private fun ReplyBubbleContent(content: BubbleContent<RoomEvent.Reply>) {
maxLines = 1, maxLines = 1,
color = content.textColor() color = content.textColor()
) )
Spacer(modifier = Modifier.height(2.dp))
when (val replyingTo = content.message.replyingTo) { when (val replyingTo = content.message.replyingTo) {
is Message -> { is Message -> {
Text( Text(
text = replyingTo.content, text = replyingTo.content,
color = content.textColor(), color = content.textColor().copy(alpha = 0.8f),
fontSize = 15.sp, fontSize = 14.sp,
modifier = Modifier.wrapContentSize(), modifier = Modifier.wrapContentSize(),
textAlign = TextAlign.Start, textAlign = TextAlign.Start,
) )