refactor: reformat code and optimize imports

src/main/kotlin/app/revanced/patches/youtube/ads/general/bytecode/patch/GeneralAdsBytecodePatch.kt

@@ -38,7 +38,12 @@ class GeneralAdsBytecodePatch : BytecodePatch() {
 
                         val viewRegister = getInstruction<Instruction35c>(insertIndex).registerC
 
-                        this.implementation!!.injectHideCall(insertIndex, viewRegister, "ads/AdsFilter", "hideAdAttributionView")
+                        this.implementation!!.injectHideCall(
+                            insertIndex,
+                            viewRegister,
+                            "ads/AdsFilter",
+                            "hideAdAttributionView"
+                        )
                     }
             }
         }

src/main/kotlin/app/revanced/patches/youtube/ads/general/resource/patch/GeneralAdsPatch.kt

@@ -11,9 +11,9 @@ import app.revanced.patcher.patch.PatchResultSuccess
 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.ads.general.bytecode.patch.GeneralAdsBytecodePatch
 import app.revanced.patches.youtube.ads.getpremium.patch.HideGetPremiumPatch
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.litho.patch.LithoFilterPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.resources.ResourceUtils.copyXmlNode

src/main/kotlin/app/revanced/patches/youtube/ads/getpremium/patch/HideGetPremiumPatch.kt

@@ -24,8 +24,10 @@ class HideGetPremiumPatch : BytecodePatch(
         CompactYpcOfferModuleViewFingerprint.result?.let {
             it.mutableMethod.apply {
                 val startIndex = it.scanResult.patternScanResult!!.startIndex
-                val measuredWidthRegister = getInstruction<TwoRegisterInstruction>(startIndex).registerA
-                val measuredHeightInstruction = getInstruction<TwoRegisterInstruction>(startIndex + 1)
+                val measuredWidthRegister =
+                    getInstruction<TwoRegisterInstruction>(startIndex).registerA
+                val measuredHeightInstruction =
+                    getInstruction<TwoRegisterInstruction>(startIndex + 1)
                 val measuredHeightRegister = measuredHeightInstruction.registerA
                 val tempRegister = measuredHeightInstruction.registerB
 

src/main/kotlin/app/revanced/patches/youtube/ads/video/patch/VideoAdsPatch.kt

@@ -8,8 +8,8 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.videoads.AbstractVideoAdsPatch
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.ADS_PATH
 

src/main/kotlin/app/revanced/patches/youtube/buttomplayer/buttoncontainer/patch/ButtonContainerPatch.kt

@@ -9,8 +9,8 @@ import app.revanced.patcher.patch.PatchResultSuccess
 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.shared.patch.litho.ComponentParserPatch.Companion.objectHook
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.litho.patch.LithoFilterPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.BOTTOM_PLAYER

src/main/kotlin/app/revanced/patches/youtube/buttomplayer/comment/patch/CommentComponentPatch.kt

@@ -9,8 +9,8 @@ import app.revanced.patcher.patch.PatchResultSuccess
 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.ads.general.bytecode.patch.GeneralAdsBytecodePatch
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 
 @Patch

src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/flyoutpanel/patch/FlyoutPanelPatch.kt

@@ -9,8 +9,8 @@ import app.revanced.patcher.patch.PatchResultSuccess
 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.ads.general.resource.patch.GeneralAdsPatch
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 
 @Patch

src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/patch/OldQualityLayoutPatch.kt

@@ -12,7 +12,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.flyoutpanel.oldqualitylayout.fingerprints.QualityMenuViewInflateFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch

src/main/kotlin/app/revanced/patches/youtube/fullscreen/autoplaypreview/patch/HideAutoplayPreviewPatch.kt

@@ -13,8 +13,8 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.shared.fingerprints.LayoutConstructorFingerprint
+import app.revanced.patches.youtube.utils.fingerprints.LayoutConstructorFingerprint
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.AutoNavPreviewStub
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
@@ -45,12 +45,15 @@ class HideAutoplayPreviewPatch : BytecodePatch(
             it.mutableMethod.apply {
                 val insertInstruction = implementation!!.instructions
 
-                val dummyRegister = getInstruction<OneRegisterInstruction>(getStringIndex("1.0x")).registerA
+                val dummyRegister =
+                    getInstruction<OneRegisterInstruction>(getStringIndex("1.0x")).registerA
                 val insertIndex = getWideLiteralIndex(AutoNavPreviewStub)
 
-                val branchIndex = insertInstruction.subList(insertIndex + 1, insertInstruction.size - 1).indexOfFirst { instruction ->
-                    ((instruction as? ReferenceInstruction)?.reference as? FieldReference)?.type == "Lcom/google/android/apps/youtube/app/player/autonav/AutonavToggleController;"
-                } + 1
+                val branchIndex =
+                    insertInstruction.subList(insertIndex + 1, insertInstruction.size - 1)
+                        .indexOfFirst { instruction ->
+                            ((instruction as? ReferenceInstruction)?.reference as? FieldReference)?.type == "Lcom/google/android/apps/youtube/app/player/autonav/AutonavToggleController;"
+                        } + 1
 
                 val jumpInstruction = getInstruction<Instruction>(insertIndex + branchIndex)
 

src/main/kotlin/app/revanced/patches/youtube/fullscreen/compactcontrolsoverlay/fingerprints/YouTubeControlsOverlayFingerprint.kt

@@ -12,5 +12,9 @@ object YouTubeControlsOverlayFingerprint : MethodFingerprint(
         Opcode.MOVE_RESULT,
         Opcode.IF_EQZ
     ),
-    customFingerprint = { it, _ -> it.definingClass.endsWith("YouTubeControlsOverlay;") && it.isWideLiteralExists(YoutubeControlsOverlay) }
+    customFingerprint = { it, _ ->
+        it.definingClass.endsWith("YouTubeControlsOverlay;") && it.isWideLiteralExists(
+            YoutubeControlsOverlay
+        )
+    }
 )

src/main/kotlin/app/revanced/patches/youtube/fullscreen/compactcontrolsoverlay/patch/CompactControlsOverlayPatch.kt

@@ -14,7 +14,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.fullscreen.compactcontrolsoverlay.fingerprints.YouTubeControlsOverlayFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
@@ -38,10 +38,11 @@ class CompactControlsOverlayPatch : BytecodePatch(
     override fun execute(context: BytecodeContext): PatchResult {
 
         YouTubeControlsOverlayFingerprint.result?.let {
-            with (context
-                .toMethodWalker(it.method)
-                .nextMethod(it.scanResult.patternScanResult!!.startIndex, true)
-                .getMethod() as MutableMethod
+            with(
+                context
+                    .toMethodWalker(it.method)
+                    .nextMethod(it.scanResult.patternScanResult!!.startIndex, true)
+                    .getMethod() as MutableMethod
             ) {
                 val insertIndex = implementation!!.instructions.size - 1
                 val targetRegister = getInstruction<OneRegisterInstruction>(insertIndex).registerA

src/main/kotlin/app/revanced/patches/youtube/fullscreen/endscreenoverlay/patch/HideEndScreenOverlayPatch.kt

@@ -13,7 +13,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.fullscreen.endscreenoverlay.fingerprints.EndScreenResultsFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch

src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/fingerprints/FullscreenEngagementPanelFingerprint.kt

@@ -6,5 +6,9 @@ import app.revanced.util.bytecode.isWideLiteralExists
 
 object FullscreenEngagementPanelFingerprint : MethodFingerprint(
     returnType = "L",
-    customFingerprint = { it, _ -> it.definingClass.endsWith("FullscreenEngagementPanelOverlay;") && it.isWideLiteralExists(FullScreenEngagementPanel) }
+    customFingerprint = { it, _ ->
+        it.definingClass.endsWith("FullscreenEngagementPanelOverlay;") && it.isWideLiteralExists(
+            FullScreenEngagementPanel
+        )
+    }
 )

src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/patch/HideFullscreenPanelsPatch.kt

@@ -16,8 +16,8 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.shared.fingerprints.LayoutConstructorFingerprint
+import app.revanced.patches.youtube.utils.fingerprints.LayoutConstructorFingerprint
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.fullscreen.fullscreenpanels.fingerprints.FullscreenEngagementPanelFingerprint
 import app.revanced.patches.youtube.fullscreen.fullscreenpanels.fingerprints.FullscreenViewAdderFingerprint
 import app.revanced.patches.youtube.utils.quickactionscontainer.patch.HideQuickActionsContainerPatch
@@ -83,7 +83,8 @@ class HideFullscreenPanelsPatch : BytecodePatch(
 
         LayoutConstructorFingerprint.result?.let {
             it.mutableMethod.apply {
-                val dummyRegister = getInstruction<OneRegisterInstruction>(getStringIndex("1.0x")).registerA
+                val dummyRegister =
+                    getInstruction<OneRegisterInstruction>(getStringIndex("1.0x")).registerA
 
                 val invokeIndex = implementation!!.instructions.indexOfFirst { instruction ->
                     instruction.opcode == Opcode.INVOKE_VIRTUAL &&

src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/fingerprints/OrientationPrimaryFingerprint.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-object OrientationPrimaryFingerprint : MethodFingerprint (
+object OrientationPrimaryFingerprint : MethodFingerprint(
     returnType = "V",
     accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
     parameters = listOf("L"),
@@ -13,5 +13,5 @@ object OrientationPrimaryFingerprint : MethodFingerprint (
         Opcode.INVOKE_STATIC,
         Opcode.MOVE_RESULT
     ),
-    customFingerprint = { it, _ -> it.name == "<init>"}
+    customFingerprint = { it, _ -> it.name == "<init>" }
 )

src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/fingerprints/OrientationSecondaryFingerprint.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-object OrientationSecondaryFingerprint : MethodFingerprint (
+object OrientationSecondaryFingerprint : MethodFingerprint(
     returnType = "V",
     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
     parameters = listOf("L"),

src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/patch/LandScapeModePatch.kt

@@ -14,8 +14,10 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.fullscreen.landscapemode.fingerprints.*
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
+import app.revanced.patches.youtube.fullscreen.landscapemode.fingerprints.OrientationParentFingerprint
+import app.revanced.patches.youtube.fullscreen.landscapemode.fingerprints.OrientationPrimaryFingerprint
+import app.revanced.patches.youtube.fullscreen.landscapemode.fingerprints.OrientationSecondaryFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.FULLSCREEN
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
@@ -35,7 +37,8 @@ class LandScapeModePatch : BytecodePatch(
                 OrientationPrimaryFingerprint,
                 OrientationSecondaryFingerprint
             ).forEach {
-                it.also { it.resolve(context, classDef) }.result?.injectOverride() ?: return it.toErrorResult()
+                it.also { it.resolve(context, classDef) }.result?.injectOverride()
+                    ?: return it.toErrorResult()
             }
         } ?: return OrientationParentFingerprint.toErrorResult()
 
@@ -64,7 +67,7 @@ class LandScapeModePatch : BytecodePatch(
                 val register = getInstruction<OneRegisterInstruction>(index).registerA
 
                 addInstructions(
-                    index +1, """
+                    index + 1, """
                         invoke-static {v$register}, $INTEGRATIONS_CLASS_DESCRIPTOR
                         move-result v$register
                         """

src/main/kotlin/app/revanced/patches/youtube/fullscreen/quickactions/patch/QuickActionsPatch.kt

@@ -9,8 +9,8 @@ import app.revanced.patcher.patch.PatchResultSuccess
 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.ads.general.resource.patch.GeneralAdsPatch
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.quickactionscontainer.patch.HideQuickActionsContainerPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 

src/main/kotlin/app/revanced/patches/youtube/general/accountmenu/patch/AccountMenuPatch.kt

@@ -13,7 +13,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.general.accountmenu.fingerprints.AccountMenuFingerprint
 import app.revanced.patches.youtube.general.accountmenu.fingerprints.AccountMenuParentFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch

src/main/kotlin/app/revanced/patches/youtube/general/autocaptions/patch/AutoCaptionsPatch.kt

@@ -15,9 +15,9 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.shared.fingerprints.SubtitleButtonControllerFingerprint
-import app.revanced.patches.shared.fingerprints.SubtitleTrackFingerprint
+import app.revanced.patches.youtube.utils.fingerprints.SubtitleButtonControllerFingerprint
+import app.revanced.patches.shared.fingerprints.captions.SubtitleTrackFingerprint
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.general.autocaptions.fingerprints.StartVideoInformerFingerprint
 import app.revanced.patches.youtube.utils.playertype.patch.PlayerTypeHookPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
@@ -51,7 +51,7 @@ class AutoCaptionsPatch : BytecodePatch(
                     const/4 v0, ${status.value}
                     sput-boolean v0, $GENERAL->captionsButtonStatus:Z
                     """
-            )?: return fingerprint.toErrorResult()
+            ) ?: return fingerprint.toErrorResult()
         }
 
         SubtitleTrackFingerprint.result?.let {

src/main/kotlin/app/revanced/patches/youtube/general/autopopuppanels/patch/PlayerPopupPanelsPatch.kt

@@ -13,7 +13,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.general.autopopuppanels.fingerprints.EngagementPanelControllerFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.GENERAL

src/main/kotlin/app/revanced/patches/youtube/general/categorybar/patch/CategoryBarPatch.kt

@@ -13,7 +13,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.general.categorybar.fingerprints.FilterBarHeightFingerprint
 import app.revanced.patches.youtube.general.categorybar.fingerprints.RelatedChipCloudFingerprint
 import app.revanced.patches.youtube.general.categorybar.fingerprints.SearchResultsChipBarFingerprint
@@ -76,8 +76,9 @@ class CategoryBarPatch : BytecodePatch(
 
         return PatchResultSuccess()
     }
+
     private companion object {
-        private fun <RegisterInstruction: OneRegisterInstruction> MethodFingerprint.patch(
+        private fun <RegisterInstruction : OneRegisterInstruction> MethodFingerprint.patch(
             insertIndexOffset: Int = 0,
             hookRegisterOffset: Int = 0,
             instructions: (Int) -> String
@@ -87,7 +88,8 @@ class CategoryBarPatch : BytecodePatch(
                     val endIndex = it.scanResult.patternScanResult!!.endIndex
 
                     val insertIndex = endIndex + insertIndexOffset
-                    val register = getInstruction<RegisterInstruction>(endIndex + hookRegisterOffset).registerA
+                    val register =
+                        getInstruction<RegisterInstruction>(endIndex + hookRegisterOffset).registerA
 
                     addInstructions(insertIndex, instructions(register))
                 }

src/main/kotlin/app/revanced/patches/youtube/general/channellistsubmenu/patch/ChannelListSubMenuPatch.kt

@@ -12,7 +12,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.general.channellistsubmenu.fingerprints.ChannelListSubMenuFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
@@ -42,7 +42,7 @@ class ChannelListSubMenuPatch : BytecodePatch(
 
                 addInstruction(
                     endIndex + 1,
-                        "invoke-static {v$register}, $GENERAL->hideChannelListSubMenu(Landroid/view/View;)V"
+                    "invoke-static {v$register}, $GENERAL->hideChannelListSubMenu(Landroid/view/View;)V"
                 )
             }
         } ?: return ChannelListSubMenuFingerprint.toErrorResult()

src/main/kotlin/app/revanced/patches/youtube/general/crowdfundingbox/patch/CrowdfundingBoxPatch.kt

@@ -12,7 +12,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.general.crowdfundingbox.fingerprints.CrowdfundingBoxFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch

src/main/kotlin/app/revanced/patches/youtube/general/floatingmicrophone/patch/FloatingMicrophonePatch.kt

@@ -12,7 +12,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.general.floatingmicrophone.fingerprints.FloatingMicrophoneFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch

src/main/kotlin/app/revanced/patches/youtube/general/headerswitch/patch/HeaderSwitchPatch.kt

@@ -12,7 +12,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.WordMarkHeader
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
@@ -45,7 +45,8 @@ class HeaderSwitchPatch : BytecodePatch() {
                     .findMutableMethodOf(method)
                     .apply {
                         val targetIndex = getWideLiteralIndex(WordMarkHeader)
-                        val targetRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA
+                        val targetRegister =
+                            getInstruction<OneRegisterInstruction>(targetIndex).registerA
 
                         addInstructions(
                             targetIndex + 1, """

src/main/kotlin/app/revanced/patches/youtube/general/loadmorebutton/patch/LoadMoreButtonPatch.kt

@@ -12,7 +12,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.general.loadmorebutton.fingerprints.LoadMoreButtonFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
@@ -31,7 +31,7 @@ import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 @YouTubeCompatibility
 @Version("0.0.1")
 class LoadMoreButtonPatch : BytecodePatch(
-    listOf(LoadMoreButtonFingerprint,)
+    listOf(LoadMoreButtonFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
         LoadMoreButtonFingerprint.result?.let {
@@ -43,7 +43,7 @@ class LoadMoreButtonPatch : BytecodePatch(
                     "invoke-static {v$targetRegister}, $GENERAL->hideLoadMoreButton(Landroid/view/View;)V"
                 )
             }
-        }?: return LoadMoreButtonFingerprint.toErrorResult()
+        } ?: return LoadMoreButtonFingerprint.toErrorResult()
 
         /**
          * Add settings

src/main/kotlin/app/revanced/patches/youtube/general/mixplaylists/patch/MixPlaylistsPatch.kt

@@ -14,8 +14,8 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.shared.fingerprints.EmptyComponentBuilderFingerprint
+import app.revanced.patches.shared.fingerprints.litho.EmptyComponentBuilderFingerprint
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.general.mixplaylists.fingerprints.BottomPanelOverlayTextFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.bytecode.getStringIndex

src/main/kotlin/app/revanced/patches/youtube/general/personalinformation/patch/HideEmailAddressPatch.kt

@@ -12,7 +12,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.general.personalinformation.fingerprints.AccountSwitcherAccessibilityLabelFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.GENERAL

src/main/kotlin/app/revanced/patches/youtube/general/searchterms/patch/SearchTermsPatch.kt

@@ -13,7 +13,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.general.searchterms.fingerprints.SearchEndpointFingerprint
 import app.revanced.patches.youtube.general.searchterms.fingerprints.SearchEndpointParentFingerprint
 import app.revanced.patches.youtube.general.searchterms.fingerprints.SearchSuggestionEntryFingerprint
@@ -44,10 +44,16 @@ class SearchTermsPatch : BytecodePatch(
     override fun execute(context: BytecodeContext): PatchResult {
 
         SearchEndpointParentFingerprint.result?.let { parentResult ->
-            SearchEndpointFingerprint.also { it.resolve(context, parentResult.classDef) }.result?.let {
+            SearchEndpointFingerprint.also {
+                it.resolve(
+                    context,
+                    parentResult.classDef
+                )
+            }.result?.let {
                 it.mutableMethod.apply {
                     val targetIndex = it.scanResult.patternScanResult!!.startIndex + 1
-                    val targetRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA
+                    val targetRegister =
+                        getInstruction<OneRegisterInstruction>(targetIndex).registerA
 
                     addInstruction(
                         targetIndex + 1,

src/main/kotlin/app/revanced/patches/youtube/general/snackbar/patch/HideSnackBarPatch.kt

@@ -13,7 +13,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.general.snackbar.fingerprints.HideSnackBarFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.GENERAL

src/main/kotlin/app/revanced/patches/youtube/general/stories/patch/HideStoriesPatch.kt

@@ -12,8 +12,8 @@ import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 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.mapping.ResourceMappingPatch
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.formats.Instruction22c
@@ -40,7 +40,7 @@ class HideStoriesPatch : BytecodePatch() {
     ).map { name ->
         ResourceMappingPatch.resourceMappings.single { it.name == name }.id
     }
-    private var patchSuccessArray = Array(resourceIds.size) {false}
+    private var patchSuccessArray = Array(resourceIds.size) { false }
 
     override fun execute(context: BytecodeContext): PatchResult {
         context.classes.forEach { classDef ->
@@ -55,10 +55,19 @@ class HideStoriesPatch : BytecodePatch() {
                                         val iPutInstruction = instructions.elementAt(insertIndex)
                                         if (iPutInstruction.opcode != Opcode.IPUT_OBJECT) return@forEachIndexed
 
-                                        val mutableMethod = context.proxy(classDef).mutableClass.findMutableMethodOf(method)
+                                        val mutableMethod =
+                                            context.proxy(classDef).mutableClass.findMutableMethodOf(
+                                                method
+                                            )
 
-                                        val viewRegister = (iPutInstruction as Instruction22c).registerA
-                                        mutableMethod.implementation!!.injectHideCall(insertIndex, viewRegister, "layout/GeneralPatch", "hideStoriesShelf")
+                                        val viewRegister =
+                                            (iPutInstruction as Instruction22c).registerA
+                                        mutableMethod.implementation!!.injectHideCall(
+                                            insertIndex,
+                                            viewRegister,
+                                            "layout/GeneralPatch",
+                                            "hideStoriesShelf"
+                                        )
 
                                         patchSuccessArray[0] = true
                                         patchSuccessArray[1] = true
@@ -69,15 +78,25 @@ class HideStoriesPatch : BytecodePatch() {
                                         val iPutInstruction = instructions.elementAt(insertIndex)
                                         if (iPutInstruction.opcode != Opcode.IPUT_OBJECT) return@forEachIndexed
 
-                                        val mutableMethod = context.proxy(classDef).mutableClass.findMutableMethodOf(method)
+                                        val mutableMethod =
+                                            context.proxy(classDef).mutableClass.findMutableMethodOf(
+                                                method
+                                            )
 
-                                        val viewRegister = (iPutInstruction as Instruction22c).registerA
-                                        mutableMethod.implementation!!.injectHideCall(insertIndex, viewRegister, "layout/GeneralPatch", "hideStoriesShelf")
+                                        val viewRegister =
+                                            (iPutInstruction as Instruction22c).registerA
+                                        mutableMethod.implementation!!.injectHideCall(
+                                            insertIndex,
+                                            viewRegister,
+                                            "layout/GeneralPatch",
+                                            "hideStoriesShelf"
+                                        )
 
                                         patchSuccessArray[2] = true
                                     }
                                 }
                             }
+
                             else -> return@forEachIndexed
                         }
                     }

src/main/kotlin/app/revanced/patches/youtube/general/suggestions/patch/SuggestionsShelfPatch.kt

@@ -12,7 +12,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.general.suggestions.fingerprints.BreakingNewsFingerprint
 import app.revanced.patches.youtube.utils.litho.patch.LithoFilterPatch
 import app.revanced.patches.youtube.utils.navbarindex.patch.NavBarIndexPatch
@@ -49,6 +49,20 @@ class SuggestionsShelfPatch : BytecodePatch(
             }
         } ?: return BreakingNewsFingerprint.toErrorResult()
 
+        /*
+        SuggestionContentsBuilderFingerprint.result?.let {
+            it.mutableMethod.apply {
+                addInstructionsWithLabels(
+                    2, """
+                        invoke-static/range {p2 .. p2}, $GENERAL->hideSuggestionsShelf(Ljava/lang/Object;)Z
+                        move-result v0
+                        if-eqz v0, :not_an_ad
+                        """ + emptyComponentLabel, ExternalLabel("not_an_ad", getInstruction(2))
+                )
+            }
+        } ?: return SuggestionContentsBuilderFingerprint.toErrorResult()
+         */
+
 
         /**
          * Add settings

src/main/kotlin/app/revanced/patches/youtube/general/tabletminiplayer/patch/TabletMiniPlayerPatch.kt

@@ -16,7 +16,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.general.tabletminiplayer.fingerprints.MiniPlayerDimensionsCalculatorFingerprint
 import app.revanced.patches.youtube.general.tabletminiplayer.fingerprints.MiniPlayerOverrideFingerprint
 import app.revanced.patches.youtube.general.tabletminiplayer.fingerprints.MiniPlayerOverrideNoContextFingerprint
@@ -49,9 +49,17 @@ class TabletMiniPlayerPatch : BytecodePatch(
     override fun execute(context: BytecodeContext): PatchResult {
 
         MiniPlayerDimensionsCalculatorFingerprint.result?.let { parentResult ->
-            MiniPlayerOverrideNoContextFingerprint.also { it.resolve(context, parentResult.classDef) }.result?.let { result ->
+            MiniPlayerOverrideNoContextFingerprint.also {
+                it.resolve(
+                    context,
+                    parentResult.classDef
+                )
+            }.result?.let { result ->
                 val (method, _, parameterRegister) = result.addProxyCall()
-                method.insertOverride(method.implementation!!.instructions.size - 1, parameterRegister)
+                method.insertOverride(
+                    method.implementation!!.instructions.size - 1,
+                    parameterRegister
+                )
             } ?: return MiniPlayerOverrideNoContextFingerprint.toErrorResult()
         } ?: return MiniPlayerDimensionsCalculatorFingerprint.toErrorResult()
 
@@ -115,7 +123,8 @@ class TabletMiniPlayerPatch : BytecodePatch(
         fun MethodFingerprintResult.unwrap(): Triple<MutableMethod, Int, Int> {
             val scanIndex = this.scanResult.patternScanResult!!.endIndex
             val method = this.mutableMethod
-            val parameterRegister = method.getInstruction<OneRegisterInstruction>(scanIndex).registerA
+            val parameterRegister =
+                method.getInstruction<OneRegisterInstruction>(scanIndex).registerA
 
             return Triple(method, scanIndex, parameterRegister)
         }

src/main/kotlin/app/revanced/patches/youtube/general/widesearchbar/patch/WideSearchbarPatch.kt

@@ -14,7 +14,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.general.widesearchbar.fingerprints.SetActionBarRingoFingerprint
 import app.revanced.patches.youtube.general.widesearchbar.fingerprints.SetToolBarPaddingFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch

src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingIconMMTPatch.kt

@@ -9,7 +9,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.resources.IconHelper.customIcon
 import app.revanced.util.resources.ResourceHelper.updatePatchStatusIcon

src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingIconRevancifyBluePatch.kt

@@ -9,7 +9,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.resources.IconHelper.customIcon
 import app.revanced.util.resources.ResourceHelper.updatePatchStatusIcon

src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingIconRevancifyRedPatch.kt

@@ -9,7 +9,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.resources.IconHelper.customIcon
 import app.revanced.util.resources.ResourceHelper.updatePatchStatusIcon

src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/patch/CustomBrandingNamePatch.kt

@@ -5,10 +5,14 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.OptionsContainer
+import app.revanced.patcher.patch.PatchOption
+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.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.resources.ResourceHelper.updatePatchStatusLabel
 import org.w3c.dom.Element
@@ -31,7 +35,7 @@ class CustomBrandingNamePatch : ResourcePatch {
 
             // for each file in the "layouts" directory replace all necessary attributes content
             context.xmlEditor[it.absolutePath].use { editor ->
-            val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
+                val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
 
                 for (i in 0 until resourcesNode.childNodes.length) {
                     val node = resourcesNode.childNodes.item(i)
@@ -50,6 +54,7 @@ class CustomBrandingNamePatch : ResourcePatch {
 
         return PatchResultSuccess()
     }
+
     companion object : OptionsContainer() {
         var YouTubeAppName: String? by option(
             PatchOption.StringOption(

src/main/kotlin/app/revanced/patches/youtube/layout/doubletapbackground/patch/DoubleTapOverlayBackgroundPatch.kt

@@ -9,7 +9,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 
 @Patch(false)
@@ -30,14 +30,16 @@ class DoubleTapOverlayBackgroundPatch : ResourcePatch {
                         view.attributes.getNamedItem("android:id").nodeValue.endsWith("tap_bloom_view")
                     ) {
                         attributes.forEach { attribute ->
-                            view.attributes.getNamedItem("android:layout_$attribute").nodeValue = "0.0dip"
+                            view.attributes.getNamedItem("android:layout_$attribute").nodeValue =
+                                "0.0dip"
                         }
                     }
                     if (
                         view.hasAttributes() &&
                         view.attributes.getNamedItem("android:id").nodeValue.endsWith("dark_background")
                     ) {
-                        view.attributes.getNamedItem("android:src").nodeValue = "@color/full_transparent"
+                        view.attributes.getNamedItem("android:src").nodeValue =
+                            "@color/full_transparent"
                         break
                     }
                 }

src/main/kotlin/app/revanced/patches/youtube/layout/doubletaplength/patch/DoubleTapLengthPatch.kt

@@ -5,10 +5,14 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.OptionsContainer
-import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.PatchOption
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.resources.ResourceHelper.addEntryValues
 import app.revanced.util.resources.ResourceUtils
@@ -40,7 +44,7 @@ class DoubleTapLengthPatch : ResourcePatch {
         val length = DoubleTapLengthArrays
             ?: return PatchResultError("Invalid double-tap length array.")
 
-        val splits = length.replace(" ","").split(",")
+        val splits = length.replace(" ", "").split(",")
         if (splits.isEmpty()) throw IllegalArgumentException("Invalid double-tap length elements")
         val lengthElements = splits.map { it }
         for (index in 0 until splits.count()) {

src/main/kotlin/app/revanced/patches/youtube/layout/forcebackground/patch/PlayerButtonBackgroundPatch.kt

@@ -10,7 +10,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import org.w3c.dom.Element
 

src/main/kotlin/app/revanced/patches/youtube/layout/forceheader/patch/PremiumHeadingPatch.kt

@@ -10,7 +10,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption

src/main/kotlin/app/revanced/patches/youtube/layout/materialyou/patch/MaterialYouPatch.kt

@@ -9,7 +9,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.layout.theme.patch.GeneralThemePatch
 import app.revanced.patches.youtube.layout.theme.patch.GeneralThemePatch.Companion.isMonetPatchIncluded
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch

src/main/kotlin/app/revanced/patches/youtube/layout/optimize/patch/OptimizeResourcePatch.kt

@@ -9,7 +9,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 
 @Patch

src/main/kotlin/app/revanced/patches/youtube/layout/optimize/patch/RedundantResourcePatch.kt

@@ -7,7 +7,7 @@ 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.patches.shared.annotation.YouTubeCompatibility
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.util.resources.ResourceUtils
 import app.revanced.util.resources.ResourceUtils.copyResources
 import java.io.File
@@ -35,22 +35,23 @@ class RedundantResourcePatch : ResourcePatch {
             (WHITELIST_GENERAL + array).forEach { name ->
                 try {
                     Files.copy(
-                            context["res"].resolve("$path/$name").toPath(),
-                            context["res"].resolve("$tmpDirectory/$name").toPath(),
-                            StandardCopyOption.REPLACE_EXISTING
+                        context["res"].resolve("$path/$name").toPath(),
+                        context["res"].resolve("$tmpDirectory/$name").toPath(),
+                        StandardCopyOption.REPLACE_EXISTING
                     )
-                } catch (_: Exception) {}
+                } catch (_: Exception) {
+                }
             }
             val directoryPath = context["res"].resolve(path)
 
             Files.walk(directoryPath.toPath())
-                    .map(Path::toFile)
-                    .sorted(Comparator.reverseOrder())
-                    .forEach(File::delete)
+                .map(Path::toFile)
+                .sorted(Comparator.reverseOrder())
+                .forEach(File::delete)
 
             Files.move(
-                    context["res"].resolve(tmpDirectory).toPath(),
-                    context["res"].resolve(path).toPath()
+                context["res"].resolve(tmpDirectory).toPath(),
+                context["res"].resolve(path).toPath()
             )
         }
 

src/main/kotlin/app/revanced/patches/youtube/layout/pipnotification/patch/PiPNotificationPatch.kt

@@ -11,7 +11,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.layout.pipnotification.fingerprints.PrimaryPiPFingerprint
 import app.revanced.patches.youtube.layout.pipnotification.fingerprints.SecondaryPiPFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch

src/main/kotlin/app/revanced/patches/youtube/layout/splashanimation/patch/AddSplashAnimationPatch.kt

@@ -8,7 +8,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.util.resources.ResourceUtils
 import app.revanced.util.resources.ResourceUtils.copyResources
 import app.revanced.util.resources.ResourceUtils.copyXmlNode

src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/GeneralThemePatch.kt

@@ -40,7 +40,8 @@ class GeneralThemePatch : ResourcePatch {
             context.xmlEditor[stylesPath].use { editor ->
                 val file = editor.file
 
-                val childNodes = (file.getElementsByTagName("resources").item(0) as Element).childNodes
+                val childNodes =
+                    (file.getElementsByTagName("resources").item(0) as Element).childNodes
 
                 for (i in 0 until childNodes.length) {
                     val node = childNodes.item(i) as? Element ?: continue
@@ -64,10 +65,12 @@ class GeneralThemePatch : ResourcePatch {
                                         "Base.Theme.YouTube.Launcher.Light" -> "@color/yt_white1"
                                         else -> "null"
                                     }
+
                                     1 -> when (nodeAttributeName) {
                                         "Base.Theme.YouTube.Launcher" -> "?attr/splashScreenColor"
                                         else -> "null"
                                     }
+
                                     else -> "null"
                                 }
                             )
@@ -91,6 +94,7 @@ class GeneralThemePatch : ResourcePatch {
 
         return PatchResultSuccess()
     }
+
     internal companion object {
         var isMonetPatchIncluded: Boolean = false
     }

src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/ThemePatch.kt

@@ -4,10 +4,14 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.OptionsContainer
+import app.revanced.patcher.patch.PatchOption
+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.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.layout.theme.patch.GeneralThemePatch.Companion.isMonetPatchIncluded
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.resources.ResourceHelper.updatePatchStatusTheme

src/main/kotlin/app/revanced/patches/youtube/layout/tooltip/patch/TooltipContentViewPatch.kt

@@ -11,7 +11,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.layout.tooltip.fingerprints.TooltipContentViewFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch

src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/patch/PowerSaveModePatch.kt

@@ -13,7 +13,7 @@ import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.misc.ambientmode.fingerprints.PowerSaveModeFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.MISC_PATH

src/main/kotlin/app/revanced/patches/youtube/misc/debugging/patch/DebuggingPatch.kt

@@ -9,7 +9,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 
 @Patch(false)

src/main/kotlin/app/revanced/patches/youtube/misc/externalbrowser/patch/ExternalBrowserPatch.kt

@@ -12,8 +12,10 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.misc.externalbrowser.fingerprints.*
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
+import app.revanced.patches.youtube.misc.externalbrowser.fingerprints.ExternalBrowserPrimaryFingerprint
+import app.revanced.patches.youtube.misc.externalbrowser.fingerprints.ExternalBrowserSecondaryFingerprint
+import app.revanced.patches.youtube.misc.externalbrowser.fingerprints.ExternalBrowserTertiaryFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.MISC_PATH
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction

src/main/kotlin/app/revanced/patches/youtube/misc/forceopus/patch/ForceOpusCodecPatch.kt

@@ -8,8 +8,8 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.opus.AbstractOpusCodecsPatch
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.MISC_PATH
 

src/main/kotlin/app/revanced/patches/youtube/misc/forcevp9/patch/ForceVP9CodecPatch.kt

@@ -16,9 +16,14 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.shared.fingerprints.LayoutSwitchFingerprint
-import app.revanced.patches.youtube.misc.forcevp9.fingerprints.*
+import app.revanced.patches.youtube.utils.fingerprints.LayoutSwitchFingerprint
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
+import app.revanced.patches.youtube.misc.forcevp9.fingerprints.VideoCapabilitiesFingerprint
+import app.revanced.patches.youtube.misc.forcevp9.fingerprints.VideoCapabilitiesParentFingerprint
+import app.revanced.patches.youtube.misc.forcevp9.fingerprints.Vp9PrimaryFingerprint
+import app.revanced.patches.youtube.misc.forcevp9.fingerprints.Vp9PropsFingerprint
+import app.revanced.patches.youtube.misc.forcevp9.fingerprints.Vp9PropsParentFingerprint
+import app.revanced.patches.youtube.misc.forcevp9.fingerprints.Vp9SecondaryFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.MISC_PATH
 import org.jf.dexlib2.Opcode
@@ -46,12 +51,18 @@ class ForceVP9CodecPatch : BytecodePatch(
                 Vp9PrimaryFingerprint,
                 Vp9SecondaryFingerprint
             ).forEach { fingerprint ->
-                fingerprint.also { it.resolve(context, classDef) }.result?.injectOverride() ?: return fingerprint.toErrorResult()
+                fingerprint.also { it.resolve(context, classDef) }.result?.injectOverride()
+                    ?: return fingerprint.toErrorResult()
             }
         } ?: return LayoutSwitchFingerprint.toErrorResult()
 
         Vp9PropsParentFingerprint.result?.let { parentResult ->
-            Vp9PropsFingerprint.also { it.resolve(context, parentResult.classDef) }.result?.mutableMethod?.let {
+            Vp9PropsFingerprint.also {
+                it.resolve(
+                    context,
+                    parentResult.classDef
+                )
+            }.result?.mutableMethod?.let {
                 mapOf(
                     "MANUFACTURER" to "getManufacturer",
                     "BRAND" to "getBrand",
@@ -63,7 +74,12 @@ class ForceVP9CodecPatch : BytecodePatch(
         } ?: return Vp9PropsParentFingerprint.toErrorResult()
 
         VideoCapabilitiesParentFingerprint.result?.let { parentResult ->
-            VideoCapabilitiesFingerprint.also { it.resolve(context, parentResult.classDef) }.result?.let {
+            VideoCapabilitiesFingerprint.also {
+                it.resolve(
+                    context,
+                    parentResult.classDef
+                )
+            }.result?.let {
                 it.mutableMethod.apply {
                     val insertIndex = it.scanResult.patternScanResult!!.startIndex
 
@@ -143,7 +159,8 @@ class ForceVP9CodecPatch : BytecodePatch(
             for ((index, instruction) in implementation!!.instructions.withIndex()) {
                 if (instruction.opcode != Opcode.SGET_OBJECT) continue
 
-                val indexString = ((instruction as? ReferenceInstruction)?.reference as? DexBackedFieldReference).toString()
+                val indexString =
+                    ((instruction as? ReferenceInstruction)?.reference as? DexBackedFieldReference).toString()
 
                 if (indexString != targetString) continue
 

src/main/kotlin/app/revanced/patches/youtube/misc/language/patch/LanguageSelectorPatch.kt

@@ -12,7 +12,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.misc.language.fingerprints.GeneralPrefsFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction

src/main/kotlin/app/revanced/patches/youtube/misc/layoutswitch/patch/LayoutSwitchPatch.kt

@@ -17,8 +17,8 @@ import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.shared.fingerprints.LayoutSwitchFingerprint
+import app.revanced.patches.youtube.utils.fingerprints.LayoutSwitchFingerprint
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.misc.layoutswitch.fingerprints.ClientFormFactorFingerprint
 import app.revanced.patches.youtube.misc.layoutswitch.fingerprints.ClientFormFactorParentFingerprint
 import app.revanced.patches.youtube.misc.layoutswitch.fingerprints.ClientFormFactorWalkerFingerprint
@@ -56,18 +56,23 @@ class LayoutSwitchPatch : BytecodePatch(
                     mutableMethod.injectTabletLayout(scanResult.patternScanResult!!.startIndex + 1)
                 }
             } catch (_: Exception) {
-                ClientFormFactorWalkerFingerprint.also { it.resolve(context, classDef) }.result?.let {
+                ClientFormFactorWalkerFingerprint.also {
+                    it.resolve(
+                        context,
+                        classDef
+                    )
+                }.result?.let {
                     (context
                         .toMethodWalker(it.method)
                         .nextMethod(it.scanResult.patternScanResult!!.startIndex, true)
                         .getMethod() as MutableMethod).apply {
 
-                            val jumpIndex = implementation!!.instructions.indexOfFirst { instruction ->
-                                instruction.opcode == Opcode.RETURN_OBJECT
-                            } - 1
+                        val jumpIndex = implementation!!.instructions.indexOfFirst { instruction ->
+                            instruction.opcode == Opcode.RETURN_OBJECT
+                        } - 1
 
                         injectTabletLayout(jumpIndex)
-                        }
+                    }
                 } ?: return ClientFormFactorWalkerFingerprint.toErrorResult()
             }
         } ?: return ClientFormFactorParentFingerprint.toErrorResult()

src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/patch/MinimizedPlaybackPatch.kt

@@ -14,8 +14,10 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.*
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
+import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.KidsMinimizedPlaybackPolicyControllerFingerprint
+import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
+import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackSettingsFingerprint
 import app.revanced.patches.youtube.utils.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.utils.playertype.patch.PlayerTypeHookPatch
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
@@ -48,7 +50,7 @@ class MinimizedPlaybackPatch : BytecodePatch(
             MinimizedPlaybackManagerFingerprint,
             MinimizedPlaybackSettingsFingerprint
         ).map {
-            it.result?.mutableMethod?: return it.toErrorResult()
+            it.result?.mutableMethod ?: return it.toErrorResult()
         }
 
         methods[0].hookKidsMiniPlayer()
@@ -88,8 +90,8 @@ class MinimizedPlaybackPatch : BytecodePatch(
             val booleanIndex = booleanCalls.elementAt(1).index
             val booleanMethod =
                 context.toMethodWalker(this)
-                .nextMethod(booleanIndex, true)
-                .getMethod() as MutableMethod
+                    .nextMethod(booleanIndex, true)
+                    .getMethod() as MutableMethod
 
             booleanMethod.addInstructions(
                 0, """

src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/patch/OpenLinksDirectlyPatch.kt

@@ -12,8 +12,9 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.misc.openlinksdirectly.fingerprints.*
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
+import app.revanced.patches.youtube.misc.openlinksdirectly.fingerprints.OpenLinksDirectlyFingerprintPrimary
+import app.revanced.patches.youtube.misc.openlinksdirectly.fingerprints.OpenLinksDirectlyFingerprintSecondary
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.MISC_PATH
 import org.jf.dexlib2.iface.instruction.formats.Instruction35c

src/main/kotlin/app/revanced/patches/youtube/misc/quic/patch/QUICProtocolPatch.kt

@@ -11,8 +11,9 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.misc.quic.fingerprints.*
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
+import app.revanced.patches.youtube.misc.quic.fingerprints.CronetEngineBuilderFingerprint
+import app.revanced.patches.youtube.misc.quic.fingerprints.ExperimentalCronetEngineBuilderFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.MISC_PATH
 
@@ -39,7 +40,7 @@ class QUICProtocolPatch : BytecodePatch(
                     invoke-static {p1}, $MISC_PATH/QUICProtocolPatch;->disableQUICProtocol(Z)Z
                     move-result p1
                     """
-            )?: return it.toErrorResult()
+            ) ?: return it.toErrorResult()
         }
 
         /**

src/main/kotlin/app/revanced/patches/youtube/misc/splashanimation/patch/NewSplashAnimationPatch.kt

@@ -12,9 +12,9 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.settings.resource.patch.SettingsPatch
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.misc.splashanimation.fingerprints.SplashAnimationBuilderFingerprint
+import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.bytecode.getWide32LiteralIndex
 import app.revanced.util.integrations.Constants.MISC_PATH
 import org.jf.dexlib2.Opcode

src/main/kotlin/app/revanced/patches/youtube/misc/spoofappversion/patch/SpoofAppVersionPatch.kt

@@ -8,8 +8,8 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.versionspoof.AbstractVersionSpoofPatch
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch.Companion.contexts
 import app.revanced.util.integrations.Constants.MISC_PATH

src/main/kotlin/app/revanced/patches/youtube/misc/translations/patch/TranslationsPatch.kt

@@ -9,7 +9,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.resources.ResourceHelper.addTranslations
 

src/main/kotlin/app/revanced/patches/youtube/navigation/homepage/patch/ChangeHomePagePatch.kt

@@ -14,7 +14,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.navigation.homepage.fingerprints.IntentExceptionFingerprint
 import app.revanced.patches.youtube.navigation.homepage.fingerprints.LauncherActivityFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch

src/main/kotlin/app/revanced/patches/youtube/navigation/label/patch/NavigationLabelPatch.kt

@@ -12,7 +12,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.navigation.label.fingerprints.PivotBarSetTextFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.NAVIGATION
@@ -33,7 +33,8 @@ class NavigationLabelPatch : BytecodePatch(
         PivotBarSetTextFingerprint.result?.let {
             it.mutableMethod.apply {
                 val targetIndex = it.scanResult.patternScanResult!!.endIndex - 2
-                val targetReference = getInstruction<ReferenceInstruction>(targetIndex).reference.toString()
+                val targetReference =
+                    getInstruction<ReferenceInstruction>(targetIndex).reference.toString()
                 val targetRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA
 
                 if (targetReference != "Landroid/widget/TextView;")

src/main/kotlin/app/revanced/patches/youtube/navigation/navigationbuttons/patch/NavigationButtonsPatch.kt

@@ -13,8 +13,8 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.fingerprints.PivotBarCreateButtonViewFingerprint
+import app.revanced.patches.youtube.utils.fingerprints.PivotBarCreateButtonViewFingerprint
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.navigation.navigationbuttons.fingerprints.AutoMotiveFingerprint
 import app.revanced.patches.youtube.navigation.navigationbuttons.fingerprints.PivotBarEnumFingerprint
 import app.revanced.patches.youtube.navigation.navigationbuttons.fingerprints.PivotBarShortsButtonViewFingerprint
@@ -50,7 +50,7 @@ class NavigationButtonsPatch : BytecodePatch(
             /**
              * Home, Shorts, Subscriptions Button
              */
-            with (
+            with(
                 arrayOf(
                     PivotBarEnumFingerprint,
                     PivotBarShortsButtonViewFingerprint
@@ -125,20 +125,21 @@ class NavigationButtonsPatch : BytecodePatch(
 
         return PatchResultSuccess()
     }
+
     private companion object {
         const val enumHook =
             "sput-object v$REGISTER_TEMPLATE_REPLACEMENT, $NAVIGATION" +
-            "->" +
-            "lastPivotTab:Ljava/lang/Enum;"
+                    "->" +
+                    "lastPivotTab:Ljava/lang/Enum;"
 
         const val buttonHook =
             "invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, $NAVIGATION" +
-            "->" +
-            "hideNavigationButton(Landroid/view/View;)V"
+                    "->" +
+                    "hideNavigationButton(Landroid/view/View;)V"
 
         const val createButtonHook =
             "invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, $NAVIGATION" +
-            "->" +
-            "hideCreateButton(Landroid/view/View;)V"
+                    "->" +
+                    "hideCreateButton(Landroid/view/View;)V"
     }
 }

src/main/kotlin/app/revanced/patches/youtube/navigation/shortsnavbar/patch/ShortsNavBarPatch.kt

@@ -16,8 +16,8 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.shared.fingerprints.PivotBarCreateButtonViewFingerprint
+import app.revanced.patches.youtube.utils.fingerprints.PivotBarCreateButtonViewFingerprint
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.navigation.shortsnavbar.fingerprints.NavigationEndpointFingerprint
 import app.revanced.patches.youtube.navigation.shortsnavbar.fingerprints.ReelWatchBundleFingerprint
 import app.revanced.patches.youtube.navigation.shortsnavbar.fingerprints.ReelWatchEndpointFingerprint
@@ -64,16 +64,21 @@ class ShortsNavBarPatch : BytecodePatch(
                 .toMethodWalker(it.method)
                 .nextMethod(it.scanResult.patternScanResult!!.endIndex, true)
                 .getMethod() as MutableMethod
-            ).apply {
-                addInstruction(
-                    0,
-                    "invoke-static {}, $NAVIGATION->hideShortsPlayerNavBar()V"
-                )
-            }
+                    ).apply {
+                    addInstruction(
+                        0,
+                        "invoke-static {}, $NAVIGATION->hideShortsPlayerNavBar()V"
+                    )
+                }
         } ?: return ReelWatchBundleFingerprint.toErrorResult()
 
         ReelWatchEndpointParentFingerprint.result?.let { parentResult ->
-            ReelWatchEndpointFingerprint.also { it.resolve(context, parentResult.classDef) }.result?.mutableMethod?.addInstruction(
+            ReelWatchEndpointFingerprint.also {
+                it.resolve(
+                    context,
+                    parentResult.classDef
+                )
+            }.result?.mutableMethod?.addInstruction(
                 0,
                 "sput-object p1, $NAVIGATION->shortsContext:Landroid/content/Context;"
             ) ?: return ReelWatchEndpointFingerprint.toErrorResult()
@@ -82,7 +87,7 @@ class ShortsNavBarPatch : BytecodePatch(
         NavigationEndpointFingerprint.result?.let { result ->
             val navigationEndpointMethod = result.mutableMethod
 
-            with (navigationEndpointMethod.implementation!!.instructions) {
+            with(navigationEndpointMethod.implementation!!.instructions) {
                 filter { instruction ->
                     val fieldReference =
                         (instruction as? ReferenceInstruction)?.reference as? FieldReference

src/main/kotlin/app/revanced/patches/youtube/navigation/tabletnavbar/patch/TabletNavigationBarPatch.kt

@@ -13,7 +13,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.navigation.tabletnavbar.fingerprints.PivotBarChangedFingerprint
 import app.revanced.patches.youtube.navigation.tabletnavbar.fingerprints.PivotBarStyleFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
@@ -40,7 +40,7 @@ class TabletNavigationBarPatch : BytecodePatch(
         ).forEach {
             it.result?.insertHook() ?: return it.toErrorResult()
         }
-        
+
         /**
          * Add settings
          */
@@ -55,10 +55,12 @@ class TabletNavigationBarPatch : BytecodePatch(
 
         return PatchResultSuccess()
     }
+
     companion object {
         private fun MethodFingerprintResult.insertHook() {
             val targetIndex = scanResult.patternScanResult!!.startIndex + 1
-            val register = mutableMethod.getInstruction<OneRegisterInstruction>(targetIndex).registerA
+            val register =
+                mutableMethod.getInstruction<OneRegisterInstruction>(targetIndex).registerA
 
             mutableMethod.addInstructions(
                 targetIndex + 1, """

src/main/kotlin/app/revanced/patches/youtube/overlaybutton/autorepeat/fingerprints/VideoEndFingerprint.kt

@@ -8,5 +8,5 @@ object VideoEndFingerprint : MethodFingerprint(
     returnType = "V",
     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
     parameters = listOf(),
-    customFingerprint = { it, _ -> it.implementation!!.instructions.count() == 3 && it.annotations.isEmpty()}
+    customFingerprint = { it, _ -> it.implementation!!.instructions.count() == 3 && it.annotations.isEmpty() }
 )

src/main/kotlin/app/revanced/patches/youtube/overlaybutton/autorepeat/patch/AutoRepeatPatch.kt

@@ -13,8 +13,11 @@ import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.youtube.overlaybutton.autorepeat.fingerprints.*
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
+import app.revanced.patches.youtube.overlaybutton.autorepeat.fingerprints.AutoNavInformerFingerprint
+import app.revanced.patches.youtube.overlaybutton.autorepeat.fingerprints.RepeatListenerFingerprint
+import app.revanced.patches.youtube.overlaybutton.autorepeat.fingerprints.VideoEndFingerprint
+import app.revanced.patches.youtube.overlaybutton.autorepeat.fingerprints.VideoEndParentFingerprint
 import app.revanced.util.integrations.Constants.UTILS_PATH
 import app.revanced.util.integrations.Constants.VIDEO_PATH
 import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
@@ -33,7 +36,7 @@ class AutoRepeatPatch : BytecodePatch(
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
         VideoEndParentFingerprint.result?.classDef?.let { classDef ->
-            VideoEndFingerprint.also {it.resolve(context, classDef) }.result?.let {
+            VideoEndFingerprint.also { it.resolve(context, classDef) }.result?.let {
                 it.mutableMethod.apply {
                     addInstructionsWithLabels(
                         0, """

src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/patch/OverlayButtonsPatch.kt

@@ -10,7 +10,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.overlaybutton.autorepeat.patch.AutoRepeatPatch
 import app.revanced.patches.youtube.utils.overridespeed.patch.OverrideSpeedHookPatch
 import app.revanced.patches.youtube.utils.playercontrols.patch.PlayerControlsPatch
@@ -94,7 +94,11 @@ class OverlayButtonsPatch : ResourcePatch {
         /**
          * Merge xml nodes from the host to their real xml files
          */
-        context.copyXmlNode("youtube/overlaybuttons/host", "layout/youtube_controls_bottom_ui_container.xml", "android.support.constraint.ConstraintLayout")
+        context.copyXmlNode(
+            "youtube/overlaybuttons/host",
+            "layout/youtube_controls_bottom_ui_container.xml",
+            "android.support.constraint.ConstraintLayout"
+        )
 
         context.xmlEditor["res/layout/youtube_controls_bottom_ui_container.xml"].use { editor ->
             editor.file.doRecursively loop@{
@@ -108,7 +112,12 @@ class OverlayButtonsPatch : ResourcePatch {
                 }
 
                 // Adjust Fullscreen Button size and padding
-                val padding = "0.0dip" to arrayOf("paddingLeft", "paddingRight", "paddingTop", "paddingBottom")
+                val padding = "0.0dip" to arrayOf(
+                    "paddingLeft",
+                    "paddingRight",
+                    "paddingTop",
+                    "paddingBottom"
+                )
                 val size = "45.0dip" to arrayOf("layout_width", "layout_height")
                 it.getAttributeNode("android:id")?.let { attribute ->
                     if (attribute.textContent == "@id/fullscreen_button") {

src/main/kotlin/app/revanced/patches/youtube/player/autoplaybutton/patch/HideAutoplayButtonPatch.kt

@@ -13,8 +13,8 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.shared.fingerprints.LayoutConstructorFingerprint
+import app.revanced.patches.youtube.utils.fingerprints.LayoutConstructorFingerprint
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.AutoNavPreviewStub
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
@@ -44,10 +44,14 @@ class HideAutoplayButtonPatch : BytecodePatch(
 
         LayoutConstructorFingerprint.result?.let {
             it.mutableMethod.apply {
-                val dummyRegister = getInstruction<OneRegisterInstruction>(getStringIndex("1.0x")).registerA
+                val dummyRegister =
+                    getInstruction<OneRegisterInstruction>(getStringIndex("1.0x")).registerA
                 val insertIndex = getWideLiteralIndex(AutoNavPreviewStub)
 
-                val branchIndex = implementation!!.instructions.subList(insertIndex + 1, implementation!!.instructions.size - 1).indexOfFirst { instruction ->
+                val branchIndex = implementation!!.instructions.subList(
+                    insertIndex + 1,
+                    implementation!!.instructions.size - 1
+                ).indexOfFirst { instruction ->
                     ((instruction as? ReferenceInstruction)?.reference as? MethodReference)?.name == "addOnLayoutChangeListener"
                 } + 2
 

src/main/kotlin/app/revanced/patches/youtube/player/captionsbutton/patch/HideCaptionsButtonPatch.kt

@@ -12,8 +12,8 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.fingerprints.SubtitleButtonControllerFingerprint
+import app.revanced.patches.youtube.utils.fingerprints.SubtitleButtonControllerFingerprint
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.PLAYER
 import org.jf.dexlib2.Opcode

src/main/kotlin/app/revanced/patches/youtube/player/castbutton/patch/HideCastButtonPatch.kt

@@ -11,7 +11,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.player.castbutton.fingerprints.CastButtonFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.PLAYER

src/main/kotlin/app/revanced/patches/youtube/player/collapsebutton/patch/HideCollapseButtonPatch.kt

@@ -9,7 +9,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.playerbutton.patch.PlayerButtonPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 

src/main/kotlin/app/revanced/patches/youtube/player/customspeedoverlay/patch/CustomSpeedOverlayPatch.kt

@@ -13,7 +13,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.player.customspeedoverlay.fingerprints.SpeedOverlayHookFingerprint
 import app.revanced.patches.youtube.player.customspeedoverlay.fingerprints.YouTubeTextViewFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch

src/main/kotlin/app/revanced/patches/youtube/player/endscreencards/patch/HideEndScreenCardsPatch.kt

@@ -13,7 +13,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.player.endscreencards.fingerprints.LayoutCircleFingerprint
 import app.revanced.patches.youtube.player.endscreencards.fingerprints.LayoutIconFingerprint
 import app.revanced.patches.youtube.player.endscreencards.fingerprints.LayoutVideoFingerprint
@@ -45,10 +45,15 @@ class HideEndScreenCardsPatch : BytecodePatch(
             val index = scanResult.patternScanResult!!.endIndex
             mutableMethod.apply {
                 val register = this.getInstruction<OneRegisterInstruction>(index).registerA
-                implementation!!.injectHideCall(index + 1, register, "layout/PlayerPatch", "hideEndScreen")
+                implementation!!.injectHideCall(
+                    index + 1,
+                    register,
+                    "layout/PlayerPatch",
+                    "hideEndScreen"
+                )
             }
         }
-        
+
         listOf(
             LayoutCircleFingerprint,
             LayoutIconFingerprint,

src/main/kotlin/app/revanced/patches/youtube/player/filmstripoverlay/fingerprints/TimeBarOnClickListenerFingerprint.kt

@@ -6,5 +6,9 @@ import app.revanced.util.bytecode.isWideLiteralExists
 
 object TimeBarOnClickListenerFingerprint : MethodFingerprint(
     returnType = "V",
-    customFingerprint = { it, _ -> it.definingClass.endsWith("YouTubeControlsOverlay;") && it.isWideLiteralExists(WatchWhileTimeBarOverlayStub) }
+    customFingerprint = { it, _ ->
+        it.definingClass.endsWith("YouTubeControlsOverlay;") && it.isWideLiteralExists(
+            WatchWhileTimeBarOverlayStub
+        )
+    }
 )

src/main/kotlin/app/revanced/patches/youtube/player/filmstripoverlay/patch/HideFilmstripOverlayPatch.kt

@@ -15,8 +15,12 @@ import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.youtube.player.filmstripoverlay.fingerprints.*
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
+import app.revanced.patches.youtube.player.filmstripoverlay.fingerprints.FilmStripOverlayConfigFingerprint
+import app.revanced.patches.youtube.player.filmstripoverlay.fingerprints.FilmStripOverlayInteractionFingerprint
+import app.revanced.patches.youtube.player.filmstripoverlay.fingerprints.FilmStripOverlayParentFingerprint
+import app.revanced.patches.youtube.player.filmstripoverlay.fingerprints.FilmStripOverlayPreviewFingerprint
+import app.revanced.patches.youtube.player.filmstripoverlay.fingerprints.TimeBarOnClickListenerFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.WatchWhileTimeBarOverlayStub
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
@@ -52,7 +56,12 @@ class HideFilmstripOverlayPatch : BytecodePatch(
                 FilmStripOverlayInteractionFingerprint,
                 FilmStripOverlayPreviewFingerprint
             ).forEach { fingerprint ->
-                fingerprint.also { it.resolve(context, classDef) }.result?.mutableMethod?.injectHook()
+                fingerprint.also {
+                    it.resolve(
+                        context,
+                        classDef
+                    )
+                }.result?.mutableMethod?.injectHook()
                     ?: return fingerprint.toErrorResult()
             }
         } ?: return FilmStripOverlayParentFingerprint.toErrorResult()
@@ -89,6 +98,7 @@ class HideFilmstripOverlayPatch : BytecodePatch(
 
         return PatchResultSuccess()
     }
+
     private companion object {
         fun MutableMethod.injectHook() {
             addInstructionsWithLabels(

src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/patch/HapticFeedBackPatch.kt

@@ -15,8 +15,11 @@ import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.youtube.player.hapticfeedback.fingerprints.*
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
+import app.revanced.patches.youtube.player.hapticfeedback.fingerprints.MarkerHapticsFingerprint
+import app.revanced.patches.youtube.player.hapticfeedback.fingerprints.ScrubbingHapticsFingerprint
+import app.revanced.patches.youtube.player.hapticfeedback.fingerprints.SeekHapticsFingerprint
+import app.revanced.patches.youtube.player.hapticfeedback.fingerprints.ZoomHapticsFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.PLAYER
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction

src/main/kotlin/app/revanced/patches/youtube/player/infocards/patch/HideInfoCardsPatch.kt

@@ -13,7 +13,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.player.infocards.fingerprints.InfoCardsIncognitoFingerprint
 import app.revanced.patches.youtube.player.infocards.fingerprints.InfoCardsIncognitoParentFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
@@ -34,7 +34,8 @@ class HideInfoCardsPatch : BytecodePatch(
             InfoCardsIncognitoFingerprint.also { it.resolve(context, classDef) }.result?.let {
                 it.mutableMethod.apply {
                     val targetIndex = it.scanResult.patternScanResult!!.startIndex
-                    val targetRegister = getInstruction<TwoRegisterInstruction>(targetIndex).registerA
+                    val targetRegister =
+                        getInstruction<TwoRegisterInstruction>(targetIndex).registerA
 
                     addInstructions(
                         targetIndex + 1, """

src/main/kotlin/app/revanced/patches/youtube/player/livechatbutton/patch/HideLiveChatButtonPatch.kt

@@ -9,7 +9,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.playerbutton.patch.PlayerButtonPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 

src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/patch/HideMusicButtonPatch.kt

@@ -13,7 +13,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.player.musicbutton.fingerprints.MusicAppDeeplinkButtonFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.PLAYER
@@ -26,17 +26,19 @@ import app.revanced.util.integrations.Constants.PLAYER
 @Version("0.0.1")
 class HideMusicButtonPatch : BytecodePatch(
     listOf(MusicAppDeeplinkButtonFingerprint)
-){
+) {
     override fun execute(context: BytecodeContext): PatchResult {
 
         MusicAppDeeplinkButtonFingerprint.result?.let {
             it.mutableMethod.apply {
                 addInstructionsWithLabels(
-                    0, """
+                    0,
+                    """
                         invoke-static {}, $PLAYER->hideMusicButton()Z
                         move-result v0
                         if-nez v0, :hidden
-                        """, ExternalLabel("hidden", getInstruction(implementation!!.instructions.size - 1))
+                        """,
+                    ExternalLabel("hidden", getInstruction(implementation!!.instructions.size - 1))
                 )
             }
         } ?: return MusicAppDeeplinkButtonFingerprint.toErrorResult()

src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/fingerprints/HidePlayerButtonFingerprint.kt

@@ -2,6 +2,6 @@ package app.revanced.patches.youtube.player.playerbuttonbg.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 
-object HidePlayerButtonFingerprint : MethodFingerprint (
+object HidePlayerButtonFingerprint : MethodFingerprint(
     customFingerprint = { it, _ -> it.definingClass.endsWith("PlayerPatch;") && it.name == "hidePlayerButton" }
 )

src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt

@@ -11,7 +11,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.player.playerbuttonbg.fingerprints.HidePlayerButtonFingerprint
 import app.revanced.patches.youtube.utils.playerbutton.patch.PlayerButtonPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch

src/main/kotlin/app/revanced/patches/youtube/player/playeroverlayfilter/fingerprints/ScrimOverlayFingerprint.kt

@@ -5,5 +5,9 @@ import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.util.bytecode.isWideLiteralExists
 
 object ScrimOverlayFingerprint : MethodFingerprint(
-    customFingerprint = { it, _ -> it.definingClass.endsWith("YouTubeControlsOverlay;") && it.isWideLiteralExists(ScrimOverlay) }
+    customFingerprint = { it, _ ->
+        it.definingClass.endsWith("YouTubeControlsOverlay;") && it.isWideLiteralExists(
+            ScrimOverlay
+        )
+    }
 )

src/main/kotlin/app/revanced/patches/youtube/player/playeroverlayfilter/patch/PlayerOverlayFilterPatch.kt

@@ -13,7 +13,7 @@ import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.player.playeroverlayfilter.fingerprints.ScrimOverlayFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.ScrimOverlay

src/main/kotlin/app/revanced/patches/youtube/player/previousnextbutton/patch/HidePreviousNextButtonPatch.kt

@@ -9,7 +9,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.playerbutton.patch.PlayerButtonPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 

src/main/kotlin/app/revanced/patches/youtube/player/seekmessage/patch/SeekMessagePatch.kt

@@ -13,7 +13,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.player.seekmessage.fingerprints.SeekEduContainerFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch

src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/patch/HideSpeedOverlayPatch.kt

@@ -12,7 +12,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.player.speedoverlay.fingerprints.SpeedOverlayConfigFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.PLAYER

src/main/kotlin/app/revanced/patches/youtube/player/suggestactions/patch/SuggestedActionsPatch.kt

@@ -12,7 +12,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.player.suggestactions.fingerprints.SuggestedActionsFingerprint
 import app.revanced.patches.youtube.utils.litho.patch.LithoFilterPatch
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
@@ -35,12 +35,17 @@ class SuggestedActionsPatch : BytecodePatch(
     listOf(SuggestedActionsFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
-        SuggestedActionsFingerprint.result?.let{
+        SuggestedActionsFingerprint.result?.let {
             it.mutableMethod.apply {
                 val targetIndex = it.scanResult.patternScanResult!!.endIndex
                 val targetRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA
 
-                implementation!!.injectHideCall(targetIndex + 1, targetRegister, "layout/PlayerPatch", "hideSuggestedActions")
+                implementation!!.injectHideCall(
+                    targetIndex + 1,
+                    targetRegister,
+                    "layout/PlayerPatch",
+                    "hideSuggestedActions"
+                )
             }
         } ?: return SuggestedActionsFingerprint.toErrorResult()
 

src/main/kotlin/app/revanced/patches/youtube/player/watermark/fingerprints/HideWatermarkFingerprint.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-object HideWatermarkFingerprint : MethodFingerprint (
+object HideWatermarkFingerprint : MethodFingerprint(
     returnType = "V",
     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
     parameters = listOf("L", "L"),

src/main/kotlin/app/revanced/patches/youtube/player/watermark/fingerprints/HideWatermarkParentFingerprint.kt

@@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.AccessFlags
 
-object HideWatermarkParentFingerprint : MethodFingerprint (
+object HideWatermarkParentFingerprint : MethodFingerprint(
     returnType = "L",
     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
     strings = listOf("player_overlay_in_video_programming")

src/main/kotlin/app/revanced/patches/youtube/player/watermark/patch/HideChannelWatermarkPatch.kt

@@ -14,7 +14,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 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.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.player.watermark.fingerprints.HideWatermarkFingerprint
 import app.revanced.patches.youtube.player.watermark.fingerprints.HideWatermarkParentFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
@@ -33,7 +33,12 @@ class HideChannelWatermarkBytecodePatch : BytecodePatch(
     override fun execute(context: BytecodeContext): PatchResult {
 
         HideWatermarkParentFingerprint.result?.let { parentResult ->
-            HideWatermarkFingerprint.also { it.resolve(context, parentResult.classDef) }.result?.let {
+            HideWatermarkFingerprint.also {
+                it.resolve(
+                    context,
+                    parentResult.classDef
+                )
+            }.result?.let {
                 it.mutableMethod.apply {
                     val insertIndex = it.scanResult.patternScanResult!!.endIndex
                     val register = getInstruction<TwoRegisterInstruction>(insertIndex).registerA

src/main/kotlin/app/revanced/patches/youtube/seekbar/seekbar/patch/HideSeekbarPatch.kt

@@ -14,9 +14,9 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.shared.fingerprints.SeekbarFingerprint
-import app.revanced.patches.shared.fingerprints.SeekbarOnDrawFingerprint
+import app.revanced.patches.youtube.utils.fingerprints.SeekbarFingerprint
+import app.revanced.patches.youtube.utils.fingerprints.SeekbarOnDrawFingerprint
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.seekbar.seekbarcolor.resource.patch.SeekbarColorResourcePatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.SEEKBAR

src/main/kotlin/app/revanced/patches/youtube/seekbar/seekbarcolor/fingerprints/ControlsOverlayStyleFingerprint.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.youtube.seekbar.seekbarcolor.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.Opcode
+
+object ControlsOverlayStyleFingerprint : MethodFingerprint(
+    opcodes = listOf(Opcode.IGET_BOOLEAN),
+    strings = listOf("supportsNextPrevious", "Missing required properties:")
+)

src/main/kotlin/app/revanced/patches/youtube/seekbar/seekbarcolor/fingerprints/ProgressColorFingerprint.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.seekbar.seekbarcolor.bytecode.fingerprints
+package app.revanced.patches.youtube.seekbar.seekbarcolor.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.Opcode

src/main/kotlin/app/revanced/patches/youtube/seekbar/seekbarcolor/fingerprints/SeekbarColorFingerprint.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.seekbar.seekbarcolor.bytecode.fingerprints
+package app.revanced.patches.youtube.seekbar.seekbarcolor.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.InlineTimeBarColorizedBarPlayedColorDark

src/main/kotlin/app/revanced/patches/youtube/seekbar/seekbarcolor/patch/SeekbarColorPatch.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.seekbar.seekbarcolor.bytecode.patch
+package app.revanced.patches.youtube.seekbar.seekbarcolor.patch
 
 import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
@@ -10,23 +10,25 @@ 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.PatchResult
+import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.shared.fingerprints.ControlsOverlayStyleFingerprint
-import app.revanced.patches.youtube.seekbar.seekbarcolor.bytecode.fingerprints.ProgressColorFingerprint
-import app.revanced.patches.youtube.seekbar.seekbarcolor.bytecode.fingerprints.SeekbarColorFingerprint
-import app.revanced.patches.youtube.seekbar.seekbarcolor.resource.patch.SeekbarColorResourcePatch
+import app.revanced.patches.youtube.seekbar.seekbarcolor.fingerprints.ControlsOverlayStyleFingerprint
+import app.revanced.patches.youtube.seekbar.seekbarcolor.fingerprints.ProgressColorFingerprint
+import app.revanced.patches.youtube.seekbar.seekbarcolor.fingerprints.SeekbarColorFingerprint
+import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.litho.patch.LithoThemePatch
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.InlineTimeBarColorizedBarPlayedColorDark
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.InlineTimeBarPlayedNotHighlightedColor
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
+import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch.Companion.contexts
 import app.revanced.util.bytecode.getWideLiteralIndex
 import app.revanced.util.integrations.Constants.SEEKBAR
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import org.w3c.dom.Element
 
 @Patch
 @Name("custom-seekbar-color")
@@ -34,7 +36,6 @@ import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 @DependsOn(
     [
         LithoThemePatch::class,
-        SeekbarColorResourcePatch::class,
         SettingsPatch::class,
         SharedResourceIdPatch::class,
     ]
@@ -56,7 +57,12 @@ class SeekbarColorPatch : BytecodePatch(
         } ?: return SeekbarColorFingerprint.toErrorResult()
 
         ControlsOverlayStyleFingerprint.result?.let { parentResult ->
-            ProgressColorFingerprint.also { it.resolve(context, parentResult.classDef) }.result?.mutableMethod?.addInstructions(
+            ProgressColorFingerprint.also {
+                it.resolve(
+                    context,
+                    parentResult.classDef
+                )
+            }.result?.mutableMethod?.addInstructions(
                 0, """
                     invoke-static {p1}, $SEEKBAR->getSeekbarClickedColorValue(I)I
                     move-result p1
@@ -66,6 +72,20 @@ class SeekbarColorPatch : BytecodePatch(
 
         LithoThemePatch.injectCall("$SEEKBAR->getLithoColor(I)I")
 
+        contexts.xmlEditor["res/drawable/resume_playback_progressbar_drawable.xml"].use {
+            val layerList = it.file.getElementsByTagName("layer-list").item(0) as Element
+            val progressNode = layerList.getElementsByTagName("item").item(1) as Element
+            if (!progressNode.getAttributeNode("android:id").value.endsWith("progress")) {
+                return PatchResultError("Could not find progress bar")
+            }
+            val scaleNode = progressNode.getElementsByTagName("scale").item(0) as Element
+            val shapeNode = scaleNode.getElementsByTagName("shape").item(0) as Element
+            val replacementNode = it.file.createElement(
+                "app.revanced.integrations.patches.utils.ProgressBarDrawable"
+            )
+            scaleNode.replaceChild(replacementNode, shapeNode)
+        }
+
         /**
          * Add settings
          */