test/revanced-patches
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

fix(YouTube): Add back missing custom filter by adding the preference to the correct screen

Browse source
This commit is contained in:
oSumAtrIX 2026-03-01 00:54:36 +01:00
parent c6da2841a1
commit 2a10489a86
No known key found for this signature in database
GPG key ID: A9B3094ACDB604B4
12 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
patches/src/main/kotlin/app/revanced/patches/music/layout/hide/general/HideLayoutComponentsPatch.kt
View file

@ -3,10 +3,12 @@ package app.revanced.patches.music.layout.hide.general
import app.revanced.patches.music.misc.litho.filter.lithoFilterPatch import app.revanced.patches.music.misc.litho.filter.lithoFilterPatch
import app.revanced.patches.music.misc.settings.settingsPatch import app.revanced.patches.music.misc.settings.settingsPatch
import app.revanced.patches.shared.layout.hide.general.hideLayoutComponentsPatch import app.revanced.patches.shared.layout.hide.general.hideLayoutComponentsPatch
import app.revanced.patches.music.misc.settings.PreferenceScreen
val hideLayoutComponentsPatch = hideLayoutComponentsPatch( val hideLayoutComponentsPatch = hideLayoutComponentsPatch(
lithoFilterPatch = lithoFilterPatch, lithoFilterPatch = lithoFilterPatch,
settingsPatch = settingsPatch, settingsPatch = settingsPatch,
generalSettingsScreen = PreferenceScreen.GENERAL,
filterClasses = setOf("Lapp/revanced/extension/shared/patches/litho/CustomFilter;"), filterClasses = setOf("Lapp/revanced/extension/shared/patches/litho/CustomFilter;"),
compatibleWithPackages = arrayOf( compatibleWithPackages = arrayOf(
"com.google.android.apps.youtube.music" to setOf( "com.google.android.apps.youtube.music" to setOf(

5
patches/src/main/kotlin/app/revanced/patches/shared/layout/hide/general/HideLayoutComponentsPatch.kt
View file

@ -5,8 +5,8 @@ import app.revanced.patcher.patch.Patch
import app.revanced.patcher.patch.bytecodePatch import app.revanced.patcher.patch.bytecodePatch
import app.revanced.patches.all.misc.resources.addResources import app.revanced.patches.all.misc.resources.addResources
import app.revanced.patches.all.misc.resources.addResourcesPatch import app.revanced.patches.all.misc.resources.addResourcesPatch
import app.revanced.patches.music.misc.settings.PreferenceScreen
import app.revanced.patches.shared.misc.litho.filter.addLithoFilter import app.revanced.patches.shared.misc.litho.filter.addLithoFilter
import app.revanced.patches.shared.misc.settings.preference.BasePreferenceScreen
import app.revanced.patches.shared.misc.settings.preference.InputType import app.revanced.patches.shared.misc.settings.preference.InputType
import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference
import app.revanced.patches.shared.misc.settings.preference.SwitchPreference import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
@ -16,6 +16,7 @@ import kotlin.collections.toTypedArray
internal fun hideLayoutComponentsPatch( internal fun hideLayoutComponentsPatch(
lithoFilterPatch: Patch, lithoFilterPatch: Patch,
settingsPatch: Patch, settingsPatch: Patch,
generalSettingsScreen: BasePreferenceScreen.Screen,
additionalDependencies: Set<Patch> = emptySet(), additionalDependencies: Set<Patch> = emptySet(),
filterClasses: Set<String>, filterClasses: Set<String>,
vararg compatibleWithPackages: Pair<String, Set<String>?>, vararg compatibleWithPackages: Pair<String, Set<String>?>,
@ -36,7 +37,7 @@ internal fun hideLayoutComponentsPatch(
apply { apply {
addResources("shared", "layout.hide.general.hideLayoutComponentsPatch") addResources("shared", "layout.hide.general.hideLayoutComponentsPatch")
PreferenceScreen.GENERAL.addPreferences( generalSettingsScreen.addPreferences(
PreferenceScreenPreference( PreferenceScreenPreference(
key = "revanced_custom_filter_screen", key = "revanced_custom_filter_screen",
sorting = PreferenceScreenPreference.Sorting.UNSORTED, sorting = PreferenceScreenPreference.Sorting.UNSORTED,

3
patches/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt
View file

@ -9,7 +9,6 @@ import app.revanced.patcher.extensions.instructions
import app.revanced.patcher.extensions.replaceInstructions import app.revanced.patcher.extensions.replaceInstructions
import app.revanced.patcher.firstMethodDeclaratively import app.revanced.patcher.firstMethodDeclaratively
import app.revanced.patcher.immutableClassDef import app.revanced.patcher.immutableClassDef
import app.revanced.patcher.instructions
import app.revanced.patcher.parameterTypes import app.revanced.patcher.parameterTypes
import app.revanced.patcher.patch.bytecodePatch import app.revanced.patcher.patch.bytecodePatch
import app.revanced.patcher.returnType import app.revanced.patcher.returnType
@ -53,7 +52,7 @@ val removeViewerDiscretionDialogPatch = bytecodePatch(
apply { apply {
addResources("youtube", "interaction.dialog.removeViewerDiscretionDialogPatch") addResources("youtube", "interaction.dialog.removeViewerDiscretionDialogPatch")
PreferenceScreen.GENERAL_LAYOUT.addPreferences( PreferenceScreen.GENERAL.addPreferences(
SwitchPreference("revanced_remove_viewer_discretion_dialog"), SwitchPreference("revanced_remove_viewer_discretion_dialog"),
) )

2
patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt
View file

@ -19,7 +19,7 @@ val customBrandingPatch = baseCustomBrandingPatch(
getMainActivityOnCreate = BytecodePatchContext::mainActivityOnCreateMethod::get, getMainActivityOnCreate = BytecodePatchContext::mainActivityOnCreateMethod::get,
mainActivityName = YOUTUBE_MAIN_ACTIVITY_NAME, mainActivityName = YOUTUBE_MAIN_ACTIVITY_NAME,
activityAliasNameWithIntents = $$"com.google.android.youtube.app.honeycomb.Shell$HomeActivity", activityAliasNameWithIntents = $$"com.google.android.youtube.app.honeycomb.Shell$HomeActivity",
preferenceScreen = PreferenceScreen.GENERAL_LAYOUT, preferenceScreen = PreferenceScreen.GENERAL,
block = { block = {
dependsOn(sharedExtensionPatch) dependsOn(sharedExtensionPatch)

3
patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/ChangeHeaderPatch.kt
View file

@ -3,7 +3,6 @@ package app.revanced.patches.youtube.layout.branding.header
import app.revanced.patcher.extensions.addInstructions import app.revanced.patcher.extensions.addInstructions
import app.revanced.patcher.extensions.getInstruction import app.revanced.patcher.extensions.getInstruction
import app.revanced.patcher.extensions.wideLiteral import app.revanced.patcher.extensions.wideLiteral
import app.revanced.patcher.firstMethod
import app.revanced.patcher.patch.PatchException import app.revanced.patcher.patch.PatchException
import app.revanced.patcher.patch.bytecodePatch import app.revanced.patcher.patch.bytecodePatch
import app.revanced.patcher.patch.resourcePatch import app.revanced.patcher.patch.resourcePatch
@ -135,7 +134,7 @@ val changeHeaderPatch = resourcePatch(
apply { apply {
addResources("youtube", "layout.branding.changeHeaderPatch") addResources("youtube", "layout.branding.changeHeaderPatch")
PreferenceScreen.GENERAL_LAYOUT.addPreferences( PreferenceScreen.GENERAL.addPreferences(
if (custom == null) { if (custom == null) {
ListPreference("revanced_header_logo") ListPreference("revanced_header_logo")
} else { } else {

6
patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationBarPatch.kt
View file

@ -82,7 +82,7 @@ val navigationBarPatch = bytecodePatch(
preferences += SwitchPreference("revanced_disable_translucent_navigation_bar_light") preferences += SwitchPreference("revanced_disable_translucent_navigation_bar_light")
preferences += SwitchPreference("revanced_disable_translucent_navigation_bar_dark") preferences += SwitchPreference("revanced_disable_translucent_navigation_bar_dark")
PreferenceScreen.GENERAL_LAYOUT.addPreferences( PreferenceScreen.GENERAL.addPreferences(
SwitchPreference("revanced_disable_translucent_status_bar") SwitchPreference("revanced_disable_translucent_status_bar")
) )
@ -91,7 +91,7 @@ val navigationBarPatch = bytecodePatch(
} }
} }
PreferenceScreen.GENERAL_LAYOUT.addPreferences( PreferenceScreen.GENERAL.addPreferences(
PreferenceScreenPreference( PreferenceScreenPreference(
key = "revanced_navigation_buttons_screen", key = "revanced_navigation_buttons_screen",
sorting = Sorting.UNSORTED, sorting = Sorting.UNSORTED,
@ -189,7 +189,7 @@ val navigationBarPatch = bytecodePatch(
toolbarPreferences += SwitchPreference("revanced_wide_searchbar") toolbarPreferences += SwitchPreference("revanced_wide_searchbar")
} }
PreferenceScreen.GENERAL_LAYOUT.addPreferences( PreferenceScreen.GENERAL.addPreferences(
PreferenceScreenPreference( PreferenceScreenPreference(
key = "revanced_toolbar_screen", key = "revanced_toolbar_screen",
sorting = Sorting.UNSORTED, sorting = Sorting.UNSORTED,

2
patches/src/main/kotlin/app/revanced/patches/youtube/layout/formfactor/ChangeFormFactorPatch.kt
View file

@ -44,7 +44,7 @@ val changeFormFactorPatch = bytecodePatch(
apply { apply {
addResources("youtube", "layout.formfactor.changeFormFactorPatch") addResources("youtube", "layout.formfactor.changeFormFactorPatch")
PreferenceScreen.GENERAL_LAYOUT.addPreferences( PreferenceScreen.GENERAL.addPreferences(
ListPreference("revanced_change_form_factor"), ListPreference("revanced_change_form_factor"),
) )

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

@ -31,7 +31,6 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
import com.android.tools.smali.dexlib2.iface.reference.FieldReference
import com.android.tools.smali.dexlib2.iface.reference.MethodReference import com.android.tools.smali.dexlib2.iface.reference.MethodReference
import com.android.tools.smali.dexlib2.immutable.ImmutableMethod import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter
@ -77,6 +76,7 @@ private const val KEYWORD_FILTER_CLASS_NAME =
val hideLayoutComponentsPatch = hideLayoutComponentsPatch( val hideLayoutComponentsPatch = hideLayoutComponentsPatch(
lithoFilterPatch = lithoFilterPatch, lithoFilterPatch = lithoFilterPatch,
settingsPatch = settingsPatch, settingsPatch = settingsPatch,
generalSettingsScreen = PreferenceScreen.GENERAL,
additionalDependencies = setOf( additionalDependencies = setOf(
hideLayoutComponentsResourcePatch, hideLayoutComponentsResourcePatch,
navigationBarHookPatch, navigationBarHookPatch,

2
patches/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt
View file

@ -51,7 +51,7 @@ val spoofAppVersionPatch = bytecodePatch(
apply { apply {
addResources("youtube", "layout.spoofappversion.spoofAppVersionPatch") addResources("youtube", "layout.spoofappversion.spoofAppVersionPatch")
PreferenceScreen.GENERAL_LAYOUT.addPreferences( PreferenceScreen.GENERAL.addPreferences(
// Group the switch and list preference together, since General menu is sorted by name // Group the switch and list preference together, since General menu is sorted by name
// and the preferences can be scattered apart with non English languages. // and the preferences can be scattered apart with non English languages.
PreferenceCategory( PreferenceCategory(

2
patches/src/main/kotlin/app/revanced/patches/youtube/layout/startpage/ChangeStartPagePatch.kt
View file

@ -43,7 +43,7 @@ val changeStartPagePatch = bytecodePatch(
apply { apply {
addResources("youtube", "layout.startpage.changeStartPagePatch") addResources("youtube", "layout.startpage.changeStartPagePatch")
PreferenceScreen.GENERAL_LAYOUT.addPreferences( PreferenceScreen.GENERAL.addPreferences(
PreferenceCategory( PreferenceCategory(
titleKey = null, titleKey = null,
sorting = Sorting.UNSORTED, sorting = Sorting.UNSORTED,

4
patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt
View file

@ -203,7 +203,7 @@ val themePatch = baseThemePatch(
executeBlock = { executeBlock = {
addResources("youtube", "layout.theme.themePatch") addResources("youtube", "layout.theme.themePatch")
PreferenceScreen.GENERAL_LAYOUT.addPreferences( PreferenceScreen.GENERAL.addPreferences(
SwitchPreference("revanced_gradient_loading_screen"), SwitchPreference("revanced_gradient_loading_screen"),
) )
@ -231,7 +231,7 @@ val themePatch = baseThemePatch(
) )
if (is_19_47_or_greater) { if (is_19_47_or_greater) {
PreferenceScreen.GENERAL_LAYOUT.addPreferences( PreferenceScreen.GENERAL.addPreferences(
ListPreference("revanced_splash_screen_animation_style"), ListPreference("revanced_splash_screen_animation_style"),
) )
} }

8
patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt
View file

@ -188,16 +188,16 @@ val settingsPatch = bytecodePatch(
) )
if (is_19_34_or_greater) { if (is_19_34_or_greater) {
PreferenceScreen.GENERAL_LAYOUT.addPreferences( PreferenceScreen.GENERAL.addPreferences(
SwitchPreference("revanced_restore_old_settings_menus"), SwitchPreference("revanced_restore_old_settings_menus"),
) )
} }
PreferenceScreen.GENERAL_LAYOUT.addPreferences( PreferenceScreen.GENERAL.addPreferences(
SwitchPreference("revanced_settings_search_history"), SwitchPreference("revanced_settings_search_history"),
) )
PreferenceScreen.GENERAL_LAYOUT.addPreferences( PreferenceScreen.GENERAL.addPreferences(
if (is_20_31_or_greater) { if (is_20_31_or_greater) {
PreferenceCategory( PreferenceCategory(
titleKey = null, titleKey = null,
@ -382,7 +382,7 @@ object PreferenceScreen : BasePreferenceScreen() {
iconBold = "@drawable/revanced_settings_screen_03_feed_bold", iconBold = "@drawable/revanced_settings_screen_03_feed_bold",
layout = "@layout/preference_with_icon", layout = "@layout/preference_with_icon",
) )
val GENERAL_LAYOUT = Screen( val GENERAL = Screen(
key = "revanced_settings_screen_04_general", key = "revanced_settings_screen_04_general",
summaryKey = null, summaryKey = null,
icon = "@drawable/revanced_settings_screen_04_general", icon = "@drawable/revanced_settings_screen_04_general",