diff options
author | Martin Fietz <Martin.Fietz@gmail.com> | 2016-06-06 19:18:40 +0200 |
---|---|---|
committer | Martin Fietz <Martin.Fietz@gmail.com> | 2016-06-06 19:18:40 +0200 |
commit | 6106fdc899917c67093fa9a3888731558536e6a7 (patch) | |
tree | 0480e8bd8b1296d686dd225776806c5495a2cf24 /app | |
parent | ed077f6baee8c85ce2f0b8a5320d072a2491777a (diff) | |
parent | da315e64f67d97a3c85b0ae28d93d1d8d47ef263 (diff) | |
download | AntennaPod-6106fdc899917c67093fa9a3888731558536e6a7.zip |
Merge pull request #1958 from drabux/sort_by_feed_title
Add option to sort queue by feed title
Diffstat (limited to 'app')
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java | 14 | ||||
-rw-r--r-- | app/src/main/res/menu/queue.xml | 37 |
2 files changed, 35 insertions, 16 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 08e681c99..ee9390929 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java @@ -304,11 +304,11 @@ public class QueueFragment extends Fragment { }; conDialog.createNewDialog().show(); return true; - case R.id.queue_sort_alpha_asc: - QueueSorter.sort(getActivity(), QueueSorter.Rule.ALPHA_ASC, true); + case R.id.queue_sort_episode_title_asc: + QueueSorter.sort(getActivity(), QueueSorter.Rule.EPISODE_TITLE_ASC, true); return true; - case R.id.queue_sort_alpha_desc: - QueueSorter.sort(getActivity(), QueueSorter.Rule.ALPHA_DESC, true); + case R.id.queue_sort_episode_title_desc: + QueueSorter.sort(getActivity(), QueueSorter.Rule.EPISODE_TITLE_DESC, true); return true; case R.id.queue_sort_date_asc: QueueSorter.sort(getActivity(), QueueSorter.Rule.DATE_ASC, true); @@ -322,6 +322,12 @@ public class QueueFragment extends Fragment { case R.id.queue_sort_duration_desc: QueueSorter.sort(getActivity(), QueueSorter.Rule.DURATION_DESC, true); return true; + case R.id.queue_sort_feed_title_asc: + QueueSorter.sort(getActivity(), QueueSorter.Rule.FEED_TITLE_ASC, true); + return true; + case R.id.queue_sort_feed_title_desc: + QueueSorter.sort(getActivity(), QueueSorter.Rule.FEED_TITLE_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 01a11b10e..a5fe85865 100644 --- a/app/src/main/res/menu/queue.xml +++ b/app/src/main/res/menu/queue.xml @@ -36,47 +36,60 @@ <menu> <item - android:id="@+id/queue_sort_alpha" - android:title="@string/alpha"> + android:id="@+id/queue_sort_date" + android:title="@string/date"> <menu> <item - android:id="@+id/queue_sort_alpha_asc" + android:id="@+id/queue_sort_date_asc" android:title="@string/ascending"/> <item - android:id="@+id/queue_sort_alpha_desc" + android:id="@+id/queue_sort_date_desc" android:title="@string/descending"/> </menu> </item> <item - android:id="@+id/queue_sort_date" - android:title="@string/date"> + android:id="@+id/queue_sort_duration" + android:title="@string/duration"> <menu> <item - android:id="@+id/queue_sort_date_asc" + android:id="@+id/queue_sort_duration_asc" android:title="@string/ascending"/> <item - android:id="@+id/queue_sort_date_desc" + android:id="@+id/queue_sort_duration_desc" android:title="@string/descending"/> </menu> </item> <item - android:id="@+id/queue_sort_duration" - android:title="@string/duration"> + android:id="@+id/queue_sort_episode_title" + android:title="@string/episode_title"> <menu> <item - android:id="@+id/queue_sort_duration_asc" + android:id="@+id/queue_sort_episode_title_asc" android:title="@string/ascending"/> <item - android:id="@+id/queue_sort_duration_desc" + android:id="@+id/queue_sort_episode_title_desc" android:title="@string/descending"/> </menu> </item> + <item + android:id="@+id/queue_sort_feed_title" + android:title="@string/feed_title"> + + <menu> + <item + android:id="@+id/queue_sort_feed_title_asc" + android:title="@string/ascending"/> + <item + android:id="@+id/queue_sort_feed_title_desc" + android:title="@string/descending"/> + </menu> + </item> </menu> </item> |