feat(YouTube/Hide action buttons): add `Disable Like and Dislike butt…

…on glow` setting
anddea · Jun 14, 2024 · ffb9a08 · ffb9a08
1 parent b3e0c9f
commit ffb9a08
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 25 deletions.
diff --git a/...c/main/java/app/revanced/integrations/youtube/patches/components/ActionButtonsFilter.java b/...c/main/java/app/revanced/integrations/youtube/patches/components/ActionButtonsFilter.java
@@ -10,25 +10,22 @@
 
 @SuppressWarnings("unused")
 public final class ActionButtonsFilter extends Filter {
+    private static final String VIDEO_ACTION_BAR_PATH_PREFIX = "video_action_bar.eml";
+    private static final String ANIMATED_VECTOR_TYPE_PATH = "AnimatedVectorType";
 
-    private static final String VIDEO_ACTION_BAR_PATH = "video_action_bar.eml";
-
-    private final StringFilterGroup actionBarRule;
     private final StringFilterGroup bufferFilterPathRule;
+    private final StringFilterGroup likeSubscribeGlow;
     private final ByteArrayFilterGroupList bufferButtonsGroupList = new ByteArrayFilterGroupList();
 
     public ActionButtonsFilter() {
-        actionBarRule = new StringFilterGroup(
-                null,
-                VIDEO_ACTION_BAR_PATH
-        );
-        addIdentifierCallbacks(actionBarRule);
-
-
         bufferFilterPathRule = new StringFilterGroup(
                 null,
                 "|ContainerType|button.eml|"
         );
+        likeSubscribeGlow = new StringFilterGroup(
+                Settings.DISABLE_LIKE_DISLIKE_GLOW,
+                "animated_button_border.eml"
+        );
         addPathCallbacks(
                 new StringFilterGroup(
                         Settings.HIDE_LIKE_DISLIKE_BUTTON,
@@ -50,7 +47,8 @@ public ActionButtonsFilter() {
                         Settings.HIDE_REWARDS_BUTTON,
                         "account_link_button"
                 ),
-                bufferFilterPathRule
+                bufferFilterPathRule,
+                likeSubscribeGlow
         );
 
         bufferButtonsGroupList.addAll(
@@ -77,27 +75,22 @@ public ActionButtonsFilter() {
         );
     }
 
-    private boolean isEveryFilterGroupEnabled() {
-        for (StringFilterGroup group : pathCallbacks)
-            if (!group.isEnabled()) return false;
-
-        for (ByteArrayFilterGroup group : bufferButtonsGroupList)
-            if (!group.isEnabled()) return false;
-
-        return true;
-    }
-
     @Override
     public boolean isFiltered(String path, @Nullable String identifier, String allValue, byte[] protobufBufferArray,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
-        if (!path.startsWith(VIDEO_ACTION_BAR_PATH)) {
+        if (!path.startsWith(VIDEO_ACTION_BAR_PATH_PREFIX)) {
             return false;
         }
-        if (matchedGroup == actionBarRule && !isEveryFilterGroupEnabled()) {
-            return false;
+        if (matchedGroup == likeSubscribeGlow) {
+            if (!path.contains(ANIMATED_VECTOR_TYPE_PATH)) {
+                return false;
+            }
         }
         if (matchedGroup == bufferFilterPathRule) {
-            return bufferButtonsGroupList.check(protobufBufferArray).isFiltered();
+            // In case the group list has no match, return false.
+            if (!bufferButtonsGroupList.check(protobufBufferArray).isFiltered()) {
+                return false;
+            }
         }
 
         return super.isFiltered(path, identifier, allValue, protobufBufferArray, matchedGroup, contentType, contentIndex);

diff --git a/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java b/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java
@@ -198,6 +198,7 @@ public class Settings extends BaseSettings {
 
 
     // PreferenceScreen: Player - Action buttons
+    public static final BooleanSetting DISABLE_LIKE_DISLIKE_GLOW = new BooleanSetting("revanced_disable_like_dislike_glow", FALSE);
     public static final BooleanSetting HIDE_CLIP_BUTTON = new BooleanSetting("revanced_hide_clip_button", FALSE);
     public static final BooleanSetting HIDE_DOWNLOAD_BUTTON = new BooleanSetting("revanced_hide_download_button", FALSE);
     public static final BooleanSetting HIDE_LIKE_DISLIKE_BUTTON = new BooleanSetting("revanced_hide_like_dislike_button", FALSE);