Merge branch 'dev'

app/src/main/java/org/schabi/newpipe/MainActivity.java

@@ -453,15 +453,9 @@ public class MainActivity extends AppCompatActivity {
             NavigationHelper.openMainActivity(this);
         }
 
-        if (sharedPreferences.getBoolean(Constants.KEY_ENABLE_WATCH_HISTORY, true)) {
+        final boolean isHistoryEnabled = sharedPreferences.getBoolean(
-            if (DEBUG) Log.d(TAG, "do not show History-menu as its disabled in settings");
+                getString(R.string.enable_watch_history_key), true);
-            drawerItems.getMenu().findItem(ITEM_ID_HISTORY).setVisible(true);
+        drawerItems.getMenu().findItem(ITEM_ID_HISTORY).setVisible(isHistoryEnabled);
-        }
-
-        if (!sharedPreferences.getBoolean(Constants.KEY_ENABLE_WATCH_HISTORY, true)) {
-            if (DEBUG) Log.d(TAG, "show History-menu as its enabled in settings");
-            drawerItems.getMenu().findItem(ITEM_ID_HISTORY).setVisible(false);
-        }
     }
 
     @Override

app/src/main/java/org/schabi/newpipe/about/AboutActivity.java

@@ -88,13 +88,6 @@ public class AboutActivity extends AppCompatActivity {
     }
 
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.menu_about, menu);
-        return true;
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
 

app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java

@@ -12,6 +12,7 @@ import android.view.MenuItem;
 import android.view.ViewTreeObserver;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import us.shandian.giga.service.DownloadManagerService;
@@ -76,11 +77,9 @@ public class DownloadActivity extends AppCompatActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case android.R.id.home: {
+            case android.R.id.home:
                 onBackPressed();
                 return true;
-            }
-
             default:
                 return super.onOptionsItemSelected(item);
         }

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

@@ -600,22 +600,27 @@ public class VideoDetailFragment
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (isLoading.get()) {
+        int id = item.getItemId();
-            // if is still loading block menu
+        if (id == R.id.action_settings) {
+            NavigationHelper.openSettings(requireContext());
+            return true;
+        }
+
+        if (isLoading.get()) {
+            // if still loading, block menu buttons related to video info
             return true;
         }
 
-        int id = item.getItemId();
         switch (id) {
             case R.id.menu_item_share: {
                 if (currentInfo != null) {
-                    ShareUtils.shareUrl(this.getContext(), currentInfo.getName(), currentInfo.getOriginalUrl());
+                    ShareUtils.shareUrl(requireContext(), currentInfo.getName(), currentInfo.getOriginalUrl());
                 }
                 return true;
             }
             case R.id.menu_item_openInBrowser: {
                 if (currentInfo != null) {
-                    ShareUtils.openUrlInBrowser(this.getContext(), currentInfo.getOriginalUrl());
+                    ShareUtils.openUrlInBrowser(requireContext(), currentInfo.getOriginalUrl());
                 }
                 return true;
             }

app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java

@@ -175,17 +175,20 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
+            case R.id.action_settings:
+                NavigationHelper.openSettings(requireContext());
+                break;
             case R.id.menu_item_rss:
                 openRssFeed();
                 break;
             case R.id.menu_item_openInBrowser:
                 if (currentInfo != null) {
-                    ShareUtils.openUrlInBrowser(this.getContext(), currentInfo.getOriginalUrl());
+                    ShareUtils.openUrlInBrowser(requireContext(), currentInfo.getOriginalUrl());
                 }
                 break;
             case R.id.menu_item_share:
                 if (currentInfo != null) {
-                    ShareUtils.shareUrl(this.getContext(), name, currentInfo.getOriginalUrl());
+                    ShareUtils.shareUrl(requireContext(), name, currentInfo.getOriginalUrl());
                 }
                 break;
             default:

app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java

@@ -222,11 +222,14 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
+            case R.id.action_settings:
+                NavigationHelper.openSettings(requireContext());
+                break;
             case R.id.menu_item_openInBrowser:
-                ShareUtils.openUrlInBrowser(this.getContext(), url);
+                ShareUtils.openUrlInBrowser(requireContext(), url);
                 break;
             case R.id.menu_item_share:
-                ShareUtils.shareUrl(this.getContext(), name, url);
+                ShareUtils.shareUrl(requireContext(), name, url);
                 break;
             case R.id.menu_item_bookmark:
                 onBookmarkClicked();

app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java

@@ -156,6 +156,9 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
             case android.R.id.home:
                 finish();
                 return true;
+            case R.id.action_settings:
+                NavigationHelper.openSettings(this);
+                return true;
             case R.id.action_append_playlist:
                 appendAllToPlaylist();
                 return true;

app/src/main/java/org/schabi/newpipe/util/Constants.java

@@ -11,7 +11,5 @@ public class Constants {
     public static final String KEY_THEME_CHANGE = "key_theme_change";
     public static final String KEY_MAIN_PAGE_CHANGE = "key_main_page_change";
 
-    public static final String KEY_ENABLE_WATCH_HISTORY = "enable_watch_history";
-
     public static final int NO_SERVICE_ID = -1;
 }

app/src/main/res/menu/download_menu.xml

@@ -26,5 +26,4 @@
         android:icon="?attr/ic_delete"
         android:title="@string/clear_download_history"
         app:showAsAction="ifRoom" />
-
 </menu>

app/src/main/res/menu/menu_about.xml

@@ -1,6 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="org.schabi.newpipe.about.AboutActivity">
-
-</menu>

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>

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>

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>

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>