feat: Restore previous release

This reverts commit 3938f2f1b3.

src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/annotation/PlayerControlsCompatibility.kt

@@ -3,6 +3,6 @@ package app.revanced.patches.youtube.misc.playercontrols.annotation
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
+@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35", "18.29.38", "18.32.39"))])
 @Target(AnnotationTarget.CLASS)
 internal annotation class PlayerControlsCompatibility

src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/bytecode/patch/PlayerControlsBytecodePatch.kt

@@ -1,32 +1,39 @@
 package app.revanced.patches.youtube.misc.playercontrols.bytecode.patch
 
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 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.fingerprints.LayoutConstructorFingerprint
 import app.revanced.patches.youtube.misc.playercontrols.annotation.PlayerControlsCompatibility
 import app.revanced.patches.youtube.misc.playercontrols.fingerprints.BottomControlsInflateFingerprint
 import app.revanced.patches.youtube.misc.playercontrols.fingerprints.PlayerControlsVisibilityFingerprint
 import app.revanced.patches.youtube.misc.playercontrols.resource.patch.BottomControlsResourcePatch
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Name("Player controls bytecode patch")
 @DependsOn([BottomControlsResourcePatch::class])
 @Description("Manages the code for the player controls of the YouTube player.")
 @PlayerControlsCompatibility
 class PlayerControlsBytecodePatch : BytecodePatch(
-    listOf(PlayerControlsVisibilityFingerprint, BottomControlsInflateFingerprint)
+    listOf(
+        LayoutConstructorFingerprint,
+        BottomControlsInflateFingerprint
+    )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
+        LayoutConstructorFingerprint.result?.let {
+            if (!PlayerControlsVisibilityFingerprint.resolve(context, it.classDef))
+                throw LayoutConstructorFingerprint.exception
+        } ?: throw LayoutConstructorFingerprint.exception
+
         showPlayerControlsFingerprintResult = PlayerControlsVisibilityFingerprint.result!!
         inflateFingerprintResult = BottomControlsInflateFingerprint.result!!
-
-        return PatchResultSuccess()
     }
 
     internal companion object {

src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/BottomControlsInflateFingerprint.kt

@@ -3,8 +3,8 @@ package app.revanced.patches.youtube.misc.playercontrols.fingerprints
 import app.revanced.patcher.extensions.or
 import app.revanced.util.patch.LiteralValueFingerprint
 import app.revanced.patches.youtube.misc.playercontrols.resource.patch.BottomControlsResourcePatch
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
 
 object BottomControlsInflateFingerprint : LiteralValueFingerprint(
     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL or AccessFlags.SYNTHETIC,

src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerControlsVisibilityFingerprint.kt

@@ -2,13 +2,10 @@ package app.revanced.patches.youtube.misc.playercontrols.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.AccessFlags
 
 object PlayerControlsVisibilityFingerprint : MethodFingerprint(
     accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
     returnType = "V",
-    parameters = listOf("Z", "Z"),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("YouTubeControlsOverlay;")
-    }
+    parameters = listOf("Z", "Z")
 )

src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/resource/patch/BottomControlsResourcePatch.kt

@@ -1,9 +1,7 @@
 package app.revanced.patches.youtube.misc.playercontrols.resource.patch
 
-import app.revanced.patcher.data.DomFileEditor
+import app.revanced.patcher.util.DomFileEditor
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
@@ -11,14 +9,12 @@ import java.io.Closeable
 
 @DependsOn([ResourceMappingPatch::class])
 class BottomControlsResourcePatch : ResourcePatch, Closeable {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         resourceContext = context
         targetXmlEditor = context.xmlEditor[TARGET_RESOURCE]
 
         bottomUiContainerResourceId = ResourceMappingPatch.resourceMappings
             .single { it.type == "id" && it.name == "bottom_ui_container_stub" }.id
-
-        return PatchResultSuccess()
     }
 
     companion object {