From 9dbcae5eed995867f0504e0d429b2f37e263db0f Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Thu, 13 Nov 2008 21:22:24 +0000
Subject: [PATCH] shrink down the message list views to get toward something
 sane

---
 res/layout-land/folder_message_list_child.xml | 53 +++++++++++++++
 res/layout/folder_message_list_child.xml      | 66 ++++++++++---------
 src/com/fsck/k9/R.java                        |  6 +-
 3 files changed, 91 insertions(+), 34 deletions(-)
 create mode 100644 res/layout-land/folder_message_list_child.xml

diff --git a/res/layout-land/folder_message_list_child.xml b/res/layout-land/folder_message_list_child.xml
new file mode 100644
index 000000000..606f597a3
--- /dev/null
+++ b/res/layout-land/folder_message_list_child.xml
@@ -0,0 +1,53 @@
+<?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="19px"
+    android:paddingRight="1px"
+    android:paddingTop="3px"
+    android:background="@drawable/folder_message_list_child_background">
+    <View
+        android:id="@+id/chip"
+        android:background="@drawable/appointment_indicator_leftside_1"
+        android:layout_width="4px"
+        android:layout_height="20px"
+        android:layout_centerVertical="true" />
+    <TextView
+        android:id="@+id/subject"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textSize="10sp"
+        android:textColor="?android:attr/textColorSecondary"
+        android:layout_width="310px"
+        android:layout_height="wrap_content"
+        android:layout_toLeftOf="@+id/from"
+        android:paddingLeft="10px"
+        android:layout_marginRight="1px" />
+    <TextView
+        android:id="@+id/from"
+        android:textSize="10sp"
+        android:layout_toRightOf="@+id/subject"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:layout_width="120px"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorPrimary"
+        android:paddingLeft="5px"
+        android:paddingRight="5px"
+        android:drawablePadding="4px"
+        />
+    <TextView
+        android:id="@+id/date"
+        android:ellipsize="end"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textSize="10sp"
+        android:singleLine="true"
+        android:textColor="?android:attr/textColorPrimary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_toRightOf="@+id/from"
+        />
+</RelativeLayout>
diff --git a/res/layout/folder_message_list_child.xml b/res/layout/folder_message_list_child.xml
index 7cfe11e87..d575bbc68 100644
--- a/res/layout/folder_message_list_child.xml
+++ b/res/layout/folder_message_list_child.xml
@@ -2,48 +2,52 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:paddingRight="10px"
+    android:layout_height="19px"
+    android:paddingRight="1px"
+    android:paddingTop="3px"
     android:background="@drawable/folder_message_list_child_background">
     <View
         android:id="@+id/chip"
         android:background="@drawable/appointment_indicator_leftside_1"
         android:layout_width="4px"
-        android:layout_height="56px"
+        android:layout_height="20px"
         android:layout_centerVertical="true" />
-    <TextView
-        android:id="@+id/from"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/chip"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?android:attr/textColorPrimary"
-        android:paddingLeft="30px"
-        android:drawablePadding="4px"
-        android:paddingTop="12px" />
-    <TextView
-        android:id="@+id/date"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorPrimary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignBaseline="@+id/subject" />
     <TextView
         android:id="@+id/subject"
         android:ellipsize="end"
         android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textSize="10sp"
         android:textColor="?android:attr/textColorSecondary"
-        android:layout_width="0dip"
+        android:layout_width="200px"
         android:layout_height="wrap_content"
-        android:layout_below="@id/from"
-        android:layout_alignLeft="@id/from"
-        android:layout_toLeftOf="@id/date"
-        android:paddingLeft="30px"
-        android:layout_marginRight="6dip" />
+        android:layout_toLeftOf="@+id/from"
+        android:paddingLeft="10px"
+        android:layout_marginRight="1px" />
+    <TextView
+        android:id="@+id/from"
+        android:textSize="10sp"
+        android:layout_toRightOf="@+id/subject"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:layout_width="70px"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorPrimary"
+        android:paddingLeft="5px"
+        android:paddingRight="5px"
+        android:drawablePadding="4px"
+        />
+    <TextView
+        android:id="@+id/date"
+        android:ellipsize="end"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textSize="10sp"
+        android:singleLine="true"
+        android:textColor="?android:attr/textColorPrimary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_toRightOf="@+id/from"
+        />
 </RelativeLayout>
diff --git a/src/com/fsck/k9/R.java b/src/com/fsck/k9/R.java
index 4f9b1f430..87d8e5970 100644
--- a/src/com/fsck/k9/R.java
+++ b/src/com/fsck/k9/R.java
@@ -126,7 +126,7 @@ public final class R {
         public static final int check_mail=0x7f0a0047;
         public static final int chip=0x7f0a0024;
         public static final int compose=0x7f0a0048;
-        public static final int date=0x7f0a0026;
+        public static final int date=0x7f0a0027;
         public static final int debug_logging=0x7f0a0022;
         public static final int delete=0x7f0a0038;
         public static final int delete_account=0x7f0a0046;
@@ -141,7 +141,7 @@ public final class R {
         public static final int folder_name=0x7f0a0029;
         public static final int folder_status=0x7f0a002a;
         public static final int forward=0x7f0a004a;
-        public static final int from=0x7f0a0025;
+        public static final int from=0x7f0a0026;
         public static final int imap=0x7f0a0001;
         public static final int imap_path_prefix=0x7f0a0015;
         public static final int imap_path_prefix_section=0x7f0a0014;
@@ -168,7 +168,7 @@ public final class R {
         public static final int sensitive_logging=0x7f0a0023;
         public static final int show_pictures=0x7f0a0041;
         public static final int show_pictures_section=0x7f0a0040;
-        public static final int subject=0x7f0a0027;
+        public static final int subject=0x7f0a0025;
         public static final int text1=0x7f0a0042;
         public static final int text2=0x7f0a0043;
         public static final int to=0x7f0a002b;