From bf2d0d5596a08872230056d056241ee906962171 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel.gultsch@rwth-aachen.de>
Date: Fri, 25 Apr 2014 16:24:56 +0200
Subject: smoother scrolling (first step)

---
 res/layout/conversation_list_row.xml | 21 ++++++++++++++++++---
 res/layout/message_sent.xml          |  2 --
 res/values/strings.xml               |  2 ++
 3 files changed, 20 insertions(+), 5 deletions(-)

(limited to 'res')

diff --git a/res/layout/conversation_list_row.xml b/res/layout/conversation_list_row.xml
index 469a0cde1..76016adac 100644
--- a/res/layout/conversation_list_row.xml
+++ b/res/layout/conversation_list_row.xml
@@ -22,24 +22,39 @@
 	        android:id="@+id/conversation_name"
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
-	        android:layout_alignLeft="@+id/conversation_lastmsg"
+	        android:layout_alignLeft="@+id/conversation_lastwrapper"
 	        android:layout_toLeftOf="@+id/conversation_lastupdate"
 	        android:singleLine="true"
 	        android:textColor="#636363"
 	        android:textSize="20sp"
 	        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:layout_below="@id/conversation_name"
+	        
 	        android:textColor="#636363"
 	        android:textSize="14sp"
 	        android:singleLine="true"
 	        android:scrollHorizontally="false"
-	        android:paddingTop="3dp"/>
+	        />
+	    
+	    <ImageView
+	        android:id="@+id/conversation_lastimage"
+	        android:layout_width="fill_parent"
+	        android:layout_height="36dp"
+	        android:scaleType="centerCrop" />
 
+	</LinearLayout>
 	    <TextView
 	        android:id="@+id/conversation_lastupdate"
 	        android:layout_width="wrap_content"
diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml
index 1ae422bb4..f0950ef91 100644
--- a/res/layout/message_sent.xml
+++ b/res/layout/message_sent.xml
@@ -25,8 +25,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:adjustViewBounds="true"
-                android:maxHeight="288dp"
-                android:maxWidth="288dp"
                 android:paddingBottom="2dp"
                 />
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index df0961794..1bc03a919 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -66,4 +66,6 @@
     <string name="send_pgp_message">Send openPGP encrypted message</string>
     <string name="your_nick_has_been_changed">Your nickname has been changed</string>
     <string name="download_image">Download Image</string>
+    <string name="error_loading_image">Error loading image (File not found)</string>
+    <string name="image_offered_for_download"><i>Image file offered for download</i></string>
 </resources>
-- 
cgit v1.2.3