feat(YouTube/Description components): Expand video description setting clicks chapter

src/main/kotlin/app/revanced/patches/youtube/player/descriptions/DescriptionComponentsPatch.kt

@@ -5,17 +5,18 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patches.shared.litho.LithoFilterPatch
-import app.revanced.patches.youtube.player.descriptions.fingerprints.EngagementPanelSubHeaderFingerprint
+import app.revanced.patches.youtube.player.descriptions.fingerprints.EngagementPanelTitleFingerprint
+import app.revanced.patches.youtube.player.descriptions.fingerprints.EngagementPanelTitleParentFingerprint
 import app.revanced.patches.youtube.player.descriptions.fingerprints.TextViewComponentFingerprint
 import app.revanced.patches.youtube.utils.compatibility.Constants.COMPATIBLE_PACKAGE
 import app.revanced.patches.youtube.utils.integrations.Constants.COMPONENTS_PATH
 import app.revanced.patches.youtube.utils.integrations.Constants.PLAYER_CLASS_DESCRIPTOR
-import app.revanced.patches.youtube.utils.playertype.PlayerTypeHookPatch
 import app.revanced.patches.youtube.utils.recyclerview.BottomSheetRecyclerViewPatch
-import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.settings.SettingsPatch
-import app.revanced.util.getTargetIndexReversed
+import app.revanced.util.getTargetIndex
 import app.revanced.util.getTargetIndexWithMethodReferenceName
+import app.revanced.util.getWalkerMethod
+import app.revanced.util.getWideLiteralInstructionIndex
 import app.revanced.util.patch.BaseBytecodePatch
 import app.revanced.util.resultOrThrow
 import com.android.tools.smali.dexlib2.Opcode
@@ -29,13 +30,11 @@ object DescriptionComponentsPatch : BaseBytecodePatch(
     dependencies = setOf(
         BottomSheetRecyclerViewPatch::class,
         LithoFilterPatch::class,
-        PlayerTypeHookPatch::class,
+        SettingsPatch::class
-        SettingsPatch::class,
-        SharedResourceIdPatch::class
     ),
     compatiblePackages = COMPATIBLE_PACKAGE,
     fingerprints = setOf(
-        EngagementPanelSubHeaderFingerprint,
+        EngagementPanelTitleParentFingerprint,
         TextViewComponentFingerprint
     )
 ) {
@@ -60,14 +59,18 @@ object DescriptionComponentsPatch : BaseBytecodePatch(
                 }
             }
 
-            EngagementPanelSubHeaderFingerprint.resultOrThrow().mutableMethod.apply {
+            EngagementPanelTitleFingerprint.resolve(
-                val instructionIndex = getTargetIndexReversed(Opcode.INVOKE_INTERFACE) + 1
+                context,
-                val viewRegister = getInstruction<OneRegisterInstruction>(instructionIndex).registerA
+                EngagementPanelTitleParentFingerprint.resultOrThrow().classDef
+            )
+            EngagementPanelTitleFingerprint.resultOrThrow().mutableMethod.apply {
+                val contentDescriptionIndex = getTargetIndexWithMethodReferenceName("setContentDescription")
+                val contentDescriptionRegister = getInstruction<FiveRegisterInstruction>(contentDescriptionIndex).registerD
 
                 addInstruction(
-                    instructionIndex + 1,
+                    contentDescriptionIndex,
-                    "invoke-static { v$viewRegister }, " +
+                    "invoke-static {v$contentDescriptionRegister}," +
-                            "$PLAYER_CLASS_DESCRIPTOR->engagementPanelSubHeaderViewLoaded(Landroid/view/View;)V",
+                            "$PLAYER_CLASS_DESCRIPTOR->setContentDescription(Ljava/lang/String;)V"
                 )
             }
 

src/main/kotlin/app/revanced/patches/youtube/player/descriptions/fingerprints/EngagementPanelSubHeaderFingerprint.kt

@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.player.descriptions.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch.PanelSubHeader
-import app.revanced.util.fingerprint.LiteralValueFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-
-internal object EngagementPanelSubHeaderFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    returnType = "V",
-    parameters = listOf("Landroid/view/ViewGroup;", "L"),
-    literalSupplier = { PanelSubHeader }
-)

src/main/kotlin/app/revanced/patches/youtube/player/descriptions/fingerprints/EngagementPanelTitleFingerprint.kt

@@ -0,0 +1,8 @@
+package app.revanced.patches.youtube.player.descriptions.fingerprints
+
+import app.revanced.util.fingerprint.MethodReferenceNameFingerprint
+
+internal object EngagementPanelTitleFingerprint : MethodReferenceNameFingerprint(
+    strings = listOf(". "),
+    reference = { "setContentDescription" }
+)

src/main/kotlin/app/revanced/patches/youtube/player/descriptions/fingerprints/EngagementPanelTitleParentFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.youtube.player.descriptions.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object EngagementPanelTitleParentFingerprint : MethodFingerprint(
+    strings = listOf("[EngagementPanelTitleHeader] Cannot remove action buttons from header as the child count is out of sync. Buttons to remove exceed current header child count.")
+)

src/main/kotlin/app/revanced/patches/youtube/utils/resourceid/SharedResourceIdPatch.kt

@@ -67,7 +67,6 @@ object SharedResourceIdPatch : ResourcePatch() {
     var ModernMiniPlayerRewindButton = -1L
     var MusicAppDeeplinkButtonView = -1L
     var NotificationBigPictureIconWidth = -1L
-    var PanelSubHeader = -1L
     var PlayerCollapseButton = -1L
     var PosterArtWidthDefault = -1L
     var QualityAuto = -1L
@@ -155,7 +154,6 @@ object SharedResourceIdPatch : ResourcePatch() {
         ModernMiniPlayerRewindButton = getId(ID, "modern_miniplayer_rewind_button")
         MusicAppDeeplinkButtonView = getId(ID, "music_app_deeplink_button_view")
         NotificationBigPictureIconWidth = getId(DIMEN, "notification_big_picture_icon_width")
-        PanelSubHeader = getId(ID, "panel_subheader")
         PlayerCollapseButton = getId(ID, "player_collapse_button")
         PosterArtWidthDefault = getId(DIMEN, "poster_art_width_default")
         QualityAuto = getId(STRING, "quality_auto")