icon, contact list and conversation redesign

AndroidManifest.xml

@@ -9,8 +9,8 @@
 
     <permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
                 android:label="Access to TextSecure Secrets"
-                android:protectionLevel="signature" />    
-    
+                android:protectionLevel="signature" />
+
 	<uses-permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"/>
     <uses-permission android:name="android.permission.READ_PROFILE"/>
     <uses-permission android:name="android.permission.WRITE_PROFILE"/>
@@ -39,14 +39,14 @@
     <permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE"
                 android:protectionLevel="signature" />
     <uses-permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE" />
-        
+
     <application android:name="org.thoughtcrime.securesms.ApplicationListener"
                  android:icon="@drawable/icon"
                  android:label="@string/app_name"
                  android:theme="@style/TextSecure.LightTheme">
 
         <activity android:name=".RoutingActivity"
-                  android:theme="@style/NoAnimation.Theme.Sherlock.Light.DarkActionBar"            
+                  android:theme="@style/NoAnimation.Theme.Sherlock.Light.DarkActionBar"
                   android:launchMode="singleTask"
                   android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
 
@@ -54,7 +54,7 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            
+
             <intent-filter>
                   <action android:name="android.intent.action.SENDTO"/>
                   <category android:name="android.intent.category.DEFAULT" />
@@ -63,7 +63,7 @@
                   <data android:scheme="mms" />
                   <data android:scheme="mmsto" />
             </intent-filter>
-            
+
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -71,7 +71,7 @@
                 <data android:mimeType="image/*" />
                 <data android:mimeType="text/*" />
             </intent-filter>            
-            
+
         </activity>
 
     <activity android:name=".RegistrationProblemsActivity"
@@ -95,7 +95,6 @@
         <activity android:name=".ConversationListActivity"
               android:label="@string/app_name"
               android:launchMode="singleTask"
-              android:uiOptions="splitActionBarWhenNarrow"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ConversationActivity"

res/drawable/conversation_item_received_shape.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape  android:shape="rectangle">
+            <solid android:color="#09000000" />
+            <corners android:radius="@dimen/conversation_item_corner_radius" />
+        </shape>
+    </item>
+
+    <item android:bottom="@dimen/conversation_item_drop_shadow_dist">
+        <shape xmlns:android="http://schemas.android.com/apk/res/android">
+            <solid android:color="#ffeeeeee" />
+            <!--stroke android:width="0.5dp" android:color="#03000000" /-->
+            <corners android:radius="@dimen/conversation_item_corner_radius" />
+        </shape>
+    </item>
+
+</layer-list>

res/drawable/conversation_item_received_triangle_shape.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <rotate
+            android:fromDegrees="45"
+            android:toDegrees="45"
+            android:pivotX="110%"
+            android:pivotY="120%" >
+            <shape
+                android:shape="rectangle" >
+                <solid
+                    android:color="#ffeeeeee" />
+            </shape>
+        </rotate>
+    </item>
+</layer-list>

res/drawable/conversation_item_sent_shape.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape  android:shape="rectangle">
+            <solid android:color="#09000000" />
+            <corners android:radius="@dimen/conversation_item_corner_radius" />
+        </shape>
+    </item>
+
+    <item android:bottom="@dimen/conversation_item_drop_shadow_dist">
+        <shape xmlns:android="http://schemas.android.com/apk/res/android">
+            <solid android:color="#ff64a926" />
+            <!--stroke android:width="0.5dp" android:color="#03000000" /-->
+            <corners android:radius="@dimen/conversation_item_corner_radius" /> <!-- android:topRightRadius="0dp" -->
+        </shape>
+    </item>
+
+</layer-list>

res/drawable/conversation_item_sent_triangle_shape.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <rotate
+            android:fromDegrees="45"
+            android:toDegrees="45"
+            android:pivotX="0%"
+            android:pivotY="-30%" >
+            <shape
+                android:shape="rectangle" >
+                <solid
+                    android:color="#ff64a926" />
+            </shape>
+        </rotate>
+    </item>
+</layer-list>

res/layout/conversation_activity.xml

@@ -120,16 +120,15 @@
                     android:clickable="false"
                     android:enabled="false" />
 
-
             </LinearLayout>
 
            <TextView android:id="@+id/space_left"
                      android:paddingLeft="5dip"
                      android:layout_width="fill_parent"
                      android:layout_height="wrap_content"
+                     android:visibility="gone"
                      android:text="160/160 (1)" />
 
-
         </LinearLayout>
     </RelativeLayout>
 

res/layout/conversation_fragment.xml

@@ -16,6 +16,8 @@
               android:scrollbarStyle="insideOverlay"
               android:stackFromBottom="true"
               android:fadingEdge="none"
+              android:divider="@android:color/transparent"
+              android:dividerHeight="0dp"
               android:layout_marginBottom="1dip"/>
 
 </LinearLayout>

res/layout/conversation_fragment_cab.xml

@@ -13,6 +13,7 @@
         android:singleLine="true"
         android:layout_gravity="center_vertical"
         android:textAppearance="?android:attr/textAppearanceMediumInverse"
+        android:textColor="?textColorPrimary"
         android:layout_weight="1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />

res/layout/conversation_item_received.xml

@@ -5,46 +5,73 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:paddingRight="10dip"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:background="?conversation_background">
 
     <RelativeLayout
-                  android:layout_width="fill_parent"
-                  android:layout_height="fill_parent"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
                   android:orientation="horizontal"
-                  android:background="?conversation_card_background">
+                  android:layout_marginTop="6dp"
+                  android:layout_marginLeft="10dp"
+                  android:layout_marginBottom="6dp"
+                  android:layout_marginRight="0dp">
 
-        <view  xmlns:android="http://schemas.android.com/apk/res/android"
-               class="org.thoughtcrime.securesms.components.ImageDivet"
-               position="right"
+        <ImageView  xmlns:android="http://schemas.android.com/apk/res/android"
                android:id="@+id/contact_photo"
                android:layout_alignParentLeft="true"
-               android:layout_width="60dp"
-               android:layout_height="60dp"
+               android:layout_width="40dp"
+               android:layout_height="40dp"
                android:cropToPadding="true"
-               android:scaleType="centerCrop" />
+               android:scaleType="centerCrop"
+               android:layout_marginRight="10dp"
+            />
+
+        <View
+            android:id="@+id/triangle_tick"
+            android:background="@drawable/conversation_item_received_triangle_shape"
+            android:layout_width="12dp"
+            android:layout_height="15dp"
+            android:layout_marginTop="12dp"
+            android:layout_alignRight="@id/contact_photo"
+            />
 
         <LinearLayout android:id="@+id/conversation_item_parent"
-                      android:layout_width="fill_parent"
+                      android:layout_width="wrap_content"
                       android:layout_height="match_parent"
-                      android:layout_toLeftOf="@+id/indicators_parent"
-                      android:layout_toRightOf="@id/contact_photo"
-                      android:background="?conversation_background"
-                      android:paddingLeft="10dip"
-                      android:orientation="vertical" >
-
-            <TextView android:id="@+id/conversation_item_body"
-                android:autoLink="all"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:linksClickable="true"
-                android:paddingTop="5dip"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?conversation_text_primary_color"
-                android:textSize="16sp" />
+                      android:layout_toRightOf="@id/triangle_tick"
+                      android:background="@drawable/conversation_item_received_shape"
+                      android:orientation="vertical">
+
+            <LinearLayout android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:orientation="horizontal"
+                          android:paddingTop="5dip"
+                          android:paddingLeft="10dp"
+                          android:paddingRight="10dp">
+
+                <ImageView
+                    android:id="@+id/key_exchange_indicator"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_menu_login"
+                    android:visibility="gone"
+                    android:contentDescription="Key Exchange Indicator"/>
+
+                <TextView android:id="@+id/conversation_item_body"
+                    android:autoLink="all"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:linksClickable="true"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="?conversation_received_text_primary_color"
+                    android:textSize="16sp" />
+
+            </LinearLayout>
 
             <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/mms_view"
-                android:layout_width="fill_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
                 android:paddingTop="7dip"
@@ -96,11 +123,14 @@
 
             </LinearLayout>
 
-            <LinearLayout android:layout_width="fill_parent"
+            <LinearLayout android:layout_width="wrap_content"
                           android:layout_height="match_parent"
                           android:orientation="horizontal"
-                          android:paddingTop="5dip"
-                          android:gravity="left">
+                          android:gravity="left"
+                          android:paddingTop="2dip"
+                          android:paddingLeft="8dp"
+                          android:paddingRight="5dp"
+                          android:paddingBottom="5dp" >
 
               <ImageView android:id="@+id/delivered_indicator"
                          android:layout_width="wrap_content"
@@ -109,17 +139,27 @@
                          android:src="?conversation_delivered_indicator"
                          android:visibility="gone"
                          android:contentDescription="Delivered Indicator"/>
-                              
+
 		      <TextView android:id="@+id/group_message_status"
 		                android:layout_width="wrap_content"
 		                android:layout_height="wrap_content"
 		                android:linksClickable="false"
 		                android:textAppearance="?android:attr/textAppearanceSmall"
 		                android:layout_gravity="left"
-		                android:textColor="?conversation_text_secondary_color"
+		                android:textColor="?conversation_received_text_secondary_color"
 		                android:visibility="gone"
 		                android:layout_marginRight="8dip"
-		                android:paddingTop="1dip"/>                
+		                android:paddingTop="1dip"/>
+
+                <ImageView android:id="@+id/sms_secure_indicator"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:src="?menu_lock_icon_small"
+                           android:layout_gravity="center_vertical"
+                           android:visibility="gone"
+                           android:paddingRight="4dp"
+                           android:paddingTop="2dp"
+                           android:contentDescription="Secure Message Indicator"/>
 
 		      <TextView android:id="@+id/conversation_item_date"
 		                android:autoLink="all"
@@ -128,10 +168,11 @@
 		                android:linksClickable="false"
 		                android:textAppearance="?android:attr/textAppearanceSmall"
 		                android:layout_gravity="left"
-		                android:textColor="?conversation_text_secondary_color"
-		                android:paddingTop="1dip"/>
-		      </LinearLayout>             
-             
+		                android:textColor="?conversation_received_text_secondary_color"
+                        android:fontFamily="sans-serif-light"
+		                android:paddingTop="1dip" />
+
+		    </LinearLayout>
         </LinearLayout>
 
        <LinearLayout android:id="@+id/indicators_parent"
@@ -142,21 +183,7 @@
                       android:gravity="center_vertical"
                       android:background="?conversation_background">
 
-            <ImageView
-                android:id="@+id/key_exchange_indicator"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_menu_login"
-                android:visibility="gone"
-                android:contentDescription="Key Exchange Indicator"/>
 
-            <ImageView
-                android:id="@+id/sms_secure_indicator"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_menu_lock_holo_light"
-                android:visibility="gone"
-                android:contentDescription="Secure Message Indicator"/>
 
             <ImageView
                 android:id="@+id/sms_failed_indicator"

res/layout/conversation_item_sent.xml

@@ -4,37 +4,24 @@
     android:id="@+id/conversation_item"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="10dip"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:background="?conversation_background">
 
-    <RelativeLayout android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
+    <RelativeLayout android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:orientation="horizontal"
-                    android:background="?conversation_card_background">
+                    android:layout_marginTop="6dp"
+                    android:layout_marginLeft="6dp"
+                    android:layout_marginBottom="6dp"
+                    android:layout_marginRight="0dp">
 
         <LinearLayout android:id="@+id/indicators_parent"
                       android:layout_width="wrap_content"
                       android:layout_height="match_parent"
                       android:orientation="vertical"
-                      android:layout_alignParentLeft="true"
-                      android:gravity="center_vertical"
-                      android:background="?conversation_background">
-
-            <ImageView
-                android:id="@+id/key_exchange_indicator"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_menu_login"
-                android:visibility="gone"
-                android:contentDescription="Key Exchange Indicator"/>
-
-            <ImageView
-                android:id="@+id/sms_secure_indicator"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_menu_lock_holo_light"
-                android:visibility="gone"
-                android:contentDescription="Secure Message Indicator"/>
+                      android:gravity="right"
+                      android:layout_alignParentRight="true"
+                      android:visibility="gone">
 
             <ImageView
                 android:id="@+id/sms_failed_indicator"
@@ -46,28 +33,42 @@
         </LinearLayout>
 
         <LinearLayout android:id="@+id/conversation_item_parent"
-                      android:layout_width="fill_parent"
+                      android:layout_width="wrap_content"
                       android:layout_height="match_parent"
-                      android:layout_toRightOf="@id/indicators_parent"
-                      android:layout_toLeftOf="@+id/contact_photo"
-                      android:background="?conversation_background"
+                      android:layout_alignParentRight="true"
+                      android:background="@drawable/conversation_item_sent_shape"
                       android:paddingRight="10dip"
-                      android:orientation="vertical" >
+                      android:paddingLeft="10dip"
+                      android:layout_marginRight="12dp"
+                      android:orientation="vertical">
 
-            <TextView android:id="@+id/conversation_item_body"
-                android:autoLink="all"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:linksClickable="true"
-                android:paddingTop="5dip"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:gravity="right"
-                android:textColor="?conversation_text_primary_color"
-                android:textSize="16sp" />
+            <LinearLayout android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:orientation="horizontal"
+                          android:paddingTop="5dip">
+
+                <TextView android:id="@+id/conversation_item_body"
+                    android:autoLink="all"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:linksClickable="true"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:gravity="right"
+                    android:textColor="?conversation_sent_text_primary_color"
+                    android:textSize="16sp" />
+
+                <ImageView
+                    android:id="@+id/key_exchange_indicator"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_menu_login"
+                    android:visibility="gone"
+                    android:contentDescription="Key Exchange Indicator"/>
+            </LinearLayout>
 
             <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/mms_view"
-                android:layout_width="fill_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
                 android:paddingTop="7dip"
@@ -119,11 +120,11 @@
 
             </LinearLayout>
 
-            <LinearLayout android:layout_width="fill_parent"
+            <LinearLayout android:layout_width="wrap_content"
                           android:layout_height="match_parent"
                           android:orientation="horizontal"
-                          android:paddingTop="5dip"
-                          android:gravity="right">
+                          android:paddingTop="0dip"
+                          android:layout_gravity="right">
 
               <ImageView android:id="@+id/delivered_indicator"
                          android:layout_width="wrap_content"
@@ -132,18 +133,18 @@
                          android:src="?conversation_delivered_indicator"
                          android:visibility="gone"
                          android:contentDescription="Delivered Indicator"/>
-                
+
 		      <TextView android:id="@+id/group_message_status"
 		                android:layout_width="wrap_content"
 		                android:layout_height="wrap_content"
 		                android:linksClickable="false"
 		                android:textAppearance="?android:attr/textAppearanceSmall"
 		                android:layout_gravity="right"
-		                android:textColor="?conversation_text_secondary_color"
+		                android:textColor="?conversation_sent_text_secondary_color"
 		                android:visibility="gone"
 		                android:layout_marginRight="8dip"
 		                android:paddingTop="1dip"/>
-                
+
 		      <TextView android:id="@+id/conversation_item_date"
 		                android:autoLink="all"
 		                android:layout_width="wrap_content"
@@ -151,26 +152,44 @@
 		                android:linksClickable="false"
 		                android:textAppearance="?android:attr/textAppearanceSmall"
 		                android:layout_gravity="right"
-		                android:textColor="?conversation_text_secondary_color"
-		                android:paddingTop="1dip"/>                
-                
+                        android:fontFamily="sans-serif-light"
+		                android:textColor="?conversation_sent_text_secondary_color"
+		                android:paddingTop="1dip"
+                        android:paddingBottom="5dp" />
+
+                <ImageView
+                    android:id="@+id/sms_secure_indicator"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical|right"
+                    android:src="?menu_lock_icon_small"
+                    android:visibility="gone"
+                    android:paddingLeft="4dp"
+                    android:paddingBottom="3dp"
+                    android:contentDescription="Secure Message Indicator" />
+
             </LinearLayout>
-             
-             
+
         </LinearLayout>
 
-        <view  xmlns:android="http://schemas.android.com/apk/res/android"
-               class="org.thoughtcrime.securesms.components.ImageDivet"
-               position="left"
+        <View
+            android:background="@drawable/conversation_item_sent_triangle_shape"
+            android:layout_width="12dp"
+            android:layout_height="15dp"
+            android:layout_marginTop="12dp"
+            android:layout_alignParentRight="true"
+            />
+
+        <ImageView  xmlns:android="http://schemas.android.com/apk/res/android"
                android:id="@id/contact_photo"
                android:layout_alignParentRight="true"
-               android:layout_width="60dp"
-               android:layout_height="60dp"
+               android:layout_width="40dp"
+               android:layout_height="40dp"
                android:cropToPadding="true"
                android:layout_marginRight="0dip"
                android:padding="0dip"
-               android:scaleType="centerCrop" />
-
+               android:scaleType="centerCrop"
+               android:visibility="gone" />
 
     </RelativeLayout>
 </org.thoughtcrime.securesms.ConversationItem>

res/layout/conversation_list_item_view.xml

@@ -9,19 +9,17 @@
                  android:layout_height="wrap_content"
                  android:layout_centerVertical="true"
                  android:layout_alignParentLeft="true"
+                 android:padding="8dp"
                  android:visibility="visible">
 
-	    <QuickContactBadge android:id="@+id/contact_photo_badge"
-	                       style="?android:attr/quickContactBadgeStyleWindowLarge"
-	                       android:visibility="gone" />
-
 	    <ImageView android:id="@+id/contact_photo_image"
-	               android:layout_width="60dp"
-	               android:layout_height="60dp"
+	               android:layout_width="50dp"
+	               android:layout_height="50dp"
 	               android:cropToPadding="true"
 	               android:scaleType="centerCrop"
 	               android:visibility="gone"
-                   android:contentDescription="Contact Photo Image"/>
+                   android:contentDescription="Contact Photo Image"
+                   android:layout_marginLeft="3dp" />
     </FrameLayout>
 
     <!--<CheckBox android:id="@+id/checkbox"-->
@@ -35,29 +33,31 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="?attr/conversation_list_item_contact_color"
         android:singleLine="true"
-        android:layout_marginTop="6dip"
+        android:layout_marginTop="12dip"
         android:layout_marginRight="5dip"
-        android:layout_marginLeft="10dip"
+        android:layout_marginLeft="4dip"
         android:layout_marginBottom="10dip"
         android:layout_alignTop="@id/contact_photo_frame"
         android:layout_toRightOf="@id/contact_photo_frame"
         android:layout_alignWithParentIfMissing="true"
-        android:ellipsize="marquee"/>
+        android:ellipsize="marquee" />
     <!--android:layout_toLeftOf="@id/checkbox"-->
 
-
     <TextView android:id="@+id/date"
-        android:layout_marginBottom="10dip"
+        android:layout_marginTop="12dip"
         android:layout_marginLeft="5dip"
         android:paddingRight="10dip"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="13dp"
+        android:textColor="?attr/conversation_list_item_subject_color"
+        android:fontFamily="sans-serif-light"
         android:singleLine="true"
-        android:layout_alignBottom="@id/contact_photo_frame"
-        android:layout_alignParentRight="true"/>
+        android:layout_alignTop="@id/contact_photo_frame"
+        android:layout_alignParentRight="true" />
 
     <ImageView android:id="@+id/error"
         android:layout_marginLeft="3dip"
@@ -67,7 +67,7 @@
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:src="@drawable/ic_list_alert_sms_failed"
-        android:contentDescription="Error Alert"/>
+        android:contentDescription="Error Alert" />
 
      <ImageView android:id="@+id/attachment"
         android:layout_marginLeft="3dip"
@@ -77,15 +77,17 @@
         android:layout_toLeftOf="@id/error"
         android:layout_alignBottom="@id/date"
         android:src="@drawable/ic_attachment_universal_small"
-        android:contentDescription="Attachment Indicator"/>
+        android:contentDescription="Attachment Indicator" />
 
     <TextView android:id="@+id/subject"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?attr/conversation_list_item_subject_color"
+        android:fontFamily="sans-serif-light"
         android:singleLine="true"
-        android:layout_marginBottom="10dip"
-        android:layout_marginLeft="10dip"
+        android:layout_marginBottom="12dip"
+        android:layout_marginLeft="4dip"
         android:layout_alignBottom="@id/contact_photo_frame"
         android:layout_toRightOf="@id/contact_photo_frame"
         android:layout_toLeftOf="@id/date"

res/menu/conversation_callable.xml

@@ -3,8 +3,7 @@
 
     <item android:title="@string/conversation_callable__menu_call"
           android:id="@+id/menu_call"
-          android:icon="@drawable/ic_menu_call"
+          android:icon="?menu_call_icon"
           android:showAsAction="ifRoom" />
 
 </menu>
-

res/menu/conversation_insecure.xml

@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:title="Security"
           android:id="@+id/menu_security"
-          android:icon="@drawable/ic_menu_unlock_holo_dark"
+          android:icon="?menu_unlock_icon"
           android:showAsAction="ifRoom">
           <menu>
               <item android:title="@string/conversation_insecure__menu_start_secure_session"
@@ -10,4 +10,4 @@
 
           </menu>
     </item>
-</menu>
+</menu>

res/menu/conversation_list.xml

@@ -3,7 +3,7 @@
 
     <item android:title="@string/conversation_list__menu_search"
           android:id="@+id/menu_search"
-          android:icon="@drawable/ic_menu_search_holo_dark"
+          android:icon="?attr/menu_search_icon"
           android:actionViewClass="com.actionbarsherlock.widget.SearchView"
           android:showAsAction="ifRoom|collapseActionView" />
 

res/menu/conversation_list_batch.xml

@@ -3,11 +3,11 @@
 
     <item android:title="@string/conversation_list_batch__menu_delete_selected"
           android:id="@+id/menu_delete_selected"
-          android:icon="@drawable/ic_menu_trash_holo_dark"
+          android:icon="?menu_trash_icon"
           android:showAsAction="ifRoom" />
 
     <item android:title="@string/conversation_list_batch__menu_select_all"
           android:id="@+id/menu_select_all"
-          android:icon="@drawable/ic_menu_selectall_holo_dark" />
+          android:icon="?menu_selectall_icon" />
 
 </menu>

res/menu/conversation_secure_identity.xml

@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:title="@string/conversation_secure_verified__menu_security"
           android:id="@+id/menu_security"
-          android:icon="@drawable/ic_menu_lock_holo_dark"
+          android:icon="?menu_lock_icon"
           android:showAsAction="ifRoom">
           <menu>
               <item android:title="@string/conversation_secure_verified__menu_verify_recipient"

res/menu/conversation_secure_no_identity.xml

@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:title="@string/conversation_secure_verified__menu_security"
           android:id="@+id/menu_security"
-          android:icon="@drawable/ic_menu_lock_holo_dark"
+          android:icon="?menu_lock_icon"
           android:showAsAction="ifRoom">
           <menu>
               <item android:title="@string/conversation_secure_verified__menu_no_identity"

res/menu/text_secure_normal.xml

@@ -2,8 +2,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:title="@string/text_secure_normal__menu_new_message"
           android:id="@+id/menu_new_message"
-          android:icon="@drawable/ic_menu_msg_compose_holo_dark"
-          android:showAsAction="ifRoom" />
+          android:icon="?attr/menu_new_conversation_icon"
+          android:showAsAction="always" />
 
     <item android:title="@string/text_secure_normal__menu_clear_passphrase"
           android:id="@+id/menu_clear_passphrase"

res/values/attrs.xml

@@ -4,11 +4,19 @@
     <attr name="conversation_list_item_background_read" format="reference"/>
     <attr name="conversation_list_item_background_unread" format="reference"/>
     <attr name="conversation_list_item_count_color" format="reference|color"/>
+    <attr name="conversation_list_item_contact_color" format="reference|color"/>
+    <attr name="conversation_list_item_subject_color" format="reference|color"/>
+
+    <attr name="conversation_sent_card_background" format="reference|color"/>
+    <attr name="conversation_sent_text_primary_color" format="reference|color"/>
+    <attr name="conversation_sent_text_secondary_color" format="reference|color"/>
+    <attr name="conversation_received_card_background" format="reference|color"/>
+    <attr name="conversation_received_text_primary_color" format="reference|color"/>
+    <attr name="conversation_received_text_secondary_color" format="reference|color"/>
+
+    <attr name="actionbar_icon" format="reference" />
 
     <attr name="conversation_background" format="reference|color"/>
-    <attr name="conversation_card_background" format="reference|color"/>
-    <attr name="conversation_text_primary_color" format="reference|color"/>
-    <attr name="conversation_text_secondary_color" format="reference|color"/>
     <attr name="conversation_avatar_divet_right" format="reference"/>
     <attr name="conversation_avatar_divet_left" format="reference"/>
     <attr name="conversation_editor_background" format="reference|color"/>
@@ -23,4 +31,13 @@
     <attr name="navigation_drawer_text_color" format="color"/>
     <attr name="navigation_drawer_icons" format="reference"/>
     <attr name="navigation_drawer_shadow" format="reference"/>
+
+    <attr name="menu_new_conversation_icon" format="reference" />
+    <attr name="menu_search_icon" format="reference" />
+    <attr name="menu_call_icon" format="reference" />
+    <attr name="menu_unlock_icon" format="reference" />
+    <attr name="menu_lock_icon" format="reference" />
+    <attr name="menu_lock_icon_small" format="reference" />
+    <attr name="menu_trash_icon" format="reference" />
+    <attr name="menu_selectall_icon" format="reference" />
 </resources>

res/values/dimens.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="emoji_size">64dip</dimen>
+    <dimen name="conversation_item_corner_radius">3dp</dimen>
+    <dimen name="conversation_item_drop_shadow_dist">2dp</dimen>
 </resources>

res/values/strings.xml

@@ -52,8 +52,8 @@
     <!-- ConversationActivity -->
     <string name="ConversationActivity_initiate_secure_session_question">Initiate Secure Session?</string>
     <string name="ConversationActivity_initiate_secure_session_with_s_question">Initiate secure session with %s?</string>
-    <string name="ConversationActivity_abort_secure_session_confirmation">Abort Secure Session Confirmation</string>
-    <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Are you sure that you want to abort this secure session?</string>
+    <string name="ConversationActivity_abort_secure_session_confirmation">End Secure Session Confirmation</string>
+    <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Are you sure that you want to end this secure session?</string>
     <string name="ConversationActivity_delete_thread_confirmation">Delete Thread Confirmation</string>
     <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Are you sure that you want to permanently delete this conversation?</string>
     <string name="ConversationActivity_add_attachment">Add attachment</string>
@@ -691,7 +691,7 @@
     <string name="conversation_secure_verified__menu_security">Security</string>
     <string name="conversation_secure_verified__menu_no_identity">No Identity Available</string>
     <string name="conversation_secure_verified__menu_verify_recipient">Verify Recipient</string>
-    <string name="conversation_secure_verified__menu_abort_secure_session">Abort Secure Session</string>
+    <string name="conversation_secure_verified__menu_abort_secure_session">End Secure Session</string>
     
     <!-- conversation -->
     <string name="conversation__menu_add_attachment">Add attachment</string>