From 7ac8c2483e5933b260e01cbd0337d78a7801e084 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Thu, 23 Jan 2025 12:03:16 +0100 Subject: [PATCH] Show snackbar on archive/unarchive from bottomDialog Signed-off-by: Marcel Hibbe --- .../dialog/ConversationsListBottomDialog.kt | 39 +++++++++++++------ app/src/main/res/values/strings.xml | 2 + 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt index c5f4af4b8..8bf06bf70 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt @@ -200,17 +200,7 @@ class ConversationsListBottomDialog( } binding.conversationArchive.setOnClickListener { - val currentUser = userManager.currentUser.blockingGet() - val token = conversation.token - lifecycleScope.launch { - if (conversation.hasArchived) { - conversationInfoViewModel.unarchiveConversation(currentUser, token) - } else { - conversationInfoViewModel.archiveConversation(currentUser, token) - } - } - activity.fetchRooms() - dismiss() + handleArchiving() } binding.conversationOperationRename.setOnClickListener { @@ -226,6 +216,33 @@ class ConversationsListBottomDialog( } } + private fun handleArchiving() { + val currentUser = userManager.currentUser.blockingGet() + val token = conversation.token + lifecycleScope.launch { + if (conversation.hasArchived) { + conversationInfoViewModel.unarchiveConversation(currentUser, token) + activity.showSnackbar( + String.format( + context.resources.getString(R.string.unarchived_conversation), + conversation.displayName + ) + ) + dismiss() + } else { + conversationInfoViewModel.archiveConversation(currentUser, token) + activity.showSnackbar( + String.format( + context.resources.getString(R.string.archived_conversation), + conversation.displayName + ) + ) + dismiss() + } + } + activity.fetchRooms() + } + @Suppress("Detekt.TooGenericExceptionCaught") @SuppressLint("StringFormatInvalid", "TooGenericExceptionCaught") private fun addConversationToFavorites() { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8731479ad..e4fe172ab 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -848,4 +848,6 @@ How to translate with transifex: Replacement: Resend No conversations archived + Archived %1$s + Unarchived %1$s