From 8436e6b50b2e58d592314d432b49766d771dd8d9 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Thu, 22 Mar 2012 23:37:03 +0100
Subject: [PATCH] Tweaked MessageCompose layout

---
 res/layout/message_compose.xml | 53 +++++++++++++++++-----------------
 res/values/strings.xml         |  6 ++++
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/res/layout/message_compose.xml b/res/layout/message_compose.xml
index 4e5149a9c..b6ac2da71 100644
--- a/res/layout/message_compose.xml
+++ b/res/layout/message_compose.xml
@@ -9,8 +9,8 @@
         android:layout_width="fill_parent"
         android:layout_height="0dip"
         android:layout_weight="1"
-        android:scrollbarStyle="outsideInset"
-        android:fillViewport="true" >
+        android:scrollbarStyle="insideOverlay"
+        android:fillViewport="true">
 
         <LinearLayout
             android:layout_width="fill_parent"
@@ -64,16 +64,16 @@
                         android:hint="@string/message_compose_to_hint"
                         android:textColor="@android:color/primary_text_light"
                         android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:layout_width="fill_parent"
+                        android:layout_width="0dp"
                         android:layout_marginRight="6dip"
-                        android:layout_weight="5"/>
+                        android:layout_weight="1"/>
 
                     <ImageButton
                         android:id="@+id/add_to"
+                        android:contentDescription="@string/message_compose_description_add_to"
                         android:src="@drawable/ic_button_contacts"
-                        android:layout_weight="1"
                         android:layout_height="fill_parent"
-                        android:layout_width="60dip"
+                        android:layout_width="wrap_content"
                         android:layout_marginTop="1dip"/>
 
                 </LinearLayout>
@@ -89,9 +89,9 @@
 
                     <MultiAutoCompleteTextView
                         android:id="@+id/cc"
-                        android:layout_width="fill_parent"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="5"
+                        android:layout_weight="1"
                         android:layout_marginRight="6dip"
                         android:inputType="textEmailAddress|textMultiLine"
                         android:imeOptions="actionNext"
@@ -101,9 +101,9 @@
 
                     <ImageButton
                         android:id="@+id/add_cc"
+                        android:contentDescription="@string/message_compose_description_add_cc"
                         android:src="@drawable/ic_button_contacts"
-                        android:layout_weight="1"
-                        android:layout_width="60dip"
+                        android:layout_width="wrap_content"
                         android:layout_height="fill_parent"
                         android:layout_marginTop="1dip"/>
 
@@ -120,10 +120,10 @@
 
                     <MultiAutoCompleteTextView
                         android:id="@+id/bcc"
-                        android:layout_width="fill_parent"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginRight="6dip"
-                        android:layout_weight="5"
+                        android:layout_weight="1"
                         android:inputType="textEmailAddress|textMultiLine"
                         android:imeOptions="actionNext"
                         android:hint="@string/message_compose_bcc_hint"
@@ -131,11 +131,11 @@
                         android:textAppearance="?android:attr/textAppearanceMedium"/>
 
                     <ImageButton
+                        android:id="@+id/add_bcc"
+                        android:contentDescription="@string/message_compose_description_add_bcc"
                         android:layout_marginTop="1dip"
                         android:layout_height="fill_parent"
-                        android:id="@+id/add_bcc"
-                        android:layout_weight="1"
-                        android:layout_width="60dip"
+                        android:layout_width="wrap_content"
                         android:src="@drawable/ic_button_contacts"/>
 
                 </LinearLayout>
@@ -228,6 +228,7 @@
                 <View
                     android:layout_width="fill_parent"
                     android:layout_height="1dip"
+                    android:layout_marginBottom="4dp"
                     android:background="@drawable/divider_horizontal_email" />
 
             </LinearLayout>
@@ -235,8 +236,8 @@
             <EditText
                 android:id="@+id/message_content"
                 android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1.0"
+                android:layout_height="0dp"
+                android:layout_weight="1"
                 android:gravity="left|top"
                 android:hint="@string/message_compose_content_hint"
                 android:inputType="textMultiLine|textAutoCorrect|textCapSentences"
@@ -249,12 +250,13 @@
                 android:id="@+id/upper_signature"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1.0"
                 android:gravity="left|top"
                 android:editable="false"
                 android:minLines="0"
                 android:autoText="true"
                 android:capitalize="sentences"
+                android:hint="@string/message_compose_signature_hint"
+                android:inputType="textMultiLine|textAutoCorrect|textCapSentences"
                 android:textColor="@android:color/primary_text_light"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -265,9 +267,7 @@
                 android:padding="0dip"
                 android:layout_gravity="right"
                 android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentRight="true" />
+                android:layout_width="match_parent"/>
 
             <!-- Quoted text bar -->
             <RelativeLayout
@@ -279,11 +279,11 @@
                     android:id="@+id/quoted_text"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.0"
                     android:gravity="left|top"
                     android:minLines="3"
                     android:autoText="true"
                     android:capitalize="sentences"
+                    android:inputType="textMultiLine|textAutoCorrect|textCapSentences"
                     android:textColor="@android:color/primary_text_light"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -301,19 +301,17 @@
 
                     <ImageButton
                         android:id="@+id/quoted_text_edit"
+                        android:contentDescription="@string/message_compose_description_edit_quoted_text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentTop="true"
-                        android:layout_alignParentLeft="true"
                         android:layout_marginRight="8dip"
                         android:background="@drawable/btn_edit" />
 
                     <ImageButton
                         android:id="@+id/quoted_text_delete"
+                        android:contentDescription="@string/message_compose_description_delete_quoted_text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentTop="true"
-                        android:layout_alignParentRight="true"
                         android:background="@drawable/btn_dialog" />
 
                 </LinearLayout>
@@ -324,12 +322,13 @@
                 android:id="@+id/lower_signature"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1.0"
                 android:gravity="left|top"
                 android:editable="false"
                 android:minLines="0"
                 android:autoText="true"
                 android:capitalize="sentences"
+                android:hint="@string/message_compose_signature_hint"
+                android:inputType="textMultiLine|textAutoCorrect|textCapSentences"
                 android:textColor="@android:color/primary_text_light"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8d66d64ea..c1cfb2b26 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -260,6 +260,7 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
     <string name="message_compose_bcc_hint">Bcc</string>
     <string name="message_compose_subject_hint">Subject</string>
     <string name="message_compose_content_hint">Message text</string>
+    <string name="message_compose_signature_hint">Signature</string>
     <string name="message_compose_quote_header_separator">-------- Original Message --------</string>
     <string name="message_compose_quote_header_subject">Subject:</string>
     <string name="message_compose_quote_header_send_date">Sent:</string>
@@ -273,6 +274,11 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
     <string name="message_compose_downloading_attachments_toast">Some attachments were not downloaded. They will be downloaded automatically before this message is sent.</string>
     <string name="message_compose_attachments_skipped_toast">Some attachments cannot be forwarded because they have not been downloaded.</string>
     <string name="message_compose_show_quoted_text_action">Quote message</string>
+    <string name="message_compose_description_add_to">Add recipient (To)</string>
+    <string name="message_compose_description_add_cc">Add recipient (CC)</string>
+    <string name="message_compose_description_add_bcc">Add recipient (BCC)</string>
+    <string name="message_compose_description_delete_quoted_text">Remove quoted text</string>
+    <string name="message_compose_description_edit_quoted_text">Edit quoted text</string>
 
     <string name="message_view_from_format">From: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
     <string name="message_to_label">To:</string>