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

styling the inline composer rely to match the reply messages

This commit is contained in:
Adam Brown 2022-10-02 15:54:30 +01:00 committed by Adam Brown
parent d18c14b152
commit 1efb1cf6c6
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -477,7 +477,11 @@ private fun ReplyBubbleContent(content: BubbleContent<RoomEvent.Reply>) {
Column( Column(
Modifier Modifier
.fillMaxWidth() .fillMaxWidth()
.background(if (content.isNotSelf) SmallTalkTheme.extendedColors.onOthersBubble.copy(alpha = 0.1f) else SmallTalkTheme.extendedColors.onSelfBubble.copy(alpha = 0.2f), RoundedCornerShape(12.dp)) .background(
if (content.isNotSelf) SmallTalkTheme.extendedColors.onOthersBubble.copy(alpha = 0.1f) else SmallTalkTheme.extendedColors.onSelfBubble.copy(
alpha = 0.2f
), RoundedCornerShape(12.dp)
)
.padding(8.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
@ -642,7 +646,7 @@ private fun TextComposer(state: ComposerState.Text, onTextChange: (String) -> Un
transitionSpec = { transitionSpec = {
val durationMillis = 300 val durationMillis = 300
slideIntoContainer(towards = AnimatedContentScope.SlideDirection.Up, tween(durationMillis)) { it / 2 } slideIntoContainer(towards = AnimatedContentScope.SlideDirection.Up, tween(durationMillis)) { it / 2 }
.with(slideOutVertically(tween(durationMillis)) { it / 2}) .with(slideOutVertically(tween(durationMillis)) { it / 2 })
.using( .using(
SizeTransform( SizeTransform(
clip = true, clip = true,
@ -652,7 +656,7 @@ private fun TextComposer(state: ComposerState.Text, onTextChange: (String) -> Un
) { ) {
if (it is Message) { if (it is Message) {
Box(Modifier.padding(12.dp)) { Box(Modifier.padding(12.dp)) {
Box(Modifier.padding(4.dp).clickable { replyActions.onDismiss() }.wrapContentWidth().align(Alignment.TopEnd)) { Box(Modifier.padding(8.dp).clickable { replyActions.onDismiss() }.wrapContentWidth().align(Alignment.TopEnd)) {
Icon( Icon(
modifier = Modifier.size(16.dp), modifier = Modifier.size(16.dp),
imageVector = Icons.Filled.Close, imageVector = Icons.Filled.Close,
@ -662,8 +666,8 @@ private fun TextComposer(state: ComposerState.Text, onTextChange: (String) -> Un
Column( Column(
Modifier Modifier
.fillMaxWidth() .fillMaxWidth()
.background(SmallTalkTheme.extendedColors.selfBubbleReplyBackground) .background(SmallTalkTheme.extendedColors.onOthersBubble.copy(alpha = 0.1f), RoundedCornerShape(12.dp))
.padding(4.dp) .padding(8.dp)
) { ) {
val replyName = it.author.displayName ?: it.author.id.value val replyName = it.author.displayName ?: it.author.id.value
Text( Text(
@ -676,7 +680,7 @@ private fun TextComposer(state: ComposerState.Text, onTextChange: (String) -> Un
Text( Text(
text = it.content, text = it.content,
color = SmallTalkTheme.extendedColors.onSelfBubble, color = SmallTalkTheme.extendedColors.onSelfBubble,
fontSize = 15.sp, fontSize = 14.sp,
maxLines = 2, maxLines = 2,
modifier = Modifier.wrapContentSize(), modifier = Modifier.wrapContentSize(),
textAlign = TextAlign.Start, textAlign = TextAlign.Start,