gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-23 20:55:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

hide features that are not available in thread view

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2025-07-11 14:26:30 +02:00
parent 65d7203820
commit 3b9ab6e543
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
2 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)

34
app/src/main/res/menu/menu_conversation.xml
View File

@ -6,53 +6,67 @@
~ SPDX-License-Identifier: GPL-3.0-or-later
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<item
android:id="@+id/conversation_event"
android:icon="@drawable/baseline_calendar_today_24"
android:orderInCategory="0"
android:title="@string/nc_event_conversation_menu"
app:showAsAction="ifRoom">
</item>
android:visible="false"
app:showAsAction="ifRoom"
tools:visible="true" />
<item
android:id="@+id/conversation_voice_call"
android:icon="@drawable/ic_call_white_24dp"
android:orderInCategory="1"
android:title="@string/nc_conversation_menu_voice_call"
app:showAsAction="ifRoom" />
android:visible="false"
app:showAsAction="ifRoom"
tools:visible="true" />
<item
android:id="@+id/conversation_video_call"
android:icon="@drawable/ic_videocam_white_24px"
android:orderInCategory="2"
android:title="@string/nc_conversation_menu_video_call"
app:showAsAction="ifRoom" />
android:visible="false"
app:showAsAction="ifRoom"
tools:visible="true" />
<item
android:id="@+id/conversation_search"
android:icon="@drawable/ic_search_white_24dp"
android:orderInCategory="3"
android:title="@string/nc_search"
app:showAsAction="ifRoom" />
android:visible="false"
app:showAsAction="ifRoom"
tools:visible="true" />
<item
android:id="@+id/conversation_info"
android:orderInCategory="4"
android:title="@string/nc_conversation_menu_conversation_info"
app:showAsAction="never" />
android:visible="false"
app:showAsAction="never"
tools:visible="true" />
<item
android:id="@+id/shared_items"
android:orderInCategory="5"
android:title="@string/nc_shared_items"
app:showAsAction="never" />
android:visible="false"
app:showAsAction="never"
tools:visible="true" />
<item
android:id="@+id/show_threads"
android:orderInCategory="6"
android:title="@string/show_threads_overview"
app:showAsAction="never" />
android:visible="false"
app:showAsAction="never"
tools:visible="true" />
</menu>