From 3d9391cf267dff862648fd3ece4dd010d5b5d6ae Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Mon, 10 Jan 2011 17:47:12 +0000
Subject: [PATCH] refactor apart the messageview layouts

---
 res/layout/message_view.xml        |  1 +
 res/layout/message_view_body.xml   | 29 +++++++++++++++++++++++++++++
 res/layout/message_view_header.xml | 29 ++++-------------------------
 3 files changed, 34 insertions(+), 25 deletions(-)
 create mode 100644 res/layout/message_view_body.xml

diff --git a/res/layout/message_view.xml b/res/layout/message_view.xml
index 2055b14c2..01c6e7dc5 100644
--- a/res/layout/message_view.xml
+++ b/res/layout/message_view.xml
@@ -21,6 +21,7 @@
             android:layout_height="0dip"
             android:layout_weight="1">
             <include layout="@layout/message_view_header" />
+            <include layout="@layout/message_view_body" />
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="0dip"
diff --git a/res/layout/message_view_body.xml b/res/layout/message_view_body.xml
new file mode 100644
index 000000000..701177cd7
--- /dev/null
+++ b/res/layout/message_view_body.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/body_container"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        >
+    <!-- Content area -->
+    <com.fsck.k9.view.MessageWebView
+        android:id="@+id/message_content"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent" />
+    <com.fsck.k9.view.AccessibleWebView
+        android:id="@+id/accessible_message_content"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent" />
+    <!-- Attachments area -->
+    <LinearLayout
+        android:id="@+id/attachments"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:padding="4dip" />
+    <Button android:id="@+id/download_remainder"
+        android:text="@string/message_view_download_remainder"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:layout_width="fill_parent" />
+</LinearLayout>
diff --git a/res/layout/message_view_header.xml b/res/layout/message_view_header.xml
index 40498d399..ed9a59afd 100644
--- a/res/layout/message_view_header.xml
+++ b/res/layout/message_view_header.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Header area -->
+<merge
+        xmlns:android="http://schemas.android.com/apk/res/android"
+    >
     <LinearLayout
         android:id="@+id/header_container"
         android:layout_width="fill_parent"
@@ -248,25 +248,4 @@
             android:layout_weight="1"/>
 
     </LinearLayout>
-    <!-- Content area -->
-    <com.fsck.k9.view.MessageWebView
-        android:id="@+id/message_content"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent" />
-    <com.fsck.k9.view.AccessibleWebView
-        android:id="@+id/accessible_message_content"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent" />
-    <!-- Attachments area -->
-    <LinearLayout
-        android:id="@+id/attachments"
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:padding="4dip" />
-    <Button android:id="@+id/download_remainder"
-        android:text="@string/message_view_download_remainder"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:layout_width="fill_parent" />
-</merge>
+    </merge>