Add badges to Avatars in a variety of places.

app/src/main/java/org/thoughtcrime/securesms/animation/transitions/CircleAvatarTransition.kt

@@ -14,7 +14,6 @@ import android.view.animation.AccelerateInterpolator
 import android.view.animation.DecelerateInterpolator
 import android.view.animation.Interpolator
 import androidx.annotation.RequiresApi
-import org.thoughtcrime.securesms.components.AvatarImageView
 
 private const val POSITION_ON_SCREEN = "signal.circleavatartransition.positiononscreen"
 private const val WIDTH = "signal.circleavatartransition.width"
@@ -36,7 +35,7 @@ class CircleAvatarTransition(context: Context, attrs: AttributeSet?) : Transitio
   private fun captureValues(transitionValues: TransitionValues) {
     val view: View = transitionValues.view
 
-    if (view is AvatarImageView) {
+    if (view.transitionName == "avatar") {
       val topLeft = intArrayOf(0, 0)
       view.getLocationOnScreen(topLeft)
       transitionValues.values[POSITION_ON_SCREEN] = topLeft
@@ -51,7 +50,7 @@ class CircleAvatarTransition(context: Context, attrs: AttributeSet?) : Transitio
     }
 
     val view: View = endValues.view
-    if (view !is AvatarImageView || view.transitionName != "avatar") {
+    if (view.transitionName != "avatar") {
       return null
     }
 

app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt

@@ -0,0 +1,75 @@
+package org.thoughtcrime.securesms.badges
+
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.Drawable
+import android.util.AttributeSet
+import androidx.annotation.ColorInt
+import androidx.annotation.Px
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.core.content.res.use
+import androidx.lifecycle.Lifecycle
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.Badges.insetWithOutline
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.mms.GlideApp
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.util.ViewUtil
+import org.thoughtcrime.securesms.util.visible
+
+private val TAG = Log.tag(BadgeImageView::class.java)
+
+class BadgeImageView @JvmOverloads constructor(
+  context: Context,
+  attrs: AttributeSet? = null
+) : AppCompatImageView(context, attrs) {
+
+  @Px
+  private var outlineWidth: Float = 0f
+
+  @ColorInt
+  private var outlineColor: Int = Color.BLACK
+
+  init {
+    context.obtainStyledAttributes(attrs, R.styleable.BadgeImageView).use {
+      outlineWidth = it.getDimension(R.styleable.BadgeImageView_badge_outline_width, 0f)
+      outlineColor = it.getColor(R.styleable.BadgeImageView_badge_outline_color, Color.BLACK)
+    }
+  }
+
+  fun setBadgeFromRecipient(recipient: Recipient?) {
+    if (recipient == null || recipient.badges.isEmpty()) {
+      setBadge(null)
+    } else {
+      setBadge(recipient.badges[0])
+    }
+  }
+
+  fun setBadge(badge: Badge?) {
+    visible = badge != null
+
+    val lifecycle = ViewUtil.getActivityLifecycle(this)
+    if (lifecycle?.currentState == Lifecycle.State.DESTROYED) {
+      Log.w(TAG, "Ignoring setBadge call for destroyed activity.")
+      return
+    }
+
+    GlideApp
+      .with(this)
+      .load(badge)
+      .into(this)
+  }
+
+  override fun setImageDrawable(drawable: Drawable?) {
+    if (drawable == null || outlineWidth == 0f) {
+      super.setImageDrawable(drawable)
+    } else {
+      super.setImageDrawable(
+        drawable.insetWithOutline(
+          outlineWidth, outlineColor
+        )
+      )
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt

@@ -5,6 +5,7 @@ import android.widget.TextView
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.Navigation
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.BadgeImageView
 import org.thoughtcrime.securesms.components.AvatarImageView
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
@@ -162,6 +163,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
 
     private val avatarView: AvatarImageView = itemView.findViewById(R.id.icon)
     private val aboutView: TextView = itemView.findViewById(R.id.about)
+    private val badgeView: BadgeImageView = itemView.findViewById(R.id.badge)
 
     override fun bind(model: BioPreference) {
       super.bind(model)
@@ -171,6 +173,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
       titleView.text = model.recipient.profileName.toString()
       summaryView.text = PhoneNumberFormatter.prettyPrint(model.recipient.requireE164())
       avatarView.setRecipient(Recipient.self())
+      badgeView.setBadgeFromRecipient(Recipient.self())
 
       titleView.visibility = View.VISIBLE
       summaryView.visibility = View.VISIBLE

app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt

@@ -259,6 +259,9 @@ class ConversationSettingsFragment : DSLSettingsFragment(
                 )
               }
             }
+          },
+          onBadgeClick = { badge ->
+            ViewBadgeBottomSheetDialogFragment.show(parentFragmentManager, state.recipient.id, badge)
           }
         )
       )

app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/AvatarPreference.kt

@@ -3,6 +3,8 @@ package org.thoughtcrime.securesms.components.settings.conversation.preferences
 import android.view.View
 import androidx.core.view.ViewCompat
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.BadgeImageView
+import org.thoughtcrime.securesms.badges.models.Badge
 import org.thoughtcrime.securesms.components.AvatarImageView
 import org.thoughtcrime.securesms.components.settings.PreferenceModel
 import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto
@@ -23,7 +25,8 @@ object AvatarPreference {
 
   class Model(
     val recipient: Recipient,
-    val onAvatarClick: (View) -> Unit
+    val onAvatarClick: (View) -> Unit,
+    val onBadgeClick: (Badge) -> Unit
   ) : PreferenceModel<Model>() {
     override fun areItemsTheSame(newItem: Model): Boolean {
       return recipient == newItem.recipient
@@ -36,11 +39,23 @@ object AvatarPreference {
 
   private class ViewHolder(itemView: View) : MappingViewHolder<Model>(itemView) {
     private val avatar: AvatarImageView = itemView.findViewById<AvatarImageView>(R.id.bio_preference_avatar).apply {
-      ViewCompat.setTransitionName(this, "avatar")
       setFallbackPhotoProvider(AvatarPreferenceFallbackPhotoProvider())
     }
 
+    private val badge: BadgeImageView = itemView.findViewById(R.id.bio_preference_badge)
+
+    init {
+      ViewCompat.setTransitionName(avatar.parent as View, "avatar")
+    }
+
     override fun bind(model: Model) {
+      badge.setBadgeFromRecipient(model.recipient)
+      badge.setOnClickListener {
+        val badge = model.recipient.badges.firstOrNull()
+        if (badge != null) {
+          model.onBadgeClick(badge)
+        }
+      }
       avatar.setAvatar(model.recipient)
       avatar.disableQuickContact()
       avatar.setOnClickListener { model.onAvatarClick(avatar) }

app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java

@@ -5,7 +5,6 @@ import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.CheckBox;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -14,6 +13,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.badges.BadgeImageView;
 import org.thoughtcrime.securesms.components.AvatarImageView;
 import org.thoughtcrime.securesms.components.FromTextView;
 import org.thoughtcrime.securesms.mms.GlideRequests;
@@ -37,6 +37,7 @@ public class ContactSelectionListItem extends ConstraintLayout implements Recipi
   private TextView        labelView;
   private CheckBox        checkBox;
   private View            smsTag;
+  private BadgeImageView  badge;
 
   private String           number;
   private String           chipName;
@@ -65,6 +66,7 @@ public class ContactSelectionListItem extends ConstraintLayout implements Recipi
     this.nameView          = findViewById(R.id.name);
     this.checkBox          = findViewById(R.id.check_box);
     this.smsTag            = findViewById(R.id.sms_tag);
+    this.badge             = findViewById(R.id.contact_badge);
 
     ViewUtil.setTextViewGravityStart(this.nameView, getContext());
   }
@@ -118,6 +120,8 @@ public class ContactSelectionListItem extends ConstraintLayout implements Recipi
     }
 
     this.checkBox.setVisibility(checkboxVisible ? View.VISIBLE : View.GONE);
+
+    badge.setBadgeFromRecipient(recipientSnapshot);
   }
 
   public void setChecked(boolean selected, boolean animate) {
@@ -229,6 +233,7 @@ public class ContactSelectionListItem extends ConstraintLayout implements Recipi
       contactPhotoImage.setAvatar(glideRequests, recipient, false);
       setText(recipient, contactType, contactName, contactNumber, contactLabel, contactAbout);
       smsTag.setVisibility(recipient.isRegistered() ? GONE : VISIBLE);
+      badge.setBadgeFromRecipient(recipient);
     } else {
       Log.w(TAG, "Bad change! Local recipient doesn't match. Ignoring. Local: " + (this.recipient == null ? "null" : this.recipient.getId()) + ", Changed: " + recipient.getId());
     }

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationBannerView.java

@@ -12,6 +12,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.badges.BadgeImageView;
 import org.thoughtcrime.securesms.components.AvatarImageView;
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
 import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
@@ -29,6 +30,7 @@ public class ConversationBannerView extends ConstraintLayout {
   private TextView        contactSubtitle;
   private EmojiTextView   contactDescription;
   private View            tapToView;
+  private BadgeImageView  contactBadge;
 
   public ConversationBannerView(Context context) {
     this(context, null);
@@ -44,6 +46,7 @@ public class ConversationBannerView extends ConstraintLayout {
     inflate(getContext(), R.layout.conversation_banner_view, this);
 
     contactAvatar      = findViewById(R.id.message_request_avatar);
+    contactBadge       = findViewById(R.id.message_request_badge);
     contactTitle       = findViewById(R.id.message_request_title);
     contactAbout       = findViewById(R.id.message_request_about);
     contactSubtitle    = findViewById(R.id.message_request_subtitle);
@@ -53,6 +56,10 @@ public class ConversationBannerView extends ConstraintLayout {
     contactAvatar.setFallbackPhotoProvider(new FallbackPhotoProvider());
   }
 
+  public void setBadge(@Nullable Recipient recipient) {
+    contactBadge.setBadgeFromRecipient(recipient);
+  }
+
   public void setAvatar(@NonNull GlideRequests requests, @Nullable Recipient recipient) {
     contactAvatar.setAvatar(requests, recipient, false);
 

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java

@@ -55,6 +55,7 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
 import androidx.core.app.ActivityOptionsCompat;
 import androidx.core.text.HtmlCompat;
+import androidx.core.view.ViewCompat;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
@@ -579,6 +580,8 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
     int          pendingMemberCount = recipientInfo.getGroupPendingMemberCount();
     List<String> groups             = recipientInfo.getSharedGroups();
 
+    conversationBanner.setBadge(recipient);
+
     if (recipient != null) {
       conversationBanner.setAvatar(GlideApp.with(context), recipient);
       conversationBanner.showBackgroundBubble(recipient.hasWallpaper());
@@ -1510,6 +1513,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
     @Override
     public void onSharedContactDetailsClicked(@NonNull Contact contact, @NonNull View avatarTransitionView) {
       if (getContext() != null && getActivity() != null) {
+        ViewCompat.setTransitionName(avatarTransitionView, "avatar");
         Bundle bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(getActivity(), avatarTransitionView, "avatar").toBundle();
         ActivityCompat.startActivity(getActivity(), SharedContactDetailsActivity.getIntent(getContext(), contact), bundle);
       }

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java

@@ -1788,7 +1788,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
     @Override
     public void onClick(View view) {
       if (eventListener != null && batchSelected.isEmpty() && messageRecord.isMms() && !((MmsMessageRecord) messageRecord).getSharedContacts().isEmpty()) {
-        eventListener.onSharedContactDetailsClicked(((MmsMessageRecord) messageRecord).getSharedContacts().get(0), sharedContactStub.get().getAvatarView());
+        eventListener.onSharedContactDetailsClicked(((MmsMessageRecord) messageRecord).getSharedContacts().get(0), (View) sharedContactStub.get().getAvatarView().getParent());
       } else {
         passthroughClickListener.onClick(view);
       }

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java

@@ -19,6 +19,8 @@ import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.badges.BadgeImageView;
+import org.thoughtcrime.securesms.badges.models.Badge;
 import org.thoughtcrime.securesms.components.AvatarImageView;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.LiveRecipient;
@@ -31,6 +33,7 @@ import java.util.Objects;
 public class ConversationTitleView extends RelativeLayout {
 
   private AvatarImageView avatar;
+  private BadgeImageView  badge;
   private TextView        title;
   private TextView        subtitle;
   private ImageView       verified;
@@ -52,6 +55,7 @@ public class ConversationTitleView extends RelativeLayout {
     super.onFinishInflate();
 
     this.title                    = findViewById(R.id.title);
+    this.badge                    = findViewById(R.id.badge);
     this.subtitle                 = findViewById(R.id.subtitle);
     this.verified                 = findViewById(R.id.verified_indicator);
     this.subtitleContainer        = findViewById(R.id.subtitle_container);
@@ -102,6 +106,8 @@ public class ConversationTitleView extends RelativeLayout {
       this.avatar.setAvatar(glideRequests, recipient, false);
     }
 
+    badge.setBadgeFromRecipient(recipient);
+
     updateVerifiedSubtitleVisibility();
   }
 

app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java

@@ -42,6 +42,7 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.BindableConversationListItem;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.Unbindable;
+import org.thoughtcrime.securesms.badges.BadgeImageView;
 import org.thoughtcrime.securesms.components.AlertView;
 import org.thoughtcrime.securesms.components.AvatarImageView;
 import org.thoughtcrime.securesms.components.DeliveryStatusView;
@@ -105,6 +106,7 @@ public final class ConversationListItem extends ConstraintLayout
   private boolean             batchMode;
   private Locale              locale;
   private String              highlightSubstring;
+  private BadgeImageView      badge;
 
   private int             unreadCount;
   private AvatarImageView contactPhotoImage;
@@ -135,6 +137,7 @@ public final class ConversationListItem extends ConstraintLayout
     this.thumbnailView           = findViewById(R.id.conversation_list_item_thumbnail);
     this.archivedView            = findViewById(R.id.conversation_list_item_archived);
     this.unreadIndicator         = findViewById(R.id.conversation_list_item_unread_indicator);
+    this.badge                   = findViewById(R.id.conversation_list_item_badge);
     thumbnailView.setClickable(false);
   }
 
@@ -201,6 +204,7 @@ public final class ConversationListItem extends ConstraintLayout
     setThumbnailSnippet(thread);
     setBatchMode(batchMode);
     setRippleColor(recipient.get());
+    badge.setBadgeFromRecipient(recipient.get());
     setUnreadIndicator(thread);
     this.contactPhotoImage.setAvatar(glideRequests, recipient.get(), !batchMode);
   }
@@ -428,6 +432,7 @@ public final class ConversationListItem extends ConstraintLayout
     }
     contactPhotoImage.setAvatar(glideRequests, recipient, !batchMode);
     setRippleColor(recipient);
+    badge.setBadgeFromRecipient(recipient);
   }
 
   private static @NonNull LiveData<SpannableString> getThreadDisplayBody(@NonNull Context context, @NonNull ThreadRecord thread) {

app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java

@@ -1031,6 +1031,14 @@ public class Recipient {
     return badges;
   }
 
+  public @Nullable Badge getFeaturedBadge() {
+    if (badges.isEmpty()) {
+      return null;
+    } else {
+      return badges.get(0);
+    }
+  }
+
   public @Nullable String getCombinedAboutAndEmoji() {
     if (!Util.isEmpty(aboutEmoji)) {
       if (!Util.isEmpty(about)) {

app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java

@@ -24,6 +24,8 @@ import androidx.lifecycle.ViewModelProviders;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.badges.BadgeImageView;
+import org.thoughtcrime.securesms.badges.view.ViewBadgeBottomSheetDialogFragment;
 import org.thoughtcrime.securesms.components.AvatarImageView;
 import org.thoughtcrime.securesms.components.settings.DSLSettingsIcon;
 import org.thoughtcrime.securesms.components.settings.conversation.preferences.ButtonStripPreference;
@@ -75,6 +77,7 @@ public final class RecipientBottomSheetDialogFragment extends BottomSheetDialogF
   private View                     noteToSelfDescription;
   private View                     buttonStrip;
   private View                     interactionsContainer;
+  private BadgeImageView           badgeImageView;
 
   public static BottomSheetDialogFragment create(@NonNull RecipientId recipientId,
                                                  @Nullable GroupId groupId)
@@ -122,6 +125,7 @@ public final class RecipientBottomSheetDialogFragment extends BottomSheetDialogF
     noteToSelfDescription  = view.findViewById(R.id.rbs_note_to_self_description);
     buttonStrip            = view.findViewById(R.id.button_strip);
     interactionsContainer  = view.findViewById(R.id.interactions_container);
+    badgeImageView         = view.findViewById(R.id.rbs_badge);
 
     return view;
   }
@@ -148,6 +152,7 @@ public final class RecipientBottomSheetDialogFragment extends BottomSheetDialogF
         }
       });
       avatar.setAvatar(recipient);
+      badgeImageView.setBadgeFromRecipient(recipient);
       if (recipient.isSelf()) {
         avatar.setOnClickListener(v -> {
           dismiss();
@@ -279,6 +284,11 @@ public final class RecipientBottomSheetDialogFragment extends BottomSheetDialogF
       viewModel.onAvatarClicked(requireActivity());
     });
 
+    badgeImageView.setOnClickListener(view -> {
+      dismiss();
+      ViewBadgeBottomSheetDialogFragment.show(getParentFragmentManager(), recipientId, null);
+    });
+
     blockButton.setOnClickListener(view -> viewModel.onBlockClicked(requireActivity()));
     unblockButton.setOnClickListener(view -> viewModel.onUnblockClicked(requireActivity()));
 

app/src/main/res/drawable/ic_badge_24.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,22.5c-0.3,0 -0.5,0 -0.8,-0.1s-0.5,-0.2 -0.7,-0.3l-3.3,-1.9L4,18.4c-0.5,-0.3 -0.8,-0.6 -1.1,-1.1s-0.4,-1 -0.4,-1.5V12V8.2c0,-0.5 0.1,-1.1 0.4,-1.5S3.5,5.9 4,5.6l3.3,-1.9l3.3,-1.9c0.5,-0.3 1,-0.4 1.5,-0.4s1,0.1 1.5,0.4l3.3,1.9L20,5.6c0.5,0.3 0.8,0.6 1.1,1.1s0.4,1 0.4,1.5V12v3.8c0,0.5 -0.1,1.1 -0.4,1.5s-0.6,0.8 -1.1,1.1l-3.3,1.9l-3.3,1.9c-0.2,0.1 -0.5,0.2 -0.7,0.3S12.3,22.5 12,22.5zM12,3c-0.1,0 -0.3,0 -0.4,0.1s-0.2,0.1 -0.4,0.2L8,5L4.7,6.9C4.5,7.1 4.3,7.3 4.2,7.5S4,8 4,8.2V12v3.8C4,16 4,16.3 4.2,16.5s0.3,0.4 0.5,0.5L8,19l3.3,1.9C11.5,21 11.7,21 12,21s0.5,-0.1 0.8,-0.2L16,19l3.3,-1.9c0.2,-0.1 0.4,-0.3 0.5,-0.5S20,16 20,15.8V12V8.2C20,8 20,7.7 19.8,7.5s-0.3,-0.4 -0.5,-0.5L16,5l-3.3,-1.9C12.6,3.1 12.5,3 12.4,3S12.1,3 12,3z"
+      android:fillColor="#1B1B1B"/>
+</vector>

app/src/main/res/layout/bio_preference_item.xml

@@ -19,6 +19,20 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <org.thoughtcrime.securesms.badges.BadgeImageView
+        android:id="@+id/badge"
+        android:layout_width="26dp"
+        android:layout_height="26dp"
+        android:layout_marginStart="39dp"
+        android:layout_marginTop="39dp"
+        android:contentDescription="@string/ImageView__badge"
+        android:visibility="gone"
+        app:badge_outline_color="@color/signal_background_primary"
+        app:badge_outline_width="1dp"
+        app:layout_constraintStart_toStartOf="@id/icon"
+        app:layout_constraintTop_toTopOf="@id/icon"
+        tools:visibility="visible" />
+
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"

app/src/main/res/layout/contact_selection_list_item.xml

@@ -23,6 +23,20 @@
         tools:ignore="UnusedAttribute"
         tools:src="@color/blue_600" />
 
+    <org.thoughtcrime.securesms.badges.BadgeImageView
+        android:id="@+id/contact_badge"
+        android:layout_width="@dimen/badge_size_small"
+        android:layout_height="@dimen/badge_size_small"
+        android:layout_marginStart="23dp"
+        android:layout_marginTop="23dp"
+        android:contentDescription="@string/ImageView__badge"
+        android:visibility="gone"
+        app:badge_outline_color="@color/signal_background_primary"
+        app:badge_outline_width="1dp"
+        app:layout_constraintStart_toStartOf="@id/contact_photo_image"
+        app:layout_constraintTop_toTopOf="@id/contact_photo_image"
+        tools:visibility="visible" />
+
     <androidx.appcompat.widget.AppCompatCheckBox
         android:id="@+id/check_box"
         android:layout_width="22dp"

app/src/main/res/layout/conversation_banner_view.xml

@@ -9,22 +9,36 @@
 
     <org.thoughtcrime.securesms.components.AvatarImageView
         android:id="@+id/message_request_avatar"
-        android:layout_width="112dp"
+        android:layout_width="80dp"
-        android:layout_height="112dp"
+        android:layout_height="80dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:srcCompat="@tools:sample/avatars" />
 
+    <org.thoughtcrime.securesms.badges.BadgeImageView
+        android:id="@+id/message_request_badge"
+        android:layout_width="34dp"
+        android:layout_height="34dp"
+        android:layout_marginStart="46dp"
+        android:layout_marginTop="47dp"
+        android:contentDescription="@string/ImageView__badge"
+        android:visibility="gone"
+        app:badge_outline_color="@color/signal_background_primary"
+        app:badge_outline_width="1dp"
+        app:layout_constraintStart_toStartOf="@id/message_request_avatar"
+        app:layout_constraintTop_toTopOf="@id/message_request_avatar"
+        tools:visibility="visible" />
+
     <LinearLayout
         android:id="@+id/message_request_avatar_tap_to_view"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:orientation="vertical"
-        android:gravity="center"
         android:background="@drawable/circle_tint_darker"
-        android:visibility="gone"
         android:foreground="?attr/selectableItemBackground"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/message_request_avatar"
         app:layout_constraintEnd_toEndOf="@+id/message_request_avatar"
         app:layout_constraintStart_toStartOf="@+id/message_request_avatar"
@@ -34,15 +48,15 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
-            app:tint="@color/core_white"
+            app:srcCompat="@drawable/ic_tap_outline_24"
-            app:srcCompat="@drawable/ic_tap_outline_24" />
+            app:tint="@color/core_white" />
 
         <TextView
-            android:textAppearance="@style/TextAppearance.Signal.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/core_white"
+            android:text="@string/MessageRequestProfileView_view"
-            android:text="@string/MessageRequestProfileView_view" />
+            android:textAppearance="@style/TextAppearance.Signal.Subtitle"
+            android:textColor="@color/core_white" />
 
     </LinearLayout>
 
@@ -64,13 +78,13 @@
         android:id="@+id/message_request_about"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:gravity="center"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:gravity="center"
         android:textAppearance="@style/Signal.Text.MessageRequest.Subtitle"
-        tools:text="Hangin' on the web"
+        app:emoji_forceCustom="true"
         app:layout_constraintTop_toBottomOf="@id/message_request_title"
-        app:emoji_forceCustom="true"/>
+        tools:text="Hangin' on the web" />
 
     <TextView
         android:id="@+id/message_request_subtitle"

app/src/main/res/layout/conversation_list_item_view.xml

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.conversationlist.ConversationListItem
+<org.thoughtcrime.securesms.conversationlist.ConversationListItem xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="78dp"
     android:background="@drawable/conversation_list_item_background"
     android:focusable="true"
+    android:minHeight="78dp"
     android:nextFocusLeft="@+id/container"
     android:nextFocusRight="@+id/fab"
     android:paddingStart="@dimen/dsl_settings_gutter"
@@ -17,9 +16,9 @@
         android:id="@+id/conversation_list_item_avatar"
         android:layout_width="@dimen/conversation_list_avatar_size"
         android:layout_height="@dimen/conversation_list_avatar_size"
+        android:layout_marginTop="12dp"
         android:contentDescription="@string/conversation_list_item_view__contact_photo_image"
         android:foreground="@drawable/contact_photo_background"
-      android:layout_marginTop="12dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@drawable/ic_contact_picture" />
@@ -29,17 +28,17 @@
         style="@style/Signal.Text.Caption"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/unread_count_bubble_diameter"
+        android:layout_marginBottom="27dp"
         android:background="@drawable/unread_count_background_new"
         android:fontFamily="sans-serif-medium"
         android:gravity="center"
-      android:paddingStart="7dp"
-      android:paddingEnd="7dp"
         android:minWidth="@dimen/unread_count_bubble_diameter"
         android:minHeight="@dimen/unread_count_bubble_diameter"
+        android:paddingStart="7dp"
+        android:paddingEnd="7dp"
         android:textColor="@color/core_white"
-      android:layout_marginBottom="27dp"
-      app:layout_constraintEnd_toStartOf="@id/conversation_list_item_avatar_barrier"
         app:layout_constraintBottom_toBottomOf="@id/conversation_list_item_avatar"
+        app:layout_constraintEnd_toStartOf="@id/conversation_list_item_avatar_barrier"
         tools:text="9" />
 
     <org.thoughtcrime.securesms.components.FromTextView
@@ -48,15 +47,15 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-      android:layout_marginEnd="12dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="12dp"
         android:drawablePadding="5dp"
         android:ellipsize="end"
         android:fontFamily="sans-serif-medium"
         android:maxLines="1"
         android:textColor="@color/signal_text_primary"
-      app:layout_constraintStart_toEndOf="@id/conversation_list_item_avatar"
         app:layout_constraintEnd_toStartOf="@id/conversation_list_item_name_barrier"
+        app:layout_constraintStart_toEndOf="@id/conversation_list_item_avatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="Long Chat name for testing purposes" />
@@ -68,9 +67,9 @@
         android:layout_marginEnd="2dp"
         android:paddingTop="2dp"
         android:visibility="gone"
-      app:useSmallIcon="true"
-      app:layout_constraintTop_toBottomOf="@id/conversation_list_item_name"
         app:layout_constraintStart_toStartOf="@id/conversation_list_item_name"
+        app:layout_constraintTop_toBottomOf="@id/conversation_list_item_name"
+        app:useSmallIcon="true"
         tools:visibility="visible" />
 
     <org.thoughtcrime.securesms.components.emoji.SimpleEmojiTextView
@@ -78,16 +77,16 @@
         style="@style/Signal.Text.Preview"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-      android:ellipsize="end"
-      android:maxLines="2"
-      android:lines="2"
-      android:textColor="@color/signal_text_secondary"
         android:layout_marginEnd="12dp"
         android:layout_marginBottom="8dp"
-      tools:text="I'll send those photos over to the Bugle ASAP."
+        android:ellipsize="end"
-      app:layout_constraintTop_toBottomOf="@id/conversation_list_item_name"
+        android:lines="2"
+        android:maxLines="2"
+        android:textColor="@color/signal_text_secondary"
+        app:layout_constraintEnd_toStartOf="@id/conversation_list_item_summary_barrier"
         app:layout_constraintStart_toEndOf="@id/conversation_list_item_alert"
-      app:layout_constraintEnd_toStartOf="@id/conversation_list_item_summary_barrier"/>
+        app:layout_constraintTop_toBottomOf="@id/conversation_list_item_name"
+        tools:text="I'll send those photos over to the Bugle ASAP." />
 
     <org.thoughtcrime.securesms.components.TypingIndicatorView
         android:id="@+id/conversation_list_item_typing_indicator"
@@ -95,10 +94,10 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
         android:visibility="gone"
-      tools:visibility="visible"
-      app:typingIndicator_tint="@color/signal_icon_tint_secondary"
         app:layout_constraintStart_toStartOf="@id/conversation_list_item_summary"
-      app:layout_constraintTop_toTopOf="@id/conversation_list_item_summary"/>
+        app:layout_constraintTop_toTopOf="@id/conversation_list_item_summary"
+        app:typingIndicator_tint="@color/signal_icon_tint_secondary"
+        tools:visibility="visible" />
 
     <org.thoughtcrime.securesms.components.ThumbnailView
         android:id="@+id/conversation_list_item_thumbnail"
@@ -109,23 +108,23 @@
         android:layout_toStartOf="@+id/conversation_list_item_date"
         android:contentDescription="@string/conversation_activity__attachment_thumbnail"
         android:visibility="gone"
-      tools:visibility="gone"
+        app:layout_constraintEnd_toStartOf="@id/conversation_list_item_thumbnail_barrier"
-      app:thumbnail_radius="8dp"
         app:layout_constraintTop_toTopOf="parent"
-      app:layout_constraintEnd_toStartOf="@id/conversation_list_item_thumbnail_barrier"/>
+        app:thumbnail_radius="8dp"
+        tools:visibility="gone" />
 
     <TextView
         android:id="@id/conversation_list_item_date"
         style="@style/Signal.Text.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
         android:singleLine="true"
         android:textColor="@color/signal_icon_tint_secondary"
-      android:layout_marginTop="2dp"
+        app:layout_constraintBottom_toBottomOf="@id/conversation_list_item_name"
-      tools:text="10:00 am"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/conversation_list_item_name"
-      app:layout_constraintBottom_toBottomOf="@id/conversation_list_item_name"/>
+        tools:text="10:00 am" />
 
     <LinearLayout
         android:id="@+id/conversation_list_item_status_container"
@@ -164,23 +163,23 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         app:barrierDirection="end"
-      app:constraint_referenced_ids="conversation_list_item_avatar"
+        app:barrierMargin="@dimen/unread_count_bubble_barrier_margin"
-      app:barrierMargin="@dimen/unread_count_bubble_barrier_margin"/>
+        app:constraint_referenced_ids="conversation_list_item_avatar" />
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/conversation_list_item_summary_barrier"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-      app:barrierDirection="start"
         app:barrierAllowsGoneWidgets="false"
+        app:barrierDirection="start"
         app:constraint_referenced_ids="conversation_list_item_thumbnail,conversation_list_item_status_container" />
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/conversation_list_item_name_barrier"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-      app:barrierDirection="start"
         app:barrierAllowsGoneWidgets="false"
+        app:barrierDirection="start"
         app:constraint_referenced_ids="conversation_list_item_thumbnail,conversation_list_item_date" />
 
     <androidx.constraintlayout.widget.Barrier
@@ -188,6 +187,20 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         app:barrierDirection="start"
-      app:constraint_referenced_ids="conversation_list_item_date,conversation_list_item_status_container"/>
+        app:constraint_referenced_ids="conversation_list_item_date,conversation_list_item_status_container" />
+
+    <org.thoughtcrime.securesms.badges.BadgeImageView
+        android:id="@+id/conversation_list_item_badge"
+        android:layout_width="26dp"
+        android:layout_height="26dp"
+        android:layout_marginStart="@dimen/conversation_list_badge_offset"
+        android:layout_marginTop="@dimen/conversation_list_badge_offset"
+        android:contentDescription="@string/ImageView__badge"
+        android:visibility="gone"
+        app:badge_outline_color="@color/signal_background_primary"
+        app:badge_outline_width="1dp"
+        app:layout_constraintStart_toStartOf="@id/conversation_list_item_avatar"
+        app:layout_constraintTop_toTopOf="@id/conversation_list_item_avatar"
+        tools:visibility="visible" />
 
 </org.thoughtcrime.securesms.conversationlist.ConversationListItem>

app/src/main/res/layout/conversation_settings_avatar_preference_item.xml

@@ -1,12 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_marginTop="40dp"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal">
+
         <org.thoughtcrime.securesms.components.AvatarImageView
-        android:layout_gravity="center_horizontal"
             android:id="@+id/bio_preference_avatar"
             android:layout_width="80dp"
             android:layout_height="80dp"
-        android:layout_marginTop="40dp" />
+            android:layout_gravity="center_horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <org.thoughtcrime.securesms.badges.BadgeImageView
+            android:id="@+id/bio_preference_badge"
+            android:layout_width="34dp"
+            android:layout_height="34dp"
+            android:layout_marginStart="46dp"
+            android:layout_marginTop="47dp"
+            android:contentDescription="@string/ImageView__badge"
+            android:visibility="gone"
+            app:badge_outline_color="@color/signal_background_primary"
+            app:badge_outline_width="1dp"
+            app:layout_constraintStart_toStartOf="@id/bio_preference_avatar"
+            app:layout_constraintTop_toTopOf="@id/bio_preference_avatar"
+            tools:visibility="visible" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>

app/src/main/res/layout/conversation_title_view.xml

@@ -9,6 +9,12 @@
     android:gravity="center_vertical"
     tools:layout_height="?actionBarSize">
 
+    <RelativeLayout
+        android:transitionName="avatar"
+        android:id="@+id/contact_photo_container"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent">
+
         <org.thoughtcrime.securesms.components.AvatarImageView
             android:id="@+id/contact_photo_image"
             android:layout_width="36dp"
@@ -20,16 +26,30 @@
             android:contentDescription="@string/conversation_list_item_view__contact_photo_image"
             android:cropToPadding="true"
             android:foreground="@drawable/contact_photo_background"
-        android:transitionName="contact_photo"
             app:fallbackImageSize="small"
             tools:src="@drawable/ic_contact_picture" />
 
+        <org.thoughtcrime.securesms.badges.BadgeImageView
+            android:id="@+id/badge"
+            android:layout_width="@dimen/badge_size_small"
+            android:layout_height="@dimen/badge_size_small"
+            android:layout_alignStart="@id/contact_photo_image"
+            android:layout_alignTop="@id/contact_photo_image"
+            android:layout_marginStart="21dp"
+            android:layout_marginTop="21dp"
+            android:contentDescription="@string/ImageView__badge"
+            android:visibility="gone"
+            app:badge_outline_color="@color/signal_background_primary"
+            app:badge_outline_width="1dp"
+            tools:visibility="visible" />
+    </RelativeLayout>
+
     <LinearLayout
         android:id="@+id/content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_toEndOf="@id/contact_photo_image"
+        android:layout_toEndOf="@id/contact_photo_container"
         android:orientation="vertical">
 
         <org.thoughtcrime.securesms.components.emoji.EmojiTextView
@@ -39,11 +59,11 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|start"
             android:drawablePadding="3dp"
+            android:drawableTint="@color/signal_inverse_transparent_80"
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:maxLines="1"
             android:transitionName="recipient_name"
-            android:drawableTint="@color/signal_inverse_transparent_80"
             tools:ignore="UnusedAttribute"
             tools:text="J. Jonah Jameson" />
 
@@ -61,8 +81,8 @@
                 android:layout_height="match_parent"
                 android:layout_marginEnd="3dp"
                 android:tint="@color/signal_inverse_transparent_80"
-                app:srcCompat="@drawable/ic_check_24"
                 android:visibility="gone"
+                app:srcCompat="@drawable/ic_check_24"
                 tools:visibility="visible" />
 
             <TextView
@@ -75,8 +95,8 @@
                 android:ellipsize="end"
                 android:gravity="center_vertical"
                 android:maxLines="1"
-                android:textColor="@color/signal_inverse_transparent_80"
                 android:text="@string/ConversationTitleView_verified"
+                android:textColor="@color/signal_inverse_transparent_80"
                 android:textDirection="ltr" />
 
             <org.thoughtcrime.securesms.components.emoji.EmojiTextView
@@ -87,8 +107,8 @@
                 android:layout_gravity="center_vertical|start"
                 android:ellipsize="end"
                 android:gravity="center_vertical"
-                android:textColor="@color/signal_inverse_transparent_80"
                 android:maxLines="1"
+                android:textColor="@color/signal_inverse_transparent_80"
                 android:textDirection="ltr"
                 tools:text="(123) 123-1234" />
 

app/src/main/res/layout/manage_profile_fragment.xml

@@ -243,10 +243,10 @@
           android:layout_width="24dp"
           android:layout_height="24dp"
           android:scaleType="fitCenter"
-          app:srcCompat="@drawable/ic_compose_24"
+          app:srcCompat="@drawable/ic_badge_24"
           app:tint="@color/signal_text_primary"
           app:layout_constraintTop_toTopOf="@id/manage_profile_badges"
-          app:layout_constraintBottom_toBottomOf="@id/manage_profile_badges_subtitle"
+          app:layout_constraintBottom_toBottomOf="@id/manage_profile_badges"
           app:layout_constraintStart_toStartOf="parent"/>
 
       <org.thoughtcrime.securesms.components.emoji.EmojiTextView
@@ -259,19 +259,10 @@
           app:layout_constraintTop_toTopOf="parent"
           app:layout_constraintStart_toEndOf="@id/manage_profile_badges_icon"
           app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintBottom_toBottomOf="parent"
           android:text="@string/ManageProfileFragment_badges"
           app:emoji_forceCustom="true" />
 
-      <TextView
-          android:id="@+id/manage_profile_badges_subtitle"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          style="@style/Signal.Text.Preview"
-          android:textColor="@color/signal_text_secondary"
-          app:layout_constraintTop_toBottomOf="@id/manage_profile_badges"
-          app:layout_constraintStart_toStartOf="@id/manage_profile_badges"
-          app:layout_constraintEnd_toEndOf="parent" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <org.thoughtcrime.securesms.util.views.LearnMoreTextView

app/src/main/res/layout/recipient_bottom_sheet.xml

@@ -21,6 +21,20 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <org.thoughtcrime.securesms.badges.BadgeImageView
+            android:id="@+id/rbs_badge"
+            android:layout_width="34dp"
+            android:layout_height="34dp"
+            android:layout_marginStart="46dp"
+            android:layout_marginTop="47dp"
+            android:contentDescription="@string/ImageView__badge"
+            android:visibility="gone"
+            app:badge_outline_color="@color/signal_background_primary"
+            app:badge_outline_width="1dp"
+            app:layout_constraintStart_toStartOf="@id/rbs_recipient_avatar"
+            app:layout_constraintTop_toTopOf="@id/rbs_recipient_avatar"
+            tools:visibility="visible" />
+
         <ProgressBar
             android:id="@+id/rbs_admin_action_busy"
             android:layout_width="0dp"

app/src/main/res/values/attrs.xml

@@ -326,4 +326,9 @@
         <attr name="bsiv_label" format="string" />
         <attr name="bsiv_icon_contentDescription" format="string" />
     </declare-styleable>
+
+    <declare-styleable name="BadgeImageView">
+        <attr name="badge_outline_width" format="dimension" />
+        <attr name="badge_outline_color" format="color" />
+    </declare-styleable>
 </resources>

app/src/main/res/values/dimens.xml

@@ -205,6 +205,9 @@
     <dimen name="toolbar_avatar_size">28dp</dimen>
     <dimen name="toolbar_avatar_margin">26dp</dimen>
     <dimen name="conversation_list_avatar_size">48dp</dimen>
+    <dimen name="conversation_list_badge_offset">25dp</dimen>
 
     <dimen name="verify_identity_vertical_margin">16dp</dimen>
+
+    <dimen name="badge_size_small">18dp</dimen>
 </resources>

app/src/main/res/values/strings.xml

@@ -3854,6 +3854,8 @@
 
     <string name="ViewBadgeBottomSheetDialogFragment__become_a_sustainer">Become a sustainer</string>
 
+    <string name="ImageView__badge">Badge</string>
+
     <!-- EOF -->
 
 </resources>