From da315e64f67d97a3c85b0ae28d93d1d8d47ef263 Mon Sep 17 00:00:00 2001
From: drabux <drabux@fouragan.net>
Date: Wed, 25 May 2016 03:19:02 +0200
Subject: Add option to sort queue by feed title

---
 .../de/danoeh/antennapod/core/util/QueueSorter.java    | 18 +++++++++++++-----
 core/src/main/res/values/strings.xml                   |  3 ++-
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'core/src/main')

diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/QueueSorter.java b/core/src/main/java/de/danoeh/antennapod/core/util/QueueSorter.java
index a17ecb124..c3b4c0e15 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/QueueSorter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/QueueSorter.java
@@ -13,22 +13,24 @@ import de.danoeh.antennapod.core.storage.DBWriter;
  */
 public class QueueSorter {
     public enum Rule {
-        ALPHA_ASC,
-        ALPHA_DESC,
+        EPISODE_TITLE_ASC,
+        EPISODE_TITLE_DESC,
         DATE_ASC,
         DATE_DESC,
         DURATION_ASC,
-        DURATION_DESC
+        DURATION_DESC,
+        FEED_TITLE_ASC,
+        FEED_TITLE_DESC
     }
 
     public static void sort(final Context context, final Rule rule, final boolean broadcastUpdate) {
         Comparator<FeedItem> comparator = null;
 
         switch (rule) {
-            case ALPHA_ASC:
+            case EPISODE_TITLE_ASC:
                 comparator = (f1, f2) -> f1.getTitle().compareTo(f2.getTitle());
                 break;
-            case ALPHA_DESC:
+            case EPISODE_TITLE_DESC:
                 comparator = (f1, f2) -> f2.getTitle().compareTo(f1.getTitle());
                 break;
             case DATE_ASC:
@@ -60,6 +62,12 @@ public class QueueSorter {
                     return -1 * (duration1 - duration2);
                 };
                 break;
+            case FEED_TITLE_ASC:
+                comparator = (f1, f2) -> f1.getFeed().getTitle().compareTo(f2.getFeed().getTitle());
+                break;
+            case FEED_TITLE_DESC:
+                comparator = (f1, f2) -> f2.getFeed().getTitle().compareTo(f1.getFeed().getTitle());
+                break;
             default:
         }
 
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 7e0982294..419a366d1 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -232,9 +232,10 @@
     <string name="move_to_top_label">Move to top</string>
     <string name="move_to_bottom_label">Move to bottom</string>
     <string name="sort">Sort</string>
-    <string name="alpha">Alphabetically</string>
     <string name="date">Date</string>
     <string name="duration">Duration</string>
+    <string name="episode_title">Episode title</string>
+    <string name="feed_title">Feed title</string>
     <string name="ascending">Ascending</string>
     <string name="descending">Descending</string>
     <string name="clear_queue_confirmation_msg">Please confirm that you want to clear the queue of ALL of the episodes in it</string>
-- 
cgit v1.2.3