diff --git a/app/src/main/java/org/linphone/activities/main/chat/adapters/ImdnAdapter.kt b/app/src/main/java/org/linphone/activities/main/chat/adapters/ImdnAdapter.kt index e5cf89bad..f55341540 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/adapters/ImdnAdapter.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/adapters/ImdnAdapter.kt @@ -84,22 +84,22 @@ class ImdnAdapter( ChatMessage.State.Displayed -> { binding.title = R.string.chat_message_imdn_displayed binding.textColor = R.color.imdn_read_color - binding.icon = R.drawable.message_read + binding.icon = R.drawable.chat_read } ChatMessage.State.DeliveredToUser -> { binding.title = R.string.chat_message_imdn_delivered binding.textColor = R.color.grey_color - binding.icon = R.drawable.message_delivered + binding.icon = R.drawable.chat_delivered } ChatMessage.State.Delivered -> { binding.title = R.string.chat_message_imdn_sent binding.textColor = R.color.grey_color - binding.icon = R.drawable.message_delivered + binding.icon = R.drawable.chat_delivered } ChatMessage.State.NotDelivered -> { binding.title = R.string.chat_message_imdn_undelivered binding.textColor = R.color.red_color - binding.icon = R.drawable.message_undelivered + binding.icon = R.drawable.chat_error } } binding.executePendingBindings() diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageViewModel.kt index eb41ab725..d67ebc72a 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageViewModel.kt @@ -160,9 +160,9 @@ class ChatMessageViewModel( } imdnIcon.value = when (state) { - ChatMessage.State.DeliveredToUser -> R.drawable.imdn_received - ChatMessage.State.Displayed -> R.drawable.imdn_read - else -> R.drawable.imdn_error + ChatMessage.State.DeliveredToUser -> R.drawable.chat_delivered + ChatMessage.State.Displayed -> R.drawable.chat_read + else -> R.drawable.chat_error } } diff --git a/app/src/main/res/drawable-xhdpi/chat_delivered.png b/app/src/main/res/drawable-xhdpi/chat_delivered.png new file mode 100644 index 000000000..b49e4e7e8 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/chat_delivered.png differ diff --git a/app/src/main/res/drawable-xhdpi/chat_error.png b/app/src/main/res/drawable-xhdpi/chat_error.png new file mode 100644 index 000000000..1979db520 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/chat_error.png differ diff --git a/app/src/main/res/drawable-xhdpi/chat_group_delete.png b/app/src/main/res/drawable-xhdpi/chat_group_delete.png index b5e68df20..18b42abed 100644 Binary files a/app/src/main/res/drawable-xhdpi/chat_group_delete.png and b/app/src/main/res/drawable-xhdpi/chat_group_delete.png differ diff --git a/app/src/main/res/drawable-xhdpi/chat_read.png b/app/src/main/res/drawable-xhdpi/chat_read.png new file mode 100644 index 000000000..5c00f33e6 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/chat_read.png differ diff --git a/app/src/main/res/drawable-xhdpi/imdn_error.png b/app/src/main/res/drawable-xhdpi/imdn_error.png deleted file mode 100644 index c3f8b3251..000000000 Binary files a/app/src/main/res/drawable-xhdpi/imdn_error.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/imdn_read.png b/app/src/main/res/drawable-xhdpi/imdn_read.png deleted file mode 100644 index 534ea87cf..000000000 Binary files a/app/src/main/res/drawable-xhdpi/imdn_read.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/imdn_received.png b/app/src/main/res/drawable-xhdpi/imdn_received.png deleted file mode 100644 index 592684b07..000000000 Binary files a/app/src/main/res/drawable-xhdpi/imdn_received.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/message_delivered.png b/app/src/main/res/drawable-xhdpi/message_delivered.png deleted file mode 100644 index 3ce176076..000000000 Binary files a/app/src/main/res/drawable-xhdpi/message_delivered.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/message_read.png b/app/src/main/res/drawable-xhdpi/message_read.png deleted file mode 100644 index 94587d935..000000000 Binary files a/app/src/main/res/drawable-xhdpi/message_read.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/message_undelivered.png b/app/src/main/res/drawable-xhdpi/message_undelivered.png deleted file mode 100644 index 764d90627..000000000 Binary files a/app/src/main/res/drawable-xhdpi/message_undelivered.png and /dev/null differ diff --git a/app/src/main/res/layout/chat_message_list_cell.xml b/app/src/main/res/layout/chat_message_list_cell.xml index 4cb6dfcba..29ad6e347 100644 --- a/app/src/main/res/layout/chat_message_list_cell.xml +++ b/app/src/main/res/layout/chat_message_list_cell.xml @@ -49,7 +49,7 @@ + android:src="@{icon, default=@drawable/chat_read}" />