refactor(youtube): move to correct package

Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>
2023-02-20 05:14:59 +01:00
parent fd62566cbf
commit 939f8b531a
89 changed files with 298 additions and 253 deletions
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.buttons.annotations
+package app.revanced.patches.youtube.layout.buttons.action.annotations

 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.buttons.patch
+package app.revanced.patches.youtube.layout.buttons.action.patch

 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -13,7 +13,7 @@ import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
 import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.buttons.annotations.HideButtonsCompatibility
+import app.revanced.patches.youtube.layout.buttons.action.annotations.HideButtonsCompatibility
 import app.revanced.patches.youtube.misc.litho.filter.patch.LithoFilterPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch

@@ -71,7 +71,7 @@ class HideButtonsPatch : ResourcePatch {
                        false,
                        StringResource("revanced_hide_share_button_summary_on", "Share button is hidden"),
                        StringResource("revanced_hide_share_button_summaryoff", "Share button is shown")
-                    ),
+                    )
                ),
                StringResource("revanced_hide_buttons_summary", "Hide or show buttons under videos")
            )
@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.buttons.autoplay.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.49.37", "18.03.36")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class AutoplayButtonCompatibility
@@ -0,0 +1,20 @@
+package app.revanced.patches.youtube.layout.buttons.autoplay.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+object AutoNavInformerFingerprint : MethodFingerprint(
+    "Z",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    opcodes = listOf(
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+    ),
+    customFingerprint = { it.definingClass.endsWith("WillAutonavInformer;") }
+)
@@ -0,0 +1,10 @@
+package app.revanced.patches.youtube.layout.buttons.autoplay.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object LayoutConstructorFingerprint : MethodFingerprint(
+    strings = listOf("1.0x"),
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("YouTubeControlsOverlay;")
+    }
+)
@@ -0,0 +1,92 @@
+package app.revanced.patches.youtube.layout.buttons.autoplay.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.util.smali.ExternalLabel
+import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
+import app.revanced.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.layout.buttons.autoplay.annotations.AutoplayButtonCompatibility
+import app.revanced.patches.youtube.layout.buttons.autoplay.fingerprints.AutoNavInformerFingerprint
+import app.revanced.patches.youtube.layout.buttons.autoplay.fingerprints.LayoutConstructorFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import org.jf.dexlib2.iface.instruction.Instruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+import org.jf.dexlib2.iface.reference.MethodReference
+
+@Patch
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class, ResourceMappingPatch::class])
+@Name("hide-autoplay-button")
+@Description("Hides the autoplay button in the video player.")
+@AutoplayButtonCompatibility
+@Version("0.0.1")
+class HideAutoplayButtonPatch : BytecodePatch(
+    listOf(
+        LayoutConstructorFingerprint, AutoNavInformerFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_hide_autoplay_button",
+                StringResource("revanced_hide_autoplay_button_title", "Hide autoplay button"),
+                true,
+                StringResource("revanced_hide_autoplay_button_summary_on", "Autoplay button is hidden"),
+                StringResource("revanced_hide_autoplay_button_summary_off", "Autoplay button is shown")
+            )
+        )
+
+        val autoNavInformerMethod = AutoNavInformerFingerprint.result!!.mutableMethod
+
+        val layoutGenMethodResult = LayoutConstructorFingerprint.result!!
+        val layoutGenMethod = layoutGenMethodResult.mutableMethod
+        val layoutGenMethodInstructions = layoutGenMethod.implementation!!.instructions
+
+        // resolve the offsets such as ...
+        val autoNavPreviewStubId = ResourceMappingPatch.resourceMappings.single {
+            it.name == "autonav_preview_stub"
+        }.id
+        // where to insert the branch instructions and ...
+        val insertIndex = layoutGenMethodInstructions.indexOfFirst {
+            (it as? WideLiteralInstruction)?.wideLiteral == autoNavPreviewStubId
+        }
+        // where to branch away
+        val branchIndex = layoutGenMethodInstructions.subList(insertIndex + 1, layoutGenMethodInstructions.size - 1).indexOfFirst {
+            ((it as? ReferenceInstruction)?.reference as? MethodReference)?.name == "addOnLayoutChangeListener"
+        } + 2
+
+        val jumpInstruction = layoutGenMethodInstructions[insertIndex + branchIndex] as Instruction
+        layoutGenMethod.addInstructions(
+            insertIndex, """
+                invoke-static {}, Lapp/revanced/integrations/patches/HideAutoplayButtonPatch;->isButtonShown()Z
+                move-result v11
+                if-eqz v11, :hidden
+            """, listOf(ExternalLabel("hidden", jumpInstruction))
+        )
+
+        //force disable autoplay since it's hard to do without the button
+        autoNavInformerMethod.addInstructions(
+            0, """
+            invoke-static {}, Lapp/revanced/integrations/patches/HideAutoplayButtonPatch;->isButtonShown()Z
+            move-result v0
+            if-nez v0, :hidden
+            const/4 v0, 0x0
+            return v0
+            :hidden
+            nop
+        """
+        )
+
+        return PatchResultSuccess()
+    }
+}
@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.buttons.captions.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.49.37", "18.03.36")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class HideCaptionsButtonCompatibility
@@ -0,0 +1,56 @@
+package app.revanced.patches.youtube.layout.buttons.captions.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.layout.autocaptions.fingerprints.SubtitleButtonControllerFingerprint
+import app.revanced.patches.youtube.layout.buttons.captions.annotations.HideCaptionsButtonCompatibility
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import org.jf.dexlib2.Opcode
+
+@Patch
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
+@Name("hide-captions-button")
+@Description("Hides the captions button on video player.")
+@HideCaptionsButtonCompatibility
+@Version("0.0.1")
+class HideCaptionsButtonPatch : BytecodePatch(listOf(
+    SubtitleButtonControllerFingerprint,
+)) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_hide_captions_button",
+                StringResource("revanced_hide_captions_button_title", "Hide captions button"),
+                false,
+                StringResource("revanced_hide_captions_button_summary_on", "Captions button is hidden"),
+                StringResource("revanced_hide_captions_button_summary_off", "Captions button is shown")
+            )
+        )
+
+        val subtitleButtonControllerMethod = SubtitleButtonControllerFingerprint.result!!.mutableMethod
+
+        // Due to previously applied patches, scanResult index cannot be used in this context
+        val igetBooleanIndex = subtitleButtonControllerMethod.implementation!!.instructions.indexOfFirst {
+            it.opcode == Opcode.IGET_BOOLEAN
+        }
+
+        subtitleButtonControllerMethod.addInstructions(
+            igetBooleanIndex + 1, """
+                invoke-static {v0}, Lapp/revanced/integrations/patches/HideCaptionsButtonPatch;->hideCaptionsButton(Landroid/widget/ImageView;)V
+            """
+        )
+
+        return PatchResultSuccess()
+    }
+}
@@ -0,0 +1,9 @@
+package app.revanced.patches.youtube.layout.buttons.cast.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.google.android.youtube")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class CastButtonCompatibility
@@ -0,0 +1,57 @@
+package app.revanced.patches.youtube.layout.buttons.cast.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+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.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.layout.buttons.cast.annotations.CastButtonCompatibility
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+
+@Patch
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
+@Name("hide-cast-button")
+@Description("Hides the cast button in the video player.")
+@CastButtonCompatibility
+@Version("0.0.1")
+class HideCastButtonPatch : BytecodePatch() {
+    override fun execute(context: BytecodeContext): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_hide_cast_button",
+                StringResource("revanced_hide_cast_button_title", "Hide cast button"),
+                true,
+                StringResource("revanced_hide_cast_button_summary_on", "Cast button is hidden"),
+                StringResource("revanced_hide_cast_button_summary_off", "Cast button is shown")
+            )
+        )
+
+        with(
+            context.findClass("MediaRouteButton")
+                ?: return PatchResultError("MediaRouteButton class not found.")
+        ) {
+            with(
+                mutableClass.methods.find { it.name == "setVisibility" }
+                    ?: return PatchResultError("setVisibility method not found.")
+            ) {
+                addInstructions(
+                    0, """
+                            invoke-static {p1}, Lapp/revanced/integrations/patches/HideCastButtonPatch;->getCastButtonOverrideV2(I)I
+                            move-result p1
+                        """
+                )
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+}
@@ -0,0 +1,11 @@
+package app.revanced.patches.youtube.layout.buttons.pivotbar.create.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.Opcode
+
+object PivotBarCreateButtonViewFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.MOVE_OBJECT,
+        Opcode.INVOKE_DIRECT_RANGE, // unique instruction anchor
+    )
+)
@@ -0,0 +1,79 @@
+package app.revanced.patches.youtube.layout.buttons.pivotbar.create.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.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.mapping.misc.patch.ResourceMappingPatch
+import app.revanced.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.layout.buttons.pivotbar.create.fingerprints.PivotBarCreateButtonViewFingerprint
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.annotations.PivotBarCompatibility
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.fingerprints.InitializeButtonsFingerprint
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.patch.ResolvePivotBarFingerprintsPatch
+import app.revanced.patches.youtube.layout.buttons.pivotbar.utils.InjectionUtils.REGISTER_TEMPLATE_REPLACEMENT
+import app.revanced.patches.youtube.layout.buttons.pivotbar.utils.InjectionUtils.injectHook
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import org.jf.dexlib2.Opcode
+
+@Patch
+@DependsOn([IntegrationsPatch::class, ResourceMappingPatch::class, SettingsPatch::class, ResolvePivotBarFingerprintsPatch::class])
+@Name("hide-create-button")
+@Description("Hides the create button in the navigation bar.")
+@PivotBarCompatibility
+@Version("0.0.1")
+class CreateButtonRemoverPatch : BytecodePatch() {
+    private companion object {
+        const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/HideCreateButtonPatch;"
+    }
+
+    override fun execute(context: BytecodeContext): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_hide_create_button",
+                StringResource("revanced_hide_create_button_title", "Hide create button"),
+                true,
+                StringResource("revanced_hide_create_button_summary_on", "Create button is hidden"),
+                StringResource("revanced_hide_create_button_summary_off", "Create button is shown")
+            )
+        )
+
+        /*
+         * Resolve fingerprints
+         */
+
+        InitializeButtonsFingerprint.result!!.let {
+            if (!PivotBarCreateButtonViewFingerprint.resolve(context, it.mutableMethod, it.mutableClass))
+                return PivotBarCreateButtonViewFingerprint.toErrorResult()
+        }
+
+        PivotBarCreateButtonViewFingerprint.result!!.apply {
+            val insertIndex = mutableMethod.implementation!!.instructions.let {
+                val scanStart = scanResult.patternScanResult!!.endIndex
+
+                scanStart + it.subList(scanStart, it.size - 1).indexOfFirst { instruction ->
+                    instruction.opcode == Opcode.INVOKE_STATIC
+                }
+            }
+
+            /*
+             * Inject hooks
+             */
+            val hook = "invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, " +
+                    "$INTEGRATIONS_CLASS_DESCRIPTOR->hideCreateButton(Landroid/view/View;)V"
+
+            mutableMethod.injectHook(hook, insertIndex)
+        }
+
+
+        return PatchResultSuccess()
+    }
+}
@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.buttons.pivotbar.shared.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.49.37", "18.03.36")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class PivotBarCompatibility
@@ -0,0 +1,15 @@
+package app.revanced.patches.youtube.layout.buttons.pivotbar.shared.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.patch.ResolvePivotBarFingerprintsPatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+
+object InitializeButtonsFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.implementation?.instructions?.any {
+            it.opcode == Opcode.CONST && (it as WideLiteralInstruction).wideLiteral ==
+                    ResolvePivotBarFingerprintsPatch.imageOnlyTabResourceId
+        } == true
+    }
+)
@@ -0,0 +1,10 @@
+package app.revanced.patches.youtube.layout.buttons.pivotbar.shared.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object PivotBarConstructorFingerprint : MethodFingerprint(
+    access = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    strings = listOf("com.google.android.apps.youtube.app.endpoint.flags")
+)
@@ -0,0 +1,45 @@
+package app.revanced.patches.youtube.layout.buttons.pivotbar.shared.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patches.music.layout.upgradebutton.fingerprints.PivotBarConstructorFingerprint
+import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.annotations.PivotBarCompatibility
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.fingerprints.InitializeButtonsFingerprint
+
+@DependsOn([ResourceMappingPatch::class])
+@PivotBarCompatibility
+@Description("Resolves necessary fingerprints.")
+@Version("0.0.1")
+class ResolvePivotBarFingerprintsPatch : BytecodePatch(
+    listOf(PivotBarConstructorFingerprint)
+) {
+    internal companion object {
+        var imageOnlyTabResourceId: Long = -1
+    }
+
+    override fun execute(context: BytecodeContext): PatchResult {
+        // imageOnlyTabResourceId is used in InitializeButtonsFingerprint fingerprint
+        ResourceMappingPatch.resourceMappings.find { it.type == "layout" && it.name == "image_only_tab" }
+            ?.let { imageOnlyTabResourceId = it.id } ?: return PatchResultError("Failed to find resource")
+
+        PivotBarConstructorFingerprint.result?.let {
+            // Resolve InitializeButtonsFingerprint on the class of the method
+            // which PivotBarConstructorFingerprint resolved to
+            if (!InitializeButtonsFingerprint.resolve(
+                    context,
+                    it.classDef
+                )
+            ) return InitializeButtonsFingerprint.toErrorResult()
+        } ?: return PivotBarConstructorFingerprint.toErrorResult()
+        return PatchResultSuccess()
+    }
+}
@@ -0,0 +1,15 @@
+package app.revanced.patches.youtube.layout.buttons.pivotbar.shorts.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.Opcode
+
+object PivotBarEnumFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IF_NEZ, // target reference
+        Opcode.SGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+    )
+)
@@ -0,0 +1,12 @@
+package app.revanced.patches.youtube.layout.buttons.pivotbar.shorts.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.Opcode
+
+object PivotBarShortsButtonViewFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.INVOKE_VIRTUAL_RANGE,
+        Opcode.MOVE_RESULT_OBJECT, // target reference
+        Opcode.GOTO,
+    )
+)
@@ -0,0 +1,93 @@
+package app.revanced.patches.youtube.layout.buttons.pivotbar.shorts.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.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.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.annotations.PivotBarCompatibility
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.fingerprints.InitializeButtonsFingerprint
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.patch.ResolvePivotBarFingerprintsPatch
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shorts.fingerprints.PivotBarEnumFingerprint
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shorts.fingerprints.PivotBarShortsButtonViewFingerprint
+import app.revanced.patches.youtube.layout.buttons.pivotbar.utils.InjectionUtils.REGISTER_TEMPLATE_REPLACEMENT
+import app.revanced.patches.youtube.layout.buttons.pivotbar.utils.InjectionUtils.injectHook
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+
+@Patch
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class, ResolvePivotBarFingerprintsPatch::class])
+@Name("hide-shorts-button")
+@Description("Hides the shorts button on the navigation bar.")
+@PivotBarCompatibility
+@Version("0.0.1")
+class ShortsButtonRemoverPatch : BytecodePatch() {
+    private companion object {
+        const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/HideShortsButtonPatch;"
+    }
+
+    override fun execute(context: BytecodeContext): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_hide_shorts_button",
+                StringResource("revanced_hide_shorts_button_title", "Hide shorts button"),
+                true,
+                StringResource("revanced_hide_shorts_button_summary_on", "Shorts button is hidden"),
+                StringResource("revanced_hide_shorts_button_summary_off", "Shorts button is shown")
+            )
+        )
+
+        /*
+         * Resolve fingerprints
+         */
+
+        val initializeButtonsResult = InitializeButtonsFingerprint.result!!
+
+        val fingerprintResults =
+            arrayOf(PivotBarEnumFingerprint, PivotBarShortsButtonViewFingerprint)
+                .onEach {
+                    if (!it.resolve(
+                            context,
+                            initializeButtonsResult.mutableMethod,
+                            initializeButtonsResult.mutableClass
+                        )
+                    )
+                        return it.toErrorResult()
+                }
+                .map { it.result!!.scanResult.patternScanResult!! }
+
+
+        val enumScanResult = fingerprintResults[0]
+        val buttonViewResult = fingerprintResults[1]
+
+        val enumHookInsertIndex = enumScanResult.startIndex + 2
+        val buttonHookInsertIndex = buttonViewResult.endIndex
+
+        /*
+         * Inject hooks
+         */
+
+        val enumHook = "sput-object v$REGISTER_TEMPLATE_REPLACEMENT, " +
+                "$INTEGRATIONS_CLASS_DESCRIPTOR->lastPivotTab:Ljava/lang/Enum;"
+        val buttonHook = "invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, " +
+                "$INTEGRATIONS_CLASS_DESCRIPTOR->hideShortsButton(Landroid/view/View;)V"
+
+        // Inject bottom to top to not mess up the indices
+        mapOf(
+            buttonHook to buttonHookInsertIndex,
+            enumHook to enumHookInsertIndex
+        ).forEach { (hook, insertIndex) ->
+            initializeButtonsResult.mutableMethod.injectHook(hook, insertIndex)
+        }
+
+        return PatchResultSuccess()
+    }
+}
@@ -0,0 +1,30 @@
+package app.revanced.patches.youtube.layout.buttons.pivotbar.utils
+
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import org.jf.dexlib2.Opcode.MOVE_RESULT_OBJECT
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+internal object InjectionUtils {
+    const val REGISTER_TEMPLATE_REPLACEMENT: String = "REGISTER_INDEX"
+
+    /**
+     * Injects an instruction into insertIndex of the hook.
+     * @param hook The hook to insert.
+     * @param insertIndex The index to insert the instruction at.
+     * [MOVE_RESULT_OBJECT] has to be the previous instruction before [insertIndex].
+     */
+    fun MutableMethod.injectHook(hook: String, insertIndex: Int) {
+        val injectTarget = this
+
+        // Register to pass to the hook
+        val registerIndex = insertIndex - 1 // MOVE_RESULT_OBJECT is always the previous instruction
+        val register = (injectTarget.instruction(registerIndex) as OneRegisterInstruction).registerA
+
+        injectTarget.addInstruction(
+            insertIndex,
+            hook.replace("REGISTER_INDEX", register.toString()),
+        )
+    }
+}
@@ -0,0 +1,12 @@
+package app.revanced.patches.youtube.layout.buttons.player.background.annotations
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.google.android.youtube", arrayOf("17.49.37", "18.03.36"))
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class PlayerButtonBackgroundCompatibility
@@ -0,0 +1,38 @@
+package app.revanced.patches.youtube.layout.buttons.player.background.patch
+
+import app.revanced.extensions.doRecursively
+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.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.youtube.layout.buttons.player.background.annotations.PlayerButtonBackgroundCompatibility
+import org.w3c.dom.Element
+
+@Patch
+@Name("remove-player-button-background")
+@Description("Removes the background from the video player buttons.")
+@PlayerButtonBackgroundCompatibility
+@Version("0.0.1")
+class PlayerButtonBackgroundPatch : ResourcePatch {
+    private companion object {
+        const val RESOURCE_FILE_PATH = "res/drawable/player_button_circle_background.xml"
+    }
+    
+    override fun execute(context: ResourceContext): PatchResult {
+        context.xmlEditor[RESOURCE_FILE_PATH].use { editor ->
+            editor.file.doRecursively node@{ node ->
+                if (node !is Element) return@node
+
+                node.getAttributeNode("android:color")?.let { attribute ->
+                    attribute.textContent = "@android:color/transparent"
+                }
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+}
@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.buttons.player.hide.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf()
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class HidePlayerButtonsCompatibility
@@ -0,0 +1,9 @@
+package app.revanced.patches.youtube.layout.buttons.player.hide.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.Opcode
+
+object PlayerControlsVisibilityModelFingerprint : MethodFingerprint(
+    opcodes = listOf(Opcode.INVOKE_DIRECT_RANGE),
+    strings = listOf("hasNext", "hasPrevious", "Missing required properties:")
+)
@@ -0,0 +1,74 @@
+package app.revanced.patches.youtube.layout.buttons.player.hide.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.layout.buttons.player.hide.annotations.HidePlayerButtonsCompatibility
+import app.revanced.patches.youtube.layout.buttons.player.hide.fingerprints.PlayerControlsVisibilityModelFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import org.jf.dexlib2.iface.instruction.formats.Instruction3rc
+
+@Patch
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
+@Name("hide-player-buttons")
+@Description("Adds the option to hide video player previous and next buttons.")
+@HidePlayerButtonsCompatibility
+@Version("0.0.1")
+class HidePlayerButtonsPatch : BytecodePatch(
+    listOf(PlayerControlsVisibilityModelFingerprint)
+) {
+    private object ParameterOffsets {
+        const val HAS_NEXT = 5
+    }
+
+    override fun execute(context: BytecodeContext): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_hide_player_buttons",
+                StringResource(
+                    "revanced_hide_player_buttons_title",
+                    "Hide previous & next video buttons"
+                ),
+                false,
+                StringResource(
+                    "revanced_hide_player_buttons_summary_on",
+                    "The buttons are hidden"
+                ),
+                StringResource(
+                    "revanced_hide_player_buttons_summary_off",
+                    "The buttons are shown"
+                )
+            )
+        )
+
+        PlayerControlsVisibilityModelFingerprint.result?.apply {
+            val callIndex = scanResult.patternScanResult!!.endIndex
+            val callInstruction = mutableMethod.instruction(callIndex) as Instruction3rc
+
+            // overriding this parameter register hides the previous and next buttons
+            val hasNextParameterRegister = callInstruction.startRegister + ParameterOffsets.HAS_NEXT
+
+            mutableMethod.addInstructions(
+                callIndex,
+                """
+                    invoke-static { }, Lapp/revanced/integrations/patches/HidePlayerButtonsPatch;->hideButtons()Z
+                    move-result v$hasNextParameterRegister
+                    xor-int/lit8 v$hasNextParameterRegister, v$hasNextParameterRegister, 1
+                """
+            )
+        } ?: return PlayerControlsVisibilityModelFingerprint.toErrorResult()
+        return PatchResultSuccess()
+    }
+}