Merge pull request #2637 from ByteHamster/apply-actions

Changed batch edit icon and name

app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java

@@ -140,18 +140,7 @@ public class CompletedDownloadsFragment extends ListFragment {
         super.onCreateOptionsMenu(menu, inflater);
         if(items != null) {
             inflater.inflate(R.menu.downloads_completed, menu);
-            MenuItem episodeActions = menu.findItem(R.id.episode_actions);
-            if(items.size() > 0) {
-                int[] attrs = {R.attr.action_bar_icon_color};
-                TypedArray ta = getActivity().obtainStyledAttributes(UserPreferences.getTheme(), attrs);
-                int textColor = ta.getColor(0, Color.GRAY);
-                ta.recycle();
-                episodeActions.setIcon(new IconDrawable(getActivity(),
-                        FontAwesomeIcons.fa_gears).color(textColor).actionBarSize());
-                episodeActions.setVisible(true);
-            } else {
-                episodeActions.setVisible(false);
-            }
+            menu.findItem(R.id.episode_actions).setVisible(items.size() > 0);
         }
     }
 

app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java

@@ -221,13 +221,6 @@ public class ItemlistFragment extends ListFragment {
                 menu.findItem(R.id.share_link_item).setVisible(false);
                 menu.findItem(R.id.visit_website_item).setVisible(false);
             }
-            int[] attrs = { R.attr.action_bar_icon_color };
-            TypedArray ta = getActivity().obtainStyledAttributes(UserPreferences.getTheme(), attrs);
-            int textColor = ta.getColor(0, Color.GRAY);
-            ta.recycle();
-
-            menu.findItem(R.id.episode_actions).setIcon(new IconDrawable(getActivity(),
-                    FontAwesomeIcons.fa_gears).color(textColor).actionBarSize());
 
             isUpdatingFeed = MenuItemUtils.updateRefreshMenuItem(menu, R.id.refresh_item, updateRefreshMenuItemChecker);
         }

app/src/main/res/menu/downloads_completed.xml

@@ -6,7 +6,8 @@
     <item
         android:id="@+id/episode_actions"
         android:menuCategory="container"
-        android:title="@string/episode_actions"
+        android:title="@string/batch_edit"
+        android:icon="?attr/checkbox_multiple"
         custom:showAsAction="always">
     </item>
 

app/src/main/res/menu/feedlist.xml

@@ -12,7 +12,8 @@
     <item
         android:id="@+id/episode_actions"
         android:menuCategory="container"
-        android:title="@string/episode_actions"
+        android:icon="?attr/checkbox_multiple"
+        android:title="@string/batch_edit"
         custom:showAsAction="always">
     </item>
     <item

core/src/main/res/values/attrs.xml

@@ -44,6 +44,7 @@
     <attr name="ic_unfav" format="reference"/>
     <attr name="ic_sleep" format="reference"/>
     <attr name="ic_sleep_off" format="reference"/>
+    <attr name="checkbox_multiple" format="reference"/>
     <attr name="ic_check_box" format="reference"/>
     <attr name="ic_check_box_outline" format="reference"/>
     <attr name="ic_indeterminate_check_box" format="reference"/>

core/src/main/res/values/strings.xml

@@ -136,7 +136,7 @@
     <string name="feed_remover_msg">Removing Feed</string>
     <string name="load_complete_feed">Refresh complete Feed</string>
     <string name="hide_episodes_title">Hide Episodes</string>
-    <string name="episode_actions">Apply actions</string>
+    <string name="batch_edit">Batch edit</string>
     <string name="hide_unplayed_episodes_label">Unplayed</string>
     <string name="hide_paused_episodes_label">Paused</string>
     <string name="hide_played_episodes_label">Played</string>

core/src/main/res/values/styles.xml

@@ -13,6 +13,7 @@
         <item name="alertDialogTheme">@style/AntennaPod.Dialog.Light</item>
         <item type="attr" name="action_bar_icon_color">@color/grey600</item>
         <item type="attr" name="action_about">@drawable/ic_info_grey600_24dp</item>
+        <item type="attr" name="checkbox_multiple">@drawable/ic_checkbox_multiple_marked_outline_grey600_24dp</item>
         <item type="attr" name="action_search">@drawable/ic_search_grey600_24dp</item>
         <item type="attr" name="action_stream">@drawable/ic_settings_input_antenna_grey600_24dp</item>
         <item type="attr" name="av_download">@drawable/ic_file_download_grey600_24dp</item>
@@ -75,7 +76,8 @@
         <item name="progressBarTheme">@style/ProgressBarDark</item>
         <item name="alertDialogTheme">@style/AntennaPod.Dialog.Dark</item>
         <item type="attr" name="action_bar_icon_color">@color/white</item>
-        <item type="attr" name="action_about">@drawable/ic_info_white_24dp</item>g
+        <item type="attr" name="action_about">@drawable/ic_info_white_24dp</item>
+        <item type="attr" name="checkbox_multiple">@drawable/ic_checkbox_multiple_marked_outline_white_24dp</item>
         <item type="attr" name="action_search">@drawable/ic_search_white_24dp</item>
         <item type="attr" name="action_stream">@drawable/ic_settings_input_antenna_white_24dp</item>
         <item type="attr" name="av_download">@drawable/ic_file_download_white_24dp</item>
@@ -140,6 +142,7 @@
         <item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
         <item name="alertDialogTheme">@style/AntennaPod.Dialog.Light</item>
         <item type="attr" name="action_about">@drawable/ic_info_grey600_24dp</item>
+        <item type="attr" name="checkbox_multiple">@drawable/ic_checkbox_multiple_marked_outline_grey600_24dp</item>
         <item type="attr" name="action_search">@drawable/ic_search_grey600_24dp</item>
         <item type="attr" name="action_stream">@drawable/ic_settings_input_antenna_grey600_24dp</item>
         <item type="attr" name="av_download">@drawable/ic_file_download_grey600_24dp</item>
@@ -204,6 +207,7 @@
         <item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
         <item name="alertDialogTheme">@style/AntennaPod.Dialog.Dark</item>
         <item type="attr" name="action_about">@drawable/ic_info_white_24dp</item>
+        <item type="attr" name="checkbox_multiple">@drawable/ic_checkbox_multiple_marked_outline_white_24dp</item>
         <item type="attr" name="action_search">@drawable/ic_search_white_24dp</item>
         <item type="attr" name="action_stream">@drawable/ic_settings_input_antenna_white_24dp</item>
         <item type="attr" name="av_download">@drawable/ic_file_download_white_24dp</item>