feat: Publish as a library (#3356)

2023-12-02 22:35:13 +01:00
parent f909df8047
commit d3acdead51
500 changed files with 2369 additions and 719 deletions
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.announcements

-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstructions
@@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

-object AutoRepeatFingerprint : MethodFingerprint(
+internal object AutoRepeatFingerprint : MethodFingerprint(
    "V",
    AccessFlags.PUBLIC or AccessFlags.FINAL,
    listOf(),
@@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

-object AutoRepeatParentFingerprint : MethodFingerprint(
+internal object AutoRepeatParentFingerprint : MethodFingerprint(
    "V",
    AccessFlags.PUBLIC or AccessFlags.FINAL,
    strings = listOf(
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.dimensions.spoof

-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
@@ -2,7 +2,7 @@ package app.revanced.patches.youtube.misc.dimensions.spoof.fingerprints

 import app.revanced.patcher.fingerprint.MethodFingerprint

-object DeviceDimensionsModelToStringFingerprint : MethodFingerprint(
+internal object DeviceDimensionsModelToStringFingerprint : MethodFingerprint(
    returnType = "L",
    strings = listOf("minh.", ";maxh.")
 )
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.fix.backtoexitgesture

-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.fingerprint.MethodFingerprint
@@ -13,7 +13,7 @@ import app.revanced.patches.youtube.misc.fix.backtoexitgesture.fingerprints.Recy

@Patch(description = "Fixes the swipe back to exit gesture.")
@Suppress("unused")
-object FixBackToExitGesturePatch : BytecodePatch(
+internal object FixBackToExitGesturePatch : BytecodePatch(
    setOf(
        RecyclerViewTopScrollingParentFingerprint,
        RecyclerViewScrollingFingerprint,
@@ -47,7 +47,7 @@ object FixBackToExitGesturePatch : BytecodePatch(
     *
     * @param targetMethod The target method to call.
     */
-    fun MethodFingerprint.injectCall(targetMethod: IntegrationsMethod) = result?.apply {
+    private fun MethodFingerprint.injectCall(targetMethod: IntegrationsMethod) = result?.apply {
        mutableMethod.addInstruction(
            scanResult.patternScanResult!!.endIndex, targetMethod.toString()
        )
@@ -60,7 +60,7 @@ object FixBackToExitGesturePatch : BytecodePatch(
     * @param methodName The method name.
     * @param parameterTypes The parameters of the method.
     */
-    data class IntegrationsMethod(
+    internal data class IntegrationsMethod(
        val register: String = "", val methodName: String, val parameterTypes: String = ""
    ) {
        override fun toString() =
@@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

-object OnBackPressedFingerprint : MethodFingerprint(
+internal object OnBackPressedFingerprint : MethodFingerprint(
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    returnType = "V",
    opcodes = listOf(
@@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

-object RecyclerViewScrollingFingerprint : MethodFingerprint(
+internal object RecyclerViewScrollingFingerprint : MethodFingerprint(
    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
    returnType = "V",
    parameters = listOf(),
@@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

-object RecyclerViewTopScrollingFingerprint : MethodFingerprint(
+internal object RecyclerViewTopScrollingFingerprint : MethodFingerprint(
    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
        Opcode.IGET_OBJECT,
        Opcode.IF_EQZ,
@@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

-object RecyclerViewTopScrollingParentFingerprint : MethodFingerprint(
+internal object RecyclerViewTopScrollingParentFingerprint : MethodFingerprint(
    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
    parameters = listOf("L", "L", "Landroid/view/ViewGroup;", "Landroid/view/ViewGroup;"),
    opcodes = listOf(
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.fix.playback

-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.fix.playback

-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
@@ -34,7 +34,7 @@ object SpoofSignaturePatch : BytecodePatch(
    setOf(
        PlayerResponseModelImplGeneralFingerprint,
        PlayerResponseModelImplLiveStreamFingerprint,
-        PlayerResponseModelImplRecommendedLevel,
+        PlayerResponseModelImplRecommendedLevelFingerprint,
        StoryboardRendererSpecFingerprint,
        StoryboardRendererDecoderSpecFingerprint,
        StoryboardRendererDecoderRecommendedLevelFingerprint,
@@ -201,7 +201,7 @@ object SpoofSignaturePatch : BytecodePatch(
        } ?: throw StoryboardRendererDecoderRecommendedLevelFingerprint.exception

        // Hook the recommended precise seeking thumbnails quality level.
-        PlayerResponseModelImplRecommendedLevel.result?.let {
+        PlayerResponseModelImplRecommendedLevelFingerprint.result?.let {
            it.mutableMethod.apply {
                val moveOriginalRecommendedValueIndex = it.scanResult.patternScanResult!!.endIndex
                val originalValueRegister =
@@ -214,7 +214,7 @@ object SpoofSignaturePatch : BytecodePatch(
                        """
                )
            }
-        } ?: throw PlayerResponseModelImplRecommendedLevel.exception
+        } ?: throw PlayerResponseModelImplRecommendedLevelFingerprint.exception

        StoryboardRendererSpecFingerprint.result?.let {
            it.mutableMethod.apply {
@@ -1,12 +1,12 @@
 package app.revanced.patches.youtube.misc.fix.playback.fingerprints

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

-object PlayerResponseModelImplGeneralFingerprint : MethodFingerprint(
+internal object PlayerResponseModelImplGeneralFingerprint : MethodFingerprint(
    returnType = "Ljava/lang/String;",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    parameters = emptyList(),
@@ -1,12 +1,12 @@
 package app.revanced.patches.youtube.misc.fix.playback.fingerprints

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

-object PlayerResponseModelImplLiveStreamFingerprint : MethodFingerprint(
+internal object PlayerResponseModelImplLiveStreamFingerprint : MethodFingerprint(
    returnType = "Ljava/lang/String;",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    parameters = emptyList(),
@@ -1,12 +1,12 @@
 package app.revanced.patches.youtube.misc.fix.playback.fingerprints

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

-object PlayerResponseModelImplRecommendedLevel : MethodFingerprint(
+internal object PlayerResponseModelImplRecommendedLevelFingerprint : MethodFingerprint(
    returnType = "I",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    parameters = emptyList(),
@@ -6,7 +6,7 @@ import app.revanced.util.patch.LiteralValueFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

-object ScrubbedPreviewLayoutFingerprint : LiteralValueFingerprint(
+internal object ScrubbedPreviewLayoutFingerprint : LiteralValueFingerprint(
    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
    returnType = "V",
    parameters = listOf("Landroid/content/Context;", "Landroid/util/AttributeSet;", "I", "I"),
@@ -8,7 +8,7 @@ import com.android.tools.smali.dexlib2.Opcode
 /**
 * Resolves to the same method as [StoryboardRendererDecoderSpecFingerprint].
 */
-object StoryboardRendererDecoderRecommendedLevelFingerprint : MethodFingerprint(
+internal object StoryboardRendererDecoderRecommendedLevelFingerprint : MethodFingerprint(
    returnType = "V",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    parameters = listOf("Lcom/google/android/libraries/youtube/innertube/model/player/PlayerResponseModel;"),
@@ -8,7 +8,7 @@ import com.android.tools.smali.dexlib2.Opcode
 /**
 * Resolves to the same method as [StoryboardRendererDecoderRecommendedLevelFingerprint].
 */
-object StoryboardRendererDecoderSpecFingerprint : MethodFingerprint(
+internal object StoryboardRendererDecoderSpecFingerprint : MethodFingerprint(
    returnType = "V",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    parameters = listOf("Lcom/google/android/libraries/youtube/innertube/model/player/PlayerResponseModel;"),
@@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

-object StoryboardRendererSpecFingerprint : MethodFingerprint(
+internal object StoryboardRendererSpecFingerprint : MethodFingerprint(
    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
    returnType = "L",
    parameters = listOf("Ljava/lang/String;", "J"),
@@ -8,7 +8,7 @@ import com.android.tools.smali.dexlib2.Opcode
 /**
 * Resolves using the class found in [StoryboardThumbnailParentFingerprint].
 */
-object StoryboardThumbnailFingerprint : MethodFingerprint(
+internal object StoryboardThumbnailFingerprint : MethodFingerprint(
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    returnType = "Z",
    parameters = listOf(),
@@ -10,7 +10,7 @@ import com.android.tools.smali.dexlib2.AccessFlags
 * An additional change here might force the thumbnails to be created,
 * or possibly a change somewhere else (maybe involving YouTube 18.23.35 class `hte`)
 */
-object StoryboardThumbnailParentFingerprint : MethodFingerprint(
+internal object StoryboardThumbnailParentFingerprint : MethodFingerprint(
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    returnType = "Landroid/graphics/Bitmap;",
    strings = listOf("Storyboard regionDecoder.decodeRegion exception - "),
@@ -3,7 +3,7 @@ package app.revanced.patches.youtube.misc.fix.playback.fingerprints
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

-object UserAgentHeaderBuilderFingerprint : MethodFingerprint(
+internal object UserAgentHeaderBuilderFingerprint : MethodFingerprint(
    parameters = listOf("L", "L", "L"),
    opcodes = listOf(Opcode.MOVE_RESULT_OBJECT, Opcode.INVOKE_VIRTUAL),
    strings = listOf("(Linux; U; Android "),
@@ -9,7 +9,7 @@ import com.android.tools.smali.dexlib2.AccessFlags
 * It appears this hook may no longer be needed as one of the constructor parameters is the already hooked
 * [EmbeddedPlayerControlsOverlayFingerprint]
 */
-object APIPlayerServiceFingerprint : IntegrationsFingerprint(
+internal object APIPlayerServiceFingerprint : IntegrationsFingerprint(
    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
    customFingerprint = { methodDef, _ -> methodDef.definingClass == "Lcom/google/android/apps/youtube/embeddedplayer/service/service/jar/ApiPlayerService;" },
    // Integrations context is the first method parameter.
@@ -5,7 +5,7 @@ import app.revanced.patches.shared.integrations.AbstractIntegrationsPatch.Integr
 /**
 * Hooks the context when the app is launched as a regular application (and is not an embedded video playback).
 */
-object ApplicationInitFingerprint : IntegrationsFingerprint(
+internal object ApplicationInitFingerprint : IntegrationsFingerprint(
    strings = listOf("Application creation", "Application.onCreate"),
    // Integrations context is the Activity itself.
 )
@@ -10,7 +10,7 @@ import com.android.tools.smali.dexlib2.AccessFlags
 * Note: this fingerprint may no longer be needed, as it appears
 * [RemoteEmbedFragmentFingerprint] may be set before this hook is called.
 */
-object EmbeddedPlayerControlsOverlayFingerprint : IntegrationsFingerprint(
+internal object EmbeddedPlayerControlsOverlayFingerprint : IntegrationsFingerprint(
    accessFlags = AccessFlags.PRIVATE or AccessFlags.CONSTRUCTOR,
    returnType = "V",
    parameters = listOf("Landroid/content/Context;", "L", "L"),
@@ -10,7 +10,7 @@ import com.android.tools.smali.dexlib2.AccessFlags
 * Note: this fingerprint may or may not be needed, as
 * [RemoteEmbedFragmentFingerprint] might be set before this is called.
 */
-object EmbeddedPlayerFingerprint : IntegrationsFingerprint(
+internal object EmbeddedPlayerFingerprint : IntegrationsFingerprint(
    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
    returnType = "L",
    parameters = listOf("L", "L", "Landroid/content/Context;"),
@@ -7,7 +7,7 @@ import com.android.tools.smali.dexlib2.AccessFlags
 /**
 * For embedded playback.  Likely covers Google Play store and other Google products.
 */
-object RemoteEmbedFragmentFingerprint : IntegrationsFingerprint(
+internal object RemoteEmbedFragmentFingerprint : IntegrationsFingerprint(
    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
    returnType = "V",
    parameters = listOf("Landroid/content/Context;", "L", "L"),
@@ -7,7 +7,7 @@ import com.android.tools.smali.dexlib2.AccessFlags
 /**
 * For embedded playback inside 3rd party android app (such as 3rd party Reddit apps).
 */
-object RemoteEmbeddedPlayerFingerprint : IntegrationsFingerprint(
+internal object RemoteEmbeddedPlayerFingerprint : IntegrationsFingerprint(
    accessFlags = AccessFlags.PRIVATE or AccessFlags.CONSTRUCTOR,
    returnType = "V",
    parameters = listOf("Landroid/content/Context;", "L", "L", "Z"),
@@ -11,7 +11,7 @@ import com.android.tools.smali.dexlib2.AccessFlags
 * but this may still be used by older apps:
 * https://developers.google.com/youtube/android/player
 */
-object StandalonePlayerActivityFingerprint : IntegrationsFingerprint(
+internal object StandalonePlayerActivityFingerprint : IntegrationsFingerprint(
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    returnType = "V",
    parameters = listOf("L"),
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.links

-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
@@ -8,7 +8,7 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
-import app.revanced.util.patch.AbstractTransformInstructionsPatch
+import app.revanced.patches.all.misc.transformation.AbstractTransformInstructionsPatch
 import com.android.tools.smali.dexlib2.iface.ClassDef
 import com.android.tools.smali.dexlib2.iface.Method
 import com.android.tools.smali.dexlib2.iface.instruction.Instruction
@@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

-object ABUriParserFingerprint : MethodFingerprint(
+internal object ABUriParserFingerprint : MethodFingerprint(
    returnType = "Ljava/lang/Object",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    parameters = listOf("Ljava/lang/Object"),
@@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

-object HTTPUriParserFingerprint : MethodFingerprint(
+internal object HTTPUriParserFingerprint : MethodFingerprint(
    returnType = "Landroid/net/Uri",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
    parameters = listOf("Ljava/lang/String"),
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.litho.filter

-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
@@ -37,7 +37,7 @@ object LithoFilterPatch : BytecodePatch(
    private val Instruction.descriptor
        get() = (this as ReferenceInstruction).reference.toString()

-    const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/components/LithoFilterPatch;"
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/components/LithoFilterPatch;"

    internal lateinit var addFilter: (String) -> Unit
        private set
@@ -3,7 +3,7 @@ package app.revanced.patches.youtube.misc.litho.filter.fingerprints
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

-object ComponentContextParserFingerprint : MethodFingerprint(
+internal object ComponentContextParserFingerprint : MethodFingerprint(
    opcodes = listOf(
        Opcode.INVOKE_VIRTUAL,
        Opcode.INVOKE_VIRTUAL,
@@ -3,7 +3,7 @@ package app.revanced.patches.youtube.misc.litho.filter.fingerprints
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

-object EmptyComponentBuilderFingerprint : MethodFingerprint(
+internal object EmptyComponentBuilderFingerprint : MethodFingerprint(
    opcodes = listOf(
        Opcode.INVOKE_INTERFACE,
        Opcode.INVOKE_STATIC_RANGE
@@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

-object LithoFilterFingerprint : MethodFingerprint(
+internal object LithoFilterFingerprint : MethodFingerprint(
    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.CONSTRUCTOR,
    returnType = "V",
    customFingerprint = { _, classDef ->
@@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

-object ProtobufBufferReferenceFingerprint : MethodFingerprint(
+internal object ProtobufBufferReferenceFingerprint : MethodFingerprint(
    returnType = "V",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    parameters = listOf("I", "Ljava/nio/ByteBuffer;"),
@@ -3,7 +3,7 @@ package app.revanced.patches.youtube.misc.litho.filter.fingerprints
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

-object ReadComponentIdentifierFingerprint : MethodFingerprint(
+internal object ReadComponentIdentifierFingerprint : MethodFingerprint(
    opcodes = listOf(
        Opcode.IF_NEZ,
        null,
@@ -3,6 +3,6 @@ package app.revanced.patches.youtube.misc.microg.fingerprints

 import app.revanced.patcher.fingerprint.MethodFingerprint

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

 import app.revanced.patcher.fingerprint.MethodFingerprint

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

 import app.revanced.patcher.fingerprint.MethodFingerprint

-object CastDynamiteModuleV2Fingerprint : MethodFingerprint(
+internal object CastDynamiteModuleV2Fingerprint : MethodFingerprint(
    strings = listOf("Failed to load module via V2: ")
 )
@@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

-object GooglePlayUtilityFingerprint : MethodFingerprint(
+internal object GooglePlayUtilityFingerprint : MethodFingerprint(
    returnType = "I",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
    parameters = listOf("L", "I"),
@@ -3,6 +3,6 @@ package app.revanced.patches.youtube.misc.microg.fingerprints

 import app.revanced.patcher.fingerprint.MethodFingerprint

-object PrimeFingerprint : MethodFingerprint(
+internal object PrimeFingerprint : MethodFingerprint(
    strings = listOf("com.google.android.GoogleCamera", "com.android.vending")
 )
@@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

-object ServiceCheckFingerprint : MethodFingerprint(
+internal object ServiceCheckFingerprint : MethodFingerprint(
    returnType = "V",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
    parameters = listOf("L", "I"),
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.minimizedplayback

-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
@@ -47,7 +47,7 @@ object MinimizedPlaybackPatch : BytecodePatch(
        KidsMinimizedPlaybackPolicyControllerFingerprint
    )
 ) {
-    const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/MinimizedPlaybackPatch;"
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/MinimizedPlaybackPatch;"

    override fun execute(context: BytecodeContext) {
        // TODO: remove this empty preference sometime after mid 2023
@@ -6,7 +6,7 @@ import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.NarrowLiteralInstruction

-object KidsMinimizedPlaybackPolicyControllerFingerprint : MethodFingerprint(
+internal object KidsMinimizedPlaybackPolicyControllerFingerprint : MethodFingerprint(
    returnType = "V",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    parameters = listOf("I", "L", "L"),
@@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

-object MinimizedPlaybackManagerFingerprint : MethodFingerprint(
+internal object MinimizedPlaybackManagerFingerprint : MethodFingerprint(
    "Z",
    AccessFlags.PUBLIC or AccessFlags.STATIC,
    listOf("L"),
@@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

-object MinimizedPlaybackSettingsFingerprint : MethodFingerprint(
+internal object MinimizedPlaybackSettingsFingerprint : MethodFingerprint(
    returnType = "Ljava/lang/String;",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    parameters = listOf(),
@@ -7,7 +7,7 @@ import com.android.tools.smali.dexlib2.AccessFlags
 /**
 * Class fingerprint for [MinimizedPlaybackSettingsFingerprint]
 */
-object MinimizedPlaybackSettingsParentFingerprint : MethodFingerprint(
+internal object MinimizedPlaybackSettingsParentFingerprint : MethodFingerprint(
    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
    returnType = "I",
    parameters = listOf(),
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.playercontrols

-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.fingerprint.MethodFingerprintResult
@@ -6,7 +6,7 @@ import app.revanced.util.patch.LiteralValueFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

-object BottomControlsInflateFingerprint : LiteralValueFingerprint(
+internal object BottomControlsInflateFingerprint : LiteralValueFingerprint(
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL or AccessFlags.SYNTHETIC,
    returnType = "L",
    parameters = listOf(),
@@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

-object PlayerControlsVisibilityFingerprint : MethodFingerprint(
+internal object PlayerControlsVisibilityFingerprint : MethodFingerprint(
    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
    returnType = "V",
    parameters = listOf("Z", "Z")
@@ -3,7 +3,7 @@ package app.revanced.patches.youtube.misc.playeroverlay.fingerprint

 import app.revanced.patcher.fingerprint.MethodFingerprint

-object PlayerOverlaysOnFinishInflateFingerprint : MethodFingerprint(
+internal object PlayerOverlaysOnFinishInflateFingerprint : MethodFingerprint(
    customFingerprint = { methodDef, _ ->
        methodDef.definingClass.endsWith("YouTubePlayerOverlaysLayout;") && methodDef.name == "onFinishInflate"
    }
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.playertype

-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
@@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

-object PlayerTypeFingerprint : MethodFingerprint(
+internal object PlayerTypeFingerprint : MethodFingerprint(
    returnType = "V",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    parameters = listOf("L"),
@@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

-object VideoStateFingerprint : MethodFingerprint(
+internal object VideoStateFingerprint : MethodFingerprint(
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    returnType = "V",
    parameters = listOf("L"),
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.privacy

-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
@@ -40,7 +40,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 object RemoveTrackingQueryParameterPatch : BytecodePatch(
    setOf(CopyTextFingerprint, SystemShareSheetFingerprint, YouTubeShareSheetFingerprint)
 ) {
-    const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/RemoveTrackingQueryParameterPatch;"
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/RemoveTrackingQueryParameterPatch;"

    override fun execute(context: BytecodeContext) {
        SettingsPatch.PreferenceScreen.MISC.addPreferences(
@@ -3,7 +3,7 @@ package app.revanced.patches.youtube.misc.privacy.fingerprints
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

-object CopyTextFingerprint : MethodFingerprint(
+internal object CopyTextFingerprint : MethodFingerprint(
    returnType = "V",
    parameters = listOf("L", "Ljava/util/Map;"),
    opcodes = listOf(
@@ -3,7 +3,7 @@ package app.revanced.patches.youtube.misc.privacy.fingerprints
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

-object SystemShareSheetFingerprint : MethodFingerprint(
+internal object SystemShareSheetFingerprint : MethodFingerprint(
    returnType = "V",
    parameters = listOf("L", "Ljava/util/Map;"),
    opcodes = listOf(
@@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

-object YouTubeShareSheetFingerprint : MethodFingerprint(
+internal object YouTubeShareSheetFingerprint : MethodFingerprint(
    returnType = "V",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    parameters = listOf("L", "Ljava/util/Map;"),
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.recyclerviewtree.hook

-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
@@ -11,7 +11,7 @@ import app.revanced.patches.youtube.misc.recyclerviewtree.hook.fingerprints.Recy
@Patch(
    dependencies = [IntegrationsPatch::class]
 )
-object RecyclerViewTreeHookPatch : BytecodePatch(
+internal object RecyclerViewTreeHookPatch : BytecodePatch(
    setOf(RecyclerViewTreeObserverFingerprint)
 ) {
    internal lateinit var addHook: (String) -> Unit
@@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

-object RecyclerViewTreeObserverFingerprint : MethodFingerprint(
+internal object RecyclerViewTreeObserverFingerprint : MethodFingerprint(
    returnType = "V",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
    opcodes = listOf(
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.settings

-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
@@ -7,9 +7,9 @@ import app.revanced.patches.shared.mapping.misc.ResourceMappingPatch
 import app.revanced.patches.shared.settings.AbstractSettingsResourcePatch
 import app.revanced.patches.shared.settings.preference.addPreference
 import app.revanced.patches.shared.settings.preference.impl.*
-import app.revanced.util.resources.ResourceUtils
-import app.revanced.util.resources.ResourceUtils.copyResources
-import app.revanced.util.resources.ResourceUtils.mergeStrings
+import app.revanced.util.ResourceGroup
+import app.revanced.util.copyResources
+import app.revanced.util.mergeStrings
 import org.w3c.dom.Element
 import org.w3c.dom.Node

@@ -46,7 +46,7 @@ object SettingsResourcePatch : AbstractSettingsResourcePatch(
         * copy layout resources
         */
        arrayOf(
-            ResourceUtils.ResourceGroup("layout", "revanced_settings_with_toolbar.xml")
+            ResourceGroup("layout", "revanced_settings_with_toolbar.xml")
        ).forEach { resourceGroup ->
            context.copyResources("settings", resourceGroup)
        }
@@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

-object LicenseActivityFingerprint : MethodFingerprint(
+internal object LicenseActivityFingerprint : MethodFingerprint(
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    returnType = "V",
    parameters = listOf("L"),
@@ -6,7 +6,7 @@ import app.revanced.util.patch.LiteralValueFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

-object SetThemeFingerprint : LiteralValueFingerprint(
+internal object SetThemeFingerprint : LiteralValueFingerprint(
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    returnType = "L",
    parameters = listOf(),
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.misc.zoomhaptics.fingerprints
 import app.revanced.patcher.fingerprint.MethodFingerprint

-object ZoomHapticsFingerprint : MethodFingerprint(
+internal object ZoomHapticsFingerprint : MethodFingerprint(
    strings = listOf(
        "Failed to haptics vibrate for video zoom"
    )