Skip to content

adjust chat bubble size #6397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sowjanyakch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

adjust chat bubble size #6397

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 32 additions & 23 deletions app/src/main/java/com/nextcloud/talk/ui/chat/ChatMessageScaffold.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxScope
import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.Row
Expand Down Expand Up @@ -57,6 +58,7 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.core.graphics.ColorUtils
Expand All @@ -81,6 +83,7 @@ private const val SINGLE_EMOJI_SIZE_MULTIPLIER = 2.5f
private const val HALF_OPACITY = 127
private const val MESSAGE_LENGTH_THRESHOLD = 25
private const val ANIMATED_BLINK = 500
private const val MESSAGE_BUBBLE_MAX_WIDTH_FRACTION = 0.9f

private val bubbleRadiusBig = 10.dp
private val bubbleRadiusSmall = 2.dp
Expand Down Expand Up @@ -222,28 +225,33 @@ fun MessageScaffold(
}
}

Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = if (incoming) Arrangement.Start else Arrangement.End
) {
MessageLeadingDecoration(
uiMessage = uiMessage,
isOneToOneConversation = isOneToOneConversation
)
MessageBubbleWithReactions(
uiMessage = uiMessage,
incoming = incoming,
includePadding = includePadding,
isOneToOneConversation = isOneToOneConversation,
conversationThreadId = conversationThreadId,
shape = shape,
resolvedBubbleColor = resolvedBubbleColor,
metadataLayoutMode = metadataLayoutMode,
captionText = captionText,
showInlineMetadata = showInlineMetadata,
showQuote = showQuote,
content = content
)
BoxWithConstraints(modifier = Modifier.fillMaxWidth()) {
val messageBubbleMaxWidth = maxWidth * MESSAGE_BUBBLE_MAX_WIDTH_FRACTION

Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = if (incoming) Arrangement.Start else Arrangement.End
) {
MessageLeadingDecoration(
uiMessage = uiMessage,
isOneToOneConversation = isOneToOneConversation
)
MessageBubbleWithReactions(
uiMessage = uiMessage,
incoming = incoming,
includePadding = includePadding,
isOneToOneConversation = isOneToOneConversation,
conversationThreadId = conversationThreadId,
maxBubbleWidth = messageBubbleMaxWidth,
shape = shape,
resolvedBubbleColor = resolvedBubbleColor,
metadataLayoutMode = metadataLayoutMode,
captionText = captionText,
showInlineMetadata = showInlineMetadata,
showQuote = showQuote,
content = content
)
}
}
}

Expand Down Expand Up @@ -282,6 +290,7 @@ private fun MessageBubbleWithReactions(
includePadding: Boolean,
isOneToOneConversation: Boolean,
conversationThreadId: Long?,
maxBubbleWidth: Dp,
shape: RoundedCornerShape,
resolvedBubbleColor: Color,
metadataLayoutMode: MetadataLayoutMode,
Expand All @@ -292,7 +301,7 @@ private fun MessageBubbleWithReactions(
) {
val bubbleModifier = Modifier
.defaultMinSize(60.dp, 40.dp)
.widthIn(60.dp, 280.dp)
.widthIn(60.dp, maxBubbleWidth)

val hasReactionsOrThread = uiMessage.reactions.isNotEmpty() ||
isFirstMessageOfThreadInNormalChat(uiMessage, conversationThreadId)
Expand Down
Loading