Adjust conversation updates margins

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

@@ -410,7 +410,7 @@ public final class ConversationUpdateItem extends FrameLayout
       ViewUtil.setTopMargin(background, marginCollapsed);
       ViewUtil.setBottomMargin(background, marginDefault);
 
-      ViewUtil.setPaddingTop(background, paddingCollapsed);
+      ViewUtil.setPaddingTop(background, paddingDefault);
       ViewUtil.setPaddingBottom(background, paddingDefault);
 
       ViewUtil.updateLayoutParams(background, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);

app/src/main/java/org/thoughtcrime/securesms/database/model/LiveUpdateMessage.java

@@ -1,8 +1,11 @@
 package org.thoughtcrime.securesms.database.model;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.graphics.PorterDuff;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.InsetDrawable;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
@@ -19,6 +22,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.ContextUtil;
 import org.thoughtcrime.securesms.util.SpanUtil;
 import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
 import org.whispersystems.libsignal.util.guava.Function;
 
@@ -71,7 +75,13 @@ public final class LiveUpdateMessage {
       drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
       drawable.setColorFilter(tint, PorterDuff.Mode.SRC_ATOP);
 
-      Spannable stringWithImage = new SpannableStringBuilder().append(SpanUtil.buildImageSpan(drawable)).append("  ").append(string);
+      InsetDrawable insetDrawable = new InsetDrawable(drawable, 0, 0, 0, ViewUtil.dpToPx(-3));
+      insetDrawable.setBounds(0, 0, drawable.getIntrinsicWidth(), insetDrawable.getIntrinsicHeight());
+
+      Drawable spaceDrawable = new ColorDrawable(Color.TRANSPARENT);
+      spaceDrawable.setBounds(0, 0, ViewUtil.dpToPx(8), drawable.getIntrinsicHeight());
+
+      Spannable stringWithImage = new SpannableStringBuilder().append(SpanUtil.buildImageSpanBottomAligned(drawable)).append(SpanUtil.buildImageSpan(spaceDrawable)).append(string);
 
       return new SpannableString(SpanUtil.color(tint, stringWithImage));
     }

app/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java

@@ -99,6 +99,13 @@ public final class SpanUtil {
     return imageSpan;
   }
 
+  public static CharSequence buildImageSpanBottomAligned(@NonNull Drawable drawable) {
+    SpannableString imageSpan = new SpannableString(" ");
+    imageSpan.setSpan(new ImageSpan(drawable, DynamicDrawableSpan.ALIGN_BOTTOM), 0, imageSpan.length(), 0);
+
+    return imageSpan;
+  }
+
   public static CharSequence learnMore(@NonNull Context context,
                                        @ColorInt int color,
                                        @NonNull View.OnClickListener onLearnMoreClicked)

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

@@ -26,7 +26,7 @@
 
         <org.thoughtcrime.securesms.components.emoji.EmojiTextView
             android:id="@+id/conversation_update_body"
-            style="@style/Signal.Text.Preview"
+            style="@style/TextAppearance.Signal.Subtitle"
             android:textSize="13sp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

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

@@ -170,8 +170,9 @@
     <dimen name="review_card_icon_arc_radius">14.5dp</dimen>
 
     <dimen name="conversation_update_vertical_margin">4dp</dimen>
-    <dimen name="conversation_update_vertical_padding">5dp</dimen>
-    <dimen name="conversation_update_vertical_padding_collapsed">2dp</dimen>
+    <dimen name="conversation_update_vertical_padding">8dp</dimen>
+    <dimen name="conversation_update_vertical_padding_collapsed">4dp</dimen>
+    <dimen name="conversation_update_horizontal_padding">8dp</dimen>
 
     <dimen name="transfer_top_padding">64dp</dimen>
     <dimen name="transfer_split_top_padding">32dp</dimen>