diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ButtonsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ButtonsFilter.java index 5a61dfc82..12775ed5f 100644 --- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ButtonsFilter.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ButtonsFilter.java @@ -7,6 +7,10 @@ final class ButtonsFilter extends Filter { private static final String COMPACT_CHANNEL_BAR_PATH_PREFIX = "compact_channel_bar.eml"; private static final String VIDEO_ACTION_BAR_PATH_PREFIX = "video_action_bar.eml"; private static final String VIDEO_ACTION_BAR_PATH = "video_action_bar.eml"; + /** + * Video bar path when the video information is collapsed. Seems to shown only with 20.14+ + */ + private static final String COMPACTIFY_VIDEO_ACTION_BAR_PATH = "compactify_video_action_bar.eml"; private static final String ANIMATED_VECTOR_TYPE_PATH = "AnimatedVectorType"; private final StringFilterGroup likeSubscribeGlow; @@ -82,6 +86,10 @@ final class ButtonsFilter extends Filter { Settings.HIDE_STOP_ADS_BUTTON, "yt_outline_slash_circle_left" ), + new ByteArrayFilterGroup( + Settings.HIDE_COMMENTS_BUTTON, + "yt_outline_message_bubble_right" + ), // Check for clip button both here and using a path filter, // as there's a chance the path is a generic action button and won't contain 'clip_button' new ByteArrayFilterGroup( @@ -124,9 +132,8 @@ final class ButtonsFilter extends Filter { } if (matchedGroup == bufferFilterPathGroup) { - // Make sure the current path is the right one - // to avoid false positives. - return path.startsWith(VIDEO_ACTION_BAR_PATH) + // Make sure the current path is the right one to avoid false positives. + return (path.startsWith(VIDEO_ACTION_BAR_PATH) || path.startsWith(COMPACTIFY_VIDEO_ACTION_BAR_PATH)) && bufferButtonsGroupList.check(buffer).isFiltered(); } diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java index d7e1bf67e..7177067f5 100644 --- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java @@ -222,6 +222,7 @@ public class Settings extends BaseSettings { public static final BooleanSetting DISABLE_LIKE_SUBSCRIBE_GLOW = new BooleanSetting("revanced_disable_like_subscribe_glow", FALSE); public static final BooleanSetting HIDE_ASK_BUTTON = new BooleanSetting("revanced_hide_ask_button", FALSE); public static final BooleanSetting HIDE_CLIP_BUTTON = new BooleanSetting("revanced_hide_clip_button", TRUE); + public static final BooleanSetting HIDE_COMMENTS_BUTTON = new BooleanSetting("revanced_hide_comments_button", TRUE); public static final BooleanSetting HIDE_DOWNLOAD_BUTTON = new BooleanSetting("revanced_hide_download_button", FALSE); public static final BooleanSetting HIDE_HYPE_BUTTON = new BooleanSetting("revanced_hide_hype_button", FALSE); public static final BooleanSetting HIDE_LIKE_DISLIKE_BUTTON = new BooleanSetting("revanced_hide_like_dislike_button", FALSE); diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt index 0881c499a..62c4dacdd 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt @@ -41,6 +41,7 @@ val hideButtonsPatch = resourcePatch( SwitchPreference("revanced_disable_like_subscribe_glow"), SwitchPreference("revanced_hide_ask_button"), SwitchPreference("revanced_hide_clip_button"), + SwitchPreference("revanced_hide_comments_button"), SwitchPreference("revanced_hide_download_button"), SwitchPreference("revanced_hide_hype_button"), SwitchPreference("revanced_hide_like_dislike_button"), diff --git a/patches/src/main/resources/addresources/values/strings.xml b/patches/src/main/resources/addresources/values/strings.xml index 5f4d5d5d7..13de8f6da 100644 --- a/patches/src/main/resources/addresources/values/strings.xml +++ b/patches/src/main/resources/addresources/values/strings.xml @@ -649,6 +649,10 @@ Adjust volume by swiping vertically on the right side of the screen" Hide Stop ads Stop ads button is hidden Stop ads button is shown + + Hide Comments + Comments button is hidden + Comments button is shown Hide Report