#364 Rework chat layouts + add avatars

3 files changed, 77 insertions, 52 deletions

diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index a62cfa65..89ad77ac 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -37,7 +37,7 @@
 				android:layout_weight="1"
 				android:autoLink="all"
 				android:hint="@string/chat.send_a_message"
-				android:inputType="textEmailAddress|textMultiLine"
+				android:inputType="textCapSentences|textAutoCorrect|textLongMessage"
 				android:linksClickable="true"
 				android:paddingBottom="10dip"
 				android:paddingTop="10dip" />
diff --git a/res/layout/chat_item.xml b/res/layout/chat_item.xml
index b44631d1..b175d6c1 100644
--- a/res/layout/chat_item.xml
+++ b/res/layout/chat_item.xml
@@ -1,36 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="horizontal"
 	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:orientation="vertical" >
+	android:layout_height="wrap_content">
 
-	<TextView
-		android:id="@+id/chat_username"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginLeft="6dip"
-		android:layout_marginRight="6dip"
-		android:ellipsize="marquee"
-		android:singleLine="true"
-		android:text="User"
-		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:textColor="?android:textColorSecondary"/>
+	<ImageView
+		android:id="@+id/chat_avatar"
+		android:src="@drawable/ic_social_person"
+		android:layout_width="@dimen/AlbumArt.Small"
+		android:layout_height="@dimen/AlbumArt.Small"
+		android:layout_gravity="left|center_vertical"/>
 
 	<LinearLayout
-		android:id="@+id/chat_message_layout"
-		android:layout_width="wrap_content"
+		android:layout_width="0dip"
 		android:layout_height="wrap_content"
-		android:layout_marginTop="2dip"
-		android:orientation="horizontal" >
+		android:layout_weight="1"
+		android:orientation="vertical" >
 
-		<TextView
-			android:id="@+id/chat_time"
+		<LinearLayout
+			android:id="@+id/chat_message_layout"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="6dip"
-			android:singleLine="true"
-			android:text="00:00"
-			android:textAppearance="?android:attr/textAppearanceMedium" />
+			android:layout_marginBottom="4dip"
+			android:orientation="horizontal" >
+
+			<TextView
+				android:id="@+id/chat_username"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="6dip"
+				android:layout_marginRight="6dip"
+				android:ellipsize="marquee"
+				android:singleLine="true"
+				android:text="User"
+				android:textAppearance="?android:attr/textAppearanceLarge"
+				android:textColor="?android:textColorSecondary"/>
+
+			<TextView
+				android:id="@+id/chat_time"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="6dip"
+				android:singleLine="true"
+				android:text="00:00"
+				android:textAppearance="?android:attr/textAppearanceSmall" />
+		</LinearLayout>
 
 		<TextView
 			android:id="@+id/chat_message"
diff --git a/res/layout/chat_item_reverse.xml b/res/layout/chat_item_reverse.xml
index 62695521..1d441da0 100644
--- a/res/layout/chat_item_reverse.xml
+++ b/res/layout/chat_item_reverse.xml
@@ -1,38 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="horizontal"
 	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:orientation="vertical" >
-
-	<TextView
-		android:id="@+id/chat_username"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginRight="6dip"
-		android:gravity="right"
-		android:layout_gravity="right"
-		android:ellipsize="marquee"
-		android:singleLine="true"
-		android:text="User"
-		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:textColor="?android:textColorSecondary"/>
+	android:layout_height="wrap_content">
 
 	<LinearLayout
-		android:layout_width="wrap_content"
+		android:layout_width="0dip"
 		android:layout_height="wrap_content"
-		android:layout_marginTop="2dip"
-		android:orientation="horizontal"
-		android:layout_gravity="right" >
+		android:layout_weight="1"
+		android:orientation="vertical" >
 
-		<TextView
-			android:id="@+id/chat_time"
+		<LinearLayout
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="6dip"
-			android:singleLine="true"
-			android:gravity="right"
-			android:text="00:00"
-			android:textAppearance="?android:attr/textAppearanceMedium" />
+			android:layout_marginBottom="4dip"
+			android:orientation="horizontal"
+			android:layout_gravity="right" >
+
+			<TextView
+				android:id="@+id/chat_time"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginRight="6dip"
+				android:singleLine="true"
+				android:text="00:00"
+				android:textAppearance="?android:attr/textAppearanceSmall" />
+
+			<TextView
+				android:id="@+id/chat_username"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="6dip"
+				android:ellipsize="marquee"
+				android:singleLine="true"
+				android:text="User"
+				android:textAppearance="?android:attr/textAppearanceLarge"
+				android:textColor="?android:textColorSecondary"/>
+		</LinearLayout>
 
 		<TextView
 			android:id="@+id/chat_message"
@@ -43,8 +47,15 @@
 			android:autoLink="all"
 			android:linksClickable="true"
 			android:singleLine="false"
-			android:gravity="right"
 			android:text="Chat message"
-			android:textAppearance="?android:attr/textAppearanceMedium" />
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_gravity="right"/>
 	</LinearLayout>
+
+	<ImageView
+		android:id="@+id/chat_avatar"
+		android:src="@drawable/ic_social_person"
+		android:layout_width="@dimen/AlbumArt.Small"
+		android:layout_height="@dimen/AlbumArt.Small"
+		android:layout_gravity="right|center_vertical"/>
 </LinearLayout>
\ No newline at end of file