From ae05ac38151ebd3197953af97ca0dd847a04cc2d Mon Sep 17 00:00:00 2001 From: ILoveOpenSourceApplications <117499019+ILoveOpenSourceApplications@users.noreply.github.com> Date: Thu, 15 May 2025 01:27:47 +0530 Subject: [PATCH] fix(YouTube - Hide layout components): Fix `Hide video recommendation labels` (#4956) --- .../components/LayoutComponentsFilter.java | 22 ++++--------------- .../extension/youtube/settings/Settings.java | 2 +- .../hide/general/HideLayoutComponentsPatch.kt | 2 +- .../resources/addresources/values/strings.xml | 8 +++---- 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java index 5f6bffd1a..e82a6b30f 100644 --- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java @@ -34,8 +34,6 @@ public final class LayoutComponentsFilter extends Filter { private final StringFilterGroup notifyMe; private final StringFilterGroup singleItemInformationPanel; private final StringFilterGroup expandableMetadata; - private final ByteArrayFilterGroup searchResultRecommendations; - private final StringFilterGroup searchResultVideo; private final StringFilterGroup compactChannelBarInner; private final StringFilterGroup compactChannelBarInnerButton; private final ByteArrayFilterGroup joinMembershipButton; @@ -233,14 +231,9 @@ public final class LayoutComponentsFilter extends Filter { "mixed_content_shelf" ); - searchResultVideo = new StringFilterGroup( - Settings.HIDE_SEARCH_RESULT_RECOMMENDATIONS, - "search_video_with_context.eml" - ); - - searchResultRecommendations = new ByteArrayFilterGroup( - Settings.HIDE_SEARCH_RESULT_RECOMMENDATIONS, - "endorsement_header_footer" + final var searchResultRecommendationLabels = new StringFilterGroup( + Settings.HIDE_SEARCH_RESULT_RECOMMENDATION_LABELS, + "endorsement_header_footer.eml" ); horizontalShelves = new StringFilterGroup( @@ -258,7 +251,7 @@ public final class LayoutComponentsFilter extends Filter { compactChannelBar, communityPosts, paidPromotion, - searchResultVideo, + searchResultRecommendationLabels, latestPosts, channelWatermark, communityGuidelines, @@ -300,13 +293,6 @@ public final class LayoutComponentsFilter extends Filter { return false; } - if (matchedGroup == searchResultVideo) { - if (searchResultRecommendations.check(protobufBufferArray).isFiltered()) { - return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex); - } - return false; - } - // The groups are excluded from the filter due to the exceptions list below. // Filter them separately here. if (matchedGroup == notifyMe || matchedGroup == inFeedSurvey || matchedGroup == expandableMetadata) 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 bcabefb31..6d6282faf 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 @@ -103,7 +103,7 @@ public class Settings extends BaseSettings { public static final BooleanSetting HIDE_MOVIES_SECTION = new BooleanSetting("revanced_hide_movies_section", TRUE); public static final BooleanSetting HIDE_NOTIFY_ME_BUTTON = new BooleanSetting("revanced_hide_notify_me_button", TRUE); public static final BooleanSetting HIDE_PLAYABLES = new BooleanSetting("revanced_hide_playables", TRUE); - public static final BooleanSetting HIDE_SEARCH_RESULT_RECOMMENDATIONS = new BooleanSetting("revanced_hide_search_result_recommendations", TRUE); + public static final BooleanSetting HIDE_SEARCH_RESULT_RECOMMENDATION_LABELS = new BooleanSetting("revanced_hide_search_result_recommendation_labels", TRUE); public static final BooleanSetting HIDE_SHOW_MORE_BUTTON = new BooleanSetting("revanced_hide_show_more_button", TRUE, true); // Alternative thumbnails public static final EnumSetting ALT_THUMBNAIL_HOME = new EnumSetting<>("revanced_alt_thumbnail_home", ThumbnailOption.ORIGINAL); diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt index 59d05ef5e..3cad01e69 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt @@ -222,7 +222,7 @@ val hideLayoutComponentsPatch = bytecodePatch( SwitchPreference("revanced_hide_movies_section"), SwitchPreference("revanced_hide_notify_me_button"), SwitchPreference("revanced_hide_playables"), - SwitchPreference("revanced_hide_search_result_recommendations"), + SwitchPreference("revanced_hide_search_result_recommendation_labels"), SwitchPreference("revanced_hide_show_more_button"), SwitchPreference("revanced_hide_doodles"), ) diff --git a/patches/src/main/resources/addresources/values/strings.xml b/patches/src/main/resources/addresources/values/strings.xml index 4ae843521..16f836eab 100644 --- a/patches/src/main/resources/addresources/values/strings.xml +++ b/patches/src/main/resources/addresources/values/strings.xml @@ -210,10 +210,10 @@ You will not be notified of any unexpected events." Hide \'Notify me\' button Button is hidden Button is shown - - Hide \'People also watched\' label - Label is hidden - Label is shown + + Hide video recommendation labels + \'People also watched\' and \'You might also like\' labels are hidden + \'People also watched\' and \'You might also like\' labels are shown Hide \'Show more\' button