diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt index 76f88c350..60226b85a 100644 --- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt +++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt @@ -1024,7 +1024,7 @@ class NotificationsManager @MainThread constructor(private val context: Context) PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE ) return NotificationCompat.Action.Builder( - R.drawable.paper_plane_tilt, + R.drawable.paper_plane_right, context.getString(R.string.notification_reply_to_message), replyPendingIntent ) diff --git a/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt b/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt index 52582f4ea..1ace2ced1 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt @@ -30,7 +30,7 @@ import androidx.recyclerview.widget.RecyclerView import org.linphone.R import org.linphone.databinding.ChatBubbleIncomingBinding import org.linphone.databinding.ChatBubbleOutgoingBinding -import org.linphone.databinding.ChatEventBinding +import org.linphone.databinding.ChatConversationEventBinding import org.linphone.ui.main.chat.model.EventLogModel import org.linphone.ui.main.chat.model.EventModel import org.linphone.ui.main.chat.model.MessageModel @@ -135,9 +135,9 @@ class ConversationEventAdapter : ListAdapter AppUtils.getString( @@ -81,6 +85,25 @@ class EventModel @WorkerThread constructor(private val eventLog: EventLog) { eventLog.type.name } } + + icon = ResourcesCompat.getDrawable( + coreContext.context.resources, + when (eventLog.type) { + EventLog.Type.ConferenceEphemeralMessageEnabled, + EventLog.Type.ConferenceEphemeralMessageDisabled, + EventLog.Type.ConferenceEphemeralMessageLifetimeChanged -> { + R.drawable.clock_countdown + } + EventLog.Type.ConferenceTerminated -> { + R.drawable.x + } + EventLog.Type.ConferenceSubjectChanged -> { + R.drawable.pencil_simple + } + else -> R.drawable.user_circle + }, + coreContext.context.theme + ) } @WorkerThread diff --git a/app/src/main/res/drawable/paper_plane_right.xml b/app/src/main/res/drawable/paper_plane_right.xml new file mode 100644 index 000000000..274503570 --- /dev/null +++ b/app/src/main/res/drawable/paper_plane_right.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/paper_plane_tilt.xml b/app/src/main/res/drawable/paper_plane_tilt.xml deleted file mode 100644 index f24c657d7..000000000 --- a/app/src/main/res/drawable/paper_plane_tilt.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/chat_bubble_long_press_menu.xml b/app/src/main/res/layout/chat_bubble_long_press_menu.xml index ff173334e..bba560552 100644 --- a/app/src/main/res/layout/chat_bubble_long_press_menu.xml +++ b/app/src/main/res/layout/chat_bubble_long_press_menu.xml @@ -206,7 +206,7 @@ android:text="@string/menu_resend_chat_message" android:background="@drawable/menu_item_background" android:layout_marginBottom="1dp" - android:drawableStart="@drawable/paper_plane_tilt" + android:drawableStart="@drawable/paper_plane_right" android:visibility="@{model.isInError && model.isOutgoing ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintBottom_toTopOf="@id/reply" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/chat_conversation_event.xml b/app/src/main/res/layout/chat_conversation_event.xml new file mode 100644 index 000000000..ca03d2913 --- /dev/null +++ b/app/src/main/res/layout/chat_conversation_event.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/chat_conversation_record_voice_message_area.xml b/app/src/main/res/layout/chat_conversation_record_voice_message_area.xml index 074174ce3..851c7dfd1 100644 --- a/app/src/main/res/layout/chat_conversation_record_voice_message_area.xml +++ b/app/src/main/res/layout/chat_conversation_record_voice_message_area.xml @@ -124,7 +124,7 @@ android:layout_marginEnd="4dp" android:onClick="@{() -> viewModel.sendMessage()}" android:padding="8dp" - android:src="@drawable/paper_plane_tilt" + android:src="@drawable/paper_plane_right" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/chat_conversation_send_area_bottom_sheet.xml b/app/src/main/res/layout/chat_conversation_send_area_bottom_sheet.xml index b86478b3d..90eedd62d 100644 --- a/app/src/main/res/layout/chat_conversation_send_area_bottom_sheet.xml +++ b/app/src/main/res/layout/chat_conversation_send_area_bottom_sheet.xml @@ -145,7 +145,7 @@ android:visibility="@{viewModel.textToSend.length() > 0 || viewModel.attachments.size() > 0 ? View.VISIBLE : View.GONE, default=gone}" android:onClick="@{() -> viewModel.sendMessage()}" android:padding="8dp" - android:src="@drawable/paper_plane_tilt" + android:src="@drawable/paper_plane_right" app:layout_constraintBottom_toBottomOf="@id/message_area_background" app:layout_constraintEnd_toEndOf="@id/message_area_background" app:layout_constraintTop_toTopOf="@id/message_area_background" diff --git a/app/src/main/res/layout/chat_event.xml b/app/src/main/res/layout/chat_event.xml deleted file mode 100644 index cc55cc1b4..000000000 --- a/app/src/main/res/layout/chat_event.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file