Skip to content

[stable-23.0] Simplifying pinned messages #5821

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
mahibi merged 11 commits into from
Feb 5, 2026
Merged

[stable-23.0] Simplifying pinned messages #5821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
065b2ac
Simplifying pinned messages
rapterjet2004 Feb 4, 2026
7bc7e80
use 3dot button inside box / add shadow / avoid ripple
mahibi Feb 5, 2026
91d6591
add styling to pinned message headline
mahibi Feb 5, 2026
9292685
fix hardcoded strings
mahibi Feb 5, 2026
bd084cb
use Dispatchers.IO for getIndividualMessageFromServer
mahibi Feb 5, 2026
7b98a64
hopefully fix ANR issues by using flatMapLatest to cancel previous pi…
mahibi Feb 5, 2026
28c946d
differentiate "pinned by" messages
mahibi Feb 5, 2026
7ce40ce
test: Add previews
AndyScherzinger Feb 5, 2026
6dac318
style(dark): Fix message color
AndyScherzinger Feb 5, 2026
e6f394b
resolve ktlint warning
mahibi Feb 5, 2026
91fd0ef
style: Optimize top/end spacing of pinned message and update colors
AndyScherzinger Feb 5, 2026
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
65 changes: 34 additions & 31 deletions app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,11 @@ import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
Expand Down Expand Up @@ -652,55 +656,54 @@ class ChatActivity :
this.lifecycle.removeObserver(chatViewModel)
}

@OptIn(ExperimentalCoroutinesApi::class)
@SuppressLint("NotifyDataSetChanged", "SetTextI18n", "ResourceAsColor")
@Suppress("LongMethod")
private fun initObservers() {
Log.d(TAG, "initObservers Called")

this.lifecycleScope.launch {
lifecycleScope.launch {
chatViewModel.getConversationFlow
.collect { conversationModel ->
.onEach { conversationModel ->
currentConversation = conversationModel
chatViewModel.updateConversation(
currentConversation!!
)

chatViewModel.updateConversation(conversationModel)
logConversationInfos("GetRoomSuccessState")

if (adapter == null) {
initAdapter()
binding.messagesListView.setAdapter(adapter)
layoutManager = binding.messagesListView.layoutManager as LinearLayoutManager?
layoutManager = binding.messagesListView.layoutManager as? LinearLayoutManager
}

chatViewModel.getCapabilities(conversationUser!!, roomToken, currentConversation!!)

chatViewModel.getCapabilities(conversationUser!!, roomToken, conversationModel)
}
.flatMapLatest { conversationModel ->
if (conversationModel.lastPinnedId != null &&
conversationModel.lastPinnedId != 0L &&
conversationModel.lastPinnedId != conversationModel.hiddenPinnedId
) {
chatViewModel
.getIndividualMessageFromServer(
credentials!!,
conversationUser?.baseUrl!!,
roomToken,
conversationModel.lastPinnedId.toString()
chatViewModel.getIndividualMessageFromServer(
credentials!!,
conversationUser?.baseUrl!!,
roomToken,
conversationModel.lastPinnedId.toString()
)
} else {
flowOf(null)
}
}
.collectLatest { message ->
if (message != null) {
binding.pinnedMessageContainer.visibility = View.VISIBLE
binding.pinnedMessageComposeView.setContent {
PinnedMessageView(
message,
viewThemeUtils,
currentConversation,
scrollToMessageWithIdWithOffset = ::scrollToMessageWithIdWithOffset,
hidePinnedMessage = ::hidePinnedMessage,
unPinMessage = ::unPinMessage
)
.collect { message ->
message?.let {
binding.pinnedMessageContainer.visibility = View.VISIBLE
binding.pinnedMessageComposeView.setContent {
PinnedMessageView(
message,
viewThemeUtils,
currentConversation,
scrollToMessageWithIdWithOffset = ::scrollToMessageWithIdWithOffset,
hidePinnedMessage = ::hidePinnedMessage,
unPinMessage = ::unPinMessage
)
}
}
}
}
} else {
binding.pinnedMessageContainer.visibility = View.GONE
}
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,15 @@ import io.reactivex.Observer
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch
import java.io.File
Expand Down Expand Up @@ -887,7 +889,7 @@ class ChatViewModel @Inject constructor(
} else {
emit(null)
}
}
}.flowOn(Dispatchers.IO)

suspend fun getNumberOfThreadReplies(threadId: Long): Int = chatRepository.getNumberOfThreadReplies(threadId)

Expand Down
Loading
Loading