From 8314b65e728cd67b3d48b12385f7948717d11221 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@bestpractical.com>
Date: Tue, 4 Sep 2012 21:40:01 -0400
Subject: [PATCH] cleanup; actually use the newly extracted icons

---
 res/menu/accounts_context.xml         |  6 +++---
 res/menu/accounts_option.xml          |  8 ++++----
 res/menu/folder_context.xml           |  8 ++++----
 res/menu/folder_list_option.xml       | 24 ++++++++++++------------
 res/menu/folder_select_option.xml     | 12 ++++++------
 res/menu/manage_identities_option.xml |  2 +-
 res/menu/message_compose_option.xml   | 16 ++++++++--------
 res/menu/message_list_context.xml     | 12 ++++++------
 res/menu/message_list_option.xml      | 16 ++++++++--------
 res/menu/message_view_option.xml      | 16 ++++++++--------
 res/values/attrs.xml                  |  3 +--
 res/values/themes.xml                 |  6 ++----
 12 files changed, 63 insertions(+), 66 deletions(-)

diff --git a/res/menu/accounts_context.xml b/res/menu/accounts_context.xml
index 1d4ee38a5..2b88588ef 100644
--- a/res/menu/accounts_context.xml
+++ b/res/menu/accounts_context.xml
@@ -3,17 +3,17 @@
     <item android:id="@+id/check_mail"
         android:title="@string/check_mail_action"
         android:showAsAction="always"
-        android:icon="@drawable/ic_action_refresh" />
+        android:icon="?attr/iconActionRefresh" />
 
     <item android:id="@+id/empty_trash"
         android:title="@string/empty_trash_action"
         android:showAsAction="always"
-        android:icon="@drawable/ic_action_delete" />
+        android:icon="?attr/iconActionDelete" />
 
     <item android:id="@+id/edit_account"
         android:title="@string/account_settings_action"
         android:showAsAction="always"
-        android:icon="@drawable/ic_action_settings"/>
+        android:icon="?attr/iconActionSettings"/>
 
     <item
         android:id="@+id/compact"
diff --git a/res/menu/accounts_option.xml b/res/menu/accounts_option.xml
index a233a73b2..9c5d10c3a 100644
--- a/res/menu/accounts_option.xml
+++ b/res/menu/accounts_option.xml
@@ -4,26 +4,26 @@
 		android:id="@+id/check_mail"
         android:alphabeticShortcut="r"
 		android:title="@string/check_mail_action"
-		android:icon="@drawable/ic_action_refresh"
+		android:icon="?attr/iconActionRefresh"
 		android:showAsAction="always"
 	/>
 	<item
 		android:id="@+id/search"
 		android:title="@string/search_action"
-		android:icon="@drawable/ic_action_search"
+		android:icon="?attr/iconActionSearch"
 		android:showAsAction="always"
 	/>
 	<item
 		android:id="@+id/compose"
         android:alphabeticShortcut="c"
         android:title="@string/compose_action"
-		android:icon="@drawable/ic_action_compose"
+		android:icon="?attr/iconActionCompose"
 		android:showAsAction="always"
 	/>
 	<item
 		android:id="@+id/add_new_account"
 		android:title="@string/add_account_action"
-		android:icon="@drawable/ic_menu_add"
+		android:icon="?attr/iconMenuAdd"
 	/>
     <item
         android:id="@+id/about"
diff --git a/res/menu/folder_context.xml b/res/menu/folder_context.xml
index 37e3667cf..05a79a768 100644
--- a/res/menu/folder_context.xml
+++ b/res/menu/folder_context.xml
@@ -3,22 +3,22 @@
 
     <item
         android:id="@+id/check_mail"
-        android:icon="@drawable/ic_action_refresh"
+        android:icon="?attr/iconActionRefresh"
         android:showAsAction="always"
         android:title="@string/check_mail_action"/>
     <item
         android:id="@+id/empty_trash"
-        android:icon="@drawable/ic_action_delete"
+        android:icon="?attr/iconActionDelete"
         android:showAsAction="always"
         android:title="@string/empty_trash_action"/>
     <item
         android:id="@+id/folder_settings"
-        android:icon="@drawable/ic_action_settings"
+        android:icon="?attr/iconActionSettings"
         android:showAsAction="always"
         android:title="@string/folder_settings_action"/>
     <item
         android:id="@+id/mark_all_as_read"
-        android:icon="@drawable/ic_action_read"
+        android:icon="?attr/iconActionRead"
         android:showAsAction="always"
         android:title="@string/mark_all_as_read_action"/>
     <item
diff --git a/res/menu/folder_list_option.xml b/res/menu/folder_list_option.xml
index 2beab4381..256b1aafa 100644
--- a/res/menu/folder_list_option.xml
+++ b/res/menu/folder_list_option.xml
@@ -4,14 +4,14 @@
 		android:id="@+id/check_mail"
         android:alphabeticShortcut="r"
 		android:title="@string/check_mail_action"
-		android:icon="@drawable/ic_action_refresh"
+		android:icon="?attr/iconActionRefresh"
 		android:showAsAction="always"
 	/>
    <item
 		android:id="@+id/compose"
         android:alphabeticShortcut="c"
 		android:title="@string/compose_action"
-        android:icon="@drawable/ic_action_compose"
+        android:icon="?attr/iconActionCompose"
 		android:showAsAction="always"
 	/>
 	<item
@@ -22,32 +22,32 @@
             <item
             android:id="@+id/display_all"
             android:title="@string/folder_list_display_mode_all"
-            android:icon="@drawable/ic_menu_clear"
+            android:icon="?attr/iconMenuClear"
            />
            <item
             android:id="@+id/display_1st_class"
             android:title="@string/folder_list_display_mode_first_class"
-            android:icon="@drawable/ic_menu_clear"
+            android:icon="?attr/iconMenuClear"
            />
            <item
             android:id="@+id/display_1st_and_2nd_class"
             android:title="@string/folder_list_display_mode_first_and_second_class"
-            android:icon="@drawable/ic_menu_clear"
+            android:icon="?attr/iconMenuClear"
            />
            <item
             android:id="@+id/display_not_second_class"
             android:title="@string/folder_list_display_mode_not_second_class"
-            android:icon="@drawable/ic_menu_clear"
+            android:icon="?attr/iconMenuClear"
            />
            <item
             android:id="@+id/list_folders"
             android:title="@string/refresh_folders_action"
-            android:icon="@drawable/ic_menu_refresh"
+            android:icon="?attr/iconMenuRefresh"
          />
            <item
             android:id="@+id/filter_folders"
             android:title="@string/filter_folders_action"
-            android:icon="@drawable/ic_menu_search"
+            android:icon="?attr/iconMenuSearch"
          />
         
         </menu>
@@ -56,12 +56,12 @@
 		android:id="@+id/empty_trash"
         android:alphabeticShortcut="e"
 		android:title="@string/empty_trash_action"
-		android:icon="@drawable/ic_menu_delete"
+		android:icon="?attr/iconMenuDelete"
 	/>
     <item
         android:id="@+id/settings"
         android:title="@string/preferences_action"
-        android:icon="@drawable/ic_menu_preferences"
+        android:icon="?attr/iconMenuPreferences"
         android:showAsAction="never">
         <menu>
         <item
@@ -78,7 +78,7 @@
 	<item
 		android:id="@+id/send_messages"
 		android:title="@string/send_messages_action"
-		android:icon="@drawable/ic_menu_refresh"
+		android:icon="?attr/iconMenuRefresh"
 	/>
 	<item android:id="@+id/advanced"
         android:title="@string/advanced">
@@ -86,7 +86,7 @@
 		<item
 			android:id="@+id/compact"
 			android:title="@string/compact_action"
-			android:icon="@drawable/ic_menu_compact"
+			android:icon="?attr/iconMenuCompact"
 		/>
 		</menu>
     </item>
diff --git a/res/menu/folder_select_option.xml b/res/menu/folder_select_option.xml
index 8b9d7a240..adfb7a913 100644
--- a/res/menu/folder_select_option.xml
+++ b/res/menu/folder_select_option.xml
@@ -9,32 +9,32 @@
             <item
             android:id="@+id/display_all"
             android:title="@string/folder_list_display_mode_all"
-            android:icon="@drawable/ic_menu_clear"
+            android:icon="?attr/iconMenuClear"
            />
            <item
             android:id="@+id/display_1st_class"
             android:title="@string/folder_list_display_mode_first_class"
-            android:icon="@drawable/ic_menu_clear"
+            android:icon="?attr/iconMenuClear"
            />
            <item
             android:id="@+id/display_1st_and_2nd_class"
             android:title="@string/folder_list_display_mode_first_and_second_class"
-            android:icon="@drawable/ic_menu_clear"
+            android:icon="?attr/iconMenuClear"
            />
            <item
             android:id="@+id/display_not_second_class"
             android:title="@string/folder_list_display_mode_not_second_class"
-            android:icon="@drawable/ic_menu_clear"
+            android:icon="?attr/iconMenuClear"
            />
            <item
             android:id="@+id/list_folders"
             android:title="@string/refresh_folders_action"
-            android:icon="@drawable/ic_menu_refresh"
+            android:icon="?attr/iconMenuRefresh"
          />
            <item
             android:id="@+id/filter_folders"
             android:title="@string/filter_folders_action"
-            android:icon="@drawable/ic_menu_search"
+            android:icon="?attr/iconMenuSearch"
          />
         
     <!--     </menu>
diff --git a/res/menu/manage_identities_option.xml b/res/menu/manage_identities_option.xml
index 82922ddc0..9abbde191 100644
--- a/res/menu/manage_identities_option.xml
+++ b/res/menu/manage_identities_option.xml
@@ -4,6 +4,6 @@
 		android:id="@+id/new_identity"
         android:alphabeticShortcut="n"
 		android:title="@string/new_identity_action"
-		android:icon="@drawable/ic_menu_add"
+		android:icon="?attr/iconMenuAdd"
 	/>
 </menu>
diff --git a/res/menu/message_compose_option.xml b/res/menu/message_compose_option.xml
index be3df1509..9e2189f13 100644
--- a/res/menu/message_compose_option.xml
+++ b/res/menu/message_compose_option.xml
@@ -4,51 +4,51 @@
 		android:id="@+id/add_cc_bcc"
         android:alphabeticShortcut="c"
 		android:title="@string/add_cc_bcc_action"
-		android:icon="@drawable/ic_action_add_cc_bbc"
+		android:icon="?attr/iconActionAddCcBcc"
 		android:showAsAction="always"
 	/>
 	<item
 		android:id="@+id/add_attachment"
         android:alphabeticShortcut="n"
 		android:title="@string/add_attachment_action"
-        android:icon="@drawable/ic_action_add_attachment"
+        android:icon="?attr/iconActionAddAttachment"
         android:showAsAction="always"
     />
 	<item
 		android:id="@+id/send"
         android:alphabeticShortcut="s"
 		android:title="@string/send_action"
-		android:icon="@drawable/ic_action_send"
+		android:icon="?attr/iconActionSend"
 		android:showAsAction="always"
 	/>
 	<item
 		android:id="@+id/save"
         android:alphabeticShortcut="d"
 		android:title="@string/save_draft_action"
-		android:icon="@drawable/ic_menu_save_draft"
+		android:icon="?attr/iconMenuSaveDraft"
 	/>
 	<item
 		android:id="@+id/discard"
         android:alphabeticShortcut="q"
 		android:title="@string/discard_action"
-		android:icon="@drawable/ic_menu_close_clear_cancel"
+		android:icon="?attr/iconMenuCloseClearCancel"
 	/>
 	<item
 		android:id="@+id/read_receipt"
         android:alphabeticShortcut="r"
         android:title="@string/read_receipt"
-        android:icon="@drawable/ic_menu_reply_receipt"
+        android:icon="?attr/iconMenuReplyReceipt"
 	/>
 	<item
 		android:id="@+id/add_attachment_image"
 		android:title="@string/add_attachment_action_image"
-        android:icon="@drawable/ic_menu_attachment"
+        android:icon="?attr/iconMenuAttachment"
         android:visible="false" 
     />
 	<item
 		android:id="@+id/add_attachment_video"
 		android:title="@string/add_attachment_action_video"
-        android:icon="@drawable/ic_menu_attachment"
+        android:icon="?attr/iconMenuAttachment"
         android:visible="false"
     />
 </menu>
diff --git a/res/menu/message_list_context.xml b/res/menu/message_list_context.xml
index e0f81175b..a5d260931 100644
--- a/res/menu/message_list_context.xml
+++ b/res/menu/message_list_context.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/single_message_options"
-        android:icon="@drawable/ic_action_single_message_options"
+        android:icon="?attr/iconActionSingleMessageOptions"
         android:showAsAction="always"
         android:title="@string/single_message_options_action">
         <menu>
@@ -27,7 +27,7 @@
         android:id="@+id/delete"
         android:title="@string/delete_action"
         android:showAsAction="always"
-        android:icon="@drawable/ic_action_delete"
+        android:icon="?attr/iconActionDelete"
     />
     <item
         android:id="@+id/read_toggle"
@@ -39,13 +39,13 @@
         android:id="@+id/archive"
         android:title="@string/archive_action"
         android:showAsAction="always"
-        android:icon="@drawable/ic_action_archive"
+        android:icon="?attr/iconActionArchive"
     />
     <item
 		android:id="@+id/move_or_copy"
 	    android:title="@string/move_or_copy_action"
 	    android:showAsAction="ifRoom"
-	    android:icon="@drawable/ic_action_move_or_copy">
+	    android:icon="?attr/iconActionMoveOrCopy">
 	    <menu>
 		    <item
 		        android:id="@+id/move"
@@ -61,12 +61,12 @@
         android:id="@+id/flag_toggle"
         android:title="@string/flag_toggle_action"
         android:showAsAction="ifRoom"
-        android:icon="@drawable/ic_action_toggle_flag"
+        android:icon="?attr/iconActionToggleFlag"
     />
 	<item
         android:id="@+id/spam"
         android:title="@string/spam_action"
         android:showAsAction="ifRoom"
-        android:icon="@drawable/ic_action_spam"
+        android:icon="?attr/iconActionSpam"
     />
 </menu>
diff --git a/res/menu/message_list_option.xml b/res/menu/message_list_option.xml
index dfa5d5faa..549ff0f59 100644
--- a/res/menu/message_list_option.xml
+++ b/res/menu/message_list_option.xml
@@ -4,13 +4,13 @@
         android:id="@+id/compose"
         android:alphabeticShortcut="c"
         android:title="@string/compose_action"
-        android:icon="@drawable/ic_action_compose"
+        android:icon="?attr/iconActionCompose"
         android:showAsAction="always"
     />
     <item
         android:id="@+id/set_sort"
         android:title="@string/sort_by"
-        android:icon="@drawable/ic_action_sort"
+        android:icon="?attr/iconActionSort"
         android:showAsAction="always" >
 		<menu>
             <item
@@ -46,39 +46,39 @@
     <item
         android:id="@+id/select_all"
         android:title="@string/batch_select_all"
-        android:icon="@drawable/ic_menu_select_all"
+        android:icon="?attr/iconMenuSelectAll"
         android:showAsAction="never"
     />
     <item
         android:id="@+id/send_messages"
         android:alphabeticShortcut="r"
         android:title="@string/send_messages_action"
-        android:icon="@drawable/ic_action_refresh"
+        android:icon="?attr/iconActionRefresh"
         android:showAsAction="never"
     />
     <item
         android:id="@+id/check_mail"
         android:alphabeticShortcut="r"
         android:title="@string/check_mail_action"
-        android:icon="@drawable/ic_action_refresh"
+        android:icon="?attr/iconActionRefresh"
         android:showAsAction="always"
     />
     <item
         android:id="@+id/mark_all_as_read"
         android:title="@string/mark_all_as_read_action"
-        android:icon="@drawable/ic_menu_inbox"
+        android:icon="?attr/iconMenuInbox"
         android:showAsAction="never"
     />
     <item
         android:id="@+id/settings"
         android:title="@string/preferences_action"
-        android:icon="@drawable/ic_menu_preferences"
+        android:icon="?attr/iconMenuPreferences"
         android:showAsAction="never">
         <menu>
             <item
                 android:id="@+id/folder_settings"
                 android:title="@string/folder_settings_action"
-                android:icon="@drawable/ic_menu_preferences"
+                android:icon="?attr/iconMenuPreferences"
             />
             <item
                 android:id="@+id/account_settings"
diff --git a/res/menu/message_view_option.xml b/res/menu/message_view_option.xml
index 8e478f516..d2e1866d9 100644
--- a/res/menu/message_view_option.xml
+++ b/res/menu/message_view_option.xml
@@ -3,25 +3,25 @@
     <item
         android:id="@+id/next_message"
         android:title="@string/next_action"
-        android:icon="@drawable/ic_action_next_message"
+        android:icon="?attr/iconActionNextMessage"
         android:showAsAction="always"
     />
     <item
         android:id="@+id/previous_message"
         android:title="@string/previous_action"
-        android:icon="@drawable/ic_action_previous_message"
+        android:icon="?attr/iconActionPreviousMessage"
         android:showAsAction="always"
     />
     <item
         android:id="@+id/delete"
         android:alphabeticShortcut="q"
         android:title="@string/delete_action"
-        android:icon="@drawable/ic_action_delete"
+        android:icon="?attr/iconActionDelete"
         android:showAsAction="always"
     />
     <item
         android:id="@+id/single_message_options"
-        android:icon="@drawable/ic_action_single_message_options"
+        android:icon="?attr/iconActionSingleMessageOptions"
         android:showAsAction="ifRoom"
         android:title="@string/single_message_options_action">
         <menu>
@@ -42,20 +42,20 @@
     <item
         android:id="@+id/archive"
         android:title="@string/archive_action"
-        android:icon="@drawable/ic_action_archive"
+        android:icon="?attr/iconActionArchive"
         android:showAsAction="ifRoom"
     />
     <item
         android:id="@+id/spam"
         android:title="@string/spam_action"
-        android:icon="@drawable/ic_action_spam"
+        android:icon="?attr/iconActionSpam"
         android:showAsAction="ifRoom"
     />
     <item
 		android:id="@+id/move_or_copy"
 	    android:title="@string/move_or_copy_action"
 	    android:showAsAction="ifRoom"
-	    android:icon="@drawable/ic_action_move_or_copy">
+	    android:icon="?attr/iconActionMoveOrCopy">
 	    <menu>
 		    <item
 		        android:id="@+id/move"
@@ -71,7 +71,7 @@
         android:id="@+id/toggle_unread"
         android:alphabeticShortcut="u"
         android:title="@string/read_toggle_action"
-        android:icon="@drawable/ic_action_toggle_read"
+        android:icon="?attr/iconActionToggleRead"
         android:showAsAction="never"
     />
     <item
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 527431be5..4475e4e78 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -2,13 +2,12 @@
 <resources>
     <declare-styleable name="K9Styles">
 		<attr name="iconMenuInfoDetails" format="reference" />
-		<attr name="iconMenuPreferences" format="reference" />
 		<attr name="iconActionAddAttachment" format="reference" />
 		<attr name="iconActionAddCcBcc" format="reference" />
 		<attr name="iconActionArchive" format="reference" />
 		<attr name="iconActionCompose" format="reference" />
 		<attr name="iconActionDelete" format="reference" />
-		<attr name="iconActionMoveCopy" format="reference" />
+		<attr name="iconActionMoveOrCopy" format="reference" />
 		<attr name="iconActionNextMessage" format="reference" />
 		<attr name="iconActionPreviousMessage" format="reference" />
 		<attr name="iconActionRead" format="reference" />
diff --git a/res/values/themes.xml b/res/values/themes.xml
index c9a941607..d5ab33383 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -4,13 +4,12 @@
     <style name="Theme.K9.Light" parent="Theme.Sherlock.Light">
         <item name="android:autoCompleteTextViewStyle">@style/Widget.K9.AutoCompleteTextView</item>
 		<item name="iconMenuInfoDetails">@android:drawable/ic_menu_info_details</item>
-		<item name="iconMenuPreferences">@android:drawable/ic_menu_preferences</item>
 		<item name="iconActionAddAttachment">@drawable/ic_action_add_attachment</item>
 		<item name="iconActionAddCcBcc">@drawable/ic_action_add_cc_bbc</item>
 		<item name="iconActionArchive">@drawable/ic_action_archive</item>
 		<item name="iconActionCompose">@drawable/ic_action_compose</item>
 		<item name="iconActionDelete">@drawable/ic_action_delete</item>
-		<item name="iconActionMoveCopy">@drawable/ic_action_move_or_copy</item>
+		<item name="iconActionMoveOrCopy">@drawable/ic_action_move_or_copy</item>
 		<item name="iconActionNextMessage">@drawable/ic_action_next_message</item>
 		<item name="iconActionPreviousMessage">@drawable/ic_action_previous_message</item>
 		<item name="iconActionRead">@drawable/ic_action_read</item>
@@ -44,13 +43,12 @@
     <style name="Theme.K9.Dark" parent="Theme.Sherlock">
         <item name="android:autoCompleteTextViewStyle">@style/Widget.K9.AutoCompleteTextView</item>
 		<item name="iconMenuInfoDetails">@android:drawable/ic_menu_info_details</item>
-		<item name="iconMenuPreferences">@android:drawable/ic_menu_preferences</item>
 		<item name="iconActionAddAttachment">@drawable/ic_action_add_attachment</item>
 		<item name="iconActionAddCcBcc">@drawable/ic_action_add_cc_bbc</item>
 		<item name="iconActionArchive">@drawable/ic_action_archive</item>
 		<item name="iconActionCompose">@drawable/ic_action_compose</item>
 		<item name="iconActionDelete">@drawable/ic_action_delete</item>
-		<item name="iconActionMoveCopy">@drawable/ic_action_move_or_copy</item>
+		<item name="iconActionMoveOrCopy">@drawable/ic_action_move_or_copy</item>
 		<item name="iconActionNextMessage">@drawable/ic_action_next_message</item>
 		<item name="iconActionPreviousMessage">@drawable/ic_action_previous_message</item>
 		<item name="iconActionRead">@drawable/ic_action_read</item>