fix(YouTube - Hide Shorts Components): hide sound button

ReVanced · Jul 15, 2023 · a2b1630 · a2b1630
1 parent e78ef6d
commit a2b1630
Showing 1 changed file with 15 additions and 20 deletions.
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
@@ -1,33 +1,22 @@
 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 app.revanced.integrations.settings.SettingsEnum;
 import com.google.android.libraries.youtube.rendering.ui.pivotbar.PivotBar;
 
-import app.revanced.integrations.settings.SettingsEnum;
+import static app.revanced.integrations.utils.ReVancedUtils.hideViewBy1dpUnderCondition;
+import static app.revanced.integrations.utils.ReVancedUtils.hideViewUnderCondition;
 
 public final class ShortsFilter extends Filter {
+    // Set by patch.
     public static PivotBar pivotBar;
-    @SuppressLint("StaticFieldLeak")
-
+    final StringFilterGroupList shortsFilterGroup = new StringFilterGroupList();
     private final StringFilterGroup reelChannelBar = new StringFilterGroup(
             null,
             "reel_channel_bar"
     );
 
-    private final StringFilterGroup infoPanel = new StringFilterGroup(
-            SettingsEnum.HIDE_SHORTS_INFO_PANEL,
-            "shorts_info_panel_overview"
-    );
-
     public ShortsFilter() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) return;
-
         final var thanksButton = new StringFilterGroup(
                 SettingsEnum.HIDE_SHORTS_THANKS_BUTTON,
                 "suggested_action"
@@ -48,6 +37,11 @@ public ShortsFilter() {
                 "reel_pivot_button"
         );
 
+        final var infoPanel = new StringFilterGroup(
+                SettingsEnum.HIDE_SHORTS_INFO_PANEL,
+                "shorts_info_panel_overview"
+        );
+
         final var channelBar = new StringFilterGroup(
                 SettingsEnum.HIDE_SHORTS_CHANNEL_BAR,
                 "reel_channel_bar"
@@ -61,19 +55,20 @@ public ShortsFilter() {
                 "shorts_video_cell"
         );
 
-        this.pathFilterGroups.addAll(joinButton, subscribeButton, soundButton, channelBar);
-        this.identifierFilterGroups.addAll(shorts, thanksButton);
+        shortsFilterGroup.addAll(soundButton, infoPanel);
+        pathFilterGroups.addAll(joinButton, subscribeButton, channelBar);
+        identifierFilterGroups.addAll(shorts, thanksButton);
     }
 
     @Override
     boolean isFiltered(final String path, final String identifier,
                        final byte[] protobufBufferArray) {
+
         // Filter the path only when reelChannelBar is visible.
         if (reelChannelBar.check(path).isFiltered())
             if (this.pathFilterGroups.contains(path)) return true;
 
-        // Shorts info panel path appears outside of reelChannelBar path.
-        if (infoPanel.isEnabled() && infoPanel.check(path).isFiltered()) return true;
+        if (shortsFilterGroup.contains(path)) return true;
 
         return this.identifierFilterGroups.contains(identifier);
     }