fix: materialyou patch is broken

rmnscnce · Feb 19, 2023 · b550ed4 · b550ed4
1 parent 4d2891c
commit b550ed4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/...main/kotlin/app/revanced/patches/youtube/layout/etc/materialyou/patch/MaterialYouPatch.kt b/...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/...theme/bytecode/patch/GeneralThemePatch.kt → ...tecode/patch/GeneralThemeBytecodePatch.kt b/...theme/bytecode/patch/GeneralThemePatch.kt → ...tecode/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/...source/patch/GeneralThemeResourcePatch.kt → ...theme/resource/patch/GeneralThemePatch.kt b/...source/patch/GeneralThemeResourcePatch.kt → ...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
@@ -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