From 787fefc237f0a31a59a37b1aa78cf2b9d7d1147d Mon Sep 17 00:00:00 2001 From: jubb Date: Thu, 25 Nov 2021 17:23:48 +1100 Subject: [PATCH] refactor: change the call logos in control messages --- .../conversation/v2/messages/ControlMessageView.kt | 11 ++++++++++- .../main/res/drawable/ic_baseline_call_made_24.xml | 11 +++++++++++ .../main/res/drawable/ic_baseline_call_missed_24.xml | 11 +++++++++++ .../res/drawable/ic_baseline_call_received_24.xml | 11 +++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/drawable/ic_baseline_call_made_24.xml create mode 100644 app/src/main/res/drawable/ic_baseline_call_missed_24.xml create mode 100644 app/src/main/res/drawable/ic_baseline_call_received_24.xml diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt index dcdbf53b8a..5e28489cd3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt @@ -1,10 +1,12 @@ package org.thoughtcrime.securesms.conversation.v2.messages import android.content.Context +import android.content.res.ColorStateList import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import android.widget.LinearLayout +import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import androidx.recyclerview.widget.RecyclerView import kotlinx.android.synthetic.main.view_control_message.view.* @@ -27,6 +29,8 @@ class ControlMessageView : LinearLayout { // region Updating fun bind(message: MessageRecord) { iconImageView.visibility = View.GONE + val tintColor = if (message.isMissedCall) R.color.destructive else R.color.text + iconImageView.imageTintList = ColorStateList.valueOf(ContextCompat.getColor(context,tintColor)) if (message.isExpirationTimerUpdate) { iconImageView.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.ic_timer, context.theme)) iconImageView.visibility = View.VISIBLE @@ -34,7 +38,12 @@ class ControlMessageView : LinearLayout { iconImageView.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.ic_file_download_white_36dp, context.theme)) iconImageView.visibility = View.VISIBLE } else if (message.isCallLog) { - iconImageView.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.ic_baseline_call_24, context.theme)) + val drawable = when { + message.isIncomingCall -> R.drawable.ic_baseline_call_received_24 + message.isOutgoingCall -> R.drawable.ic_baseline_call_made_24 + else -> R.drawable.ic_baseline_call_missed_24 + } + iconImageView.setImageDrawable(ResourcesCompat.getDrawable(resources, drawable, context.theme)) iconImageView.visibility = View.VISIBLE } textView.text = message.getDisplayBody(context) diff --git a/app/src/main/res/drawable/ic_baseline_call_made_24.xml b/app/src/main/res/drawable/ic_baseline_call_made_24.xml new file mode 100644 index 0000000000..2183fbc7f5 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_call_made_24.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_call_missed_24.xml b/app/src/main/res/drawable/ic_baseline_call_missed_24.xml new file mode 100644 index 0000000000..28958d07ab --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_call_missed_24.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_call_received_24.xml b/app/src/main/res/drawable/ic_baseline_call_received_24.xml new file mode 100644 index 0000000000..05192f9f30 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_call_received_24.xml @@ -0,0 +1,11 @@ + + +