From b550ed4c21e2c1133f787a98cb8d8d911e5ee6ce Mon Sep 17 00:00:00 2001 From: inotia00 Date: Sun, 19 Feb 2023 23:15:34 +0900 Subject: [PATCH] fix: `materialyou` patch is broken --- .../youtube/layout/etc/materialyou/patch/MaterialYouPatch.kt | 4 ++-- .../{GeneralThemePatch.kt => GeneralThemeBytecodePatch.kt} | 5 +---- .../{GeneralThemeResourcePatch.kt => GeneralThemePatch.kt} | 5 ++++- .../youtube/layout/etc/theme/resource/patch/ThemePatch.kt | 3 +-- 4 files changed, 8 insertions(+), 9 deletions(-) rename src/main/kotlin/app/revanced/patches/youtube/layout/etc/theme/bytecode/patch/{GeneralThemePatch.kt => GeneralThemeBytecodePatch.kt} (87%) rename src/main/kotlin/app/revanced/patches/youtube/layout/etc/theme/resource/patch/{GeneralThemeResourcePatch.kt => GeneralThemePatch.kt} (93%) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/etc/materialyou/patch/MaterialYouPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/etc/materialyou/patch/MaterialYouPatch.kt index 0b1defd68..d9df7ca0b 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/etc/materialyou/patch/MaterialYouPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/etc/materialyou/patch/MaterialYouPatch.kt @@ -10,8 +10,8 @@ import app.revanced.patcher.patch.ResourcePatch import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch import app.revanced.patches.shared.annotation.YouTubeCompatibility -import app.revanced.patches.youtube.layout.etc.theme.bytecode.patch.GeneralThemePatch -import app.revanced.patches.youtube.layout.etc.theme.bytecode.patch.GeneralThemePatch.Companion.isMonetPatchIncluded +import app.revanced.patches.youtube.layout.etc.theme.bytecode.patch.GeneralThemeBytecodePatch.Companion.isMonetPatchIncluded +import app.revanced.patches.youtube.layout.etc.theme.resource.patch.GeneralThemePatch import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch import app.revanced.util.resources.ResourceHelper.updatePatchStatusTheme import app.revanced.util.resources.ResourceUtils.copyXmlNode diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/etc/theme/bytecode/patch/GeneralThemePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/etc/theme/bytecode/patch/GeneralThemeBytecodePatch.kt similarity index 87% rename from src/main/kotlin/app/revanced/patches/youtube/layout/etc/theme/bytecode/patch/GeneralThemePatch.kt rename to src/main/kotlin/app/revanced/patches/youtube/layout/etc/theme/bytecode/patch/GeneralThemeBytecodePatch.kt index 5489222b2..70cf709c7 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/etc/theme/bytecode/patch/GeneralThemePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/etc/theme/bytecode/patch/GeneralThemeBytecodePatch.kt @@ -8,18 +8,15 @@ import app.revanced.patcher.extensions.addInstructions import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.PatchResult import app.revanced.patcher.patch.PatchResultSuccess -import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patches.shared.annotation.YouTubeCompatibility import app.revanced.patches.youtube.layout.etc.theme.bytecode.fingerprints.LithoThemeFingerprint -import app.revanced.patches.youtube.layout.etc.theme.resource.patch.GeneralThemeResourcePatch import app.revanced.util.integrations.Constants.UTILS_PATH import org.jf.dexlib2.iface.instruction.formats.Instruction35c @Name("general-theme") -@DependsOn([GeneralThemeResourcePatch::class]) @YouTubeCompatibility @Version("0.0.1") -class GeneralThemePatch : BytecodePatch( +class GeneralThemeBytecodePatch : BytecodePatch( listOf( LithoThemeFingerprint ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/etc/theme/resource/patch/GeneralThemeResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/etc/theme/resource/patch/GeneralThemePatch.kt similarity index 93% rename from src/main/kotlin/app/revanced/patches/youtube/layout/etc/theme/resource/patch/GeneralThemeResourcePatch.kt rename to src/main/kotlin/app/revanced/patches/youtube/layout/etc/theme/resource/patch/GeneralThemePatch.kt index 3582623b5..c60ed492f 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/etc/theme/resource/patch/GeneralThemeResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/etc/theme/resource/patch/GeneralThemePatch.kt @@ -5,12 +5,15 @@ import app.revanced.patcher.annotation.Version import app.revanced.patcher.data.ResourceContext import app.revanced.patcher.patch.PatchResult import app.revanced.patcher.patch.PatchResultSuccess +import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.ResourcePatch +import app.revanced.patches.youtube.layout.etc.theme.bytecode.patch.GeneralThemeBytecodePatch import org.w3c.dom.Element @Name("general-theme-resource-patch") +@DependsOn([GeneralThemeBytecodePatch::class]) @Version("0.0.1") -class GeneralThemeResourcePatch : ResourcePatch { +class GeneralThemePatch : ResourcePatch { override fun execute(context: ResourceContext): PatchResult { // edit the resource files to change the splash screen color diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/etc/theme/resource/patch/ThemePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/etc/theme/resource/patch/ThemePatch.kt index 30539a6d3..a6333b8fb 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/etc/theme/resource/patch/ThemePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/etc/theme/resource/patch/ThemePatch.kt @@ -11,8 +11,7 @@ import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch import app.revanced.patches.shared.annotation.YouTubeCompatibility import app.revanced.patches.shared.patch.options.PatchOptions -import app.revanced.patches.youtube.layout.etc.theme.bytecode.patch.GeneralThemePatch -import app.revanced.patches.youtube.layout.etc.theme.bytecode.patch.GeneralThemePatch.Companion.isMonetPatchIncluded +import app.revanced.patches.youtube.layout.etc.theme.bytecode.patch.GeneralThemeBytecodePatch.Companion.isMonetPatchIncluded import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch import app.revanced.util.resources.ResourceHelper.updatePatchStatusTheme import org.w3c.dom.Element