gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-09 23:53:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix shimmer and "offlineNoMessages"-info handling

Browse Source 
when being offline and no messages are set -> hide shimmer

when messages are received -> hide shimmer and "offlineNoMessages"-info

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2025-01-23 09:45:02 +01:00
parent 7d0c6d67c7
commit 3330fc8210
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
View File

@ -828,12 +828,15 @@ class ChatActivity :
// Handle UI on first load // Handle UI on first load
cancelNotificationsForCurrentConversation() cancelNotificationsForCurrentConversation()
binding.progressBar.visibility = View.GONE binding.progressBar.visibility = View.GONE
binding.offline.root.visibility = View.GONE
binding.messagesListView.visibility = View.VISIBLE binding.messagesListView.visibility = View.VISIBLE
collapseSystemMessages() collapseSystemMessages()
} }
is ChatViewModel.ChatMessageUpdateState -> { is ChatViewModel.ChatMessageUpdateState -> {
// unused atm binding.progressBar.visibility = View.GONE
binding.offline.root.visibility = View.GONE
binding.messagesListView.visibility = View.VISIBLE
} }
is ChatViewModel.ChatMessageErrorState -> { is ChatViewModel.ChatMessageErrorState -> {
@ -918,9 +921,9 @@ class ChatActivity :
chatViewModel.getGeneralUIFlow.onEach { key -> chatViewModel.getGeneralUIFlow.onEach { key ->
when (key) { when (key) {
NO_OFFLINE_MESSAGES_FOUND -> { NO_OFFLINE_MESSAGES_FOUND -> {
if (networkMonitor.isOnline.value.not()) { binding.progressBar.visibility = View.GONE
binding.offline.root.visibility = View.VISIBLE binding.messagesListView.visibility = View.GONE
} binding.offline.root.visibility = View.VISIBLE
} }
else -> {} else -> {}

4
app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt
View File

@ -157,7 +157,9 @@ class OfflineFirstChatRepository @Inject constructor(
} else { } else {
if (!weAlreadyHaveSomeOfflineMessages) { if (!weAlreadyHaveSomeOfflineMessages) {
Log.d(TAG, "An online request for newest 100 messages is made because offline chat is empty") Log.d(TAG, "An online request for newest 100 messages is made because offline chat is empty")
_generalUIFlow.emit(ChatActivity.NO_OFFLINE_MESSAGES_FOUND) if (networkMonitor.isOnline.value.not()) {
_generalUIFlow.emit(ChatActivity.NO_OFFLINE_MESSAGES_FOUND)
}
} else { } else {
Log.d( Log.d(
TAG, TAG,