From ac13d1030561905a81059ad0db31a749833a31cd Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Wed, 10 May 2023 02:14:51 +0200 Subject: [PATCH] feat(youtube/hide-shorts-components): hide navigation bar --- .../patches/components/ShortsFilter.java | 20 +++++++++++++++++++ .../integrations/settings/SettingsEnum.java | 1 + .../rendering/ui/pivotbar/PivotBar.java | 10 ++++++++++ 3 files changed, 31 insertions(+) create mode 100644 dummy/src/main/java/com/google/android/libraries/youtube/rendering/ui/pivotbar/PivotBar.java diff --git a/app/src/main/java/app/revanced/integrations/patches/components/ShortsFilter.java b/app/src/main/java/app/revanced/integrations/patches/components/ShortsFilter.java index 7abae683..43ab563f 100644 --- a/app/src/main/java/app/revanced/integrations/patches/components/ShortsFilter.java +++ b/app/src/main/java/app/revanced/integrations/patches/components/ShortsFilter.java @@ -3,12 +3,18 @@ package app.revanced.integrations.patches.components; import static app.revanced.integrations.utils.ReVancedUtils.hideViewBy1dpUnderCondition; import static app.revanced.integrations.utils.ReVancedUtils.hideViewUnderCondition; +import android.annotation.SuppressLint; import android.os.Build; import android.view.View; +import com.google.android.libraries.youtube.rendering.ui.pivotbar.PivotBar; + import app.revanced.integrations.settings.SettingsEnum; public final class ShortsFilter extends Filter { + public static PivotBar pivotBar; + @SuppressLint("StaticFieldLeak") + private final StringFilterGroup reelChannelBar = new StringFilterGroup( null, "reel_channel_bar" @@ -69,4 +75,18 @@ public final class ShortsFilter extends Filter { public static void hideShortsShareButton(final View shareButtonView) { hideViewUnderCondition(SettingsEnum.HIDE_SHORTS_SHARE_BUTTON, shareButtonView); } + + public static void hideNavigationBar() { + if (!SettingsEnum.HIDE_SHORTS_NAVIGATION_BAR.getBoolean()) return; + if (pivotBar == null) return; + + pivotBar.setVisibility(View.GONE); + } + + public static View hideNavigationBar(final View navigationBarView) { + if (SettingsEnum.HIDE_SHORTS_NAVIGATION_BAR.getBoolean()) + return null; // Hides the navigation bar. + + return navigationBarView; + } } diff --git a/app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java b/app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java index 0738e037..89f6be25 100644 --- a/app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java +++ b/app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java @@ -138,6 +138,7 @@ public enum SettingsEnum { HIDE_SHORTS_COMMENTS_BUTTON("revanced_hide_shorts_comments_button", BOOLEAN, FALSE), HIDE_SHORTS_REMIX_BUTTON("revanced_hide_shorts_remix_button", BOOLEAN, FALSE), HIDE_SHORTS_SHARE_BUTTON("revanced_hide_shorts_share_button", BOOLEAN, FALSE), + HIDE_SHORTS_NAVIGATION_BAR("revanced_hide_shorts_navigation_bar", BOOLEAN, TRUE, true), HIDE_SHORTS("revanced_hide_shorts", BOOLEAN, FALSE, true), // Misc diff --git a/dummy/src/main/java/com/google/android/libraries/youtube/rendering/ui/pivotbar/PivotBar.java b/dummy/src/main/java/com/google/android/libraries/youtube/rendering/ui/pivotbar/PivotBar.java new file mode 100644 index 00000000..f275effd --- /dev/null +++ b/dummy/src/main/java/com/google/android/libraries/youtube/rendering/ui/pivotbar/PivotBar.java @@ -0,0 +1,10 @@ +package com.google.android.libraries.youtube.rendering.ui.pivotbar; + +import android.content.Context; +import android.widget.HorizontalScrollView; + +public class PivotBar extends HorizontalScrollView { + public PivotBar(Context context) { + super(context); + } +}