Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 04:39:54 +01:00
Code Issues Projects Releases Wiki Activity

Fix bomb icon color

Browse Source 
in incoming image messages without text (on old phones)
This commit is contained in:
Torsten Grote
2021-02-04 16:43:46 -03:00
parent f6ccf885e6
commit 22fb2df3dc
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

3
briar-android/src/main/res/layout/list_item_conversation_msg_image_text.xml
View File

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