From 6e9c6d1b3391a8945ab4a5b5ee91f402328d6585 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 28 Apr 2025 11:26:35 +0200 Subject: [PATCH] Fixed group chat events icon --- .../org/linphone/ui/main/chat/model/EventModel.kt | 11 +++++++++-- .../chat/viewmodel/ConversationInfoViewModel.kt | 13 +++++++------ app/src/main/res/drawable/user_circle_dashed.xml | 9 +++++++++ app/src/main/res/drawable/user_circle_minus.xml | 9 +++++++++ app/src/main/res/drawable/user_circle_plus.xml | 9 +++++++++ 5 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 app/src/main/res/drawable/user_circle_dashed.xml create mode 100644 app/src/main/res/drawable/user_circle_minus.xml create mode 100644 app/src/main/res/drawable/user_circle_plus.xml diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/EventModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/EventModel.kt index eb7b28fdb..7dd85541a 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/model/EventModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/model/EventModel.kt @@ -124,15 +124,22 @@ class EventModel R.drawable.pencil_simple } EventLog.Type.ConferenceCreated, - EventLog.Type.ConferenceParticipantAdded, - EventLog.Type.ConferenceParticipantRemoved, EventLog.Type.ConferenceParticipantDeviceAdded, EventLog.Type.ConferenceParticipantDeviceRemoved -> { R.drawable.door } + EventLog.Type.ConferenceParticipantAdded -> { + R.drawable.user_circle_plus + } + EventLog.Type.ConferenceParticipantRemoved -> { + R.drawable.user_circle_minus + } EventLog.Type.ConferenceParticipantSetAdmin -> { R.drawable.user_circle_check } + EventLog.Type.ConferenceParticipantUnsetAdmin -> { + R.drawable.user_circle_dashed + } else -> R.drawable.user_circle }, coreContext.context.theme diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt index ce12b415b..dedac0fd2 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt @@ -110,7 +110,7 @@ class ConversationInfoViewModel R.string.conversation_info_participant_added_to_conversation_toast, getParticipant(eventLog) ) - showFormattedGreenToast(message, R.drawable.user_circle) + showFormattedGreenToast(message, R.drawable.user_circle_plus) computeParticipantsList() infoChangedEvent.postValue(Event(true)) @@ -123,7 +123,7 @@ class ConversationInfoViewModel R.string.conversation_info_participant_removed_from_conversation_toast, getParticipant(eventLog) ) - showFormattedGreenToast(message, R.drawable.user_circle) + showFormattedGreenToast(message, R.drawable.user_circle_minus) computeParticipantsList() infoChangedEvent.postValue(Event(true)) @@ -134,18 +134,19 @@ class ConversationInfoViewModel Log.i( "$TAG A participant has been given/removed administration rights for group [${chatRoom.subject}]" ) - val message = if (eventLog.type == EventLog.Type.ConferenceParticipantSetAdmin) { - AppUtils.getFormattedString( + if (eventLog.type == EventLog.Type.ConferenceParticipantSetAdmin) { + val message = AppUtils.getFormattedString( R.string.conversation_info_participant_has_been_granted_admin_rights_toast, getParticipant(eventLog) ) + showFormattedGreenToast(message, R.drawable.user_circle_check) } else { - AppUtils.getFormattedString( + val message = AppUtils.getFormattedString( R.string.conversation_info_participant_no_longer_has_admin_rights_toast, getParticipant(eventLog) ) + showFormattedGreenToast(message, R.drawable.user_circle_dashed) } - showFormattedGreenToast(message, R.drawable.user_circle) computeParticipantsList() } diff --git a/app/src/main/res/drawable/user_circle_dashed.xml b/app/src/main/res/drawable/user_circle_dashed.xml new file mode 100644 index 000000000..b45871083 --- /dev/null +++ b/app/src/main/res/drawable/user_circle_dashed.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/user_circle_minus.xml b/app/src/main/res/drawable/user_circle_minus.xml new file mode 100644 index 000000000..412154d17 --- /dev/null +++ b/app/src/main/res/drawable/user_circle_minus.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/user_circle_plus.xml b/app/src/main/res/drawable/user_circle_plus.xml new file mode 100644 index 000000000..d9a95fc81 --- /dev/null +++ b/app/src/main/res/drawable/user_circle_plus.xml @@ -0,0 +1,9 @@ + + +