Skip to content

Add copy message chip to user message #78

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

Merged
merged 1 commit into from
Oct 18, 2024
Merged

Add copy message chip to user message #78

Show file tree
Hide file tree
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
86 changes: 50 additions & 36 deletions app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/chat/ChatBubble.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ import dev.jeziellago.compose.markdowntext.MarkdownText
@Composable
fun UserChatBubble(
modifier: Modifier = Modifier,
text: String
text: String,
onCopyClick: () -> Unit
) {
val cardColor = CardColors(
containerColor = MaterialTheme.colorScheme.primaryContainer,
Expand All @@ -45,17 +46,20 @@ fun UserChatBubble(
disabledContainerColor = MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.38f)
)

Card(
modifier = modifier,
shape = RoundedCornerShape(32.dp),
colors = cardColor
) {
MarkdownText(
modifier = Modifier.padding(16.dp),
markdown = text,
isTextSelectable = true,
linkifyMask = Linkify.WEB_URLS
)
Column(horizontalAlignment = Alignment.End) {
Card(
modifier = modifier,
shape = RoundedCornerShape(32.dp),
colors = cardColor
) {
MarkdownText(
modifier = Modifier.padding(16.dp),
markdown = text,
isTextSelectable = true,
linkifyMask = Linkify.WEB_URLS
)
}
CopyTextChip(onCopyClick)
}
}

Expand Down Expand Up @@ -97,38 +101,48 @@ fun OpponentChatBubble(
if (!isLoading) {
Row {
if (!isError) {
AssistChip(
onClick = onCopyClick,
label = { Text(stringResource(R.string.copy_text)) },
leadingIcon = {
Icon(
imageVector = ImageVector.vectorResource(id = R.drawable.ic_copy),
contentDescription = stringResource(R.string.copy_text),
modifier = Modifier.size(AssistChipDefaults.IconSize)
)
}
)
CopyTextChip(onCopyClick)
}
Spacer(modifier = Modifier.width(8.dp))
if (canRetry) {
AssistChip(
onClick = onRetryClick,
label = { Text(stringResource(R.string.retry)) },
leadingIcon = {
Icon(
Icons.Rounded.Refresh,
contentDescription = stringResource(R.string.retry),
modifier = Modifier.size(AssistChipDefaults.IconSize)
)
}
)
Spacer(modifier = Modifier.width(8.dp))
RetryChip(onRetryClick)
}
}
}
}
}
}

@Composable
private fun CopyTextChip(onCopyClick: () -> Unit) {
AssistChip(
onClick = onCopyClick,
label = { Text(stringResource(R.string.copy_text)) },
leadingIcon = {
Icon(
imageVector = ImageVector.vectorResource(id = R.drawable.ic_copy),
contentDescription = stringResource(R.string.copy_text),
modifier = Modifier.size(AssistChipDefaults.IconSize)
)
}
)
}

@Composable
private fun RetryChip(onRetryClick: () -> Unit) {
AssistChip(
onClick = onRetryClick,
label = { Text(stringResource(R.string.retry)) },
leadingIcon = {
Icon(
Icons.Rounded.Refresh,
contentDescription = stringResource(R.string.retry),
modifier = Modifier.size(AssistChipDefaults.IconSize)
)
}
)
}

@Composable
private fun BrandText(apiType: ApiType) {
Box(
Expand All @@ -153,7 +167,7 @@ fun UserChatBubblePreview() {
in Python?
""".trimIndent()
GPTMobileTheme {
UserChatBubble(text = sampleText)
UserChatBubble(text = sampleText, onCopyClick = {})
}
}

Expand Down
9 changes: 7 additions & 2 deletions app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/chat/ChatScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,8 @@ fun ChatScreen(
Spacer(modifier = Modifier.weight(1f))
UserChatBubble(
modifier = Modifier.widthIn(max = maximumChatBubbleWidth),
text = groupedMessages[key]!![0].content
text = groupedMessages[key]!![0].content,
onCopyClick = { clipboardManager.setText(AnnotatedString(groupedMessages[key]!![0].content.trim())) }
)
}
}
Expand Down Expand Up @@ -208,7 +209,11 @@ fun ChatScreen(
.padding(horizontal = 16.dp, vertical = 12.dp)
) {
Spacer(modifier = Modifier.weight(1f))
UserChatBubble(modifier = Modifier.widthIn(max = maximumChatBubbleWidth), text = userMessage.content)
UserChatBubble(
modifier = Modifier.widthIn(max = maximumChatBubbleWidth),
text = userMessage.content,
onCopyClick = { clipboardManager.setText(AnnotatedString(userMessage.content.trim())) }
)
}
}

Expand Down