Merge branch 'development'

1 files changed, 58 insertions, 62 deletions

diff --git a/res/layout/conversation_list_row.xml b/res/layout/conversation_list_row.xml
index 8fdd64b7..21147b4a 100644
--- a/res/layout/conversation_list_row.xml
+++ b/res/layout/conversation_list_row.xml
@@ -2,71 +2,67 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:padding="8dp">
- 
+    android:padding="8dp" >
 
-	<ImageView
-            android:id="@+id/conversation_image"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
-            android:layout_alignParentLeft="true"
-            android:scaleType="centerCrop"/>
+    <ImageView
+        android:id="@+id/conversation_image"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:layout_alignParentLeft="true"
+        android:scaleType="centerCrop" />
 
-	<RelativeLayout
-	    android:layout_toRightOf="@+id/conversation_image"
-	    android:layout_centerVertical="true"
-	    android:layout_height="wrap_content"
-	    android:layout_width="fill_parent"
-	    android:paddingLeft="8dp">
+    <RelativeLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_toRightOf="@+id/conversation_image"
+        android:paddingLeft="8dp" >
 
-	    <TextView
-	        android:id="@+id/conversation_name"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:layout_alignLeft="@+id/conversation_lastwrapper"
-	        android:layout_toLeftOf="@+id/conversation_lastupdate"
-	        android:singleLine="true"
-	        android:textSize="?attr/TextSizeHeadline"
-	        android:textColor="@color/primarytext"
-	        android:typeface="sans" />
-	 
-	    <LinearLayout
-	        android:orientation="vertical"
-	        android:id="@+id/conversation_lastwrapper"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_below="@id/conversation_name"
-	        android:paddingTop="3dp"
-	        >
-	    <TextView
-	        android:id="@+id/conversation_lastmsg"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:textSize="?attr/TextSizeBody"
-	        android:textColor="@color/primarytext"
-	        android:singleLine="true"
-	        android:scrollHorizontally="false"
-	        />
-	    
-	    <ImageView
-	        android:id="@+id/conversation_lastimage"
-	        android:layout_width="fill_parent"
-	        android:layout_height="36dp"
-	        android:background="@color/primarytext"
-	        android:scaleType="centerCrop" />
+        <TextView
+            android:id="@+id/conversation_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@+id/conversation_lastwrapper"
+            android:layout_toLeftOf="@+id/conversation_lastupdate"
+            android:singleLine="true"
+            android:textColor="@color/primarytext"
+            android:textSize="?attr/TextSizeHeadline"
+            android:typeface="sans" />
 
-	</LinearLayout>
-	    <TextView
-	        android:id="@+id/conversation_lastupdate"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:layout_alignBaseline="@+id/conversation_name"
-	        android:layout_alignParentRight="true"
-	        android:gravity="right"
-	        android:textSize="?attr/TextSizeInfo"
-	        android:textColor="@color/secondarytext"/>
+        <LinearLayout
+            android:id="@+id/conversation_lastwrapper"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/conversation_name"
+            android:orientation="vertical"
+            android:paddingTop="3dp" >
+
+            <TextView
+                android:id="@+id/conversation_lastmsg"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:scrollHorizontally="false"
+                android:singleLine="true"
+                android:textColor="@color/primarytext"
+                android:textSize="?attr/TextSizeBody" />
+
+            <ImageView
+                android:id="@+id/conversation_lastimage"
+                android:layout_width="fill_parent"
+                android:layout_height="36dp"
+                android:background="@color/primarytext"
+                android:scaleType="centerCrop" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/conversation_lastupdate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBaseline="@+id/conversation_name"
+            android:layout_alignParentRight="true"
+            android:gravity="right"
+            android:textColor="@color/secondarytext"
+            android:textSize="?attr/TextSizeInfo" />
+    </RelativeLayout>
 
- 	</RelativeLayout>
- 
- 
 </RelativeLayout>
\ No newline at end of file