Skip to content

Commit c71443a

Browse files
feat(YouTube - Hide feed components): Remove obsolete Hide search result shelf header option (ReVanced#4134)
1 parent 87b09f9 commit c71443a

File tree

4 files changed

+0
-14
lines changed

4 files changed

+0
-14
lines changed

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ public final class LayoutComponentsFilter extends Filter {
3636
);
3737

3838
private final StringTrieSearch exceptions = new StringTrieSearch();
39-
private final StringFilterGroup searchResultShelfHeader;
4039
private final StringFilterGroup inFeedSurvey;
4140
private final StringFilterGroup notifyMe;
4241
private final StringFilterGroup expandableMetadata;
@@ -194,11 +193,6 @@ public LayoutComponentsFilter() {
194193
"timed_reaction"
195194
);
196195

197-
searchResultShelfHeader = new StringFilterGroup(
198-
Settings.HIDE_SEARCH_RESULT_SHELF_HEADER,
199-
"shelf_header.eml"
200-
);
201-
202196
notifyMe = new StringFilterGroup(
203197
Settings.HIDE_NOTIFY_ME_BUTTON,
204198
"set_reminder_button"
@@ -324,9 +318,6 @@ boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBuff
324318
return false;
325319
}
326320

327-
// TODO: This also hides the feed Shorts shelf header
328-
if (matchedGroup == searchResultShelfHeader && contentIndex != 0) return false;
329-
330321
if (matchedGroup == horizontalShelves) {
331322
if (contentIndex == 0 && hideShelves()) {
332323
return super.isFiltered(path, identifier, protobufBufferArray, matchedGroup, contentType, contentIndex);

extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ public class Settings extends BaseSettings {
9393
public static final BooleanSetting HIDE_NOTIFY_ME_BUTTON = new BooleanSetting("revanced_hide_notify_me_button", TRUE);
9494
public static final BooleanSetting HIDE_PLAYABLES = new BooleanSetting("revanced_hide_playables", TRUE);
9595
public static final BooleanSetting HIDE_SEARCH_RESULT_RECOMMENDATIONS = new BooleanSetting("revanced_hide_search_result_recommendations", TRUE);
96-
public static final BooleanSetting HIDE_SEARCH_RESULT_SHELF_HEADER = new BooleanSetting("revanced_hide_search_result_shelf_header", FALSE);
9796
public static final BooleanSetting HIDE_SHOW_MORE_BUTTON = new BooleanSetting("revanced_hide_show_more_button", TRUE, true);
9897
// Alternative thumbnails
9998
public static final EnumSetting<ThumbnailOption> ALT_THUMBNAIL_HOME = new EnumSetting<>("revanced_alt_thumbnail_home", ThumbnailOption.ORIGINAL);

patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ val hideLayoutComponentsPatch = bytecodePatch(
222222
SwitchPreference("revanced_hide_notify_me_button"),
223223
SwitchPreference("revanced_hide_playables"),
224224
SwitchPreference("revanced_hide_search_result_recommendations"),
225-
SwitchPreference("revanced_hide_search_result_shelf_header"),
226225
SwitchPreference("revanced_hide_show_more_button"),
227226
SwitchPreference("revanced_hide_doodles"),
228227
)

patches/src/main/resources/addresources/values/strings.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,6 @@ You will not be notified of any unexpected events."</string>
158158
<string name="revanced_hide_timed_reactions_title">Hide timed reactions</string>
159159
<string name="revanced_hide_timed_reactions_summary_on">Timed reactions are hidden</string>
160160
<string name="revanced_hide_timed_reactions_summary_off">Timed reactions are shown</string>
161-
<string name="revanced_hide_search_result_shelf_header_title">Hide search result shelf header</string>
162-
<string name="revanced_hide_search_result_shelf_header_summary_on">Shelf header is hidden</string>
163-
<string name="revanced_hide_search_result_shelf_header_summary_off">Shelf header is shown</string>
164161
<string name="revanced_hide_channel_guidelines_title">Hide channel guidelines</string>
165162
<string name="revanced_hide_channel_guidelines_summary_on">Channel guidelines are hidden</string>
166163
<string name="revanced_hide_channel_guidelines_summary_off">Channel guidelines are shown</string>

0 commit comments

Comments
 (0)