From 065faf31b65b2ea5fbb901ab05d3c9cda5f3fd59 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Sat, 22 Feb 2020 10:23:01 +0100
Subject: [PATCH] Add settings button back in dot menu

---
 app/src/main/res/menu/download_menu.xml     |  3 +++
 app/src/main/res/menu/menu_channel.xml      | 17 ++++++++++++-----
 app/src/main/res/menu/menu_play_queue.xml   |  9 +++++++--
 app/src/main/res/menu/menu_playlist.xml     | 17 ++++++++++++-----
 app/src/main/res/menu/video_detail_menu.xml |  7 +++++++
 5 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/menu/download_menu.xml b/app/src/main/res/menu/download_menu.xml
index 27d9bfe29..c74dc804a 100644
--- a/app/src/main/res/menu/download_menu.xml
+++ b/app/src/main/res/menu/download_menu.xml
@@ -27,4 +27,7 @@
         android:title="@string/clear_download_history"
         app:showAsAction="ifRoom" />
 
+    <item android:id="@+id/action_settings"
+        android:title="@string/settings"
+        app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/menu/menu_channel.xml b/app/src/main/res/menu/menu_channel.xml
index cc6a9ed71..f8449d8b5 100644
--- a/app/src/main/res/menu/menu_channel.xml
+++ b/app/src/main/res/menu/menu_channel.xml
@@ -4,11 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:context=".fragments.list.impl.ChannelFragment">
 
-    <item
-        android:id="@+id/menu_item_openInBrowser"
-        android:title="@string/open_in_browser"
-        app:showAsAction="never"/>
-
     <item
         android:id="@+id/menu_item_rss"
         android:icon="?attr/rss"
@@ -22,4 +17,16 @@
         android:icon="?attr/share"
         android:title="@string/share"
         app:showAsAction="ifRoom"/>
+
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="1"
+        android:title="@string/settings"
+        app:showAsAction="never"/>
+
+    <item
+        android:id="@+id/menu_item_openInBrowser"
+        android:orderInCategory="2"
+        android:title="@string/open_in_browser"
+        app:showAsAction="never"/>
 </menu>
diff --git a/app/src/main/res/menu/menu_play_queue.xml b/app/src/main/res/menu/menu_play_queue.xml
index 5413794be..be6cea46c 100644
--- a/app/src/main/res/menu/menu_play_queue.xml
+++ b/app/src/main/res/menu/menu_play_queue.xml
@@ -10,13 +10,18 @@
         android:visible="true"
         app:showAsAction="ifRoom"/>
 
+    <item android:id="@+id/action_settings"
+        android:orderInCategory="1"
+        android:title="@string/settings"
+        app:showAsAction="never"/>
+
     <item android:id="@+id/action_system_audio"
-        android:orderInCategory="996"
+        android:orderInCategory="2"
         android:title="@string/play_queue_audio_settings"
         app:showAsAction="never"/>
 
     <item android:id="@+id/action_switch_main"
-        android:orderInCategory="999"
+        android:orderInCategory="3"
         android:title="@string/switch_to_main"
         app:showAsAction="never"/>
 </menu>
diff --git a/app/src/main/res/menu/menu_playlist.xml b/app/src/main/res/menu/menu_playlist.xml
index 4583ff719..5e62d40a3 100644
--- a/app/src/main/res/menu/menu_playlist.xml
+++ b/app/src/main/res/menu/menu_playlist.xml
@@ -3,11 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <item
-        android:id="@+id/menu_item_openInBrowser"
-        android:title="@string/open_in_browser"
-        app:showAsAction="never"/>
-
     <item
         android:id="@+id/menu_item_share"
         android:icon="?attr/share"
@@ -21,4 +16,16 @@
         android:visible="true"
         app:showAsAction="ifRoom"
         tools:visible="true"/>
+
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="1"
+        android:title="@string/settings"
+        app:showAsAction="never"/>
+
+    <item
+        android:id="@+id/menu_item_openInBrowser"
+        android:orderInCategory="2"
+        android:title="@string/open_in_browser"
+        app:showAsAction="never"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/video_detail_menu.xml b/app/src/main/res/menu/video_detail_menu.xml
index fd44c7860..65e7bc4da 100644
--- a/app/src/main/res/menu/video_detail_menu.xml
+++ b/app/src/main/res/menu/video_detail_menu.xml
@@ -14,8 +14,15 @@
         android:title="@string/share"
         app:showAsAction="ifRoom"/>
 
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="1"
+        android:title="@string/settings"
+        app:showAsAction="never"/>
+
     <item
         android:id="@+id/menu_item_openInBrowser"
+        android:orderInCategory="2"
         android:title="@string/open_in_browser"
         app:showAsAction="never"/>
 </menu>