Merge branch 'incoming-bombs' into '804-self-destructing-messages'

Fix bomb icon color in incoming image messages without text

See merge request briar/briar!1358

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java

@@ -2,6 +2,7 @@ package org.briarproject.briar.android.conversation;
 
 import android.content.Context;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@@ -30,7 +31,7 @@ abstract class ConversationItemViewHolder extends ViewHolder {
 	private final OutItemViewHolder outViewHolder;
 	private final TextView topNotice, text;
 	protected final TextView time;
-	private final View bomb;
+	protected final ImageView bomb;
 	@Nullable
 	private String itemKey = null;
 
@@ -38,7 +39,7 @@ abstract class ConversationItemViewHolder extends ViewHolder {
 			boolean isIncoming) {
 		super(v);
 		this.listener = listener;
-		this.outViewHolder = isIncoming ? null : new OutItemViewHolder(v);
+		outViewHolder = isIncoming ? null : new OutItemViewHolder(v);
 		root = v;
 		topNotice = v.findViewById(R.id.topNotice);
 		layout = v.findViewById(R.id.layout);

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageViewHolder.java

@@ -1,5 +1,6 @@
 package org.briarproject.briar.android.conversation;
 
+import android.content.res.ColorStateList;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -14,6 +15,7 @@ import androidx.recyclerview.widget.RecyclerView.RecycledViewPool;
 
 import static androidx.constraintlayout.widget.ConstraintSet.WRAP_CONTENT;
 import static androidx.core.content.ContextCompat.getColor;
+import static androidx.core.widget.ImageViewCompat.setImageTintList;
 
 @UiThread
 @NotNullByDefault
@@ -84,6 +86,7 @@ class ConversationMessageViewHolder extends ConversationItemViewHolder {
 		if (item.getText() == null) {
 			statusLayout.setBackgroundResource(R.drawable.msg_status_bubble);
 			time.setTextColor(timeColorBubble);
+			setImageTintList(bomb, ColorStateList.valueOf(timeColorBubble));
 			constraintSet = imageConstraints;
 		} else {
 			resetStatusLayoutForText();
@@ -111,6 +114,7 @@ class ConversationMessageViewHolder extends ConversationItemViewHolder {
 		// also reset padding (the background drawable defines some)
 		statusLayout.setPadding(0, 0, 0, 0);
 		time.setTextColor(timeColor);
+		setImageTintList(bomb, ColorStateList.valueOf(timeColor));
 	}
 
 }

briar-android/src/main/res/layout/list_item_conversation_msg_image_text.xml

@@ -60,7 +60,8 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintHorizontal_bias="1.0"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/text">
+		app:layout_constraintTop_toBottomOf="@+id/text"
+		tools:ignore="UseCompoundDrawables">
 
 		<TextView
 			android:id="@+id/time"

briar-android/src/main/res/layout/list_item_conversation_msg_out.xml

@@ -89,12 +89,14 @@
 				android:layout_marginEnd="4dp"
 				android:layout_marginRight="4dp"
 				app:srcCompat="@drawable/ic_bomb"
+				app:tint="@color/private_message_date_inverse"
 				tools:ignore="ContentDescription" />
 
 			<ImageView
 				android:id="@+id/status"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
+				app:tint="@color/private_message_date_inverse"
 				tools:ignore="ContentDescription"
 				tools:src="@drawable/message_delivered" />
 

briar-android/src/main/res/layout/list_item_conversation_notice_out.xml

@@ -69,6 +69,7 @@
 			app:layout_constraintStart_toEndOf="@+id/time"
 			app:layout_constraintTop_toTopOf="@+id/time"
 			app:srcCompat="@drawable/ic_bomb"
+			app:tint="@color/private_message_date_inverse"
 			tools:ignore="ContentDescription" />
 
 		<ImageView
@@ -80,6 +81,7 @@
 			app:layout_constraintBottom_toBottomOf="@+id/time"
 			app:layout_constraintStart_toEndOf="@+id/bomb"
 			app:layout_constraintTop_toTopOf="@+id/time"
+			app:tint="@color/private_message_date_inverse"
 			tools:ignore="ContentDescription"
 			tools:src="@drawable/message_delivered" />