diff options
| author | mr-intj <github@scott-smith.us> | 2018-04-27 17:30:40 -0700 |
|---|---|---|
| committer | mr-intj <github@scott-smith.us> | 2018-04-27 17:30:40 -0700 |
| commit | 91120d98a461d4050da30f3d039eb9b7db01c23a (patch) | |
| tree | e073f56438ce1d7c4cd2a30217f32371b1568d00 /app | |
| parent | 9d3d92cc9d98a908a5e2147aee0c6d5cb6b4db47 (diff) | |
| download | AntennaPod-91120d98a461d4050da30f3d039eb9b7db01c23a.zip | |
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
Diffstat (limited to 'app')
| -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> |