From 91120d98a461d4050da30f3d039eb9b7db01c23a Mon Sep 17 00:00:00 2001
From: mr-intj <github@scott-smith.us>
Date: Fri, 27 Apr 2018 17:30:40 -0700
Subject: Added "Random" and "Smart Shuffle" items at the bottom of the
 Queue|Sort menu.

Added "Permutor" interface to allow specification of reordering logic to be specified in QueueSorter (vs. DBWriter), similar to the existing sort logic.

Added "Random" and "Smart Shuffle" strings to core/src/main/res/values (did not add translations for non-English languages)

Closes #2366, Closes #2602
---
 .../de/danoeh/antennapod/fragment/QueueFragment.java  |  9 +++++++++
 app/src/main/res/menu/queue.xml                       | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+)

(limited to 'app')

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 fba445d3a..85abdd281 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -327,6 +327,15 @@ public class QueueFragment extends Fragment {
                 case R.id.queue_sort_feed_title_desc:
                     QueueSorter.sort(getActivity(), QueueSorter.Rule.FEED_TITLE_DESC, true);
                     return true;
+                case R.id.queue_sort_random:
+                    QueueSorter.sort(getActivity(), QueueSorter.Rule.RANDOM, true);
+                    return true;
+                case R.id.queue_sort_smart_shuffle_asc:
+                    QueueSorter.sort(getActivity(), QueueSorter.Rule.SMART_SHUFFLE_ASC, true);
+                    return true;
+                case R.id.queue_sort_smart_shuffle_desc:
+                    QueueSorter.sort(getActivity(), QueueSorter.Rule.SMART_SHUFFLE_DESC, true);
+                    return true;
                 default:
                     return false;
             }
diff --git a/app/src/main/res/menu/queue.xml b/app/src/main/res/menu/queue.xml
index a5fe85865..7b82cbef3 100644
--- a/app/src/main/res/menu/queue.xml
+++ b/app/src/main/res/menu/queue.xml
@@ -90,6 +90,25 @@
                         android:title="@string/descending"/>
                 </menu>
             </item>
+
+            <item
+                android:id="@+id/queue_sort_random"
+                android:title="@string/random">
+            </item>
+
+            <item
+                android:id="@+id/queue_sort_smart_shuffle"
+                android:title="@string/smart_shuffle">
+
+                <menu>
+                    <item
+                        android:id="@+id/queue_sort_smart_shuffle_asc"
+                        android:title="@string/ascending"/>
+                    <item
+                        android:id="@+id/queue_sort_smart_shuffle_desc"
+                        android:title="@string/descending"/>
+                </menu>
+            </item>
         </menu>
     </item>
 
-- 
cgit v1.2.3