Merge branch 'develop' into smart-spread-fix

4 files changed, 31 insertions, 10 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
index 2eff33339..85b5e3985 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
@@ -262,7 +262,7 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
             FeedItem item = itemAccess.getItem(getAdapterPosition());
 
             MenuInflater inflater = mainActivityRef.get().getMenuInflater();
-            inflater.inflate(R.menu.allepisodes_context, menu);
+            inflater.inflate(R.menu.feeditemlist_context, menu);
 
             if (item != null) {
                 menu.setHeaderTitle(item.getTitle());
@@ -277,9 +277,7 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
                     item1.setVisible(visible);
                 }
             };
-            FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item, true, null);
-
-            contextMenuInterface.setItemVisibility(R.id.remove_new_flag_item, item.isNew());
+            FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item);
         }
 
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java
index c10bb7638..8d469c7a6 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java
@@ -1,6 +1,7 @@
 package de.danoeh.antennapod.adapter;
 
 import android.content.Context;
+import android.os.Build;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -51,6 +52,17 @@ public class FeedItemlistDescriptionAdapter extends ArrayAdapter<FeedItem> {
                     .replaceAll("\\s+", " ")
                     .trim();
             holder.description.setText(description);
+
+            final int MAX_LINES_COLLAPSED = 3;
+            holder.description.setMaxLines(MAX_LINES_COLLAPSED);
+            holder.description.setOnClickListener(v -> {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN
+                        && holder.description.getMaxLines() > MAX_LINES_COLLAPSED) {
+                    holder.description.setMaxLines(MAX_LINES_COLLAPSED);
+                } else {
+                    holder.description.setMaxLines(2000);
+                }
+            });
         }
         return convertView;
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
index 382abfb32..30057dde3 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
@@ -1,6 +1,5 @@
 package de.danoeh.antennapod.adapter;
 
-import android.content.Context;
 import android.os.Build;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
@@ -169,7 +168,8 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<QueueRecyclerAdap
             FeedItem item = itemAccess.getItem(getAdapterPosition());
 
             MenuInflater inflater = mainActivity.get().getMenuInflater();
-            inflater.inflate(R.menu.queue_context, menu);
+            inflater.inflate(R.menu.queue_context, menu); // queue-specific menu items
+            inflater.inflate(R.menu.feeditemlist_context, menu); // generic menu items for item feeds
 
             if (item != null) {
                 menu.setHeaderTitle(item.getTitle());
@@ -184,7 +184,18 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<QueueRecyclerAdap
                     item1.setVisible(visible);
                 }
             };
-            FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item, true, itemAccess.getQueueIds());
+
+            FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item,
+                    R.id.skip_episode_item); // Skip Episode is not useful in Queue, so hide it.
+            // Queue-specific menu preparation
+            final boolean keepSorted = UserPreferences.isQueueKeepSorted();
+            final LongList queueAccess = itemAccess.getQueueIds();
+            if (queueAccess.size() == 0 || queueAccess.get(0) == item.getId() || keepSorted) {
+                contextMenuInterface.setItemVisibility(R.id.move_to_top_item, false);
+            }
+            if (queueAccess.size() == 0 || queueAccess.get(queueAccess.size()-1) == item.getId() || keepSorted) {
+                contextMenuInterface.setItemVisibility(R.id.move_to_bottom_item, false);
+            }
         }
 
         @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java
index da5ebf6e1..6dbeccfc9 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java
@@ -20,12 +20,12 @@ public abstract class ItemActionButton {
     }
 
     @StringRes
-    abstract public int getLabel();
+    public abstract int getLabel();
 
     @AttrRes
-    abstract public int getDrawable();
+    public abstract int getDrawable();
 
-    abstract public void onClick(Context context);
+    public abstract void onClick(Context context);
 
     public int getVisibility() {
         return View.VISIBLE;