From df9dcb1060d44a719e2892446b62cde884a880cf Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel.gultsch@rwth-aachen.de>
Date: Fri, 24 Jan 2014 23:58:51 +0100
Subject: basic persistance layer. refactor some parts of the conversation
 activity

---
 res/layout/conversation_list_row.xml | 98 +++++++++++++++++-------------------
 res/values/strings.xml               |  4 +-
 2 files changed, 46 insertions(+), 56 deletions(-)

(limited to 'res')

diff --git a/res/layout/conversation_list_row.xml b/res/layout/conversation_list_row.xml
index 5b3959c3..cfac7175 100644
--- a/res/layout/conversation_list_row.xml
+++ b/res/layout/conversation_list_row.xml
@@ -2,61 +2,53 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:padding="5dip">
+    android:padding="8dp">
  
-    <!--  ListRow Left sied Thumbnail image -->
-    <LinearLayout android:id="@+id/thumbnail"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="3dip"
-        android:layout_alignParentLeft="true"
-        android:layout_marginRight="5dip">
 
-        <ImageView
-            android:id="@+id/imageView1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_profile" />
- 
-    </LinearLayout>
- 
-    <!-- Title Of Song-->
-    <TextView
-        android:id="@+id/conversation_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/thumbnail"
-        android:layout_toRightOf="@+id/thumbnail"
-        android:text="Rihanna Love the way lie"
-        android:textColor="#636363"
-        android:typeface="sans"
-        android:textSize="20dip"/>
- 
-    <!-- Artist Name -->
-    <TextView
-        android:id="@+id/conversation_lastmsg"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/conversation_name"
-        android:textColor="#636363"
-        android:textSize="12dip"
-        android:layout_marginTop="1dip"
-        android:layout_toRightOf="@+id/thumbnail"
-        android:text="Just gona stand there and ..." />
- 
-    <!-- Rightend Duration -->
-    <TextView
-        android:id="@+id/duration"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignBottom="@id/conversation_name"
-        android:gravity="right"
-        android:text="5:45"
-        android:layout_marginRight="5dip"
-        android:textSize="10dip"
-        android:textColor="#636363"/>
- 
+	<ImageView
+            android:id="@+id/conversation_image"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
+            android:layout_alignParentLeft="true"/>
+
+	<RelativeLayout
+	    android:layout_toRightOf="@+id/conversation_image"
+	    android:layout_centerVertical="true"
+	    android:layout_height="wrap_content"
+	    android:layout_width="fill_parent"
+	    android:paddingLeft="8dp">
+
+	    <TextView
+	        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" />
+	 
+	    <TextView
+	        android:id="@+id/conversation_lastmsg"
+	        android:layout_width="fill_parent"
+	        android:layout_height="wrap_content"
+	        android:layout_below="@id/conversation_name"
+	        android:textColor="#636363"
+	        android:textSize="14sp"
+	        android:text="This is my last message"
+	        android:paddingTop="3dp"/>
+
+	    <TextView
+	        android:id="@+id/duration"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:layout_alignBaseline="@+id/conversation_name"
+	        android:layout_alignParentRight="true"
+	        android:gravity="right"
+	        android:text="2 min"
+	        android:textColor="#636363"
+	        android:textSize="12sp" />
+
+ 	</RelativeLayout>
  
  
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 053dfa5c..d6849e02 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5,10 +5,8 @@
     <string name="action_settings">Settings</string>
     <string name="action_add">New conversation</string>
     <string name="action_accounts">Manage accounts</string>
-    <string name="action_archive">Archive</string>
+    <string name="action_archive">Archive conversation</string>
     <string name="action_details">Show details</string>
     <string name="action_secure">Secure conversation</string>
     <string name="title_activity_new_conversation">New Conversation</string>
-    <string name="hello_world">Hello world!</string>
-
 </resources>
-- 
cgit v1.2.3