This commit is contained in:
daniel.boehrs
2018-10-30 10:02:16 +01:00
parent d8ccf5ed6d
commit 76a8a724ff
3 changed files with 15 additions and 5 deletions
@@ -45,6 +45,18 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/group_indicator"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_group_white_24dp"
android:visibility="gone"
android:tint="@color/gray50"
android:layout_marginTop="1dp"
android:layout_marginRight="5dp"
android:layout_marginEnd="5dp" />
<org.thoughtcrime.securesms.components.FromTextView
android:id="@+id/from_text"
style="@style/Signal.Text.Body"
@@ -20,8 +20,6 @@ import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Color;
import android.graphics.Typeface;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.Spannable;
@@ -83,6 +81,7 @@ public class ConversationListItem extends RelativeLayout
private DeliveryStatusView deliveryStatusIndicator;
private ImageView unreadIndicator;
private ImageView verifiedIndicator;
private ImageView groupIndicator;
private long lastSeen;
private int unreadCount;
@@ -107,6 +106,7 @@ public class ConversationListItem extends RelativeLayout
this.archivedView = findViewById(R.id.archived);
this.unreadIndicator = findViewById(R.id.unread_indicator);
this.verifiedIndicator = findViewById(R.id.verified_indicator);
this.groupIndicator = findViewById(R.id.group_indicator);
ViewUtil.setTextViewGravityStart(this.fromView, getContext());
ViewUtil.setTextViewGravityStart(this.subjectView, getContext());
@@ -172,6 +172,7 @@ public class ConversationListItem extends RelativeLayout
}
verifiedIndicator.setVisibility(thread.isVerified() ? VISIBLE : GONE);
groupIndicator.setVisibility(recipient.isGroupRecipient() ? VISIBLE : GONE);
}
public void bind(@NonNull Recipient contact,
@@ -27,7 +27,6 @@ import android.util.Log;
import com.annimon.stream.function.Consumer;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.color.MaterialColor;
import org.thoughtcrime.securesms.connect.ApplicationDcContext;
import org.thoughtcrime.securesms.connect.DcHelper;
@@ -37,7 +36,6 @@ import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.GroupRecordContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.SystemContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.TransparentContactPhoto;
import org.thoughtcrime.securesms.database.Address;
@@ -438,7 +436,6 @@ public class Recipient implements RecipientModifiedListener {
public synchronized @NonNull FallbackContactPhoto getFallbackContactPhoto() {
if (isResolving()) return new TransparentContactPhoto();
else if (isGroupRecipient()) return new ResourceContactPhoto(R.drawable.ic_group_white_24dp, R.drawable.ic_group_large);
else if (!TextUtils.isEmpty(name)) return new GeneratedContactPhoto(name);
else return new GeneratedContactPhoto("#");
}