build(Needs bump): Bump dependencies

2023-10-23 02:01:02 +02:00
parent fec25103c5
commit d2cd6258a9
322 changed files with 393 additions and 415 deletions
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.ad.getpremium.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.ad.video.fingerprints


-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint

 object LoadVideoAdsFingerprint : MethodFingerprint(
    strings = listOf(
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.interaction.seekbar.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

 object IsSwipingUpFingerprint : MethodFingerprint(
@@ -1,8 +1,8 @@
 package app.revanced.patches.youtube.interaction.seekbar.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.interaction.seekbar.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.NarrowLiteralInstruction
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.interaction.swipecontrols.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

 object SwipeControlsHostActivityFingerprint : MethodFingerprint(
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.autocaptions.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.autocaptions.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.autocaptions.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -4,7 +4,7 @@ import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patcher.patch.options.types.StringPatchOption.Companion.stringPatchOption
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
 import app.revanced.util.resources.ResourceUtils
 import app.revanced.util.resources.ResourceUtils.copyResources
 import java.io.File
@@ -20,6 +20,8 @@ import java.nio.file.Files
 )
@Suppress("unused")
 object CustomBrandingPatch : ResourcePatch() {
+    private const val REVANCED_ICON = "ReVanced*Logo" // Can never be a valid path.
+
    private val iconResourceFileNames = arrayOf(
        "adaptiveproduct_youtube_background_color_108",
        "adaptiveproduct_youtube_foreground_color_108",
@@ -37,16 +39,19 @@ object CustomBrandingPatch : ResourcePatch() {

    private var appName by stringPatchOption(
        key = "appName",
-        default = "YouTube ReVanced",
+        values = mapOf(
+            "YouTube ReVanced" to "YouTube ReVanced",
+            "YT" to "YT",
+            "YouTube" to "YouTube",
+        ),
        title = "App name",
-        description = "The name of the app.",
-        required = true
+        description = "The name of the app."
    )

-    private var iconPath by stringPatchOption(
+    private var icon by stringPatchOption(
        key = "iconPath",
-        default = null,
-        title = "App icon path",
+        values = mapOf("ReVanced Logo" to REVANCED_ICON),
+        title = "App icon",
        description = """
            The path to a folder containing the following folders:

@@ -62,40 +67,42 @@ object CustomBrandingPatch : ResourcePatch() {
    )

    override fun execute(context: ResourceContext) {
-        fun copyResources(resourceGroups: List<ResourceUtils.ResourceGroup>) {
-            iconPath?.let { iconPathString ->
-                val iconPath = File(iconPathString)
-                val resourceDirectory = context["res"]
+        icon?.let { icon ->
+            // Change the app icon.
+            mipmapDirectories.map { directory ->
+                ResourceUtils.ResourceGroup(
+                    directory, *iconResourceFileNames
+                )
+            }.let { resourceGroups ->
+                if (icon != REVANCED_ICON) {
+                    val path = File(icon)
+                    val resourceDirectory = context["res"]

-                resourceGroups.forEach { group ->
-                    val fromDirectory = iconPath.resolve(group.resourceDirectoryName)
-                    val toDirectory = resourceDirectory.resolve(group.resourceDirectoryName)
+                    resourceGroups.forEach { group ->
+                        val fromDirectory = path.resolve(group.resourceDirectoryName)
+                        val toDirectory = resourceDirectory.resolve(group.resourceDirectoryName)

-                    group.resources.forEach { iconFileName ->
-                        Files.write(
-                            toDirectory.resolve(iconFileName).toPath(),
-                            fromDirectory.resolve(iconFileName).readBytes()
-                        )
+                        group.resources.forEach { iconFileName ->
+                            Files.write(
+                                toDirectory.resolve(iconFileName).toPath(),
+                                fromDirectory.resolve(iconFileName).readBytes()
+                            )
+                        }
                    }
-                }
-            } ?: resourceGroups.forEach { context.copyResources("branding", it) }
+                } else resourceGroups.forEach { context.copyResources("branding", it) }
+            }
        }

-        fun createGroup(directory: String) = ResourceUtils.ResourceGroup(
-            directory, *iconResourceFileNames
-        )
-
-        // Change the app icon.
-        mipmapDirectories.map(::createGroup).let(::copyResources)
-
-        // Change the app name.
-        val manifest = context["AndroidManifest.xml"]
-        manifest.writeText(
-            manifest.readText()
-                .replace(
-                    "android:label=\"@string/application_name",
-                    "android:label=\"$appName"
-                )
-        )
+        appName?.let { name ->
+            // Change the app name.
+            val manifest = context["AndroidManifest.xml"]
+            manifest.writeText(
+                manifest.readText()
+                    .replace(
+                        "android:label=\"@string/application_name",
+                        "android:label=\"$name"
+                    )
+            )
+        }
    }
 }
@@ -5,7 +5,7 @@ import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patcher.patch.options.types.BooleanPatchOption.Companion.booleanPatchOption
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.booleanPatchOption
 import kotlin.io.path.copyTo

@Patch(
@@ -4,7 +4,6 @@ import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
@@ -2,7 +2,6 @@ package app.revanced.patches.youtube.layout.buttons.navigation

 import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.Patch
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint

 internal const val ANDROID_AUTOMOTIVE_STRING = "Android Automotive"

@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

 object PivotBarButtonsViewFingerprint : MethodFingerprint(
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

 object PivotBarConstructorFingerprint : MethodFingerprint(
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

 object PivotBarCreateButtonViewFingerprint : MethodFingerprint(
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

 object PivotBarEnumFingerprint : MethodFingerprint(
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.layout.buttons.player.hide.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

 object PlayerControlsVisibilityModelFingerprint : MethodFingerprint(
@@ -4,7 +4,7 @@ import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
@@ -4,7 +4,7 @@ import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
@@ -7,7 +7,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWith
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.layout.hide.general.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

 object ParseElementFromBufferFingerprint : MethodFingerprint(
@@ -1,9 +1,9 @@
 package app.revanced.patches.youtube.layout.hide.general.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

-object PlayerOverlayFingerprint : MethodFingerprint (
+object PlayerOverlayFingerprint : MethodFingerprint(
    "L", AccessFlags.PUBLIC or AccessFlags.FINAL, strings = listOf("player_overlay_in_video_programming")
 )
@@ -1,9 +1,9 @@
 package app.revanced.patches.youtube.layout.hide.general.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

-object ShowWatermarkFingerprint : MethodFingerprint (
+object ShowWatermarkFingerprint : MethodFingerprint(
    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L")
 )
@@ -4,7 +4,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.hide.infocards.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

 object InfocardsIncognitoFingerprint : MethodFingerprint(
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.hide.infocards.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

 object InfocardsIncognitoParentFingerprint : MethodFingerprint(
@@ -2,7 +2,6 @@ package app.revanced.patches.youtube.layout.hide.seekbar

 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
@@ -6,7 +6,6 @@ import app.revanced.extensions.injectHideViewCall
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.hide.shorts.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.layout.hide.shorts.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

 object RenderBottomNavigationBarFingerprint : MethodFingerprint(
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.layout.hide.shorts.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint

 object RenderBottomNavigationBarParentFingerprint : MethodFingerprint(
    parameters = listOf("I", "I", "L", "L", "J", "L"),
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.hide.shorts.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.layout.hide.shorts.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint

 object SetPivotBarVisibilityParentFingerprint : MethodFingerprint(
    parameters = listOf("Z"),
@@ -1,8 +1,8 @@
 package app.revanced.patches.youtube.layout.hide.time.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.panels.popup.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

 object EngagementPanelControllerFingerprint : MethodFingerprint(
@@ -2,7 +2,7 @@ package app.revanced.patches.youtube.layout.player.overlay.fingerprints

 import app.revanced.extensions.containsWideLiteralInstructionValue
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.youtube.layout.player.overlay.CustomPlayerOverlayOpacityResourcePatch
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
@@ -7,8 +7,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint

 object DislikeFingerprint : MethodFingerprint(
    "V",
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint

 object LikeFingerprint : MethodFingerprint(
    "V",
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint

 object RemoveLikeFingerprint : MethodFingerprint(
    "V",
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -2,7 +2,7 @@ package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints


 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

 object TextComponentConstructorFingerprint : MethodFingerprint(
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -3,7 +3,7 @@ package app.revanced.patches.youtube.layout.searchbar
 import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.layout.searchbar.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

 object CreateSearchSuggestionsFingerprint : MethodFingerprint(
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.searchbar.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -2,7 +2,7 @@ package app.revanced.patches.youtube.layout.seekbar.fingerprints

 import app.revanced.extensions.containsWideLiteralInstructionValue
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.youtube.layout.seekbar.SeekbarColorResourcePatch
 import com.android.tools.smali.dexlib2.AccessFlags

@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.layout.seekbar.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

 object SetSeekbarClickedColorFingerprint : MethodFingerprint(
@@ -6,7 +6,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.CompatiblePackage
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.sponsorblock.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.sponsorblock.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.sponsorblock.fingerprints


-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference

@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.spoofappversion.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,8 +1,8 @@
 package app.revanced.patches.youtube.layout.startupshortsreset.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.tablet.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -3,8 +3,7 @@ package app.revanced.patches.youtube.layout.tabletminiplayer
 import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.CompatiblePackage
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.tabletminiplayer.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.tabletminiplayer.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

 object MiniPlayerOverrideFingerprint : MethodFingerprint(
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.tabletminiplayer.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.tabletminiplayer.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -8,7 +8,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patcher.patch.options.types.StringPatchOption.Companion.stringPatchOption
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.layout.seekbar.SeekbarColorBytecodePatch
@@ -46,16 +46,19 @@ object ThemeBytecodePatch : BytecodePatch(

    internal const val GRADIENT_LOADING_SCREEN_AB_CONSTANT = 45412406L

+    private const val AMOLED_BLACK_COLOR = "#@android:color/black"
+    private const val WHITE_COLOR = "#@android:color/white"
+
    internal val darkThemeBackgroundColor by stringPatchOption(
        key = "darkThemeBackgroundColor",
-        default = "@android:color/black",
+        default = AMOLED_BLACK_COLOR,
        title = "Dark theme background color",
        description = "The background color of the dark theme. Can be a hex color or a resource reference.",
    )

    internal val lightThemeBackgroundColor by stringPatchOption(
        key = "lightThemeBackgroundColor",
-        default = "@android:color/white",
+        default = WHITE_COLOR,
        title = "Light theme background color",
        description = "The background color of the light theme. Can be a hex color or a resource reference.",
    )
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.theme.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -4,7 +4,6 @@ import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.thumbnails.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

 object CronetURLRequestCallbackOnFailureFingerprint : MethodFingerprint(
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.thumbnails.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

 // Acts as a parent fingerprint.
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.thumbnails.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

 object CronetURLRequestCallbackOnSucceededFingerprint : MethodFingerprint(
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.thumbnails.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

 object MessageDigestImageUrlFingerprint : MethodFingerprint(
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.thumbnails.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

 object MessageDigestImageUrlParentFingerprint : MethodFingerprint(
@@ -3,7 +3,6 @@ package app.revanced.patches.youtube.misc.autorepeat
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.CompatiblePackage
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.misc.autorepeat.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

 object AutoRepeatFingerprint : MethodFingerprint(
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.misc.autorepeat.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

 object AutoRepeatParentFingerprint : MethodFingerprint(
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.dimensions.spoof.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint

 object DeviceDimensionsModelToStringFingerprint : MethodFingerprint(
    returnType = "L",
@@ -3,8 +3,7 @@ package app.revanced.patches.youtube.misc.fix.backtoexitgesture
 import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.youtube.misc.fix.backtoexitgesture.fingerprints.OnBackPressedFingerprint
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.misc.fix.backtoexitgesture.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.misc.fix.backtoexitgesture.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.misc.fix.backtoexitgesture.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.misc.fix.backtoexitgesture.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -6,7 +6,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
@@ -2,7 +2,7 @@ package app.revanced.patches.youtube.misc.fix.playback.fingerprints

 import app.revanced.extensions.containsWideLiteralInstructionValue
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.fix.playback.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

 object StoryboardRendererInitFingerprint : MethodFingerprint(
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.misc.fix.playback.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

 object StoryboardRendererSpecFingerprint : MethodFingerprint(
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.misc.fix.playback.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.misc.fix.playback.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

 /**
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.fix.playback.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

 object UserAgentHeaderBuilderFingerprint : MethodFingerprint(
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.misc.links.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.misc.links.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -8,8 +8,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWith
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.litho.filter.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

 object ComponentContextParserFingerprint : MethodFingerprint(
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.litho.filter.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

 object EmptyComponentBuilderFingerprint : MethodFingerprint(
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.misc.litho.filter.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

 object LithoFilterFingerprint : MethodFingerprint(
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.misc.litho.filter.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.litho.filter.fingerprints

-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

 object ReadComponentIdentifierFingerprint : MethodFingerprint(
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.misc.microg.fingerprints


-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint

 object CastContextFetchFingerprint : MethodFingerprint(
    strings = listOf("Error fetching CastContext.")
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.misc.microg.fingerprints


-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint

 object CastDynamiteModuleFingerprint : MethodFingerprint(
    strings = listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.misc.microg.fingerprints


-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint

 object CastDynamiteModuleV2Fingerprint : MethodFingerprint(
    strings = listOf("Failed to load module via V2: ")
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.misc.microg.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

 object GooglePlayUtilityFingerprint : MethodFingerprint(
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.misc.microg.fingerprints


-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint

 object PrimeFingerprint : MethodFingerprint(
    strings = listOf("com.google.android.GoogleCamera", "com.android.vending")
--- a/Show More
+++ b/Show More