Merge pull request #1619 from mfietz/issue/1222-completed-downloads-gears

Completed Downloads: Gears Dialog

4 files changed, 162 insertions, 73 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
index ca747b9b0..53dedd496 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
@@ -25,13 +25,10 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter {
     private final Context context;
     private final ItemAccess itemAccess;
 
-    private final int imageSize;
-
     public DownloadedEpisodesListAdapter(Context context, ItemAccess itemAccess) {
         super();
         this.context = context;
         this.itemAccess = itemAccess;
-        this.imageSize = (int) context.getResources().getDimension(R.dimen.thumbnail_length_downloaded_item);
     }
 
     @Override
@@ -52,7 +49,7 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter {
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
         Holder holder;
-        final FeedItem item = (FeedItem) getItem(position);
+        final FeedItem item = getItem(position);
         if (item == null) return null;
 
         if (convertView == null) {
@@ -61,44 +58,44 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter {
                     .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             convertView = inflater.inflate(R.layout.downloaded_episodeslist_item,
                     parent, false);
+            holder.imageView = (ImageView) convertView.findViewById(R.id.imgvImage);
             holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
+            holder.txtvSize = (TextView) convertView.findViewById(R.id.txtvSize);
+            holder.queueStatus = (ImageView) convertView.findViewById(R.id.imgvInPlaylist);
             holder.pubDate = (TextView) convertView
                     .findViewById(R.id.txtvPublished);
             holder.butSecondary = (ImageButton) convertView
                     .findViewById(R.id.butSecondaryAction);
-            holder.imageView = (ImageView) convertView.findViewById(R.id.imgvImage);
-            holder.txtvSize = (TextView) convertView.findViewById(R.id.txtvSize);
             convertView.setTag(holder);
         } else {
             holder = (Holder) convertView.getTag();
         }
 
+        Glide.with(context)
+                .load(item.getImageUri())
+                .placeholder(R.color.light_gray)
+                .error(R.color.light_gray)
+                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                .fitCenter()
+                .dontAnimate()
+                .into(holder.imageView);
+
         holder.title.setText(item.getTitle());
+        holder.txtvSize.setText(Converter.byteToString(item.getMedia().getSize()));
+        holder.queueStatus.setVisibility(item.isTagged(FeedItem.TAG_QUEUE) ? View.VISIBLE : View.GONE);
         String pubDateStr = DateUtils.formatAbbrev(context, item.getPubDate());
         holder.pubDate.setText(pubDateStr);
-        holder.txtvSize.setText(Converter.byteToString(item.getMedia().getSize()));
-        FeedItem.State state = item.getState();
 
+        FeedItem.State state = item.getState();
         if (state == FeedItem.State.PLAYING) {
             holder.butSecondary.setEnabled(false);
         } else {
             holder.butSecondary.setEnabled(true);
         }
-
         holder.butSecondary.setFocusable(false);
         holder.butSecondary.setTag(item);
         holder.butSecondary.setOnClickListener(secondaryActionListener);
 
-
-        Glide.with(context)
-                .load(item.getImageUri())
-                .placeholder(R.color.light_gray)
-                .error(R.color.light_gray)
-                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                .fitCenter()
-                .dontAnimate()
-                .into(holder.imageView);
-
         return convertView;
     }
 
@@ -112,10 +109,11 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter {
 
 
     static class Holder {
-        TextView title;
-        TextView pubDate;
         ImageView imageView;
+        TextView title;
         TextView txtvSize;
+        ImageView queueStatus;
+        TextView pubDate;
         ImageButton butSecondary;
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
index 6432ebd4e..c2917a758 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
@@ -1,7 +1,6 @@
 package de.danoeh.antennapod.dialog;
 
 import android.content.res.TypedArray;
-import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.v4.app.ActivityCompat;
@@ -18,10 +17,6 @@ import android.widget.Button;
 import android.widget.ListView;
 import android.widget.Toast;
 
-import com.joanzapata.iconify.Icon;
-import com.joanzapata.iconify.IconDrawable;
-import com.joanzapata.iconify.fonts.FontAwesomeIcons;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -39,6 +34,14 @@ public class EpisodesApplyActionFragment extends Fragment {
 
     public String TAG = "EpisodeActionFragment";
 
+    public static final int ACTION_QUEUE = 0;
+    public static final int ACTION_MARK_PLAYED = 1;
+    public static final int ACTION_MARK_UNPLAYED = 2;
+    public static final int ACTION_DOWNLOAD = 4;
+    public static final int ACTION_REMOVE = 8;
+    public static final int ACTION_ALL = ACTION_QUEUE | ACTION_MARK_PLAYED | ACTION_MARK_UNPLAYED
+            | ACTION_DOWNLOAD | ACTION_REMOVE;
+
     private ListView mListView;
     private ArrayAdapter<String> mAdapter;
 
@@ -48,27 +51,26 @@ public class EpisodesApplyActionFragment extends Fragment {
     private Button btnDownload;
     private Button btnDelete;
 
-    private final Map<Long,FeedItem> idMap;
-    private final List<FeedItem> episodes;
+    private final Map<Long,FeedItem> idMap = new ArrayMap<>();
+    private final List<FeedItem> episodes = new ArrayList<>();
+    private int actions;
     private final List<String> titles = new ArrayList();
     private final LongList checkedIds = new LongList();
 
     private MenuItem mSelectToggle;
 
-    private int textColor;
-
-    public EpisodesApplyActionFragment() {
-        this.episodes = new ArrayList<>();
-        this.idMap = new ArrayMap<>();
+    public static EpisodesApplyActionFragment newInstance(List<FeedItem> items) {
+        return newInstance(items, ACTION_ALL);
     }
 
-    public void setEpisodes(List<FeedItem> episodes) {
-        this.episodes.clear();
-        this.episodes.addAll(episodes);
-        this.idMap.clear();
-        for(FeedItem episode : episodes) {
-            this.idMap.put(episode.getId(), episode);
+    public static EpisodesApplyActionFragment newInstance(List<FeedItem> items, int actions) {
+        EpisodesApplyActionFragment f = new EpisodesApplyActionFragment();
+        f.episodes.addAll(items);
+        for(FeedItem episode : items) {
+            f.idMap.put(episode.getId(), episode);
         }
+        f.actions = actions;
+        return f;
     }
 
     @Override
@@ -103,16 +105,48 @@ public class EpisodesApplyActionFragment extends Fragment {
         mListView.setAdapter(mAdapter);
         checkAll();
 
+        int lastVisibleDiv = 0;
         btnAddToQueue = (Button) view.findViewById(R.id.btnAddToQueue);
-        btnAddToQueue.setOnClickListener(v -> queueChecked());
+        if((actions & ACTION_QUEUE) != 0) {
+            btnAddToQueue.setOnClickListener(v -> queueChecked());
+            lastVisibleDiv = R.id.divider1;
+        } else {
+            btnAddToQueue.setVisibility(View.GONE);
+            view.findViewById(R.id.divider1).setVisibility(View.GONE);
+        }
         btnMarkAsPlayed = (Button) view.findViewById(R.id.btnMarkAsPlayed);
-        btnMarkAsPlayed.setOnClickListener(v -> markedCheckedPlayed());
+        if((actions & ACTION_MARK_PLAYED) != 0) {
+            btnMarkAsPlayed.setOnClickListener(v -> markedCheckedPlayed());
+            lastVisibleDiv = R.id.divider2;
+        } else {
+            btnMarkAsPlayed.setVisibility(View.GONE);
+            view.findViewById(R.id.divider2).setVisibility(View.GONE);
+        }
         btnMarkAsUnplayed = (Button) view.findViewById(R.id.btnMarkAsUnplayed);
-        btnMarkAsUnplayed.setOnClickListener(v -> markedCheckedUnplayed());
+        if((actions & ACTION_MARK_UNPLAYED) != 0) {
+            btnMarkAsUnplayed.setOnClickListener(v -> markedCheckedUnplayed());
+            lastVisibleDiv = R.id.divider3;
+        } else {
+            btnMarkAsUnplayed.setVisibility(View.GONE);
+            view.findViewById(R.id.divider3).setVisibility(View.GONE);
+        }
         btnDownload = (Button) view.findViewById(R.id.btnDownload);
-        btnDownload.setOnClickListener(v -> downloadChecked());
+        if((actions & ACTION_DOWNLOAD) != 0) {
+            btnDownload.setOnClickListener(v -> downloadChecked());
+            lastVisibleDiv = R.id.divider4;
+        } else {
+            btnDownload.setVisibility(View.GONE);
+            view.findViewById(R.id.divider4).setVisibility(View.GONE);
+        }
         btnDelete = (Button) view.findViewById(R.id.btnDelete);
-        btnDelete.setOnClickListener(v -> deleteChecked());
+        if((actions & ACTION_REMOVE) != 0) {
+            btnDelete.setOnClickListener(v -> deleteChecked());
+        } else {
+            btnDelete.setVisibility(View.GONE);
+            if(lastVisibleDiv > 0) {
+                view.findViewById(lastVisibleDiv).setVisibility(View.GONE);
+            }
+        }
 
         return view;
     }
@@ -122,11 +156,6 @@ public class EpisodesApplyActionFragment extends Fragment {
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.episodes_apply_action_options, menu);
 
-        int[] attrs = { android.R.attr.textColor };
-        TypedArray ta = getActivity().obtainStyledAttributes(attrs);
-        textColor = ta.getColor(0, Color.GRAY);
-        ta.recycle();
-
         mSelectToggle = menu.findItem(R.id.select_toggle);
         mSelectToggle.setOnMenuItemClickListener(item -> {
             if (checkedIds.size() == episodes.size()) {
@@ -140,22 +169,21 @@ public class EpisodesApplyActionFragment extends Fragment {
 
     @Override
     public void onPrepareOptionsMenu (Menu menu) {
-        /*
-         * Prepare icon for select toggle button
-         */
+        // Prepare icon for select toggle button
 
-        // Find icon attribute
         int[] icon = new int[1];
-        if(checkedIds.size() == episodes.size()) icon[0] = R.attr.ic_check_box;
-        else if(checkedIds.size() == 0) icon[0] = R.attr.ic_check_box_outline;
-        else icon[0] = R.attr.ic_indeterminate_check_box;
+        if (checkedIds.size() == episodes.size()) {
+            icon[0] = R.attr.ic_check_box;
+        } else if (checkedIds.size() == 0) {
+            icon[0] = R.attr.ic_check_box_outline;
+        } else {
+            icon[0] = R.attr.ic_indeterminate_check_box;
+        }
 
-        // Get Drawable from attribute
         TypedArray a = getActivity().obtainStyledAttributes(icon);
         Drawable iconDrawable = a.getDrawable(0);
         a.recycle();
 
-        // Set icon
         mSelectToggle.setIcon(iconDrawable);
     }
 
@@ -189,6 +217,14 @@ public class EpisodesApplyActionFragment extends Fragment {
                 checkDownloaded(false);
                 resId = R.string.selected_not_downloaded_label;
                 break;
+            case R.id.check_queued:
+                checkQueued(true);
+                resId = R.string.selected_queued_label;
+                break;
+            case R.id.check_not_queued:
+                checkQueued(false);
+                resId = R.string.selected_not_queued_label;
+                break;
             case R.id.sort_title_a_z:
                 sortByTitle(false);
                 return true;
@@ -310,6 +346,17 @@ public class EpisodesApplyActionFragment extends Fragment {
         refreshCheckboxes();
     }
 
+    private void checkQueued(boolean isQueued) {
+        for (FeedItem episode : episodes) {
+            if(episode.isTagged(FeedItem.TAG_QUEUE) == isQueued) {
+                checkedIds.add(episode.getId());
+            } else {
+                checkedIds.remove(episode.getId());
+            }
+        }
+        refreshCheckboxes();
+    }
+
     private void refreshTitles() {
         titles.clear();
         for(FeedItem episode : episodes) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
index 954c4c9e2..a53c85f1c 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
@@ -1,12 +1,20 @@
 package de.danoeh.antennapod.fragment;
 
-import android.app.Activity;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v4.app.ListFragment;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.ListView;
 
+import com.joanzapata.iconify.IconDrawable;
+import com.joanzapata.iconify.fonts.FontAwesomeIcons;
+
 import java.util.List;
 
 import de.danoeh.antennapod.R;
@@ -14,8 +22,10 @@ import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.adapter.DownloadedEpisodesListAdapter;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.dialog.EpisodesApplyActionFragment;
 import rx.Observable;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
@@ -28,22 +38,21 @@ public class CompletedDownloadsFragment extends ListFragment {
 
     private static final String TAG = CompletedDownloadsFragment.class.getSimpleName();
 
-    private static final int EVENTS =
-            EventDistributor.DOWNLOAD_HANDLED |
-                    EventDistributor.DOWNLOADLOG_UPDATE |
-                    EventDistributor.UNREAD_ITEMS_UPDATE;
+    private static final int EVENTS = EventDistributor.DOWNLOAD_HANDLED |
+            EventDistributor.DOWNLOADLOG_UPDATE |
+            EventDistributor.UNREAD_ITEMS_UPDATE;
 
     private List<FeedItem> items;
     private DownloadedEpisodesListAdapter listAdapter;
 
     private boolean viewCreated = false;
-    private boolean itemsLoaded = false;
 
     private Subscription subscription;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
         loadItems();
     }
 
@@ -81,9 +90,9 @@ public class CompletedDownloadsFragment extends ListFragment {
     }
 
     @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
-        if (viewCreated && itemsLoaded) {
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (viewCreated && items != null) {
             onFragmentLoaded();
         }
     }
@@ -99,7 +108,7 @@ public class CompletedDownloadsFragment extends ListFragment {
         lv.setPadding(0, vertPadding, 0, vertPadding);
 
         viewCreated = true;
-        if (itemsLoaded && getActivity() != null) {
+        if (items != null && getActivity() != null) {
             onFragmentLoaded();
         }
     }
@@ -111,7 +120,6 @@ public class CompletedDownloadsFragment extends ListFragment {
         if (item != null) {
             ((MainActivity) getActivity()).loadChildFragment(ItemFragment.newInstance(item.getId()));
         }
-
     }
 
     private void onFragmentLoaded() {
@@ -121,6 +129,43 @@ public class CompletedDownloadsFragment extends ListFragment {
         }
         setListShown(true);
         listAdapter.notifyDataSetChanged();
+        getActivity().supportInvalidateOptionsMenu();
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if(!isAdded()) {
+            return;
+        }
+        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);
+            }
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.episode_actions:
+                EpisodesApplyActionFragment fragment = EpisodesApplyActionFragment
+                        .newInstance(items, EpisodesApplyActionFragment.ACTION_REMOVE);
+                ((MainActivity) getActivity()).loadChildFragment(fragment);
+                return true;
+            default:
+                return false;
+        }
     }
 
     private DownloadedEpisodesListAdapter.ItemAccess itemAccess = new DownloadedEpisodesListAdapter.ItemAccess() {
@@ -157,7 +202,7 @@ public class CompletedDownloadsFragment extends ListFragment {
         if(subscription != null) {
             subscription.unsubscribe();
         }
-        if (!itemsLoaded && viewCreated) {
+        if (items == null && viewCreated) {
             setListShown(false);
         }
         subscription = Observable.fromCallable(() -> DBReader.getDownloadedItems())
@@ -166,7 +211,6 @@ public class CompletedDownloadsFragment extends ListFragment {
                 .subscribe(result -> {
                     if (result != null) {
                         items = result;
-                        itemsLoaded = true;
                         if (viewCreated && getActivity() != null) {
                             onFragmentLoaded();
                         }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
index 7a9b73982..303d273bc 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -252,8 +252,8 @@ public class ItemlistFragment extends ListFragment {
                 if (!FeedMenuHandler.onOptionsItemClicked(getActivity(), item, feed)) {
                     switch (item.getItemId()) {
                         case R.id.episode_actions:
-                            EpisodesApplyActionFragment fragment = new EpisodesApplyActionFragment();
-                            fragment.setEpisodes(feed.getItems());
+                            EpisodesApplyActionFragment fragment = EpisodesApplyActionFragment
+                                    .newInstance(feed.getItems());
                             ((MainActivity)getActivity()).loadChildFragment(fragment);
                             return true;
                         case R.id.remove_item: