Skip to content

Allowing Markdown in Pinned Messages #6266

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
rapterjet2004 wants to merge 1 commit into
base: master
Choose a base branch
from
+139 −96
Open

Allowing Markdown in Pinned Messages #6266

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
32 changes: 32 additions & 0 deletions app/src/main/java/com/nextcloud/talk/chat/ui/model/ChatMessageUi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,38 @@ fun ChatMessage.toScheduledMessageUiModel(
)
}

fun ChatMessage.toIncompleteMessageUiModel(roomToken: String, baseUrl: String): ChatMessageUi {
val sendAtTimestamp = sendAt?.toLong() ?: timestamp
return ChatMessageUi(
id = token?.toIntOrNull() ?: token.hashCode(),
message = getRichText(),
plainMessage = message.orEmpty(),
renderMarkdown = renderMarkdown != false,
actorDisplayName = actorDisplayName.orEmpty(),
isThread = isThread,
threadTitle = threadTitle.orEmpty(),
threadReplies = threadReplies ?: 0,
incoming = false,
isDeleted = isDeleted,
avatarUrl = avatarUrl,
statusIcon = MessageStatusIcon.SCHEDULED,
timestamp = sendAtTimestamp,
date = Instant.ofEpochSecond(sendAtTimestamp).atZone(ZoneId.systemDefault()).toLocalDate(),
content = null,
roomToken = roomToken,
activeUserId = null,
activeUserBaseUrl = baseUrl,
messageParameters = normalizeMessageParameters(),
reactions = emptyList(),
isEdited = lastEditTimestamp != 0L,
parentMessage = null,
replyable = false,
isGrouped = false,
isGroupedWithNext = false,
isSilent = silent
)
}

private fun ChatMessage.normalizeMessageParameters(): Map<String, Map<String, String>> =
messageParameters
.orEmpty()
Expand Down
203 changes: 107 additions & 96 deletions app/src/main/java/com/nextcloud/talk/ui/PinnedMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
Expand All @@ -46,11 +47,14 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.nextcloud.talk.R
import com.nextcloud.talk.chat.data.model.ChatMessage
import com.nextcloud.talk.chat.ui.model.toIncompleteMessageUiModel
import com.nextcloud.talk.data.user.model.User
import com.nextcloud.talk.models.domain.ConversationModel
import com.nextcloud.talk.models.json.conversations.Conversation
import com.nextcloud.talk.models.json.conversations.ConversationEnums
import com.nextcloud.talk.models.json.participants.Participant
import com.nextcloud.talk.ui.chat.EnrichedText
import com.nextcloud.talk.ui.theme.LocalViewThemeUtils
import com.nextcloud.talk.ui.theme.ViewThemeUtils
import com.nextcloud.talk.utils.ConversationUtils
import com.nextcloud.talk.utils.preview.ComposePreviewUtils
Expand Down Expand Up @@ -119,121 +123,128 @@ fun PinnedMessageView(

val interactionSource = remember { MutableInteractionSource() }

Box(
modifier = Modifier
.fillMaxWidth()
.padding(4.dp)
.shadow(
elevation = ELEVATION,
shape = RoundedCornerShape(CORNER_RADIUS.dp),
clip = false
)
.background(
incomingBubbleColor,
RoundedCornerShape(CORNER_RADIUS.dp)
)
.padding(SPACE_16.dp, SPACE_0.dp, SPACE_0.dp, SPACE_16.dp)
.heightIn(max = MAX_HEIGHT.dp)
.clickable(
interactionSource = interactionSource,
indication = null
) {
scrollToMessageWithIdWithOffset(message.jsonMessageId.toString())
}
CompositionLocalProvider(
LocalViewThemeUtils provides viewThemeUtils
) {
var expanded by remember { mutableStateOf(false) }
val pinnedUntilStr = stringResource(R.string.pinned_until)
val untilUnpin = stringResource(R.string.until_unpin)
val pinnedText = remember(message.pinnedUntil) {
message.pinnedUntil?.let {
val format = if (DateFormat.is24HourFormat(context)) {
"MMM dd yyyy, HH:mm"
} else {
"MMM dd yyyy, hh:mm a"
Box(
modifier = Modifier
.fillMaxWidth()
.padding(4.dp)
.shadow(
elevation = ELEVATION,
shape = RoundedCornerShape(CORNER_RADIUS.dp),
clip = false
)
.background(
incomingBubbleColor,
RoundedCornerShape(CORNER_RADIUS.dp)
)
.padding(SPACE_16.dp, SPACE_0.dp, SPACE_0.dp, SPACE_16.dp)
.heightIn(max = MAX_HEIGHT.dp)
.clickable(
interactionSource = interactionSource,
indication = null
) {
scrollToMessageWithIdWithOffset(message.jsonMessageId.toString())
}
) {
var expanded by remember { mutableStateOf(false) }
val pinnedUntilStr = stringResource(R.string.pinned_until)
val untilUnpin = stringResource(R.string.until_unpin)
val pinnedText = remember(message.pinnedUntil) {
message.pinnedUntil?.let {
val format = if (DateFormat.is24HourFormat(context)) {
"MMM dd yyyy, HH:mm"
} else {
"MMM dd yyyy, hh:mm a"
}

val localDateTime = Instant.ofEpochSecond(it)
.atZone(ZoneId.systemDefault())
.toLocalDateTime()
val localDateTime = Instant.ofEpochSecond(it)
.atZone(ZoneId.systemDefault())
.toLocalDateTime()

val timeString = localDateTime.format(DateTimeFormatter.ofPattern(format))
val timeString = localDateTime.format(DateTimeFormatter.ofPattern(format))

"$pinnedUntilStr $timeString"
} ?: untilUnpin
}

Column(
modifier = Modifier
.verticalScroll(scrollState)
.padding(top = SPACE_16.dp, end = 40.dp)
) {
Text(
text = pinnedHeadline,
color = colorScheme.onSurfaceVariant,
style = MaterialTheme.typography.labelMedium
)
Spacer(modifier = Modifier.height(4.dp))
Text(
text = message.getRichText(),
color = colorScheme.onSurface
)
}
"$pinnedUntilStr $timeString"
} ?: untilUnpin
}

Box(
modifier = Modifier
.align(Alignment.TopEnd)
.padding(top = 2.dp)
) {
IconButton(onClick = { expanded = true }) {
Icon(
imageVector = ImageVector.vectorResource(R.drawable.ic_more_vert_24px),
contentDescription = stringResource(R.string.pinned_message_options),
tint = highEmphasisColor
Column(
modifier = Modifier
.verticalScroll(scrollState)
.padding(top = SPACE_16.dp, end = 40.dp)
) {
Text(
text = pinnedHeadline,
color = colorScheme.onSurfaceVariant,
style = MaterialTheme.typography.labelMedium
)
Spacer(modifier = Modifier.height(4.dp))
EnrichedText(
message = message.toIncompleteMessageUiModel(
currentConversation!!.token,
currentConversation.remoteServer!!
),
Modifier
)
}

DropdownMenu(
expanded = expanded,
onDismissRequest = { expanded = false },
modifier = Modifier.background(outgoingBubbleColor)
Box(
modifier = Modifier
.align(Alignment.TopEnd)
.padding(top = 2.dp)
) {
DropdownMenuItem(
text = {
Text(
text = pinnedText,
color = highEmphasisColor
)
},
onClick = {},
enabled = false
)
IconButton(onClick = { expanded = true }) {
Icon(
imageVector = ImageVector.vectorResource(R.drawable.ic_more_vert_24px),
contentDescription = stringResource(R.string.pinned_message_options),
tint = highEmphasisColor
)
}

HorizontalDivider()
DropdownMenu(
expanded = expanded,
onDismissRequest = { expanded = false },
modifier = Modifier.background(outgoingBubbleColor)
) {
DropdownMenuItem(
text = {
Text(
text = pinnedText,
color = highEmphasisColor
)
},
onClick = {},
enabled = false
)

DropdownMenuItem(
text = { Text(stringResource(R.string.pinned_go_to_message), color = highEmphasisColor) },
onClick = {
expanded = false
scrollToMessageWithIdWithOffset(message.jsonMessageId.toString())
}
)
HorizontalDivider()

DropdownMenuItem(
text = { Text(stringResource(R.string.pinned_dismiss), color = highEmphasisColor) },
onClick = {
expanded = false
hidePinnedMessage(message)
}
)
DropdownMenuItem(
text = { Text(stringResource(R.string.pinned_go_to_message), color = highEmphasisColor) },
onClick = {
expanded = false
scrollToMessageWithIdWithOffset(message.jsonMessageId.toString())
}
)

if (canPin) {
DropdownMenuItem(
text = { Text(stringResource(R.string.unpin_message), color = highEmphasisColor) },
text = { Text(stringResource(R.string.pinned_dismiss), color = highEmphasisColor) },
onClick = {
expanded = false
unPinMessage(message)
hidePinnedMessage(message)
}
)

if (canPin) {
DropdownMenuItem(
text = { Text(stringResource(R.string.unpin_message), color = highEmphasisColor) },
onClick = {
expanded = false
unPinMessage(message)
}
)
}
}
}
}
Expand Down
Loading