Merge pull request #290 from BURG3R5/feature/hide_kiosk

Add "Show kiosks in drawer" toggle

Author: polymorphicshade

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

@@ -284,15 +284,18 @@ private void addDrawerMenuForCurrentService() throws ExtractionException {
         //Kiosks
         final int currentServiceId = ServiceHelper.getSelectedServiceId(this);
         final StreamingService service = NewPipe.getService(currentServiceId);
-
-        int kioskMenuItemId = 0;
-
-        for (final String ks : service.getKioskList().getAvailableKiosks()) {
-            drawerLayoutBinding.navigation.getMenu()
-                    .add(R.id.menu_kiosks_group, kioskMenuItemId, 0, KioskTranslator
-                            .getTranslatedKioskName(ks, this))
-                    .setIcon(KioskTranslator.getKioskIcon(ks));
-            kioskMenuItemId++;
+        final boolean showKiosks = sharedPreferences.getBoolean(
+                getString(R.string.show_kiosks_key), true);
+
+        if (showKiosks) {
+            int kioskMenuItemId = 0;
+            for (final String ks : service.getKioskList().getAvailableKiosks()) {
+                drawerLayoutBinding.navigation.getMenu()
+                        .add(R.id.menu_kiosks_group, kioskMenuItemId, 0, KioskTranslator
+                                .getTranslatedKioskName(ks, this))
+                        .setIcon(KioskTranslator.getKioskIcon(ks));
+                kioskMenuItemId++;
+            }
         }
 
         //Settings and About
@@ -547,6 +550,19 @@ protected void onResume() {
             NavigationHelper.openMainActivity(this);
         }
 
+        if (sharedPreferences.getBoolean(Constants.KEY_DRAWER_CHANGE, false)) {
+            if (DEBUG) {
+                Log.d(TAG, "Drawer settings have changed, recreating drawer menu...");
+            }
+            sharedPreferences.edit().putBoolean(Constants.KEY_DRAWER_CHANGE, false).apply();
+            try {
+                drawerLayoutBinding.navigation.getMenu().clear();
+                addDrawerMenuForCurrentService();
+            } catch (final Exception e) {
+                ErrorUtil.showUiErrorSnackbar(this, "Rebuilding drawer menu", e);
+            }
+        }
+
         final boolean isHistoryEnabled = sharedPreferences.getBoolean(
                 getString(R.string.enable_watch_history_key), true);
         drawerLayoutBinding.navigation.getMenu().findItem(ITEM_ID_HISTORY)

app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java

@@ -52,6 +52,14 @@ public void onCreatePreferences(final Bundle savedInstanceState, final String ro
                         getString(R.string.auto_device_theme_title)));
             }
         }
+
+        final String showKiosksKey = getString(R.string.show_kiosks_key);
+        findPreference(showKiosksKey).setOnPreferenceChangeListener((preference, newValue) -> {
+            defaultPreferences.edit()
+                    .putBoolean(Constants.KEY_DRAWER_CHANGE, true)
+                    .apply();
+            return true;
+        });
     }
 
     @Override

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

@@ -16,5 +16,6 @@ const val KEY_SEARCH_STRING = "key_search_string"
 
 const val KEY_THEME_CHANGE = "key_theme_change"
 const val KEY_MAIN_PAGE_CHANGE = "key_main_page_change"
+const val KEY_DRAWER_CHANGE = "key_drawer_change"
 
 const val NO_SERVICE_ID = -1

app/src/main/res/values/settings_keys.xml

@@ -1564,6 +1564,8 @@
         <item>@string/image_quality_high_key</item>
     </string-array>
 
+    <string name="show_kiosks_key">show_kiosks</string>
+
     <!-- SponsorBlock -->
     <string name="sponsor_block_home_page_key" translatable="false">sponsor_block_home_page</string>
     <string name="sponsor_block_enable_key" translatable="false">sponsor_block_enable</string>

app/src/main/res/values/strings.xml

@@ -886,6 +886,8 @@
     <string name="trending_podcasts">Trending podcasts</string>
     <string name="trending_movies">Trending movies and shows</string>
     <string name="trending_music">Trending music</string>
+    <string name="show_kiosks_title">Show kiosks in drawer</string>
+    <string name="show_kiosks_summary">Show trending, most liked, and other kiosks</string>
     <string name="entry_deleted">Entry deleted</string>
     <string name="player_http_403">HTTP error 403 received from server while playing, likely caused by streaming URL expiration or an IP ban</string>
     <string name="player_http_invalid_status">HTTP error %1$s received from server while playing</string>

app/src/main/res/xml/appearance_settings.xml

@@ -66,4 +66,12 @@
         app:singleLineTitle="false"
         app:iconSpaceReserved="false" />
 
+    <SwitchPreferenceCompat
+        android:defaultValue="true"
+        android:key="@string/show_kiosks_key"
+        android:summary="@string/show_kiosks_summary"
+        android:title="@string/show_kiosks_title"
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
+
 </PreferenceScreen>