From 77bc346ef9f5271e048e13c05630ec6f58e42ede Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@bestpractical.com>
Date: Mon, 10 Sep 2012 18:37:43 -0400
Subject: [PATCH 1/2] New icon and divider for message lists

---
 res/drawable-hdpi/divider_dark.9.png              | Bin 0 -> 78 bytes
 res/drawable-hdpi/divider_light.9.png             | Bin 0 -> 76 bytes
 .../ic_menu_moreoverflow_holo_dark.png            | Bin 0 -> 144 bytes
 .../ic_menu_moreoverflow_holo_light.png           | Bin 0 -> 148 bytes
 res/drawable-mdpi/divider_dark.9.png              | Bin 0 -> 78 bytes
 res/drawable-mdpi/divider_light.9.png             | Bin 0 -> 76 bytes
 .../ic_menu_moreoverflow_holo_dark.png            | Bin 0 -> 122 bytes
 .../ic_menu_moreoverflow_holo_light.png           | Bin 0 -> 131 bytes
 res/drawable-xhdpi/divider_dark.9.png             | Bin 0 -> 83 bytes
 res/drawable-xhdpi/divider_light.9.png            | Bin 0 -> 83 bytes
 .../ic_menu_moreoverflow_holo_dark.png            | Bin 0 -> 167 bytes
 .../ic_menu_moreoverflow_holo_light.png           | Bin 0 -> 184 bytes
 res/values/attrs.xml                              |   2 ++
 res/values/themes.xml                             |   4 ++++
 14 files changed, 6 insertions(+)
 create mode 100644 res/drawable-hdpi/divider_dark.9.png
 create mode 100644 res/drawable-hdpi/divider_light.9.png
 create mode 100644 res/drawable-hdpi/ic_menu_moreoverflow_holo_dark.png
 create mode 100644 res/drawable-hdpi/ic_menu_moreoverflow_holo_light.png
 create mode 100644 res/drawable-mdpi/divider_dark.9.png
 create mode 100644 res/drawable-mdpi/divider_light.9.png
 create mode 100644 res/drawable-mdpi/ic_menu_moreoverflow_holo_dark.png
 create mode 100644 res/drawable-mdpi/ic_menu_moreoverflow_holo_light.png
 create mode 100644 res/drawable-xhdpi/divider_dark.9.png
 create mode 100644 res/drawable-xhdpi/divider_light.9.png
 create mode 100644 res/drawable-xhdpi/ic_menu_moreoverflow_holo_dark.png
 create mode 100644 res/drawable-xhdpi/ic_menu_moreoverflow_holo_light.png

diff --git a/res/drawable-hdpi/divider_dark.9.png b/res/drawable-hdpi/divider_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..986ab0b9746301f2dd9401829da09e00995621b3
GIT binary patch
literal 78
zcmeAS@N?(olHy`uVBq!ia0vp^%plCc1|-8Yw(bW~qMj~}Asp9}6B-)+^BAxRtXRm=
az`@Yw&#rLZUbzUUfWgz%&t;ucLK6T(%Mo}0

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/divider_light.9.png b/res/drawable-hdpi/divider_light.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..0279e17a123f8cbb3c7e3a9ce5c5af8e693b6977
GIT binary patch
literal 76
zcmeAS@N?(olHy`uVBq!ia0vp^%plCc1|-8Yw(bW~!k#XUAsp9}6B-)+^LX%RmN2q0
Ycy4A9FVZ~13zTN?boFyt=akR{01+Y(GXMYp

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_menu_moreoverflow_holo_dark.png b/res/drawable-hdpi/ic_menu_moreoverflow_holo_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..2abc45809c62513224e9d695542cb8dd8e8087b9
GIT binary patch
literal 144
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezt=sPZ!6KjC*gdALL|E;9+*q=6m<7
zlueVX_4IZHnJ0qE#_rG0T(kiyWMEjjhCTn?qu5pu`=4q}27?c$C=-xvpo(CHaDZeV
Zn6Yoz!5==w<ccAP>*?y}vd$@?2>|OKBsl;8

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_menu_moreoverflow_holo_light.png b/res/drawable-hdpi/ic_menu_moreoverflow_holo_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb6aef1d069a14a7fc1cea9780c919c61679e4fa
GIT binary patch
literal 148
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtXipc%kc@k8uWjUIP~c#3xZ62X
z=G4p^oaPsfxfS0Jish)R3f(&WG9yqa14Evg(y_dGGlfCy2iXqR3?>_SEs{VyhV?DH
iJ0OaDc|iOR772{!kNsXaOPT8&i0|p@=d#Wzp$Py$I4IEo

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/divider_dark.9.png b/res/drawable-mdpi/divider_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..986ab0b9746301f2dd9401829da09e00995621b3
GIT binary patch
literal 78
zcmeAS@N?(olHy`uVBq!ia0vp^%plCc1|-8Yw(bW~qMj~}Asp9}6B-)+^BAxRtXRm=
az`@Yw&#rLZUbzUUfWgz%&t;ucLK6T(%Mo}0

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/divider_light.9.png b/res/drawable-mdpi/divider_light.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..0279e17a123f8cbb3c7e3a9ce5c5af8e693b6977
GIT binary patch
literal 76
zcmeAS@N?(olHy`uVBq!ia0vp^%plCc1|-8Yw(bW~!k#XUAsp9}6B-)+^LX%RmN2q0
Ycy4A9FVZ~13zTN?boFyt=akR{01+Y(GXMYp

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_menu_moreoverflow_holo_dark.png b/res/drawable-mdpi/ic_menu_moreoverflow_holo_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba704b67e3a25f1fb1b16a261c5a1b25fabd0c0d
GIT binary patch
literal 122
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzM^6{Wkch)?uQ+l6B^Vrg<?fw-
z%Uf!gVZ(K(VMAo-MN8#b><eTK^xt25c#oUm9_y3un%5W^7-TPi2!;&y9EPp@=5MCX
R_zN_Q!PC{xWt~$(69C9zB;Wu5

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_menu_moreoverflow_holo_light.png b/res/drawable-mdpi/ic_menu_moreoverflow_holo_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..01d681697f799729aa60bcc03878b8718ef5f705
GIT binary patch
literal 131
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzFHaZ8kch)?uW#gKP~c&9OkaNH
zNWhsXa}P0HP*CC8e>x;QVw%w1wevX{81fiqT9$oZHH(4a215zM2{s3I28IOo7eJ#J
d>KPlRN5&o6d@ywr|9haR44$rjF6*2UngC}HDAND{

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/divider_dark.9.png b/res/drawable-xhdpi/divider_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..e62f011d45a2c4c61a60b6451bec014a557a5188
GIT binary patch
literal 83
zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1|(O0oL2{=q&!_5LpZJ{Cp0wt58!#o&?v=m
gn8lDKU<(7oW*(8&@UL&}fT|cgUHx3vIVCg!0O}VNC;$Ke

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/divider_light.9.png b/res/drawable-xhdpi/divider_light.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..65061c0f45e63fe0fea0bfad9c71ee52c07ef38e
GIT binary patch
literal 83
zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1|(O0oL2{=q&!_5LpZJ{Cp0wt58!$3;rOwB
g4O4-x!vO{c$tv!+&aYQD0#z}1y85}Sb4q9e02-<n00000

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_menu_moreoverflow_holo_dark.png b/res/drawable-xhdpi/ic_menu_moreoverflow_holo_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..a92fb1d4af622cfad770d7c494121719a7896e61
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=d7dtgAr-gYUQ-leFyLX@@b&p`
z%gbN)&SLHDYV<0q^J4_6fq?|&@*V6j4#NRakTDF}Z~@#RP$drMna{J{ZM0wU(H|t@
M>FVdQ&MBb@0L8N*<^TWy

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_menu_moreoverflow_holo_light.png b/res/drawable-xhdpi/ic_menu_moreoverflow_holo_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..930ca8d95e8bee5a1240fba645d9dab919abd734
GIT binary patch
literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=^`0({Ar-gYUf;;epuoZ6aJO@&
z%&D0-IKvGL&8p&qV;O7KuliPO1yl(K>(rHwor_8Hg9|Y9Gj8!^hz0Vk4~QZ}ABcvv
nF)(akj$uTI?LshtEWgbR4Rf6*RPme*0Ev6L`njxgN@xNAEX^ml

literal 0
HcmV?d00001

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 4475e4e78..e2f0383cc 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <declare-styleable name="K9Styles">
+        <attr name="listDivider" format="reference" />
+		<attr name="iconListItemMenu" format="reference" />
 		<attr name="iconMenuInfoDetails" format="reference" />
 		<attr name="iconActionAddAttachment" format="reference" />
 		<attr name="iconActionAddCcBcc" format="reference" />
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 10e81ff29..5f1e37b61 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -3,6 +3,8 @@
 
     <style name="Theme.K9.Light" parent="Theme.Sherlock.Light">
         <item name="android:autoCompleteTextViewStyle">@style/Widget.K9.AutoCompleteTextView</item>
+        <item name="listDivider">@drawable/divider_light</item>
+        <item name="iconListItemMenu">@drawable/ic_menu_moreoverflow_holo_light</item>
 		<item name="iconMenuInfoDetails">@android:drawable/ic_menu_info_details</item>
 		<item name="iconActionAddAttachment">@drawable/ic_action_add_attachment_light</item>
 		<item name="iconActionAddCcBcc">@drawable/ic_action_add_cc_bbc_light</item>
@@ -42,6 +44,8 @@
 
     <style name="Theme.K9.Dark" parent="Theme.Sherlock">
         <item name="android:autoCompleteTextViewStyle">@style/Widget.K9.AutoCompleteTextView</item>
+        <item name="listDivider">@drawable/divider_dark</item>
+        <item name="iconListItemMenu">@drawable/ic_menu_moreoverflow_holo_dark</item>
 		<item name="iconMenuInfoDetails">@android:drawable/ic_menu_info_details</item>
 		<item name="iconActionAddAttachment">@drawable/ic_action_add_attachment_dark</item>
 		<item name="iconActionAddCcBcc">@drawable/ic_action_add_cc_bcc_dark</item>

From b5d887728a455f9eb597bcbe49537bd7ad50a9c8 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@bestpractical.com>
Date: Tue, 11 Sep 2012 18:45:16 -0400
Subject: [PATCH 2/2] Cleanups to our MessageList item select/deselect code.
 Fixes bugs where the action mode wouldn't trigger if the first item was
 checked with the checkbox

---
 src/com/fsck/k9/activity/MessageList.java | 60 +++++++++--------------
 1 file changed, 23 insertions(+), 37 deletions(-)

diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 7399ce4ab..178686f8d 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -669,7 +669,7 @@ public class MessageList extends K9ListActivity implements OnItemClickListener {
 
         MessageInfoHolder message = (MessageInfoHolder) mAdapter.getItem(position);
         if (mSelectedCount > 0) {
-        handleContextRelatedClick(position);
+            toggleMessageSelect(position);
         } else {
             onOpenMessage(message);
         }
@@ -700,7 +700,8 @@ public class MessageList extends K9ListActivity implements OnItemClickListener {
             @Override
             public boolean onItemLongClick(AdapterView<?> parent, View view,
                     int position, long id) {
-                return handleContextRelatedClick(position);
+                toggleMessageSelect(position);
+                return true;
             }});
 
         // Correcting for screen rotation when in ActionMode
@@ -2288,24 +2289,12 @@ public class MessageList extends K9ListActivity implements OnItemClickListener {
         public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
             if (position != -1) {
                 MessageInfoHolder message = (MessageInfoHolder) mAdapter.getItem(position);
-                if (message.selected != isChecked) {
-                    if (isChecked) {
-                        mSelectedCount++;
-                    } else if (mSelectedCount > 0) {
-                        mSelectedCount--;
+                    toggleMessageSelect(message);
+                    if (!mCheckboxes) {
+                         selected.setVisibility(isChecked ? View.VISIBLE : View.GONE);
                     }
 
-                    // We must set the flag before showing the buttons as the
-                    // buttons text depends on what is selected.
-                    message.selected = isChecked;
-                    if (!mCheckboxes) {
-                        if (isChecked) {
-                            selected.setVisibility(View.VISIBLE);
-                        } else {
-                            selected.setVisibility(View.GONE);
-                        }
-                    }
-                }
+
             }
         }
     }
@@ -2399,7 +2388,23 @@ public class MessageList extends K9ListActivity implements OnItemClickListener {
         mAdapter.notifyDataSetChanged();
     }
 
+    private void toggleMessageSelect(int position){
+        MessageInfoHolder holder = (MessageInfoHolder) mAdapter.getItem(position);
+        toggleMessageSelect(holder);
+    }
+
     private void toggleMessageSelect(final MessageInfoHolder holder){
+        if (mActionMode != null) {
+            if (mSelectedCount == 1 && holder.selected) {
+                mActionMode.finish();
+                return;
+            }
+        } else {
+            mActionMode = MessageList.this.startActionMode(mActionModeCallback);
+     }
+
+
+
     if (holder.selected) {
         holder.selected = false;
         mSelectedCount -= 1;
@@ -2720,25 +2725,6 @@ public class MessageList extends K9ListActivity implements OnItemClickListener {
         return account;
     }
 
-    private boolean handleContextRelatedClick(int position){
-    MessageInfoHolder holder = (MessageInfoHolder) mAdapter.getItem(position);
-        if (mActionMode != null) {
-            if (mSelectedCount > 1) {
-                toggleMessageSelect(holder);
-            } else {
-                if (holder.selected) {
-                    mActionMode.finish();
-                } else {
-                    toggleMessageSelect(holder);
-                }
-            }
-        } else {
-            mActionMode = MessageList.this.startActionMode(mActionModeCallback);
-            toggleMessageSelect(holder);
-        }
-
-        return true;
-    }
 
     private ActionMode.Callback mActionModeCallback = new ActionMode.Callback() {