From 1edf415c2d11414d261c7437f2f9a14081286962 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 11 Sep 2019 23:00:46 +0200
Subject: Showing full description when clicking item on podcast preview screen

---
 .../antennapod/adapter/FeedItemlistDescriptionAdapter.java   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'app/src/main/java/de/danoeh/antennapod/adapter')

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;
     }
-- 
cgit v1.2.3


From 0daef525b05ac963f0f255b7eb1fe676cd6a96b0 Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Sun, 22 Sep 2019 12:54:09 -0700
Subject: #3302 - support remove new flag in Podcast screen and Podcast Episode
 Screen. - moved the logic in Episodes Screen (AllEpisodesRecycleAdapter and
 EpisodesListFragment) to the generic FeedItemMenuHandler

---
 .../java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java    | 2 --
 1 file changed, 2 deletions(-)

(limited to 'app/src/main/java/de/danoeh/antennapod/adapter')

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..246119306 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
@@ -278,8 +278,6 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
                 }
             };
             FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item, true, null);
-
-            contextMenuInterface.setItemVisibility(R.id.remove_new_flag_item, item.isNew());
         }
 
     }
-- 
cgit v1.2.3


From 9573e6b675b5235639d567ad135fc6adeda26b37 Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Sun, 22 Sep 2019 13:50:52 -0700
Subject: #3302 - refactor retire episode screen item context menu (and reuse
 the common item context menu)

---
 .../java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/java/de/danoeh/antennapod/adapter')

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 246119306..74e7733e8 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());
-- 
cgit v1.2.3


From 684505205732e57a014ae2162d4ab98b8961286f Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Sun, 22 Sep 2019 15:39:49 -0700
Subject: Queue context menu refactor - move queue-specific logic out of
 generic handler

---
 .../danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java |  2 +-
 .../de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java   | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'app/src/main/java/de/danoeh/antennapod/adapter')

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 74e7733e8..2bf9bb256 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
@@ -277,7 +277,7 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
                     item1.setVisible(visible);
                 }
             };
-            FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item, true, null);
+            FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item, true);
         }
 
     }
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..25b92d452 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;
@@ -184,7 +183,16 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<QueueRecyclerAdap
                     item1.setVisible(visible);
                 }
             };
-            FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item, true, itemAccess.getQueueIds());
+            FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item, true);
+            // 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
-- 
cgit v1.2.3


From 27ce3c85c4972e095a51e882f1dfd09cbf6959c2 Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Sun, 22 Sep 2019 15:46:26 -0700
Subject: Queue context menu refactor - move queue menu definition xml reuse
 the generic one

---
 .../main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/de/danoeh/antennapod/adapter')

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 25b92d452..c2f3f0dd8 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
@@ -168,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());
-- 
cgit v1.2.3


From 931c670398225c771352b271e03eec578f1a7ff0 Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Mon, 23 Sep 2019 03:55:58 -0700
Subject: Queue context menu refactor - hide Skip Episode (same as pre-refactor
 behavior)

---
 .../main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/de/danoeh/antennapod/adapter')

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 c2f3f0dd8..02a4b09ff 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
@@ -184,7 +184,9 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<QueueRecyclerAdap
                     item1.setVisible(visible);
                 }
             };
-            FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item, true);
+
+            FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item, true,
+                    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();
-- 
cgit v1.2.3


From 6c05a8c7306518da2518ec6d42d6466cd1a1c5b5 Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Mon, 23 Sep 2019 04:02:24 -0700
Subject: feeditem context menu refactor - removed unused showExtendedMenu
 parameter

---
 .../java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java    | 2 +-
 .../main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java/de/danoeh/antennapod/adapter')

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 2bf9bb256..85b5e3985 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
@@ -277,7 +277,7 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
                     item1.setVisible(visible);
                 }
             };
-            FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item, true);
+            FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item);
         }
 
     }
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 02a4b09ff..30057dde3 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
@@ -185,7 +185,7 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<QueueRecyclerAdap
                 }
             };
 
-            FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item, true,
+            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();
-- 
cgit v1.2.3


From 58348908ea5821af5e6e8be823e43bdd4450b006 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 24 Sep 2019 11:27:08 +0200
Subject: Fixed checkstyle violations

---
 .../de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/src/main/java/de/danoeh/antennapod/adapter')

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;
-- 
cgit v1.2.3