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 a78b941bf..1576dfec4 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 @@ -36,7 +36,6 @@ public final class LayoutComponentsFilter extends Filter { ); private final StringTrieSearch exceptions = new StringTrieSearch(); - private final StringFilterGroup searchResultShelfHeader; private final StringFilterGroup inFeedSurvey; private final StringFilterGroup notifyMe; private final StringFilterGroup expandableMetadata; @@ -194,11 +193,6 @@ public final class LayoutComponentsFilter extends Filter { "timed_reaction" ); - searchResultShelfHeader = new StringFilterGroup( - Settings.HIDE_SEARCH_RESULT_SHELF_HEADER, - "shelf_header.eml" - ); - notifyMe = new StringFilterGroup( Settings.HIDE_NOTIFY_ME_BUTTON, "set_reminder_button" @@ -324,9 +318,6 @@ public final class LayoutComponentsFilter extends Filter { return false; } - // TODO: This also hides the feed Shorts shelf header - if (matchedGroup == searchResultShelfHeader && contentIndex != 0) return false; - if (matchedGroup == horizontalShelves) { if (contentIndex == 0 && hideShelves()) { return super.isFiltered(path, identifier, protobufBufferArray, matchedGroup, contentType, contentIndex); 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 eaad85188..c59d2d04b 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 @@ -93,7 +93,6 @@ public class Settings extends BaseSettings { 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_SHELF_HEADER = new BooleanSetting("revanced_hide_search_result_shelf_header", FALSE); 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 a52fc5ff0..a1d2236b1 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,6 @@ val hideLayoutComponentsPatch = bytecodePatch( SwitchPreference("revanced_hide_notify_me_button"), SwitchPreference("revanced_hide_playables"), SwitchPreference("revanced_hide_search_result_recommendations"), - SwitchPreference("revanced_hide_search_result_shelf_header"), 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 e2c26d4f1..e45b97d09 100644 --- a/patches/src/main/resources/addresources/values/strings.xml +++ b/patches/src/main/resources/addresources/values/strings.xml @@ -158,9 +158,6 @@ You will not be notified of any unexpected events." Hide timed reactions Timed reactions are hidden Timed reactions are shown - Hide search result shelf header - Shelf header is hidden - Shelf header is shown Hide channel guidelines Channel guidelines are hidden Channel guidelines are shown