From 890d217ab752db3b78c8b423837d1640f9011a9e Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 15 Feb 2023 10:03:28 +0100 Subject: [PATCH] Disable some actions when a chat room has been left --- .../main/chat/fragments/DetailChatRoomFragment.kt | 4 ++++ app/src/main/res/drawable/chat_room_menu_devices.xml | 4 ++++ .../main/res/drawable/chat_room_menu_ephemeral.xml | 4 ++++ app/src/main/res/drawable/chat_room_menu_meeting.xml | 4 ++++ .../main/res/layout/chat_room_detail_fragment.xml | 2 +- app/src/main/res/layout/chat_room_menu.xml | 12 ++++++++++++ 6 files changed, 29 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt index c9711e89a..ae83d7405 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt @@ -936,6 +936,10 @@ class DetailChatRoomFragment : MasterFragment + + + diff --git a/app/src/main/res/drawable/chat_room_menu_ephemeral.xml b/app/src/main/res/drawable/chat_room_menu_ephemeral.xml index f539c09c1..55433de52 100644 --- a/app/src/main/res/drawable/chat_room_menu_ephemeral.xml +++ b/app/src/main/res/drawable/chat_room_menu_ephemeral.xml @@ -1,5 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/chat_room_menu_meeting.xml b/app/src/main/res/drawable/chat_room_menu_meeting.xml index ed877a812..88f9dfd62 100644 --- a/app/src/main/res/drawable/chat_room_menu_meeting.xml +++ b/app/src/main/res/drawable/chat_room_menu_meeting.xml @@ -1,5 +1,9 @@ + + + diff --git a/app/src/main/res/layout/chat_room_detail_fragment.xml b/app/src/main/res/layout/chat_room_detail_fragment.xml index a5f07eef2..a52042a6f 100644 --- a/app/src/main/res/layout/chat_room_detail_fragment.xml +++ b/app/src/main/res/layout/chat_room_detail_fragment.xml @@ -122,7 +122,7 @@ android:layout_weight="0.2" android:background="?attr/button_background_drawable" android:padding="7dp" - android:enabled="@{viewModel.groupCallAvailable}" + android:enabled="@{viewModel.groupCallAvailable && !chatSendingViewModel.isReadOnly}" android:visibility="@{viewModel.oneToOneChatRoom ? View.GONE : View.VISIBLE}" android:src="@drawable/icon_video_conf_new" /> diff --git a/app/src/main/res/layout/chat_room_menu.xml b/app/src/main/res/layout/chat_room_menu.xml index 2b8009992..b163d5dac 100644 --- a/app/src/main/res/layout/chat_room_menu.xml +++ b/app/src/main/res/layout/chat_room_menu.xml @@ -55,6 +55,15 @@ + + + @@ -109,6 +119,7 @@ android:visibility="@{ephemeralHidden ? View.GONE : View.VISIBLE}" android:background="@drawable/menu_background" android:onClick="@{ephemeralListener}" + android:enabled="@{ephemeralEnabled}" style="@style/popup_item_font" android:text="@string/chat_message_context_menu_ephemeral_messages" app:drawableRightCompat="@drawable/chat_room_menu_ephemeral" /> @@ -119,6 +130,7 @@ android:visibility="@{meetingHidden ? View.GONE : View.VISIBLE}" android:background="@drawable/menu_background" android:onClick="@{meetingListener}" + android:enabled="@{meetingEnabled}" style="@style/popup_item_font" android:text="@string/conference_schedule_title" app:drawableRightCompat="@drawable/chat_room_menu_meeting" />