remove hack

This commit is contained in:
oSumAtrIX 2026-02-19 16:25:19 +01:00
parent 549fb57b23
commit db74542031
No known key found for this signature in database
GPG key ID: A9B3094ACDB604B4
3 changed files with 2 additions and 10 deletions

View file

@ -3,11 +3,9 @@ package app.revanced.patches.music.layout.hide.general
import app.revanced.patches.music.misc.litho.filter.lithoFilterPatch
import app.revanced.patches.music.misc.settings.settingsPatch
import app.revanced.patches.shared.layout.hide.general.hideLayoutComponentsPatch
import app.revanced.patches.shared.misc.litho.filter.addLithoFilter
val hideLayoutComponentsPatch = hideLayoutComponentsPatch(
lithoFilterPatch = lithoFilterPatch,
getAddLithoFilter = { addLithoFilter },
settingsPatch = settingsPatch,
filterClasses = setOf("Lapp/revanced/extension/shared/patches/litho/CustomFilter;"),
compatibleWithPackages = arrayOf("com.google.android.apps.youtube.music" to setOf("7.29.52", "8.10.52")),

View file

@ -6,6 +6,7 @@ import app.revanced.patcher.patch.bytecodePatch
import app.revanced.patches.all.misc.resources.addResources
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.settings.preference.InputType
import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference
import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
@ -14,7 +15,6 @@ import kotlin.collections.toTypedArray
internal fun hideLayoutComponentsPatch(
lithoFilterPatch: Patch,
getAddLithoFilter: () -> (String) -> Unit, // Temporal hack until YouTube can use the shared litho filter patch.
settingsPatch: Patch,
additionalDependencies: Set<Patch> = emptySet(),
filterClasses: Set<String>,
@ -47,11 +47,7 @@ internal fun hideLayoutComponentsPatch(
),
)
val addLithoFilter = getAddLithoFilter()
filterClasses.forEach { className ->
addLithoFilter(className)
}
filterClasses.forEach { className -> addLithoFilter(className) }
executeBlock()
}

View file

@ -9,7 +9,6 @@ import app.revanced.patches.shared.layout.hide.general.hideLayoutComponentsPatch
import app.revanced.patches.shared.misc.mapping.ResourceType
import app.revanced.patches.shared.misc.mapping.resourceMappingPatch
import app.revanced.patches.shared.misc.settings.preference.*
import app.revanced.patches.shared.misc.litho.filter.addLithoFilter
import app.revanced.patches.youtube.misc.litho.filter.lithoFilterPatch
import app.revanced.patches.youtube.misc.navigation.navigationBarHookPatch
import app.revanced.patches.youtube.misc.playservice.is_20_26_or_greater
@ -67,7 +66,6 @@ private const val KEYWORD_FILTER_CLASS_NAME =
val hideLayoutComponentsPatch = hideLayoutComponentsPatch(
lithoFilterPatch = lithoFilterPatch,
getAddLithoFilter = { addLithoFilter },
settingsPatch = settingsPatch,
additionalDependencies = setOf(
hideLayoutComponentsResourcePatch,