Merge branch 'develop'1.0

4 files changed, 68 insertions, 17 deletions

diff --git a/app/src/main/res/menu/feeditem.xml b/app/src/main/res/menu/feeditem.xml
index 5b25e8f2c..8227f8b14 100644
--- a/app/src/main/res/menu/feeditem.xml
+++ b/app/src/main/res/menu/feeditem.xml
@@ -5,19 +5,19 @@
     <item
         android:id="@+id/download_item"
         android:icon="?attr/av_download"
-        custom:showAsAction="ifRoom|collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/download_label">
     </item>
     <item
         android:id="@+id/stream_item"
         android:icon="?attr/action_stream"
-        custom:showAsAction="ifRoom|collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/stream_label">
     </item>
     <item
         android:id="@+id/play_item"
         android:icon="?attr/av_play"
-        custom:showAsAction="ifRoom|collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/play_label">
     </item>
     <item
@@ -65,7 +65,7 @@
     <item
         android:id="@+id/visit_website_item"
         android:icon="?attr/location_web_site"
-        custom:showAsAction="ifRoom|collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/visit_website_label">
     </item>
     <item
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
deleted file mode 100644
index a968f51ce..000000000
--- a/app/src/main/res/menu/main.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:custom="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/show_preferences"
-        android:title="@string/settings_label"
-        android:menuCategory="system"
-        custom:showAsAction="collapseActionView"/>
-
-
-</menu>
diff --git a/app/src/main/res/menu/mediaplayer.xml b/app/src/main/res/menu/mediaplayer.xml
index 0eb2ab067..288e44401 100644
--- a/app/src/main/res/menu/mediaplayer.xml
+++ b/app/src/main/res/menu/mediaplayer.xml
@@ -21,7 +21,7 @@
     <item
         android:id="@+id/visit_website_item"
         android:icon="?attr/location_web_site"
-        custom:showAsAction="ifRoom|collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/visit_website_label"
         android:visible="false">
     </item>
diff --git a/app/src/main/res/menu/queue.xml b/app/src/main/res/menu/queue.xml
new file mode 100644
index 000000000..b85279e5a
--- /dev/null
+++ b/app/src/main/res/menu/queue.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:custom="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/refresh_item"
+        android:title="@string/refresh_label"
+        android:menuCategory="container"
+        custom:showAsAction="ifRoom"
+        android:icon="?attr/navigation_refresh"/>
+
+    <item
+        android:id="@+id/queue_sort"
+        android:title="@string/sort">
+
+        <menu>
+            <item
+                android:id="@+id/queue_sort_alpha"
+                android:title="@string/alpha">
+
+                <menu>
+                    <item
+                        android:id="@+id/queue_sort_alpha_asc"
+                        android:title="@string/ascending"/>
+                    <item
+                        android:id="@+id/queue_sort_alpha_desc"
+                        android:title="@string/descending"/>
+                </menu>
+            </item>
+
+            <item
+                android:id="@+id/queue_sort_date"
+                android:title="@string/date">
+
+                <menu>
+                    <item
+                        android:id="@+id/queue_sort_date_asc"
+                        android:title="@string/ascending"/>
+                    <item
+                        android:id="@+id/queue_sort_date_desc"
+                        android:title="@string/descending"/>
+                </menu>
+            </item>
+
+            <item
+                android:id="@+id/queue_sort_duration"
+                android:title="@string/duration">
+
+                <menu>
+                    <item
+                        android:id="@+id/queue_sort_duration_asc"
+                        android:title="@string/ascending"/>
+                    <item
+                        android:id="@+id/queue_sort_duration_desc"
+                        android:title="@string/descending"/>
+                </menu>
+            </item>
+
+        </menu>
+    </item>
+
+</menu>