From a697701c5f1f9510b51e310b1ff212b609f38519 Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Mon, 28 Oct 2024 05:39:30 -0400 Subject: [PATCH] fix(YouTube - Hide layout components): Remove obsolete 'Hide gray separator' --- .../youtube/patches/components/LayoutComponentsFilter.java | 6 ------ .../app/revanced/extension/youtube/settings/Settings.java | 1 - .../layout/hide/general/HideLayoutComponentsPatch.kt | 1 - patches/src/main/resources/addresources/values/strings.xml | 3 --- 4 files changed, 11 deletions(-) diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java index 891124987..bf10416d1 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java @@ -61,18 +61,12 @@ public final class LayoutComponentsFilter extends Filter { // Identifiers. - final var graySeparator = new StringFilterGroup( - Settings.HIDE_GRAY_SEPARATOR, - "cell_divider" // layout residue (gray line above the buttoned ad), - ); - final var chipsShelf = new StringFilterGroup( Settings.HIDE_CHIPS_SHELF, "chips_shelf" ); addIdentifierCallbacks( - graySeparator, chipsShelf ); diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java index 89831b82b..c3d1f9f96 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java @@ -96,7 +96,6 @@ public class Settings extends BaseSettings { public static final BooleanSetting HIDE_FILTER_BAR_FEED_IN_SEARCH = new BooleanSetting("revanced_hide_filter_bar_feed_in_search", FALSE, true); public static final BooleanSetting HIDE_FLOATING_MICROPHONE_BUTTON = new BooleanSetting("revanced_hide_floating_microphone_button", TRUE, true); public static final BooleanSetting HIDE_FULLSCREEN_PANELS = new BooleanSetting("revanced_hide_fullscreen_panels", TRUE, true); - public static final BooleanSetting HIDE_GRAY_SEPARATOR = new BooleanSetting("revanced_hide_gray_separator", TRUE); public static final BooleanSetting HIDE_HIDE_CHANNEL_GUIDELINES = new BooleanSetting("revanced_hide_channel_guidelines", TRUE); public static final BooleanSetting HIDE_HIDE_INFO_PANELS = new BooleanSetting("revanced_hide_info_panels", TRUE); public static final BooleanSetting HIDE_IMAGE_SHELF = new BooleanSetting("revanced_hide_image_shelf", TRUE); 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 7cbb4cabd..26401c57f 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 @@ -233,7 +233,6 @@ val hideLayoutComponentsPatch = bytecodePatch( ) PreferenceScreen.GENERAL_LAYOUT.addPreferences( - SwitchPreference("revanced_hide_gray_separator"), PreferenceScreenPreference( key = "revanced_custom_filter_screen", sorting = PreferenceScreenPreference.Sorting.UNSORTED, diff --git a/patches/src/main/resources/addresources/values/strings.xml b/patches/src/main/resources/addresources/values/strings.xml index ee04e9289..b5cea7be1 100644 --- a/patches/src/main/resources/addresources/values/strings.xml +++ b/patches/src/main/resources/addresources/values/strings.xml @@ -121,9 +121,6 @@ This is because Crowdin requires temporarily flattening this file and removing t Hide floating microphone button Microphone button hidden Microphone button shown - Hide gray separator - Gray separators are hidden - Gray separators are shown Hide channel watermark Watermark is hidden Watermark is shown