From 3ac869fa6ae095f074481d98d9a4eea207eda00d Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Thu, 5 Oct 2023 18:48:53 +0200 Subject: [PATCH] feat(YouTube - Hide shorts components): Hide subscribe button when paused separately from subscribe button --- .../integrations/patches/components/ShortsFilter.java | 10 ++++++++-- .../revanced/integrations/settings/SettingsEnum.java | 3 ++- 2 files changed, 10 insertions(+), 3 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 index a2149447..6315b0b4 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 @@ -17,6 +17,7 @@ public final class ShortsFilter extends Filter { private final StringFilterGroup channelBar; private final StringFilterGroup subscribeButton; + private final StringFilterGroup subscribeButtonPaused; private final StringFilterGroup soundButton; private final StringFilterGroup infoPanel; private final StringFilterGroup shelfHeader; @@ -57,7 +58,11 @@ public final class ShortsFilter extends Filter { subscribeButton = new StringFilterGroup( SettingsEnum.HIDE_SHORTS_SUBSCRIBE_BUTTON, - "subscribe_button", + "subscribe_button" + ); + + subscribeButtonPaused = new StringFilterGroup( + SettingsEnum.HIDE_SHORTS_SUBSCRIBE_BUTTON_PAUSED, "shorts_paused_state" ); @@ -111,7 +116,8 @@ public final class ShortsFilter extends Filter { if (matchedGroup == soundButton || matchedGroup == infoPanel || matchedGroup == channelBar || - matchedGroup == subscribeButton + matchedGroup == subscribeButton || + matchedGroup == subscribeButtonPaused ) return super.isFiltered(identifier, path, protobufBufferArray, matchedList, matchedGroup, matchedIndex); // Video action buttons (comment, share, remix) have the same path. 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 581f9340..1c7979d1 100644 --- a/app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java +++ b/app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java @@ -136,7 +136,8 @@ public enum SettingsEnum { HIDE_FILTER_BAR_FEED_IN_SEARCH("revanced_hide_filter_bar_feed_in_search", BOOLEAN, FALSE, true), HIDE_FILTER_BAR_FEED_IN_RELATED_VIDEOS("revanced_hide_filter_bar_feed_in_related_videos", BOOLEAN, FALSE, true), HIDE_SHORTS_JOIN_BUTTON("revanced_hide_shorts_join_button", BOOLEAN, TRUE), - HIDE_SHORTS_SUBSCRIBE_BUTTON("revanced_hide_shorts_subscribe_button", BOOLEAN, FALSE), + HIDE_SHORTS_SUBSCRIBE_BUTTON("revanced_hide_shorts_subscribe_button", BOOLEAN, TRUE), + HIDE_SHORTS_SUBSCRIBE_BUTTON_PAUSED("revanced_hide_shorts_subscribe_button_paused", BOOLEAN, FALSE), HIDE_SHORTS_THANKS_BUTTON("revanced_hide_shorts_thanks_button", BOOLEAN, TRUE), HIDE_SHORTS_COMMENTS_BUTTON("revanced_hide_shorts_comments_button", BOOLEAN, FALSE), HIDE_SHORTS_REMIX_BUTTON("revanced_hide_shorts_remix_button", BOOLEAN, TRUE),