From 3b9ab6e5439ea48c53c1ced66456c2353c110273 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Fri, 11 Jul 2025 14:26:30 +0200 Subject: [PATCH] hide features that are not available in thread view Signed-off-by: Marcel Hibbe --- .../com/nextcloud/talk/chat/ChatActivity.kt | 18 +++++++--- app/src/main/res/menu/menu_conversation.xml | 34 +++++++++++++------ 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index e4486a055..6702d8ed0 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -699,7 +699,8 @@ class ChatActivity : joinRoomWithPassword() if (conversationUser?.userId != "?" && - hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.MENTION_FLAG) + hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.MENTION_FLAG) && + !isChatThread() ) { binding.chatToolbar.setOnClickListener { _ -> showConversationInfoScreen() } } @@ -3175,11 +3176,20 @@ class ChatActivity : } val searchItem = menu.findItem(R.id.conversation_search) - searchItem.isVisible = CapabilitiesUtil.isUnifiedSearchAvailable(spreedCapabilities) && - currentConversation!!.remoteServer.isNullOrEmpty() + currentConversation!!.remoteServer.isNullOrEmpty() && + !isChatThread() - if (CapabilitiesUtil.isAbleToCall(spreedCapabilities)) { + val sharedItemsItem = menu.findItem(R.id.shared_items) + sharedItemsItem.isVisible = !isChatThread() + + val conversationInfoItem = menu.findItem(R.id.conversation_info) + conversationInfoItem.isVisible = !isChatThread() + + val showThreadsItem = menu.findItem(R.id.show_threads) + showThreadsItem.isVisible = !isChatThread() + + if (CapabilitiesUtil.isAbleToCall(spreedCapabilities) && !isChatThread()) { conversationVoiceCallMenuItem = menu.findItem(R.id.conversation_voice_call) conversationVideoMenuItem = menu.findItem(R.id.conversation_video_call) diff --git a/app/src/main/res/menu/menu_conversation.xml b/app/src/main/res/menu/menu_conversation.xml index 213b860a2..32732fb4e 100644 --- a/app/src/main/res/menu/menu_conversation.xml +++ b/app/src/main/res/menu/menu_conversation.xml @@ -6,53 +6,67 @@ ~ SPDX-License-Identifier: GPL-3.0-or-later --> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> + - - + android:visible="false" + app:showAsAction="ifRoom" + tools:visible="true" /> + android:visible="false" + app:showAsAction="ifRoom" + tools:visible="true" /> + android:visible="false" + app:showAsAction="ifRoom" + tools:visible="true" /> + android:visible="false" + app:showAsAction="ifRoom" + tools:visible="true" /> + android:visible="false" + app:showAsAction="never" + tools:visible="true" /> + android:visible="false" + app:showAsAction="never" + tools:visible="true" /> + android:visible="false" + app:showAsAction="never" + tools:visible="true" />