diff options
author | H. Lehmann <ByteHamster@users.noreply.github.com> | 2018-05-01 07:29:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-01 07:29:38 +0200 |
commit | e16a111a12946531b5fa81d77206aa6bfc2ab318 (patch) | |
tree | 8b8f6dc92c0b1261b8970bb55fc0d28983d06acc /app/src | |
parent | 9d3d92cc9d98a908a5e2147aee0c6d5cb6b4db47 (diff) | |
parent | 7be44370f6828c540ee3bcc7789b181aafadbbf4 (diff) | |
download | AntennaPod-e16a111a12946531b5fa81d77206aa6bfc2ab318.zip |
Merge pull request #2659 from mr-intj/2366-pubdate-respecting-smart-shuffle
Added "Random" and "Smart Shuffle"
Diffstat (limited to 'app/src')
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java | 9 | ||||
-rw-r--r-- | app/src/main/res/menu/queue.xml | 19 |
2 files changed, 28 insertions, 0 deletions
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> |