diff --git a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt index 76c051b9b..2d763370e 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt @@ -229,6 +229,10 @@ class ChatMessagesListAdapter( popupView.addToContactsHidden = true totalSize -= itemSize } + if (chatMessage.chatRoom.hasBeenLeft()) { + popupView.replyHidden = true + totalSize -= itemSize + } // When using WRAP_CONTENT instead of real size, fails to place the // popup window above if not enough space is available below diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/EventData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/EventData.kt index b6fb7732d..ae9f33d3d 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/data/EventData.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/data/EventData.kt @@ -45,6 +45,13 @@ class EventData(private val eventLog: EventLog) : GenericContactData( } } + val isGroupLeft: Boolean by lazy { + when (eventLog.type) { + EventLog.Type.ConferenceTerminated -> true + else -> false + } + } + init { updateEventText() } diff --git a/app/src/main/res/layout/chat_event_list_cell.xml b/app/src/main/res/layout/chat_event_list_cell.xml index 9720f7a7a..9c0e2dd2c 100644 --- a/app/src/main/res/layout/chat_event_list_cell.xml +++ b/app/src/main/res/layout/chat_event_list_cell.xml @@ -42,7 +42,7 @@ android:layout_marginBottom="5dp" android:layout_toLeftOf="@id/select" android:gravity="center" - android:background="@{data.security ? @drawable/event_decoration_red : @drawable/event_decoration_gray, default=@drawable/event_decoration_gray}" + android:background="@{data.security || data.groupLeft ? @drawable/event_decoration_red : @drawable/event_decoration_gray, default=@drawable/event_decoration_gray}" android:orientation="horizontal"> @@ -52,7 +52,7 @@ android:fontFamily="sans-serif" android:lineSpacingExtra="0sp" android:textStyle="italic" - android:textColor="@{data.security ? @color/red_color : @color/light_grey_color}" + android:textColor="@{data.security || data.groupLeft ? @color/red_color : @color/light_grey_color}" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingRight="5dp" diff --git a/app/src/main/res/layout/chat_message_long_press_menu.xml b/app/src/main/res/layout/chat_message_long_press_menu.xml index 2604ce4f3..4ab6ca775 100644 --- a/app/src/main/res/layout/chat_message_long_press_menu.xml +++ b/app/src/main/res/layout/chat_message_long_press_menu.xml @@ -36,6 +36,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 f68032cd9..100a0e23d 100644 --- a/app/src/main/res/layout/chat_room_detail_fragment.xml +++ b/app/src/main/res/layout/chat_room_detail_fragment.xml @@ -110,7 +110,7 @@