From 1c5d2405649e21f63c2de87c2867f6f030f2fa44 Mon Sep 17 00:00:00 2001
From: Bao-Long Nguyen-Trong <baolongnt@gmail.com>
Date: Tue, 12 Jan 2010 19:39:20 +0000
Subject: [PATCH] Made batch op button's text sensitive to which messages are
 selected

---
 res/layout/message_list.xml               |  6 ++---
 res/values/strings.xml                    | 13 ++++++----
 src/com/fsck/k9/activity/MessageList.java | 31 ++++++++++++++++++++++-
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/res/layout/message_list.xml b/res/layout/message_list.xml
index fc42b0652..57f90f6e6 100644
--- a/res/layout/message_list.xml
+++ b/res/layout/message_list.xml
@@ -21,21 +21,21 @@
             android:layout_width="0dip"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="Read"
+            android:text="@string/message_list_mark_read_action"
         />
         <Button
             android:id="@+id/batch_delete_button"
             android:layout_width="0dip"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="Delete"
+            android:text="@string/message_list_delete_action"
         />
         <Button
             android:id="@+id/batch_flag_button"
             android:layout_width="0dip"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="Flag"
+            android:text="@string/message_list_flag_action"
         />
     </LinearLayout>
     <ListView
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e4e34412f..126042a74 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -211,10 +211,13 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
                        <xliff:g id="polling">%s</xliff:g>
                        <xliff:g id="sending">%s</xliff:g>
                        <xliff:g id="push">%s</xliff:g></string>
-
-    
-
-<string name="message_list_load_more_messages_action">Load more messages</string>
+    <string name="message_list_load_more_messages_action">Load more messages</string>
+    <string name="message_list_to_fmt">To:<xliff:g id="counterParty">%s</xliff:g></string>
+    <string name="message_list_delete_action">Delete</string>
+    <string name="message_list_mark_read_action">Mark read</string>
+    <string name="message_list_mark_unread_action">Mark unread</string>
+    <string name="message_list_flag_action">Flag</string>
+    <string name="message_list_unflag_action">Unflag</string>
 
     <string name="message_compose_to_hint">To</string>
     <string name="message_compose_cc_hint">Cc</string>
@@ -228,7 +231,7 @@ 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 downloaded.</string>
 
-    <string name="message_list_to_fmt">To:<xliff:g id="counterParty">%s</xliff:g></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_view_to_label">To:</string>
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 4d22a73ff..6c15f9be4 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -2310,8 +2310,10 @@ public class MessageList
                     {
                         mSelectedCount--;
                     }
-                    showBatchButtons();
+                    //We must set the flag before showing the buttons
+                    //as the buttons text depends on what is selected
                     message.selected = isChecked;
+                    showBatchButtons();
                 }
             }
         }
@@ -2349,14 +2351,41 @@ public class MessageList
         {
             mSelectedCount = 0;
         }
+
+        int readButtonStringId;
+        int flagButtonStringId;
+
         if (mSelectedCount==0)
         {
+            readButtonStringId = R.string.message_list_mark_read_action;
+            flagButtonStringId = R.string.message_list_flag_action;
             disableBatchButtons();
         }
         else
         {
+            boolean newReadState = computeBatchDirection(false);
+            if (newReadState) 
+            {
+                readButtonStringId = R.string.message_list_mark_read_action;
+            }
+            else
+            {
+                readButtonStringId = R.string.message_list_mark_unread_action;
+            }
+            boolean newFlagState = computeBatchDirection(true);
+            if (newFlagState)
+            {
+                flagButtonStringId = R.string.message_list_flag_action;
+            }
+            else
+            {
+                flagButtonStringId = R.string.message_list_unflag_action;
+            }
             enableBatchButtons();
         }
+
+        mBatchReadButton.setText(readButtonStringId);
+        mBatchFlagButton.setText(flagButtonStringId);
     }
 
     class FooterViewHolder