Feature/lucide icons pt3

app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java

@@ -308,7 +308,7 @@ public void onAnimationEnd(Animator animation) {
     public void onAuthenticationFailed() {
       Log.w(TAG, "onAuthenticationFailed()");
 
-      fingerprintPrompt.setImageResource(R.drawable.ic_close_white_48dp);
+      fingerprintPrompt.setImageResource(R.drawable.ic_x);
       fingerprintPrompt.getBackground().setColorFilter(errorColor, PorterDuff.Mode.SRC_IN);
 
       TranslateAnimation shake = new TranslateAnimation(0, 30, 0, 0);

app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt

@@ -17,6 +17,7 @@ import android.widget.Space
 import android.widget.TextView
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorRes
+import androidx.annotation.DrawableRes
 import androidx.annotation.LayoutRes
 import androidx.annotation.StringRes
 import androidx.annotation.StyleRes
@@ -111,8 +112,6 @@ class SessionDialogBuilder(val context: Context) {
 
     fun view(@LayoutRes layout: Int): View = LayoutInflater.from(context).inflate(layout, contentView)
 
-    fun iconAttribute(@AttrRes icon: Int): AlertDialog.Builder = dialogBuilder.setIconAttribute(icon)
-
     fun singleChoiceItems(
         options: Collection<String>,
         currentSelected: Int = 0,

app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java

@@ -39,7 +39,7 @@ public SearchToolbar(Context context, @Nullable AttributeSet attrs, int defStyle
   }
 
   private void initialize() {
-    setNavigationIcon(getContext().getResources().getDrawable(R.drawable.ic_baseline_clear_24));
+    setNavigationIcon(getContext().getResources().getDrawable(R.drawable.ic_x));
     inflateMenu(R.menu.conversation_list_search);
 
     this.searchItem = getMenu().findItem(R.id.action_filter_search);

app/src/main/java/org/thoughtcrime/securesms/components/dialogs/DeleteMediaPreviewDialog.kt

@@ -9,7 +9,6 @@ class DeleteMediaPreviewDialog {
         @JvmStatic
         fun show(context: Context, doDelete: Runnable) {
             context.showSessionDialog {
-                iconAttribute(R.attr.dialog_alert_icon)
                 title(context.resources.getQuantityString(R.plurals.deleteMessage, 1, 1))
                 text(R.string.deleteMessageDescriptionEveryone)
                 dangerButton(R.string.delete) { doDelete.run() }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt

@@ -3,11 +3,15 @@ package org.thoughtcrime.securesms.conversation.v2.messages
 import android.Manifest
 import android.content.Context
 import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.drawable.BitmapDrawable
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.LinearLayout
+import androidx.compose.ui.graphics.Color
 import androidx.core.content.res.ResourcesCompat
+import androidx.core.graphics.drawable.toBitmap
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
@@ -57,6 +61,10 @@ class ControlMessageView : LinearLayout {
 
     val controlContentView: View get() = binding.controlContentView
 
+    val iconSize by lazy {
+        resources.getDimensionPixelSize(R.dimen.medium_spacing)
+    }
+
     init {
         layoutParams = RecyclerView.LayoutParams(RecyclerView.LayoutParams.MATCH_PARENT, RecyclerView.LayoutParams.WRAP_CONTENT)
     }
@@ -127,15 +135,30 @@ class ControlMessageView : LinearLayout {
                 binding.root.contentDescription = context.getString(R.string.AccessibilityId_message_request_config_message)
             }
             message.isCallLog -> {
-                val drawable = when {
-                    message.isIncomingCall -> R.drawable.ic_incoming_call
-                    message.isOutgoingCall -> R.drawable.ic_outgoing_call
+                val drawableRes = when {
+                    message.isIncomingCall -> R.drawable.ic_phone_incoming
+                    message.isOutgoingCall -> R.drawable.ic_phone_outgoing
                     else -> R.drawable.ic_missed_call
                 }
+
+                // Since this is using text drawable we need to go the long way around to size and style the drawable
+                // We could set the colour and style directly in the drawable's xml but it then makes it non reusable
+                // This will all be simplified  once we turn this all to Compose
+                val icon = ResourcesCompat.getDrawable(resources, drawableRes, context.theme)?.toBitmap()
+                icon?.let{
+                    val drawable = BitmapDrawable(resources, Bitmap.createScaledBitmap(icon, iconSize, iconSize, true));
+                    binding.callTextView.setCompoundDrawablesRelativeWithIntrinsicBounds(
+                        drawable,null, null, null)
+
+                    val iconTint = when {
+                        message.isIncomingCall || message.isOutgoingCall -> R.attr.message_received_text_color
+                        else -> R.attr.danger
+                    }
+
+                    drawable.setTint(context.getColorFromAttr(iconTint))
+                }
+
                 binding.textView.isVisible = false
-                binding.callTextView.setCompoundDrawablesRelativeWithIntrinsicBounds(
-                    ResourcesCompat.getDrawable(resources, drawable, context.theme),
-                    null, null, null)
                 binding.callTextView.text = messageBody
 
                 if (message.expireStarted > 0 && message.expiresIn > 0) {

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt

@@ -394,13 +394,13 @@ class VisibleMessageView : FrameLayout {
 
     private fun getMessageStatusInfo(message: MessageRecord): MessageStatusInfo? = when {
         message.isFailed ->
-            MessageStatusInfo(R.drawable.ic_delivery_status_failed,
+            MessageStatusInfo(R.drawable.ic_triangle_alert,
                 getThemedColor(context, R.attr.danger),
                 R.string.messageStatusFailedToSend
             )
         message.isSyncFailed ->
             MessageStatusInfo(
-                R.drawable.ic_delivery_status_failed,
+                R.drawable.ic_triangle_alert,
                 context.getColor(R.color.accent_orange),
                 R.string.messageStatusFailedToSync
             )