encapsulated delivery icon to separate from lock

and as a bonus some tweaked text sizes and colors
// FREEBIE

res/layout/conversation_item_received.xml

@@ -121,7 +121,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingRight="3dip"
-                    android:src="?conversation_delivered_indicator"
+                    android:src="?conversation_delivery_delivered"
                     android:contentDescription="@string/conversation_item_sent__delivered_description"
                     android:visibility="gone" />
 
@@ -142,6 +142,7 @@
                     android:paddingTop="1dip"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="?conversation_received_text_secondary_color"
+                    android:textSize="@dimen/conversation_item_date_text_size"
                     android:fontFamily="sans-serif-light"
                     android:autoLink="none"
                     android:linksClickable="false" />

res/layout/conversation_item_sent.xml

@@ -142,34 +142,30 @@
                           android:layout_gravity="right"
                           android:fontFamily="sans-serif-light"
                           android:textColor="?conversation_sent_text_secondary_color"
+                          android:textSize="@dimen/conversation_item_date_text_size"
                           android:paddingTop="1dip"
                           android:paddingBottom="5dp" />
 
-                <LinearLayout android:layout_width="wrap_content"
-                              android:layout_height="wrap_content"
-                              android:orientation="horizontal"
-                              android:layout_gravity="center_vertical|end"
-                              android:gravity="center_vertical"
-                              android:paddingBottom="3dp"
-                              android:paddingLeft="3dp"
-                              android:paddingStart="3dp">
+                <ImageView android:id="@+id/delivered_indicator"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:layout_gravity="center_vertical|end"
+                           android:src="?conversation_delivery_delivered"
+                           android:paddingLeft="2dp"
+                           android:paddingBottom="2dp"
+                           android:visibility="gone"
+                           android:contentDescription="@string/conversation_item_sent__delivered_description" />
 
-                    <ImageView android:id="@+id/delivered_indicator"
-                               android:layout_width="wrap_content"
-                               android:layout_height="wrap_content"
-                               android:src="?conversation_delivered_indicator"
-                               android:visibility="gone"
-                               android:paddingRight="1dp"
-                               android:contentDescription="@string/conversation_item_sent__delivered_description" />
+                <ImageView android:id="@+id/sms_secure_indicator"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:src="?menu_lock_icon_small"
+                           android:visibility="gone"
+                           android:layout_gravity="center_vertical|end"
+                           android:paddingLeft="2dp"
+                           android:paddingBottom="3dp"
+                           android:contentDescription="@string/conversation_item__secure_message_description" />
 
-                    <ImageView android:id="@+id/sms_secure_indicator"
-                               android:layout_width="wrap_content"
-                               android:layout_height="wrap_content"
-                               android:src="?menu_lock_icon_small"
-                               android:visibility="gone"
-                               android:contentDescription="@string/conversation_item__secure_message_description" />
-
-                </LinearLayout>
             </LinearLayout>
         </LinearLayout>
 

res/values/attrs.xml

@@ -28,7 +28,7 @@
     <attr name="conversation_send_button_push" format="reference"/>
     <attr name="conversation_send_button_sms_secure" format="reference"/>
     <attr name="conversation_send_button_sms_insecure" format="reference"/>
-    <attr name="conversation_delivered_indicator" format="reference"/>
+    <attr name="conversation_delivery_delivered" format="reference"/>
     <attr name="conversation_emoji_toggle" format="reference"/>
     <attr name="conversation_keyboard_toggle" format="reference"/>
 

res/values/colors.xml

@@ -30,7 +30,7 @@
     <color name="conversation_item_sent_pending_background_dark">#55284e0a</color>
     <color name="conversation_item_sent_push_background_light">#ff3a7ef2</color>
     <color name="conversation_item_sent_push_background_dark">#ff213b77</color>
-    <color name="conversation_item_sent_push_pending_background_light">#ff7bacf2</color>
+    <color name="conversation_item_sent_push_pending_background_light">#ff528ff2</color>
     <color name="conversation_item_sent_push_pending_background_dark">#55213b77</color>
     <color name="conversation_item_received_background_light">#ffeeeeee</color>
     <color name="conversation_item_received_background_dark">#ff333333</color>

res/values/dimens.xml

@@ -5,6 +5,7 @@
     <dimen name="emoji_drawer_item_padding">8dp</dimen>
     <dimen name="emoji_drawer_indicator_height">2dp</dimen>
     <dimen name="emoji_drawer_left_right_padding">8dp</dimen>
+    <dimen name="conversation_item_date_text_size">12sp</dimen>
     <dimen name="conversation_item_corner_radius">3dp</dimen>
     <dimen name="conversation_item_drop_shadow_dist">2dp</dimen>
     <dimen name="contact_selection_photo_size">50dp</dimen>

res/values/themes.xml

@@ -43,7 +43,7 @@
         <item name="conversation_send_button_push">@drawable/ic_send_push</item>
         <item name="conversation_send_button_sms_secure">@drawable/ic_send_sms_secure</item>
         <item name="conversation_send_button_sms_insecure">@drawable/ic_send_sms_insecure</item>
-        <item name="conversation_delivered_indicator">@drawable/ic_check_black_18dp</item>
+        <item name="conversation_delivery_delivered">@drawable/ic_delivery_delivered</item>
         <item name="conversation_emoji_toggle">@drawable/ic_emoji_dark</item>
         <item name="conversation_keyboard_toggle">@drawable/ic_ime_dark</item>
 
@@ -134,7 +134,7 @@
         <item name="conversation_send_button_push">@drawable/ic_send_push</item>
         <item name="conversation_send_button_sms_secure">@drawable/ic_send_sms_secure</item>
         <item name="conversation_send_button_sms_insecure">@drawable/ic_send_sms_insecure_dark</item>
-        <item name="conversation_delivered_indicator">@drawable/ic_check_white_18dp</item>
+        <item name="conversation_delivery_delivered">@drawable/ic_delivery_delivered_dark</item>
         <item name="conversation_emoji_toggle">@drawable/ic_emoji_light</item>
         <item name="conversation_keyboard_toggle">@drawable/ic_ime_light</item>
 

src/org/thoughtcrime/securesms/ConversationItem.java

@@ -100,7 +100,7 @@ public class ConversationItem extends LinearLayout {
   private  ImageView secureImage;
   private  ImageView failedImage;
   private  ImageView contactPhoto;
-  private  ImageView deliveredImage;
+  private  ImageView deliveryImage;
   private  View      triangleTick;
   private  ImageView pendingIndicator;
 
@@ -144,7 +144,7 @@ public class ConversationItem extends LinearLayout {
     this.mmsDownloadButton   = (Button)   findViewById(R.id.mms_download_button);
     this.mmsDownloadingLabel = (TextView) findViewById(R.id.mms_label_downloading);
     this.contactPhoto        = (ImageView)findViewById(R.id.contact_photo);
-    this.deliveredImage      = (ImageView)findViewById(R.id.delivered_indicator);
+    this.deliveryImage       = (ImageView)findViewById(R.id.delivered_indicator);
     this.conversationParent  =            findViewById(R.id.conversation_item_parent);
     this.triangleTick        =            findViewById(R.id.triangle_tick);
     this.pendingIndicator    = (ImageView)findViewById(R.id.pending_approval_indicator);
@@ -250,7 +250,7 @@ public class ConversationItem extends LinearLayout {
     }
     secureImage.setVisibility(messageRecord.isSecure() ? View.VISIBLE : View.GONE);
     bodyText.setCompoundDrawablesWithIntrinsicBounds(0, 0, messageRecord.isKeyExchange() ? R.drawable.ic_menu_login : 0, 0);
-    deliveredImage.setVisibility(!messageRecord.isKeyExchange() && messageRecord.isDelivered() ? View.VISIBLE : View.GONE);
+    deliveryImage.setVisibility(!messageRecord.isKeyExchange() && messageRecord.isDelivered() ? View.VISIBLE : View.GONE);
 
     mmsThumbnail.setVisibility(View.GONE);
     mmsDownloadButton.setVisibility(View.GONE);