conversation archiveable. new conversation will find or restart old conversations

5 files changed, 59 insertions, 7 deletions

diff --git a/res/layout/conversation_list_row.xml b/res/layout/conversation_list_row.xml
index 303fdd1d..41747240 100644
--- a/res/layout/conversation_list_row.xml
+++ b/res/layout/conversation_list_row.xml
@@ -22,7 +22,6 @@
 	        android:id="@+id/conversation_name"
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
-	        android:text="Mein Contact"
 	        android:textColor="#636363"
 	        android:textSize="20sp"
 	        android:typeface="sans" />
@@ -34,7 +33,8 @@
 	        android:layout_below="@id/conversation_name"
 	        android:textColor="#636363"
 	        android:textSize="14sp"
-	        android:text="This is my last message"
+	        android:singleLine="true"
+	        android:scrollHorizontally="false"
 	        android:paddingTop="3dp"/>
 
 	    <TextView
@@ -44,7 +44,6 @@
 	        android:layout_alignBaseline="@+id/conversation_name"
 	        android:layout_alignParentRight="true"
 	        android:gravity="right"
-	        android:text="2 min"
 	        android:textColor="#636363"
 	        android:textSize="12sp" />
 
diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml
index 11859573..3b965af2 100644
--- a/res/layout/fragment_conversation.xml
+++ b/res/layout/fragment_conversation.xml
@@ -49,7 +49,9 @@
         android:background="#e5e5e5"
         tools:listitem="@layout/message_sent"
         android:divider="@null"
-		android:dividerHeight="0dp">
+		android:dividerHeight="0dp"
+		android:transcriptMode="alwaysScroll"
+		android:listSelector="@android:color/transparent">
     </ListView>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/message_recieved.xml b/res/layout/message_recieved.xml
new file mode 100644
index 00000000..bde702ae
--- /dev/null
+++ b/res/layout/message_recieved.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="8dp">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/message_border"
+        android:layout_toRightOf="@+id/message_photo"
+     	android:layout_alignParentBottom="true"
+     	android:minHeight="48dp"
+     	>
+<LinearLayout
+    android:layout_width="wrap_content"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:background="#ededed"
+    android:padding="5dp">   
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Hi, how are you?"
+        android:textSize="16sp"
+        android:id="@+id/message_body"
+        android:textColor="#333333"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="1dp"
+        android:text="@string/sending"
+        android:textColor="#8e8e8e"
+        android:textSize="12sp"
+        android:id="@+id/message_time"/>
+
+	</LinearLayout>
+</LinearLayout>
+    <ImageView
+        android:id="@+id/message_photo"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_marginRight="-1.5dp"
+        android:padding="0dp"
+        android:src="@drawable/ic_profile"
+        android:scaleType="fitXY"/>
+	
+</RelativeLayout>
diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml
index c690c217..c3136a55 100644
--- a/res/layout/message_sent.xml
+++ b/res/layout/message_sent.xml
@@ -10,12 +10,11 @@
         android:layout_height="wrap_content"
         android:background="@drawable/message_border"
         android:layout_toLeftOf="@+id/message_photo"
-     	android:layout_alignParentLeft="true"
      	android:layout_alignParentBottom="true"
      	android:minHeight="48dp"
      	>
 <LinearLayout
-    android:layout_width="fill_parent"
+    android:layout_width="wrap_content"
     android:layout_height="fill_parent"
     android:orientation="vertical"
     android:background="#ededed"
diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml
index 39c36a53..a6cdd885 100644
--- a/res/menu/conversations.xml
+++ b/res/menu/conversations.xml
@@ -24,7 +24,7 @@
         android:id="@+id/action_archive"
         android:orderInCategory="50"
         android:showAsAction="never"
-        android:title="@string/action_archive" />
+        android:title="@string/action_archive"/>
     
     <item
         android:id="@+id/action_accounts"