Merge pull request #658 from mfietz/issue-126

Queue view: Swipe to dismiss, undo bar, status information

2 files changed, 67 insertions, 1 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
index ac9e744ed..e80bf5f14 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -16,6 +16,7 @@ import android.support.v4.util.Pair;
 import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
+import android.text.format.DateUtils;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -49,6 +50,7 @@ import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
+import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.QueueAccess;
 import de.danoeh.antennapod.core.util.playback.Timeline;
 import de.danoeh.antennapod.menuhandler.FeedItemMenuHandler;
@@ -91,6 +93,8 @@ public class ItemFragment extends Fragment implements LoaderManager.LoaderCallba
     private View header;
     private WebView webvDescription;
     private TextView txtvTitle;
+    private TextView txtvDuration;
+    private TextView txtvPublished;
     private ImageView imgvCover;
     private ProgressBar progbarDownload;
     private ProgressBar progbarLoading;
@@ -166,6 +170,8 @@ public class ItemFragment extends Fragment implements LoaderManager.LoaderCallba
         header = inflater.inflate(R.layout.feeditem_fragment_header, toolbar, false);
         root = (ViewGroup) layout.findViewById(R.id.content_root);
         txtvTitle = (TextView) header.findViewById(R.id.txtvTitle);
+        txtvDuration = (TextView) header.findViewById(R.id.txtvDuration);
+        txtvPublished = (TextView) header.findViewById(R.id.txtvPublished);
         if (Build.VERSION.SDK_INT >= 14) { // ellipsize is causing problems on old versions, see #448
             txtvTitle.setEllipsize(TextUtils.TruncateAt.END);
         }
@@ -313,6 +319,8 @@ public class ItemFragment extends Fragment implements LoaderManager.LoaderCallba
 
     private void updateAppearance() {
         txtvTitle.setText(item.getTitle());
+        txtvPublished.setText(DateUtils.formatDateTime(getActivity(), item.getPubDate().getTime(), DateUtils.FORMAT_ABBREV_ALL));
+
         Picasso.with(getActivity()).load(item.getImageUri())
                 .fit()
                 .into(imgvCover);
@@ -348,7 +356,10 @@ public class ItemFragment extends Fragment implements LoaderManager.LoaderCallba
             }
 
             drawables.recycle();
-        } else {
+        } else {if(media.getDuration() > 0) {
+                txtvDuration.setText(Converter.getDurationStringLong(media.getDuration()));
+            }
+
             boolean isDownloading = DownloadRequester.getInstance().isDownloadingFile(media);
             TypedArray drawables = getActivity().obtainStyledAttributes(new int[]{R.attr.av_play,
                     R.attr.av_download, R.attr.action_stream, R.attr.content_discard, R.attr.navigation_cancel});
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index ebfe03382..3e60f1af0 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -7,6 +7,7 @@ import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Parcelable;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.SearchView;
 import android.util.Log;
@@ -43,6 +44,8 @@ import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.util.QueueSorter;
+import de.danoeh.antennapod.core.util.gui.FeedItemUndoToken;
+import de.danoeh.antennapod.core.util.gui.UndoBarController;
 import de.danoeh.antennapod.menuhandler.MenuItemUtils;
 import de.danoeh.antennapod.menuhandler.NavDrawerActivity;
 
@@ -60,6 +63,8 @@ public class QueueFragment extends Fragment {
     private TextView txtvEmpty;
     private ProgressBar progLoading;
 
+    private UndoBarController undoBarController;
+
     private List<FeedItem> queue;
     private List<Downloader> downloaderList;
 
@@ -137,6 +142,7 @@ public class QueueFragment extends Fragment {
         unregisterForContextMenu(listView);
         listAdapter = null;
         activity.set(null);
+        undoBarController = null;
         viewsCreated = false;
         blockDownloadObserverUpdate = false;
         if (downloadObserver != null) {
@@ -318,9 +324,31 @@ public class QueueFragment extends Fragment {
 
             @Override
             public void remove(int which) {
+                Log.d(TAG, "remove("+which+")");
+                stopItemLoader();
+                FeedItem item = (FeedItem) listView.getAdapter().getItem(which);
+                DBWriter.removeQueueItem(getActivity(), item.getId(), true);
+                undoBarController.showUndoBar(false,
+                        getString(R.string.removed_from_queue), new FeedItemUndoToken(item,
+                                which)
+                );
             }
         });
 
+        undoBarController = new UndoBarController(root.findViewById(R.id.undobar), new UndoBarController.UndoListener() {
+                        @Override
+                        public void onUndo(Parcelable token) {
+                                // Perform the undo
+                        FeedItemUndoToken undoToken = (FeedItemUndoToken) token;
+                                if (token != null) {
+                                        long itemId = undoToken.getFeedItemId();
+                                        int position = undoToken.getPosition();
+                                        DBWriter.addQueueItemAt(getActivity(), itemId, position, false);
+                                    }
+                            }
+                    });
+
+
         registerForContextMenu(listView);
 
         if (!itemsLoaded) {
@@ -385,6 +413,33 @@ public class QueueFragment extends Fragment {
         }
 
         @Override
+        public long getItemDownloadedBytes(FeedItem item) {
+            if (downloaderList != null) {
+                for (Downloader downloader : downloaderList) {
+                    if (downloader.getDownloadRequest().getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA
+                            && downloader.getDownloadRequest().getFeedfileId() == item.getMedia().getId()) {
+                        Log.d(TAG, "downloaded bytes: " + downloader.getDownloadRequest().getSoFar());
+                        return downloader.getDownloadRequest().getSoFar();
+                    }
+                }
+            }
+            return 0;
+        }
+
+        @Override
+        public long getItemDownloadSize(FeedItem item) {
+            if (downloaderList != null) {
+                for (Downloader downloader : downloaderList) {
+                    if (downloader.getDownloadRequest().getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA
+                            && downloader.getDownloadRequest().getFeedfileId() == item.getMedia().getId()) {
+                        Log.d(TAG, "downloaded size: " + downloader.getDownloadRequest().getSize());
+                        return downloader.getDownloadRequest().getSize();
+                    }
+                }
+            }
+            return 0;
+        }
+        @Override
         public int getItemDownloadProgressPercent(FeedItem item) {
             if (downloaderList != null) {
                 for (Downloader downloader : downloaderList) {