Skip to content

feat: add jump to reply message functionality #24

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
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

feat: add jump to reply message functionality #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af9af1f
feat: add jump to reply message functionality
alexjyong Aug 6, 2025
bf3c72d
feature: Adding support for Github codespaces (#25)
alexjyong Aug 11, 2025
501a4d6
Merge branch 'dev' into feature-jump-to-reply-message
alexjyong Aug 11, 2025
7f07a5c
Merge branch 'dev' into feature-jump-to-reply-message
alexjyong Aug 24, 2025
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
34 changes: 19 additions & 15 deletions app/src/main/java/chat/revolt/composables/chat/Message.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@ fun Message(
onAddReaction: () -> Unit = {},
fromWebhook: Boolean = false,
webhookName: String? = null,
jumpToMessage: (String) -> Unit = {},
highlightedMessageId: String? = null,
modifier: Modifier = Modifier
) {
val author = RevoltAPI.userCache[message.author] ?: return CircularProgressIndicator()
Expand Down Expand Up @@ -281,16 +283,21 @@ fun Message(
} else {
Column(
modifier = Modifier.then(
if ((message.mentions?.contains(RevoltAPI.selfId) == true)
|| mentionsSelfRole
|| message.flags has MessageFlag.MentionsOnline
|| message.flags has MessageFlag.MentionsEveryone
) {
Modifier.background(
MaterialTheme.colorScheme.primary.copy(alpha = 0.1f)
)
} else {
Modifier
when {
highlightedMessageId == message.id -> {
Modifier.background(
MaterialTheme.colorScheme.secondary.copy(alpha = 0.3f)
)
}
(message.mentions?.contains(RevoltAPI.selfId) == true)
|| mentionsSelfRole
|| message.flags has MessageFlag.MentionsOnline
|| message.flags has MessageFlag.MentionsEveryone -> {
Modifier.background(
MaterialTheme.colorScheme.primary.copy(alpha = 0.1f)
)
}
else -> Modifier
}
)
) {
Expand All @@ -306,11 +313,8 @@ fun Message(
replyMessage.author
)
} == true),
) {
// TODO Add jump to message
if (replyMessage == null) {
Toast.makeText(context, "lmao prankd", Toast.LENGTH_SHORT).show()
}
) { messageId ->
jumpToMessage(messageId)
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/chat/revolt/composables/screens/chat/atoms/RegularMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ fun RegularMessage(
showReactBottomSheet: () -> Unit,
putTextAtCursorPosition: (String) -> Unit,
replyToMessage: suspend (String) -> Unit,
jumpToMessage: (String) -> Unit = {},
highlightedMessageId: String? = null,
scope: CoroutineScope = rememberCoroutineScope()
) {
val haptic = LocalHapticFeedback.current
Expand Down Expand Up @@ -182,6 +184,8 @@ fun RegularMessage(
},
fromWebhook = message.webhook != null,
webhookName = message.webhook?.name,
jumpToMessage = jumpToMessage,
highlightedMessageId = highlightedMessageId,
modifier = Modifier
.offset(
x = with(LocalDensity.current) { animOffsetX.toDp() }
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,6 +677,16 @@ fun ChannelScreen(
modifier = Modifier.weight(1f),
contentAlignment = Alignment.BottomCenter
) {
val jumpToMessage: (String) -> Unit = { messageId ->
viewModel.setHighlightedMessage(messageId)
val messageIndex = viewModel.findMessageIndex(messageId)
if (messageIndex >= 0) {
scope.launch {
lazyListState.animateScrollToItem(messageIndex)
}
}
}

LazyColumn(
state = lazyListState,
userScrollEnabled = !disableScroll,
Expand Down Expand Up @@ -748,6 +758,8 @@ fun ChannelScreen(
},
putTextAtCursorPosition = viewModel::putAtCursorPosition,
replyToMessage = viewModel::addReplyTo,
jumpToMessage = jumpToMessage,
highlightedMessageId = viewModel.highlightedMessageId,
scope = scope
)
}
Expand Down
23 changes: 23 additions & 0 deletions app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ class ChannelScreenViewModel @Inject constructor(
var ageGateUnlocked by mutableStateOf<Boolean?>(null)
var showGeoGate by mutableStateOf(false)

var highlightedMessageId by mutableStateOf<String?>(null)

init {
viewModelScope.launch {
keyboardHeight = kvStorage.getInt("keyboardHeight") ?: 900 // reasonable default for now
Expand Down Expand Up @@ -311,6 +313,27 @@ class ChannelScreenViewModel @Inject constructor(
keyboardHeight = height
}

fun setHighlightedMessage(messageId: String) {
highlightedMessageId = messageId

viewModelScope.launch {
delay(3000) // 3 second highlight
if (highlightedMessageId == messageId) {
highlightedMessageId = null
}
}
}

fun findMessageIndex(messageId: String): Int {
return items.indexOfFirst { item ->
when (item) {
is ChannelScreenItem.RegularMessage -> item.message.id == messageId
is ChannelScreenItem.SystemMessage -> item.message.id == messageId
else -> false
}
}
}

private suspend fun applyMessageEdit() {
try {
editMessage(
Expand Down