From 72e36c2bbb5b20a77e187f143328ef6e837a0658 Mon Sep 17 00:00:00 2001 From: flasker Date: Sun, 17 Dec 2023 17:15:23 +0300 Subject: [PATCH] hide tabs hide other services like peertube fix home screen and drawer --- .../java/org/schabi/newpipe/MainActivity.java | 42 +++++++++---------- .../subscription/SubscriptionFragment.kt | 13 ++---- .../newpipe/settings/tabs/TabsJsonHelper.java | 6 +-- .../newpipe/settings/tabs/TabsManager.java | 15 +++---- .../schabi/newpipe/util/ServiceHelper.java | 7 ++-- 5 files changed, 39 insertions(+), 44 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java index 70f0ee076..dab4ee1c5 100644 --- a/app/src/main/java/org/schabi/newpipe/MainActivity.java +++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java @@ -221,27 +221,27 @@ public class MainActivity extends AppCompatActivity { int kioskMenuItemId = 0; - for (final String ks : service.getKioskList().getAvailableKiosks()) { - drawerLayoutBinding.navigation.getMenu() - .add(R.id.menu_tabs_group, kioskMenuItemId, 0, KioskTranslator - .getTranslatedKioskName(ks, this)) - .setIcon(KioskTranslator.getKioskIcon(ks)); - kioskMenuItemId++; - } +// for (final String ks : service.getKioskList().getAvailableKiosks()) { +// drawerLayoutBinding.navigation.getMenu() +// .add(R.id.menu_tabs_group, kioskMenuItemId, 0, KioskTranslator +// .getTranslatedKioskName(ks, this)) +// .setIcon(KioskTranslator.getKioskIcon(ks)); +// kioskMenuItemId++; +// } - drawerLayoutBinding.navigation.getMenu() - .add(R.id.menu_tabs_group, ITEM_ID_SUBSCRIPTIONS, ORDER, - R.string.tab_subscriptions) - .setIcon(R.drawable.ic_tv); - drawerLayoutBinding.navigation.getMenu() - .add(R.id.menu_tabs_group, ITEM_ID_FEED, ORDER, R.string.fragment_feed_title) - .setIcon(R.drawable.ic_subscriptions); - drawerLayoutBinding.navigation.getMenu() - .add(R.id.menu_tabs_group, ITEM_ID_BOOKMARKS, ORDER, R.string.tab_bookmarks) - .setIcon(R.drawable.ic_bookmark); - drawerLayoutBinding.navigation.getMenu() - .add(R.id.menu_tabs_group, ITEM_ID_DOWNLOADS, ORDER, R.string.downloads) - .setIcon(R.drawable.ic_file_download); +// drawerLayoutBinding.navigation.getMenu() +// .add(R.id.menu_tabs_group, ITEM_ID_SUBSCRIPTIONS, ORDER, +// R.string.tab_subscriptions) +// .setIcon(R.drawable.ic_tv); +// drawerLayoutBinding.navigation.getMenu() +// .add(R.id.menu_tabs_group, ITEM_ID_FEED, ORDER, R.string.fragment_feed_title) +// .setIcon(R.drawable.ic_subscriptions); +// drawerLayoutBinding.navigation.getMenu() +// .add(R.id.menu_tabs_group, ITEM_ID_BOOKMARKS, ORDER, R.string.tab_bookmarks) +// .setIcon(R.drawable.ic_bookmark); +// drawerLayoutBinding.navigation.getMenu() +// .add(R.id.menu_tabs_group, ITEM_ID_DOWNLOADS, ORDER, R.string.downloads) +// .setIcon(R.drawable.ic_file_download); drawerLayoutBinding.navigation.getMenu() .add(R.id.menu_tabs_group, ITEM_ID_HISTORY, ORDER, R.string.action_history) .setIcon(R.drawable.ic_history); @@ -332,7 +332,7 @@ public class MainActivity extends AppCompatActivity { } private void setupDrawerHeader() { - drawerHeaderBinding.drawerHeaderActionButton.setOnClickListener(view -> toggleServices()); +// drawerHeaderBinding.drawerHeaderActionButton.setOnClickListener(view -> toggleServices()); // If the current app name is bigger than the default "NewPipe" (7 chars), // let the text view grow a little more as well. diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt index fe2321059..a9accaf7a 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt @@ -145,17 +145,12 @@ class SubscriptionFragment : BaseStateFragment() { addMenuItemToSubmenu(importSubMenu, R.string.previous_export) { onImportPreviousSelected() } .setIcon(R.drawable.ic_backup) - for (service in ServiceList.all()) { - val subscriptionExtractor = service.subscriptionExtractor ?: continue + val subscriptionExtractor = ServiceList.YouTube.subscriptionExtractor - val supportedSources = subscriptionExtractor.supportedSources - if (supportedSources.isEmpty()) continue - - addMenuItemToSubmenu(importSubMenu, service.serviceInfo.name) { - onImportFromServiceSelected(service.serviceId) - } - .setIcon(ServiceHelper.getIcon(service.serviceId)) + addMenuItemToSubmenu(importSubMenu, ServiceList.YouTube.serviceInfo.name) { + onImportFromServiceSelected(ServiceList.YouTube.serviceId) } + .setIcon(ServiceHelper.getIcon(ServiceList.YouTube.serviceId)) // -- Export -- val exportSubMenu = menu.addSubMenu(R.string.export_to) diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsJsonHelper.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsJsonHelper.java index 30676477c..5bcd7455d 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsJsonHelper.java +++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsJsonHelper.java @@ -19,10 +19,8 @@ public final class TabsJsonHelper { private static final String JSON_TABS_ARRAY_KEY = "tabs"; private static final List FALLBACK_INITIAL_TABS_LIST = List.of( - Tab.Type.DEFAULT_KIOSK.getTab(), - Tab.Type.FEED.getTab(), - Tab.Type.SUBSCRIPTIONS.getTab(), - Tab.Type.BOOKMARKS.getTab()); + Tab.Type.HISTORY.getTab()); + private TabsJsonHelper() { } diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsManager.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsManager.java index 7dcbee56f..da31bc533 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsManager.java +++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsManager.java @@ -28,13 +28,14 @@ public final class TabsManager { } public List getTabs() { - final String savedJson = sharedPreferences.getString(savedTabsKey, null); - try { - return TabsJsonHelper.getTabsFromJson(savedJson); - } catch (final TabsJsonHelper.InvalidJsonException e) { - Toast.makeText(context, R.string.saved_tabs_invalid_json, Toast.LENGTH_SHORT).show(); - return getDefaultTabs(); - } + return getDefaultTabs(); +// final String savedJson = sharedPreferences.getString(savedTabsKey, null); +// try { +// return TabsJsonHelper.getTabsFromJson(savedJson); +// } catch (final TabsJsonHelper.InvalidJsonException e) { +// Toast.makeText(context, R.string.saved_tabs_invalid_json, Toast.LENGTH_SHORT).show(); +// return getDefaultTabs(); +// } } public void saveTabs(final List tabList) { diff --git a/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java b/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java index acd019ba0..e851d4665 100644 --- a/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java @@ -193,8 +193,9 @@ public final class ServiceHelper { } public static void initServices(final Context context) { - for (final StreamingService s : ServiceList.all()) { - initService(context, s.getServiceId()); - } + initService(context, ServiceList.YouTube.getServiceId()); +// for (final StreamingService s : ServiceList.all()) { +// initService(context, ServiceList.YouTube.getServiceId()); +// } } }