From f727e6d58742a2e0ccb4cda6471a2a14f5c93a04 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Sat, 21 Sep 2024 19:08:29 -0400
Subject: [PATCH 01/19] fix: Show audio track button without layout overlap
 issues

---
 .../BottomControlsResourcePatch.kt            | 45 +++++++++----------
 .../kotlin/app/revanced/util/ResourceUtils.kt | 22 +++++++++
 .../youtube_controls_bottom_ui_container.xml  |  4 +-
 .../youtube_controls_bottom_ui_container.xml  |  2 +-
 .../youtube_controls_bottom_ui_container.xml  |  2 +-
 5 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
index 474ccf4798..6c2ed33600 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
@@ -1,10 +1,13 @@
 package app.revanced.patches.youtube.misc.playercontrols
 
 import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.DomFileEditor
 import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
+import app.revanced.util.findElementById
+import org.w3c.dom.Element
 import java.io.Closeable
 
 @Patch(dependencies = [ResourceMappingPatch::class])
@@ -14,17 +17,25 @@ object BottomControlsResourcePatch : ResourcePatch(), Closeable {
     private const val TARGET_RESOURCE_NAME = "youtube_controls_bottom_ui_container.xml"
     private const val TARGET_RESOURCE = "res/layout/$TARGET_RESOURCE_NAME"
 
-    // The element to the left of the element being added.
-    private var lastLeftOf = "fullscreen_button"
-
     private lateinit var resourceContext: ResourceContext
     private lateinit var targetDocumentEditor: DomFileEditor
+    private lateinit var targetElement : Element
 
     override fun execute(context: ResourceContext) {
+        bottomUiContainerResourceId = ResourceMappingPatch["id", "bottom_ui_container_stub"]
+
         resourceContext = context
         targetDocumentEditor = context.xmlEditor[TARGET_RESOURCE]
 
-        bottomUiContainerResourceId = ResourceMappingPatch["id", "bottom_ui_container_stub"]
+        // Add all buttons to an inner layout, to prevent audio track and other
+        // YT buttons from being inserted into the middle.
+        targetElement = targetDocumentEditor.file.createElement("LinearLayout")
+        targetElement.setAttribute("android:layout_height", "wrap_content")
+        targetElement.setAttribute("android:layout_width", "wrap_content")
+
+        val bottomContainer = targetDocumentEditor.file.childNodes.findElementById("@id/bottom_end_container")
+            ?: throw PatchException("Could not find target element")
+        bottomContainer.appendChild(targetElement)
     }
 
     /**
@@ -38,33 +49,19 @@ object BottomControlsResourcePatch : ResourcePatch(), Closeable {
                 "$resourceDirectoryName/host/layout/$TARGET_RESOURCE_NAME",
             )!!,
         ]
-        val sourceDocument = sourceDocumentEditor.file
-        val targetDocument = targetDocumentEditor.file
 
-        val targetElementTag = "android.support.constraint.ConstraintLayout"
-
-        val sourceElements = sourceDocument.getElementsByTagName(targetElementTag).item(0).childNodes
-        val targetElement = targetDocument.getElementsByTagName(targetElementTag).item(0)
+        val sourceElements = sourceDocumentEditor.file.getElementsByTagName(
+            "android.support.constraint.ConstraintLayout"
+        ).item(0).childNodes
 
+        // Copy the patch layout xml into the target layout file.
         for (index in 1 until sourceElements.length) {
             val element = sourceElements.item(index).cloneNode(true)
 
-            // If the element has no attributes there's no point to adding it to the destination.
-            if (!element.hasAttributes()) continue
-
-            // Set the elements lastLeftOf attribute to the lastLeftOf value.
-            val namespace = "@+id"
-            element.attributes.getNamedItem("yt:layout_constraintRight_toLeftOf").nodeValue =
-                "$namespace/$lastLeftOf"
-
-            // Set lastLeftOf attribute to the current element.
-            val nameSpaceLength = 5
-            lastLeftOf = element.attributes.getNamedItem("android:id").nodeValue.substring(nameSpaceLength)
-
-            // Add the element.
-            targetDocument.adoptNode(element)
+            targetDocumentEditor.file.adoptNode(element)
             targetElement.appendChild(element)
         }
+
         sourceDocumentEditor.close()
     }
 
diff --git a/src/main/kotlin/app/revanced/util/ResourceUtils.kt b/src/main/kotlin/app/revanced/util/ResourceUtils.kt
index 56076078d3..c1465d0c95 100644
--- a/src/main/kotlin/app/revanced/util/ResourceUtils.kt
+++ b/src/main/kotlin/app/revanced/util/ResourceUtils.kt
@@ -3,6 +3,7 @@ package app.revanced.util
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.util.DomFileEditor
 import app.revanced.util.resource.BaseResource
+import org.w3c.dom.Element
 import org.w3c.dom.Node
 import org.w3c.dom.NodeList
 import java.io.InputStream
@@ -164,3 +165,24 @@ internal fun Node.addResource(
 }
 
 internal fun org.w3c.dom.Document.getNode(tagName: String) = this.getElementsByTagName(tagName).item(0)
+
+internal fun NodeList.findElementById(id: String): Element? {
+    for (i in 0 until length) {
+        val node = item(i)
+        if (node.nodeType == Node.ELEMENT_NODE) {
+            val element = node as Element
+
+            if (element.getAttribute("android:id") == id) {
+                return element
+            }
+
+            // Recursively search.
+            val found = element.childNodes.findElementById(id)
+            if (found != null) {
+                return found
+            }
+        }
+    }
+
+    return null
+}
diff --git a/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
index 3a7cdd3efa..374882bce9 100644
--- a/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_timestamp_button" android:paddingLeft="12dp" android:paddingTop="22dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:longClickable="false" android:layout_width="60dp" android:layout_height="60dp" android:src="@drawable/revanced_yt_copy_timestamp" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_button" android:paddingLeft="12dp" android:paddingTop="22dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:longClickable="false" android:layout_width="60dp" android:layout_height="60dp" android:src="@drawable/revanced_yt_copy" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_timestamp_button" android:longClickable="false" android:paddingTop="3dp" android:paddingBottom="0dp" android:layout_width="45dp" android:layout_height="45dp" android:src="@drawable/revanced_yt_copy_timestamp" android:scaleType="center" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_button" android:longClickable="false" android:paddingTop="3dp" android:paddingBottom="0dp" android:layout_width="45dp" android:layout_height="45dp" android:src="@drawable/revanced_yt_copy" android:scaleType="center" style="@style/YouTubePlayerButton"/>
 </android.support.constraint.ConstraintLayout>
diff --git a/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
index b38a30b976..0885a38666 100644
--- a/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_external_download_button" android:paddingLeft="12dp" android:paddingTop="22dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:longClickable="false" android:layout_width="60dp" android:layout_height="60dp" android:src="@drawable/revanced_yt_download_button" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_external_download_button" android:longClickable="false" android:paddingTop="3dp" android:paddingBottom="0dp" android:layout_width="45dp" android:layout_height="45dp" android:src="@drawable/revanced_yt_download_button" android:scaleType="center" style="@style/YouTubePlayerButton"/>
 </android.support.constraint.ConstraintLayout>
diff --git a/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
index ddd8a125c8..9b6a8fd659 100644
--- a/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_playback_speed_dialog_button" android:paddingLeft="12dp" android:paddingTop="22dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:longClickable="false" android:layout_width="60dp" android:layout_height="60dp" android:src="@drawable/revanced_playback_speed_dialog_button" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_playback_speed_dialog_button" android:longClickable="false" android:paddingTop="3dp" android:paddingBottom="0dp" android:layout_width="45dp" android:layout_height="45dp" android:src="@drawable/revanced_playback_speed_dialog_button" android:scaleType="center" style="@style/YouTubePlayerButton"/>
 </android.support.constraint.ConstraintLayout>

From 03bdecd10d08e0a3e481463f641dc07e5ec1ae41 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Sat, 21 Sep 2024 20:09:53 -0400
Subject: [PATCH 02/19] refactor

---
 .../misc/playercontrols/BottomControlsResourcePatch.kt   | 9 ++++++---
 src/main/kotlin/app/revanced/util/ResourceUtils.kt       | 8 ++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
index 6c2ed33600..ac374a1f3a 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
@@ -6,7 +6,7 @@ import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.DomFileEditor
 import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
-import app.revanced.util.findElementById
+import app.revanced.util.findElementByAttributeValue
 import org.w3c.dom.Element
 import java.io.Closeable
 
@@ -33,8 +33,11 @@ object BottomControlsResourcePatch : ResourcePatch(), Closeable {
         targetElement.setAttribute("android:layout_height", "wrap_content")
         targetElement.setAttribute("android:layout_width", "wrap_content")
 
-        val bottomContainer = targetDocumentEditor.file.childNodes.findElementById("@id/bottom_end_container")
-            ?: throw PatchException("Could not find target element")
+        val bottomContainer = targetDocumentEditor.file.childNodes.findElementByAttributeValue(
+            "android:id",
+            "@id/bottom_end_container"
+        ) ?: throw PatchException("Could not find target element")
+
         bottomContainer.appendChild(targetElement)
     }
 
diff --git a/src/main/kotlin/app/revanced/util/ResourceUtils.kt b/src/main/kotlin/app/revanced/util/ResourceUtils.kt
index c1465d0c95..fde3752f2d 100644
--- a/src/main/kotlin/app/revanced/util/ResourceUtils.kt
+++ b/src/main/kotlin/app/revanced/util/ResourceUtils.kt
@@ -50,7 +50,7 @@ fun ResourceContext.copyResources(
     sourceResourceDirectory: String,
     vararg resources: ResourceGroup,
 ) {
-    val targetResourceDirectory = this.get("res")
+    val targetResourceDirectory = this["res", false]
 
     for (resourceGroup in resources) {
         resourceGroup.resources.forEach { resource ->
@@ -166,18 +166,18 @@ internal fun Node.addResource(
 
 internal fun org.w3c.dom.Document.getNode(tagName: String) = this.getElementsByTagName(tagName).item(0)
 
-internal fun NodeList.findElementById(id: String): Element? {
+internal fun NodeList.findElementByAttributeValue(attributeName: String, value: String): Element? {
     for (i in 0 until length) {
         val node = item(i)
         if (node.nodeType == Node.ELEMENT_NODE) {
             val element = node as Element
 
-            if (element.getAttribute("android:id") == id) {
+            if (element.getAttribute(attributeName) == value) {
                 return element
             }
 
             // Recursively search.
-            val found = element.childNodes.findElementById(id)
+            val found = element.childNodes.findElementByAttributeValue(attributeName, value)
             if (found != null) {
                 return found
             }

From e108f225b9543404c927a28ce8e977171c65c902 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Sat, 21 Sep 2024 23:36:34 -0400
Subject: [PATCH 03/19] fix: Fix vertical alignment in some situations

---
 .../playercontrols/BottomControlsResourcePatch.kt     | 11 ++++++++---
 .../layout/youtube_controls_bottom_ui_container.xml   |  4 ++--
 .../layout/youtube_controls_bottom_ui_container.xml   |  2 +-
 .../layout/youtube_controls_bottom_ui_container.xml   |  2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
index ac374a1f3a..74b28cdcdc 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
@@ -27,11 +27,16 @@ object BottomControlsResourcePatch : ResourcePatch(), Closeable {
         resourceContext = context
         targetDocumentEditor = context.xmlEditor[TARGET_RESOURCE]
 
-        // Add all buttons to an inner layout, to prevent audio track and other
-        // YT buttons from being inserted into the middle.
+        // Add all buttons to an inner layout, to prevent
+        // cardboard VR from being inserted into the middle.
         targetElement = targetDocumentEditor.file.createElement("LinearLayout")
+        targetElement.setAttribute("android:layoutDirection", "ltr")
+        targetElement.setAttribute("android:layout_width", "match_parent")
         targetElement.setAttribute("android:layout_height", "wrap_content")
-        targetElement.setAttribute("android:layout_width", "wrap_content")
+        targetElement.setAttribute("android:paddingTop", "0dip")
+        targetElement.setAttribute("android:paddingBottom", "1dip")
+        targetElement.setAttribute("android:orientation", "horizontal")
+        targetElement.setAttribute("android:gravity", "center_vertical")
 
         val bottomContainer = targetDocumentEditor.file.childNodes.findElementByAttributeValue(
             "android:id",
diff --git a/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
index 374882bce9..a519b020b5 100644
--- a/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_timestamp_button" android:longClickable="false" android:paddingTop="3dp" android:paddingBottom="0dp" android:layout_width="45dp" android:layout_height="45dp" android:src="@drawable/revanced_yt_copy_timestamp" android:scaleType="center" style="@style/YouTubePlayerButton"/>
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_button" android:longClickable="false" android:paddingTop="3dp" android:paddingBottom="0dp" android:layout_width="45dp" android:layout_height="45dp" android:src="@drawable/revanced_yt_copy" android:scaleType="center" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_button" android:longClickable="false" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/revanced_yt_copy" android:scaleType="center" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_timestamp_button" android:longClickable="false" android:paddingLeft="0.0dip" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/revanced_yt_copy_timestamp" android:scaleType="center" style="@style/YouTubePlayerButton"/>
 </android.support.constraint.ConstraintLayout>
diff --git a/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
index 0885a38666..befd56fb23 100644
--- a/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_external_download_button" android:longClickable="false" android:paddingTop="3dp" android:paddingBottom="0dp" android:layout_width="45dp" android:layout_height="45dp" android:src="@drawable/revanced_yt_download_button" android:scaleType="center" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_external_download_button" android:longClickable="false" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/revanced_yt_download_button" android:scaleType="center" style="@style/YouTubePlayerButton"/>
 </android.support.constraint.ConstraintLayout>
diff --git a/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
index 9b6a8fd659..67b2633881 100644
--- a/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_playback_speed_dialog_button" android:longClickable="false" android:paddingTop="3dp" android:paddingBottom="0dp" android:layout_width="45dp" android:layout_height="45dp" android:src="@drawable/revanced_playback_speed_dialog_button" android:scaleType="center" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_playback_speed_dialog_button" android:longClickable="false" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/revanced_playback_speed_dialog_button" android:scaleType="center" style="@style/YouTubePlayerButton"/>
 </android.support.constraint.ConstraintLayout>

From 65c265aba25978c9d2a16c8f1496bf2c73860b7e Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Sun, 22 Sep 2024 16:17:33 -0400
Subject: [PATCH 04/19] fix: Remove empty attributes

---
 .../host/layout/youtube_controls_bottom_ui_container.xml      | 4 ++--
 .../host/layout/youtube_controls_bottom_ui_container.xml      | 2 +-
 .../host/layout/youtube_controls_bottom_ui_container.xml      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
index a519b020b5..0d6ac2bfff 100644
--- a/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_button" android:longClickable="false" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/revanced_yt_copy" android:scaleType="center" style="@style/YouTubePlayerButton"/>
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_timestamp_button" android:longClickable="false" android:paddingLeft="0.0dip" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/revanced_yt_copy_timestamp" android:scaleType="center" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_button" android:longClickable="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/revanced_yt_copy" android:scaleType="center" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_timestamp_button" android:longClickable="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/revanced_yt_copy_timestamp" android:scaleType="center" style="@style/YouTubePlayerButton"/>
 </android.support.constraint.ConstraintLayout>
diff --git a/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
index befd56fb23..d79ee466e2 100644
--- a/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_external_download_button" android:longClickable="false" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/revanced_yt_download_button" android:scaleType="center" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_external_download_button" android:longClickable="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/revanced_yt_download_button" android:scaleType="center" style="@style/YouTubePlayerButton"/>
 </android.support.constraint.ConstraintLayout>
diff --git a/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
index 67b2633881..a91ecc2f3b 100644
--- a/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_playback_speed_dialog_button" android:longClickable="false" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/revanced_playback_speed_dialog_button" android:scaleType="center" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_playback_speed_dialog_button" android:longClickable="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/revanced_playback_speed_dialog_button" android:scaleType="center" style="@style/YouTubePlayerButton"/>
 </android.support.constraint.ConstraintLayout>

From 945ea3a7d32385bc6962a32f277d76f34070c629 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Sun, 22 Sep 2024 16:17:50 -0400
Subject: [PATCH 05/19] Comments

---
 src/main/resources/copyvideourl/drawable/revanced_yt_copy.xml   | 2 +-
 .../copyvideourl/drawable/revanced_yt_copy_timestamp.xml        | 2 +-
 .../downloads/drawable/revanced_yt_download_button.xml          | 2 +-
 .../drawable/revanced_playback_speed_dialog_button.xml          | 2 +-
 src/main/resources/sponsorblock/drawable/revanced_sb_adjust.xml | 2 +-
 .../resources/sponsorblock/drawable/revanced_sb_backward.xml    | 2 +-
 .../resources/sponsorblock/drawable/revanced_sb_compare.xml     | 2 +-
 src/main/resources/sponsorblock/drawable/revanced_sb_edit.xml   | 2 +-
 .../resources/sponsorblock/drawable/revanced_sb_forward.xml     | 2 +-
 src/main/resources/sponsorblock/drawable/revanced_sb_logo.xml   | 2 +-
 .../resources/sponsorblock/drawable/revanced_sb_publish.xml     | 2 +-
 src/main/resources/sponsorblock/drawable/revanced_sb_voting.xml | 2 +-
 .../swipecontrols/drawable/revanced_ic_sc_brightness_auto.xml   | 2 +-
 .../swipecontrols/drawable/revanced_ic_sc_brightness_manual.xml | 2 +-
 .../swipecontrols/drawable/revanced_ic_sc_volume_mute.xml       | 2 +-
 .../swipecontrols/drawable/revanced_ic_sc_volume_normal.xml     | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/copyvideourl/drawable/revanced_yt_copy.xml b/src/main/resources/copyvideourl/drawable/revanced_yt_copy.xml
index 008393c30c..2a5bbc872a 100644
--- a/src/main/resources/copyvideourl/drawable/revanced_yt_copy.xml
+++ b/src/main/resources/copyvideourl/drawable/revanced_yt_copy.xml
@@ -1,6 +1,6 @@
 <!--
    https://github.com/google/material-design-icons/blob/9beae745bb758f3ad56654fb377ea5cf62be4915/symbols/android/content_copy/materialsymbolsoutlined/content_copy_wght200gradN25_24px.xml
-   The icon has been resized
+   Changes made: Icon has been resized.
 
 
 Copyright 2022 Google
diff --git a/src/main/resources/copyvideourl/drawable/revanced_yt_copy_timestamp.xml b/src/main/resources/copyvideourl/drawable/revanced_yt_copy_timestamp.xml
index 841038b376..7fb6084140 100644
--- a/src/main/resources/copyvideourl/drawable/revanced_yt_copy_timestamp.xml
+++ b/src/main/resources/copyvideourl/drawable/revanced_yt_copy_timestamp.xml
@@ -1,7 +1,7 @@
 <!--
    https://github.com/google/material-design-icons/blob/9beae745bb758f3ad56654fb377ea5cf62be4915/symbols/android/content_copy/materialsymbolsoutlined/content_copy_wght200gradN25_24px.xml
    https://github.com/google/material-design-icons/blob/9beae745bb758f3ad56654fb377ea5cf62be4915/symbols/android/schedule/materialsymbolsoutlined/schedule_wght300_24px.xml
-   This icon is the result of a combination of "content copy" and "schedule" icons.
+   Changes made: This icon is the result of a combination of "content copy" and "schedule" icons.
 
 
 Copyright 2022 Google
diff --git a/src/main/resources/downloads/drawable/revanced_yt_download_button.xml b/src/main/resources/downloads/drawable/revanced_yt_download_button.xml
index 9e988c5ee5..cefb27095c 100644
--- a/src/main/resources/downloads/drawable/revanced_yt_download_button.xml
+++ b/src/main/resources/downloads/drawable/revanced_yt_download_button.xml
@@ -1,6 +1,6 @@
 <!--
    https://github.com/google/material-design-icons/blob/9beae745bb758f3ad56654fb377ea5cf62be4915/symbols/android/download/materialsymbolsoutlined/download_wght200gradN25_24px.xml
-   The icon has been resized
+   Changes made: Icon has been resized.
 
 
 Copyright 2022 Google
diff --git a/src/main/resources/speedbutton/drawable/revanced_playback_speed_dialog_button.xml b/src/main/resources/speedbutton/drawable/revanced_playback_speed_dialog_button.xml
index b42dd57f3e..f8b2d86646 100644
--- a/src/main/resources/speedbutton/drawable/revanced_playback_speed_dialog_button.xml
+++ b/src/main/resources/speedbutton/drawable/revanced_playback_speed_dialog_button.xml
@@ -1,6 +1,6 @@
 <!--
    https://github.com/google/material-design-icons/blob/9beae745bb758f3ad56654fb377ea5cf62be4915/symbols/android/slow_motion_video/materialsymbolsoutlined/slow_motion_video_wght200gradN25_24px.xml
-   The icon has been resized
+   Changes made: Icon has been resized.
 
 
 Copyright 2022 Google
diff --git a/src/main/resources/sponsorblock/drawable/revanced_sb_adjust.xml b/src/main/resources/sponsorblock/drawable/revanced_sb_adjust.xml
index c609ab8c8e..8e49dc0788 100644
--- a/src/main/resources/sponsorblock/drawable/revanced_sb_adjust.xml
+++ b/src/main/resources/sponsorblock/drawable/revanced_sb_adjust.xml
@@ -1,6 +1,6 @@
 <!--
    https://github.com/google/material-design-icons/blob/9beae745bb758f3ad56654fb377ea5cf62be4915/symbols/android/adjust/materialsymbolsoutlined/adjust_wght200gradN25_24px.xml
-   The icon has been resized
+   Changes made: Icon has been resized.
 
 
 Copyright 2022 Google
diff --git a/src/main/resources/sponsorblock/drawable/revanced_sb_backward.xml b/src/main/resources/sponsorblock/drawable/revanced_sb_backward.xml
index be1aff2d89..495c29d6a6 100644
--- a/src/main/resources/sponsorblock/drawable/revanced_sb_backward.xml
+++ b/src/main/resources/sponsorblock/drawable/revanced_sb_backward.xml
@@ -1,6 +1,6 @@
 <!--
    https://github.com/google/material-design-icons/blob/9beae745bb758f3ad56654fb377ea5cf62be4915/symbols/android/fast_forward/materialsymbolsoutlined/fast_forward_wght200gradN25_24px.xml
-   The icon has been mirrored and resized
+   Changes made: The icon has been mirrored and resized
 
 
 Copyright 2022 Google
diff --git a/src/main/resources/sponsorblock/drawable/revanced_sb_compare.xml b/src/main/resources/sponsorblock/drawable/revanced_sb_compare.xml
index 8e792377dd..04f3ecc1b8 100644
--- a/src/main/resources/sponsorblock/drawable/revanced_sb_compare.xml
+++ b/src/main/resources/sponsorblock/drawable/revanced_sb_compare.xml
@@ -1,6 +1,6 @@
 <!--
    https://github.com/google/material-design-icons/blob/9beae745bb758f3ad56654fb377ea5cf62be4915/symbols/android/compare/materialsymbolsoutlined/compare_wght200gradN25_24px.xml
-   The icon has been resized
+   Changes made: Icon has been resized.
 
 
 Copyright 2022 Google
diff --git a/src/main/resources/sponsorblock/drawable/revanced_sb_edit.xml b/src/main/resources/sponsorblock/drawable/revanced_sb_edit.xml
index 12a05f8381..1e1d8e3787 100644
--- a/src/main/resources/sponsorblock/drawable/revanced_sb_edit.xml
+++ b/src/main/resources/sponsorblock/drawable/revanced_sb_edit.xml
@@ -1,6 +1,6 @@
 <!--
    https://github.com/google/material-design-icons/blob/9beae745bb758f3ad56654fb377ea5cf62be4915/symbols/android/edit/materialsymbolsoutlined/edit_wght200gradN25_24px.xml
-   The icon has been resized
+   Changes made: Icon has been resized.
 
 
 Copyright 2022 Google
diff --git a/src/main/resources/sponsorblock/drawable/revanced_sb_forward.xml b/src/main/resources/sponsorblock/drawable/revanced_sb_forward.xml
index 1ac21ea753..c7e550b557 100644
--- a/src/main/resources/sponsorblock/drawable/revanced_sb_forward.xml
+++ b/src/main/resources/sponsorblock/drawable/revanced_sb_forward.xml
@@ -1,6 +1,6 @@
 <!--
    https://github.com/google/material-design-icons/blob/9beae745bb758f3ad56654fb377ea5cf62be4915/symbols/android/fast_forward/materialsymbolsoutlined/fast_forward_wght200gradN25_24px.xml
-   The icon has been resized
+   Changes made: Icon has been resized.
 
 
 Copyright 2022 Google
diff --git a/src/main/resources/sponsorblock/drawable/revanced_sb_logo.xml b/src/main/resources/sponsorblock/drawable/revanced_sb_logo.xml
index 709b1cdb9c..79383e6771 100644
--- a/src/main/resources/sponsorblock/drawable/revanced_sb_logo.xml
+++ b/src/main/resources/sponsorblock/drawable/revanced_sb_logo.xml
@@ -1,6 +1,6 @@
 <!--
     https://github.com/ajayyy/SponsorBlock/blob/e1d656f43f8b3cfb40e1c521e4103d61db756872/public/icons/PlayerStartIconSponsorBlocker.svg
-    The SponsorBlock logo was inverted
+    Changes made: The SponsorBlock logo was inverted.
 
 
 Copyright 2021 Ajay Ramachandran <dev@ajay.app>
diff --git a/src/main/resources/sponsorblock/drawable/revanced_sb_publish.xml b/src/main/resources/sponsorblock/drawable/revanced_sb_publish.xml
index 47ad9f2b96..370dc27b24 100644
--- a/src/main/resources/sponsorblock/drawable/revanced_sb_publish.xml
+++ b/src/main/resources/sponsorblock/drawable/revanced_sb_publish.xml
@@ -1,6 +1,6 @@
 <!--
    https://github.com/google/material-design-icons/blob/9beae745bb758f3ad56654fb377ea5cf62be4915/symbols/android/publish/materialsymbolsoutlined/publish_wght200gradN25_24px.xml
-   The icon has been resized
+   Changes made: Icon has been resized.
 
 
 Copyright 2022 Google
diff --git a/src/main/resources/sponsorblock/drawable/revanced_sb_voting.xml b/src/main/resources/sponsorblock/drawable/revanced_sb_voting.xml
index 45101e5ab3..d7b0cc4707 100644
--- a/src/main/resources/sponsorblock/drawable/revanced_sb_voting.xml
+++ b/src/main/resources/sponsorblock/drawable/revanced_sb_voting.xml
@@ -1,6 +1,6 @@
 <!--
    https://github.com/google/material-design-icons/blob/9beae745bb758f3ad56654fb377ea5cf62be4915/symbols/android/thumbs_up_down/materialsymbolsoutlined/thumbs_up_down_wght300gradN25_24px.xml
-   The icon has been resized
+   Changes made: Icon has been resized.
 
 
 Copyright 2022 Google
diff --git a/src/main/resources/swipecontrols/drawable/revanced_ic_sc_brightness_auto.xml b/src/main/resources/swipecontrols/drawable/revanced_ic_sc_brightness_auto.xml
index 10c5dd7394..f479e71755 100644
--- a/src/main/resources/swipecontrols/drawable/revanced_ic_sc_brightness_auto.xml
+++ b/src/main/resources/swipecontrols/drawable/revanced_ic_sc_brightness_auto.xml
@@ -1,6 +1,6 @@
 <!--
    https://github.com/google/material-design-icons/blob/9beae745bb758f3ad56654fb377ea5cf62be4915/symbols/android/brightness_auto/materialsymbolsoutlined/brightness_auto_wght300_24px.xml
-   The icon has been resized
+   Changes made: Icon has been resized.
 
 
 Copyright 2022 Google
diff --git a/src/main/resources/swipecontrols/drawable/revanced_ic_sc_brightness_manual.xml b/src/main/resources/swipecontrols/drawable/revanced_ic_sc_brightness_manual.xml
index b80ab20979..a5dc31c48f 100644
--- a/src/main/resources/swipecontrols/drawable/revanced_ic_sc_brightness_manual.xml
+++ b/src/main/resources/swipecontrols/drawable/revanced_ic_sc_brightness_manual.xml
@@ -1,6 +1,6 @@
 <!--
    https://github.com/google/material-design-icons/blob/9beae745bb758f3ad56654fb377ea5cf62be4915/symbols/android/brightness_6/materialsymbolsoutlined/brightness_6_wght300_24px.xml
-   The icon has been resized
+   Changes made: Icon has been resized.
 
 
 Copyright 2022 Google
diff --git a/src/main/resources/swipecontrols/drawable/revanced_ic_sc_volume_mute.xml b/src/main/resources/swipecontrols/drawable/revanced_ic_sc_volume_mute.xml
index 2628b330d9..b63afa6032 100644
--- a/src/main/resources/swipecontrols/drawable/revanced_ic_sc_volume_mute.xml
+++ b/src/main/resources/swipecontrols/drawable/revanced_ic_sc_volume_mute.xml
@@ -1,6 +1,6 @@
 <!--
    https://github.com/google/material-design-icons/blob/9beae745bb758f3ad56654fb377ea5cf62be4915/symbols/android/volume_off/materialsymbolsoutlined/volume_off_wght300_24px.xml
-   The icon has been resized
+   Changes made: Icon has been resized.
 
 
 Copyright 2022 Google
diff --git a/src/main/resources/swipecontrols/drawable/revanced_ic_sc_volume_normal.xml b/src/main/resources/swipecontrols/drawable/revanced_ic_sc_volume_normal.xml
index 45a19e9563..7ef42ada65 100644
--- a/src/main/resources/swipecontrols/drawable/revanced_ic_sc_volume_normal.xml
+++ b/src/main/resources/swipecontrols/drawable/revanced_ic_sc_volume_normal.xml
@@ -1,6 +1,6 @@
 <!--
    https://github.com/google/material-design-icons/blob/9beae745bb758f3ad56654fb377ea5cf62be4915/symbols/android/volume_up/materialsymbolsoutlined/volume_up_wght300_24px.xml
-   The icon has been resized
+   Changes made: Icon has been resized.
 
 
 Copyright 2022 Google

From 2efa28f2ac913304902929d8f42ef18936c67161 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Sun, 22 Sep 2024 16:48:59 -0400
Subject: [PATCH 06/19] refactor: Extract helper method

---
 api/revanced-patches.api                            |  1 +
 .../misc/settings/BaseSettingsResourcePatch.kt      |  7 ++-----
 src/main/kotlin/app/revanced/util/ResourceUtils.kt  | 13 +++++++++++++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/api/revanced-patches.api b/api/revanced-patches.api
index f94f26b011..84c0cb7d88 100644
--- a/api/revanced-patches.api
+++ b/api/revanced-patches.api
@@ -2201,6 +2201,7 @@ public final class app/revanced/util/ResourceUtilsKt {
 	public static final fun copyXmlNode (Ljava/lang/String;Lapp/revanced/patcher/util/DomFileEditor;Lapp/revanced/patcher/util/DomFileEditor;)Ljava/lang/AutoCloseable;
 	public static final fun doRecursively (Lorg/w3c/dom/Node;Lkotlin/jvm/functions/Function1;)V
 	public static final fun forEachChildElement (Lorg/w3c/dom/Node;Lkotlin/jvm/functions/Function1;)V
+	public static final fun insertFirst (Lorg/w3c/dom/Node;Lorg/w3c/dom/Node;)V
 	public static final fun iterateXmlNodeChildren (Lapp/revanced/patcher/data/ResourceContext;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
 }
 
diff --git a/src/main/kotlin/app/revanced/patches/shared/misc/settings/BaseSettingsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/shared/misc/settings/BaseSettingsResourcePatch.kt
index f1e488370d..1570cc3dc0 100644
--- a/src/main/kotlin/app/revanced/patches/shared/misc/settings/BaseSettingsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/misc/settings/BaseSettingsResourcePatch.kt
@@ -9,6 +9,7 @@ import app.revanced.patches.shared.misc.settings.preference.IntentPreference
 import app.revanced.util.ResourceGroup
 import app.revanced.util.copyResources
 import app.revanced.util.getNode
+import app.revanced.util.insertFirst
 import org.w3c.dom.Node
 import java.io.Closeable
 
@@ -47,11 +48,7 @@ abstract class BaseSettingsResourcePatch(
                 //  It may be necessary to ask for the desired resourceValue in the future.
                 AddResourcesPatch("values", resource)
             }.let { preferenceNode ->
-                if (prepend && firstChild != null) {
-                    insertBefore(preferenceNode, firstChild)
-                } else {
-                    appendChild(preferenceNode)
-                }
+                insertFirst(preferenceNode)
             }
         }
 
diff --git a/src/main/kotlin/app/revanced/util/ResourceUtils.kt b/src/main/kotlin/app/revanced/util/ResourceUtils.kt
index fde3752f2d..bb7bea23f0 100644
--- a/src/main/kotlin/app/revanced/util/ResourceUtils.kt
+++ b/src/main/kotlin/app/revanced/util/ResourceUtils.kt
@@ -1,6 +1,7 @@
 package app.revanced.util
 
 import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.util.DomFileEditor
 import app.revanced.util.resource.BaseResource
 import org.w3c.dom.Element
@@ -40,6 +41,14 @@ fun Node.doRecursively(action: (Node) -> Unit) {
     for (i in 0 until this.childNodes.length) this.childNodes.item(i).doRecursively(action)
 }
 
+fun Node.insertFirst(node: Node) {
+    if (hasChildNodes()) {
+        insertBefore(node, firstChild)
+    } else {
+        appendChild(node)
+    }
+}
+
 /**
  * Copy resources from the current class loader to the resource directory.
  *
@@ -186,3 +195,7 @@ internal fun NodeList.findElementByAttributeValue(attributeName: String, value:
 
     return null
 }
+
+internal fun NodeList.findElementByAttributeValueOrThrow(attributeName: String, value: String): Element {
+    return findElementByAttributeValue(attributeName, value) ?: throw PatchException("Could not find: $attributeName $value")
+}

From ab52b1296461b1e9db30e5369ffa71aaa0e7d75a Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Sun, 22 Sep 2024 16:54:10 -0400
Subject: [PATCH 07/19] fix: Use same button ordering as before.

---
 .../playercontrols/BottomControlsResourcePatch.kt | 15 ++++++++-------
 .../youtube_controls_bottom_ui_container.xml      |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
index 74b28cdcdc..06c7433f6c 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
@@ -1,12 +1,12 @@
 package app.revanced.patches.youtube.misc.playercontrols
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.DomFileEditor
 import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
-import app.revanced.util.findElementByAttributeValue
+import app.revanced.util.findElementByAttributeValueOrThrow
+import app.revanced.util.insertFirst
 import org.w3c.dom.Element
 import java.io.Closeable
 
@@ -31,17 +31,16 @@ object BottomControlsResourcePatch : ResourcePatch(), Closeable {
         // cardboard VR from being inserted into the middle.
         targetElement = targetDocumentEditor.file.createElement("LinearLayout")
         targetElement.setAttribute("android:layoutDirection", "ltr")
-        targetElement.setAttribute("android:layout_width", "match_parent")
+        targetElement.setAttribute("android:layout_width", "wrap_content")
         targetElement.setAttribute("android:layout_height", "wrap_content")
         targetElement.setAttribute("android:paddingTop", "0dip")
         targetElement.setAttribute("android:paddingBottom", "1dip")
         targetElement.setAttribute("android:orientation", "horizontal")
-        targetElement.setAttribute("android:gravity", "center_vertical")
 
-        val bottomContainer = targetDocumentEditor.file.childNodes.findElementByAttributeValue(
+        val bottomContainer = targetDocumentEditor.file.childNodes.findElementByAttributeValueOrThrow(
             "android:id",
             "@id/bottom_end_container"
-        ) ?: throw PatchException("Could not find target element")
+        )
 
         bottomContainer.appendChild(targetElement)
     }
@@ -67,7 +66,9 @@ object BottomControlsResourcePatch : ResourcePatch(), Closeable {
             val element = sourceElements.item(index).cloneNode(true)
 
             targetDocumentEditor.file.adoptNode(element)
-            targetElement.appendChild(element)
+
+            // Add the element as the first view.
+            targetElement.insertFirst(element)
         }
 
         sourceDocumentEditor.close()
diff --git a/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
index 0d6ac2bfff..864e576c2e 100644
--- a/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_button" android:longClickable="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/revanced_yt_copy" android:scaleType="center" style="@style/YouTubePlayerButton"/>
     <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_timestamp_button" android:longClickable="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/revanced_yt_copy_timestamp" android:scaleType="center" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_button" android:longClickable="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/revanced_yt_copy" android:scaleType="center" style="@style/YouTubePlayerButton"/>
 </android.support.constraint.ConstraintLayout>

From 9b268d74c72320c66a78e828e6589e6a5e070713 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Sun, 22 Sep 2024 17:14:10 -0400
Subject: [PATCH 08/19] fix: Adjust padding

---
 .../misc/playercontrols/BottomControlsResourcePatch.kt        | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
index 06c7433f6c..5c753a8ab4 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
@@ -31,10 +31,8 @@ object BottomControlsResourcePatch : ResourcePatch(), Closeable {
         // cardboard VR from being inserted into the middle.
         targetElement = targetDocumentEditor.file.createElement("LinearLayout")
         targetElement.setAttribute("android:layoutDirection", "ltr")
-        targetElement.setAttribute("android:layout_width", "wrap_content")
+        targetElement.setAttribute("android:layout_width", "match_parent")
         targetElement.setAttribute("android:layout_height", "wrap_content")
-        targetElement.setAttribute("android:paddingTop", "0dip")
-        targetElement.setAttribute("android:paddingBottom", "1dip")
         targetElement.setAttribute("android:orientation", "horizontal")
 
         val bottomContainer = targetDocumentEditor.file.childNodes.findElementByAttributeValueOrThrow(

From a835f2f17760f63257b8bcd92bb989752c1c25b8 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Sun, 22 Sep 2024 20:09:42 -0400
Subject: [PATCH 09/19] fix: refactor and cleanup

---
 api/revanced-patches.api                      |   5 +-
 .../copyvideourl/CopyVideoUrlBytecodePatch.kt |   4 +-
 .../copyvideourl/CopyVideoUrlResourcePatch.kt |   6 +-
 .../interaction/downloads/DownloadsPatch.kt   |   4 +-
 .../downloads/DownloadsResourcePatch.kt       |   6 +-
 .../sponsorblock/SponsorBlockBytecodePatch.kt |  63 ++-------
 .../BottomControlsResourcePatch.kt            |  72 ++---------
 .../PlayerControlsBytecodePatch.kt            | 122 +++++++++++++-----
 .../PlayerControlsResourcePatch.kt            |  80 ++++++++++++
 ...rprint.kt => ControlsOverlayVisibility.kt} |   5 +-
 .../fingerprints/MotionOverlayFingerprint.kt  |  13 ++
 .../MotionOverlayVisibilityFingerprint.kt     |  29 +++++
 ...PlayerBottomControlsInflateFingerprint.kt} |  12 +-
 .../PlayerTopControlsInflateFingerprint.kt    |  13 ++
 .../speed/button/PlaybackSpeedButtonPatch.kt  |   4 +-
 .../PlaybackSpeedButtonResourcePatch.kt       |   6 +-
 16 files changed, 267 insertions(+), 177 deletions(-)
 create mode 100644 src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch.kt
 rename src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/{PlayerControlsVisibilityFingerprint.kt => ControlsOverlayVisibility.kt} (70%)
 create mode 100644 src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/MotionOverlayFingerprint.kt
 create mode 100644 src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/MotionOverlayVisibilityFingerprint.kt
 rename src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/{BottomControlsInflateFingerprint.kt => PlayerBottomControlsInflateFingerprint.kt} (51%)
 create mode 100644 src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerTopControlsInflateFingerprint.kt

diff --git a/api/revanced-patches.api b/api/revanced-patches.api
index 84c0cb7d88..21f65acfbe 100644
--- a/api/revanced-patches.api
+++ b/api/revanced-patches.api
@@ -2000,13 +2000,12 @@ public final class app/revanced/patches/youtube/misc/playercontrols/BottomContro
 
 public final class app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch;
-	public static field showPlayerControlsFingerprintResult Lapp/revanced/patcher/fingerprint/MethodFingerprintResult;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
-	public final fun getShowPlayerControlsFingerprintResult ()Lapp/revanced/patcher/fingerprint/MethodFingerprintResult;
+	public final fun initializeBottomControl (Ljava/lang/String;)V
 	public final fun initializeControl (Ljava/lang/String;)V
+	public final fun initializeTopControl (Ljava/lang/String;)V
 	public final fun injectVisibilityCheckCall (Ljava/lang/String;)V
-	public final fun setShowPlayerControlsFingerprintResult (Lapp/revanced/patcher/fingerprint/MethodFingerprintResult;)V
 }
 
 public final class app/revanced/patches/youtube/misc/playeroverlay/PlayerOverlaysHookPatch : app/revanced/patcher/patch/BytecodePatch {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt
index 5d740aa59c..cea3988c28 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt
@@ -51,8 +51,8 @@ object CopyVideoUrlBytecodePatch : BytecodePatch(emptySet()) {
 
     override fun execute(context: BytecodeContext) {
         BUTTONS_DESCRIPTORS.forEach { descriptor ->
-            PlayerControlsBytecodePatch.initializeControl("$descriptor->initializeButton(Landroid/view/View;)V")
-            PlayerControlsBytecodePatch.injectVisibilityCheckCall("$descriptor->changeVisibility(Z)V")
+            PlayerControlsBytecodePatch.initializeBottomControl(descriptor)
+            PlayerControlsBytecodePatch.injectVisibilityCheckCall(descriptor)
         }
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlResourcePatch.kt
index 23476080b9..495b999cad 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlResourcePatch.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.all.misc.resources.AddResourcesPatch
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
-import app.revanced.patches.youtube.misc.playercontrols.BottomControlsResourcePatch
+import app.revanced.patches.youtube.misc.playercontrols.PlayerControlsResourcePatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
 import app.revanced.util.ResourceGroup
 import app.revanced.util.copyResources
@@ -13,7 +13,7 @@ import app.revanced.util.copyResources
 @Patch(
     dependencies = [
         SettingsPatch::class,
-        BottomControlsResourcePatch::class,
+        PlayerControlsResourcePatch::class,
         AddResourcesPatch::class
     ]
 )
@@ -34,6 +34,6 @@ internal object CopyVideoUrlResourcePatch : ResourcePatch() {
             )
         )
 
-        BottomControlsResourcePatch.addControls("copyvideourl")
+        PlayerControlsResourcePatch.addControls("copyvideourl")
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsPatch.kt
index b22a146166..6c8119fe93 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsPatch.kt
@@ -58,8 +58,8 @@ object DownloadsPatch : BytecodePatch(
     private const val BUTTON_DESCRIPTOR = "Lapp/revanced/integrations/youtube/videoplayer/ExternalDownloadButton;"
 
     override fun execute(context: BytecodeContext) {
-        PlayerControlsBytecodePatch.initializeControl("$BUTTON_DESCRIPTOR->initializeButton(Landroid/view/View;)V")
-        PlayerControlsBytecodePatch.injectVisibilityCheckCall("$BUTTON_DESCRIPTOR->changeVisibility(Z)V")
+        PlayerControlsBytecodePatch.initializeBottomControl(BUTTON_DESCRIPTOR)
+        PlayerControlsBytecodePatch.injectVisibilityCheckCall(BUTTON_DESCRIPTOR)
 
         // Main activity is used to launch downloader intent.
         MainActivityFingerprint.resultOrThrow().mutableMethod.apply {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsResourcePatch.kt
index 24285e53b1..7977497536 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsResourcePatch.kt
@@ -9,14 +9,14 @@ import app.revanced.patches.shared.misc.settings.preference.PreferenceScreen
 import app.revanced.patches.shared.misc.settings.preference.PreferenceScreen.Sorting
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
 import app.revanced.patches.shared.misc.settings.preference.TextPreference
-import app.revanced.patches.youtube.misc.playercontrols.BottomControlsResourcePatch
+import app.revanced.patches.youtube.misc.playercontrols.PlayerControlsResourcePatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
 import app.revanced.util.ResourceGroup
 import app.revanced.util.copyResources
 
 @Patch(
     dependencies = [
-        BottomControlsResourcePatch::class,
+        PlayerControlsResourcePatch::class,
         SettingsPatch::class,
         AddResourcesPatch::class,
     ],
@@ -42,6 +42,6 @@ internal object DownloadsResourcePatch : ResourcePatch() {
             ResourceGroup("drawable", "revanced_yt_download_button.xml"),
         )
 
-        BottomControlsResourcePatch.addControls("downloads")
+        PlayerControlsResourcePatch.addControls("downloads")
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockBytecodePatch.kt
index e41d0e4214..85aad5fd01 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockBytecodePatch.kt
@@ -10,7 +10,6 @@ import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
 import app.revanced.patches.youtube.layout.sponsorblock.fingerprints.AppendTimeFingerprint
 import app.revanced.patches.youtube.layout.sponsorblock.fingerprints.ControlsOverlayFingerprint
 import app.revanced.patches.youtube.layout.sponsorblock.fingerprints.RectangleFieldInvalidatorFingerprint
@@ -26,7 +25,10 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
 import app.revanced.patches.youtube.video.videoid.VideoIdPatch
 import app.revanced.util.exception
 import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.*
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.Instruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
@@ -169,59 +171,14 @@ object SponsorBlockBytecodePatch : BytecodePatch(
             break
         }
 
-        /*
-         * Voting & Shield button
-         */
-        val controlsMethodResult = PlayerControlsBytecodePatch.showPlayerControlsFingerprintResult
-
-        val controlsLayoutStubResourceId =
-            ResourceMappingPatch["id", "controls_layout_stub"]
-        val zoomOverlayResourceId =
-            ResourceMappingPatch["id", "video_zoom_overlay_stub"]
-
-        methods@ for (method in controlsMethodResult.mutableClass.methods) {
-            val instructions = method.implementation?.instructions!!
-            instructions@ for ((index, instruction) in instructions.withIndex()) {
-                // search for method which inflates the controls layout view
-                if (instruction.opcode != Opcode.CONST) continue@instructions
-
-                when ((instruction as NarrowLiteralInstruction).wideLiteral) {
-                    controlsLayoutStubResourceId -> {
-                        // replace the view with the YouTubeControlsOverlay
-                        val moveResultInstructionIndex = index + 5
-                        val inflatedViewRegister =
-                            (instructions[moveResultInstructionIndex] as OneRegisterInstruction).registerA
-                        // initialize with the player overlay object
-                        method.addInstructions(
-                            moveResultInstructionIndex + 1, // insert right after moving the view to the register and use that register
-                            """
-                                invoke-static {v$inflatedViewRegister}, $INTEGRATIONS_CREATE_SEGMENT_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->initialize(Landroid/view/View;)V
-                                invoke-static {v$inflatedViewRegister}, $INTEGRATIONS_VOTING_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->initialize(Landroid/view/View;)V
-                            """,
-                        )
-                    }
-
-                    zoomOverlayResourceId -> {
-                        val invertVisibilityMethod =
-                            context.toMethodWalker(method).nextMethod(index - 6, true).getMethod() as MutableMethod
-                        // change visibility of the buttons
-                        invertVisibilityMethod.addInstructions(
-                            0,
-                            """
-                                invoke-static {p1}, $INTEGRATIONS_CREATE_SEGMENT_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->changeVisibilityNegatedImmediate(Z)V
-                                invoke-static {p1}, $INTEGRATIONS_VOTING_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->changeVisibilityNegatedImmediate(Z)V
-                            """.trimIndent(),
-                        )
-                    }
-                }
-            }
-        }
+        // Change visibility of the buttons.
+        PlayerControlsBytecodePatch.initializeTopControl(INTEGRATIONS_CREATE_SEGMENT_BUTTON_CONTROLLER_CLASS_DESCRIPTOR)
+        PlayerControlsBytecodePatch.injectVisibilityCheckCall(INTEGRATIONS_CREATE_SEGMENT_BUTTON_CONTROLLER_CLASS_DESCRIPTOR)
 
-        // change visibility of the buttons
-        PlayerControlsBytecodePatch.injectVisibilityCheckCall("$INTEGRATIONS_CREATE_SEGMENT_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->changeVisibility(Z)V")
-        PlayerControlsBytecodePatch.injectVisibilityCheckCall("$INTEGRATIONS_VOTING_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->changeVisibility(Z)V")
+        PlayerControlsBytecodePatch.initializeTopControl(INTEGRATIONS_VOTING_BUTTON_CONTROLLER_CLASS_DESCRIPTOR)
+        PlayerControlsBytecodePatch.injectVisibilityCheckCall(INTEGRATIONS_VOTING_BUTTON_CONTROLLER_CLASS_DESCRIPTOR)
 
-        // append the new time to the player layout
+        // Append the new time to the player layout.
         val appendTimeFingerprintResult = AppendTimeFingerprint.result!!
         val appendTimePatternScanStartIndex = appendTimeFingerprintResult.scanResult.patternScanResult!!.startIndex
         val targetRegister =
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
index 5c753a8ab4..1deebe993d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
@@ -3,74 +3,18 @@ package app.revanced.patches.youtube.misc.playercontrols
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patcher.util.DomFileEditor
-import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
-import app.revanced.util.findElementByAttributeValueOrThrow
-import app.revanced.util.insertFirst
-import org.w3c.dom.Element
 import java.io.Closeable
 
-@Patch(dependencies = [ResourceMappingPatch::class])
+@Patch(
+    dependencies = [PlayerControlsBytecodePatch::class],
+)
+@Deprecated("Obsolete", replaceWith = ReplaceWith("PlayerControlsBytecodePatch"))
 object BottomControlsResourcePatch : ResourcePatch(), Closeable {
-    internal var bottomUiContainerResourceId: Long = -1
+    override fun execute(context: ResourceContext) {}
 
-    private const val TARGET_RESOURCE_NAME = "youtube_controls_bottom_ui_container.xml"
-    private const val TARGET_RESOURCE = "res/layout/$TARGET_RESOURCE_NAME"
-
-    private lateinit var resourceContext: ResourceContext
-    private lateinit var targetDocumentEditor: DomFileEditor
-    private lateinit var targetElement : Element
-
-    override fun execute(context: ResourceContext) {
-        bottomUiContainerResourceId = ResourceMappingPatch["id", "bottom_ui_container_stub"]
-
-        resourceContext = context
-        targetDocumentEditor = context.xmlEditor[TARGET_RESOURCE]
-
-        // Add all buttons to an inner layout, to prevent
-        // cardboard VR from being inserted into the middle.
-        targetElement = targetDocumentEditor.file.createElement("LinearLayout")
-        targetElement.setAttribute("android:layoutDirection", "ltr")
-        targetElement.setAttribute("android:layout_width", "match_parent")
-        targetElement.setAttribute("android:layout_height", "wrap_content")
-        targetElement.setAttribute("android:orientation", "horizontal")
-
-        val bottomContainer = targetDocumentEditor.file.childNodes.findElementByAttributeValueOrThrow(
-            "android:id",
-            "@id/bottom_end_container"
-        )
-
-        bottomContainer.appendChild(targetElement)
-    }
-
-    /**
-     * Add new controls to the bottom of the YouTube player.
-     *
-     * @param resourceDirectoryName The name of the directory containing the hosting resource.
-     */
     fun addControls(resourceDirectoryName: String) {
-        val sourceDocumentEditor = resourceContext.xmlEditor[
-            this::class.java.classLoader.getResourceAsStream(
-                "$resourceDirectoryName/host/layout/$TARGET_RESOURCE_NAME",
-            )!!,
-        ]
-
-        val sourceElements = sourceDocumentEditor.file.getElementsByTagName(
-            "android.support.constraint.ConstraintLayout"
-        ).item(0).childNodes
-
-        // Copy the patch layout xml into the target layout file.
-        for (index in 1 until sourceElements.length) {
-            val element = sourceElements.item(index).cloneNode(true)
-
-            targetDocumentEditor.file.adoptNode(element)
-
-            // Add the element as the first view.
-            targetElement.insertFirst(element)
-        }
-
-        sourceDocumentEditor.close()
+        PlayerControlsResourcePatch.addControls(resourceDirectoryName)
     }
 
-    override fun close() = targetDocumentEditor.close()
-}
+    override fun close() {}
+}
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt
index 1cc2cfcf0f..e8394bc706 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt
@@ -1,65 +1,123 @@
 package app.revanced.patches.youtube.misc.playercontrols
 
-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.fingerprint.MethodFingerprintResult
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.youtube.shared.fingerprints.LayoutConstructorFingerprint
-import app.revanced.patches.youtube.misc.playercontrols.fingerprints.BottomControlsInflateFingerprint
-import app.revanced.patches.youtube.misc.playercontrols.fingerprints.PlayerControlsVisibilityFingerprint
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.youtube.misc.playercontrols.fingerprints.PlayerBottomControlsInflateFingerprint
+import app.revanced.patches.youtube.misc.playercontrols.fingerprints.PlayerTopControlsInflateFingerprint
+import app.revanced.patches.youtube.misc.playercontrols.fingerprints.MotionOverlayVisibilityFingerprint
+import app.revanced.patches.youtube.misc.playercontrols.fingerprints.MotionOverlayFingerprint
+import app.revanced.patches.youtube.misc.playercontrols.fingerprints.ControlsOverlayVisibility
+import app.revanced.util.alsoResolve
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.resultOrThrow
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
 @Patch(
     description = "Manages the code for the player controls of the YouTube player.",
-    dependencies = [BottomControlsResourcePatch::class],
+    dependencies = [PlayerControlsResourcePatch::class],
 )
 object PlayerControlsBytecodePatch : BytecodePatch(
-    setOf(LayoutConstructorFingerprint, BottomControlsInflateFingerprint)
+    setOf(
+        PlayerTopControlsInflateFingerprint,
+        PlayerBottomControlsInflateFingerprint,
+        MotionOverlayFingerprint
+    )
 ) {
-    lateinit var showPlayerControlsFingerprintResult: MethodFingerprintResult
+    private lateinit var inflateTopControlMethod: MutableMethod
+    private var inflateTopControlInsertIndex: Int = -1
+    private var inflateTopControlRegister: Int = -1
 
-    private var moveToRegisterInstructionIndex: Int = 0
-    private var viewRegister: Int = 0
-    private lateinit var inflateFingerprintResult: MethodFingerprintResult
+    private lateinit var inflateBottomControlMethod: MutableMethod
+    private var inflateBottomControlInsertIndex: Int = -1
+    private var inflateBottomControlRegister: Int = -1
+
+    private lateinit var visibilityMethod: MutableMethod
+    private var visibilityInsertIndex: Int = 0
+
+    private lateinit var invertVisibilityMethod: MutableMethod
+    private var invertVisibilityInsertIndex: Int = 0
 
     override fun execute(context: BytecodeContext) {
-        LayoutConstructorFingerprint.result?.let {
-            if (!PlayerControlsVisibilityFingerprint.resolve(context, it.classDef))
-                throw LayoutConstructorFingerprint.exception
-        } ?: throw LayoutConstructorFingerprint.exception
+        fun MutableMethod.indexOfFirstViewInflateOrThrow() =
+            indexOfFirstInstructionOrThrow {
+                val reference = getReference<MethodReference>()
+                reference?.definingClass == "Landroid/view/ViewStub;" &&
+                        reference.name == "inflate"
+            }
+
+        PlayerBottomControlsInflateFingerprint.resultOrThrow().mutableMethod.apply{
+            inflateBottomControlMethod = this
+
+            val inflateReturnObjectIndex = indexOfFirstViewInflateOrThrow() + 1
+            inflateBottomControlRegister = getInstruction<OneRegisterInstruction>(inflateReturnObjectIndex).registerA
+            inflateBottomControlInsertIndex = inflateReturnObjectIndex + 1
+        }
+
+        PlayerTopControlsInflateFingerprint.resultOrThrow().mutableMethod.apply {
+            inflateTopControlMethod = this
 
-        showPlayerControlsFingerprintResult = PlayerControlsVisibilityFingerprint.result!!
+            val inflateReturnObjectIndex = indexOfFirstViewInflateOrThrow() + 1
+            inflateTopControlRegister = getInstruction<OneRegisterInstruction>(inflateReturnObjectIndex).registerA
+            inflateTopControlInsertIndex = inflateReturnObjectIndex + 1
+        }
+
+        ControlsOverlayVisibility.alsoResolve(
+            context, PlayerTopControlsInflateFingerprint
+        ).mutableMethod.apply {
+            visibilityMethod = this
+        }
 
-        inflateFingerprintResult = BottomControlsInflateFingerprint.result!!.also {
-            moveToRegisterInstructionIndex = it.scanResult.patternScanResult!!.endIndex
-            viewRegister =
-                (it.mutableMethod.implementation!!.instructions[moveToRegisterInstructionIndex] as OneRegisterInstruction).registerA
+        MotionOverlayVisibilityFingerprint.alsoResolve(
+            context, MotionOverlayFingerprint
+        ).mutableMethod.apply {
+            invertVisibilityMethod = this
         }
     }
 
     /**
-     * Injects the code to change the visibility of controls.
+     * Injects the code to initialize the controls.
      * @param descriptor The descriptor of the method which should be called.
      */
-    fun injectVisibilityCheckCall(descriptor: String) {
-        showPlayerControlsFingerprintResult.mutableMethod.addInstruction(
-            0,
-            """
-                    invoke-static {p1}, $descriptor
-                """
+    fun initializeTopControl(descriptor: String) {
+        inflateTopControlMethod.addInstruction(
+            inflateTopControlInsertIndex++,
+            "invoke-static { v$inflateTopControlRegister }, $descriptor->initialize(Landroid/view/View;)V"
         )
     }
 
     /**
      * Injects the code to initialize the controls.
-     * @param descriptor The descriptor of the method which should be calleed.
+     * @param descriptor The descriptor of the method which should be called.
+     */
+    fun initializeBottomControl(descriptor: String) {
+        inflateBottomControlMethod.addInstruction(
+            inflateBottomControlInsertIndex++,
+            "invoke-static { v$inflateBottomControlRegister }, $descriptor->initializeButton(Landroid/view/View;)V"
+        )
+    }
+
+    @Deprecated("Obsolete", replaceWith = ReplaceWith("initializeBottomControl"))
+    fun initializeControl(descriptor: String)= initializeBottomControl(descriptor)
+
+    /**
+     * Injects the code to change the visibility of controls.
+     * @param descriptor The descriptor of the method which should be called.
      */
-    fun initializeControl(descriptor: String) {
-        inflateFingerprintResult.mutableMethod.addInstruction(
-            moveToRegisterInstructionIndex + 1,
-            "invoke-static {v$viewRegister}, $descriptor"
+    fun injectVisibilityCheckCall(descriptor: String) {
+        visibilityMethod.addInstruction(
+            visibilityInsertIndex++,
+            "invoke-static { p1 }, $descriptor->changeVisibility(Z)V"
+        )
+
+        invertVisibilityMethod.addInstruction(
+            invertVisibilityInsertIndex++,
+            "invoke-static { p1 }, $descriptor->changeVisibilityNegatedImmediate(Z)V"
         )
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch.kt
new file mode 100644
index 0000000000..97c59ee09c
--- /dev/null
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch.kt
@@ -0,0 +1,80 @@
+package app.revanced.patches.youtube.misc.playercontrols
+
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.util.DomFileEditor
+import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
+import app.revanced.util.findElementByAttributeValueOrThrow
+import app.revanced.util.insertFirst
+import org.w3c.dom.Element
+import java.io.Closeable
+
+@Patch(dependencies = [ResourceMappingPatch::class])
+internal object PlayerControlsResourcePatch : ResourcePatch(), Closeable {
+    internal var bottomUiContainerResourceId: Long = -1L
+    internal var controlsLayoutStub: Long = -1L
+    internal var fastForwardRewindHintContainer = -1L
+
+    private const val TARGET_RESOURCE_NAME = "youtube_controls_bottom_ui_container.xml"
+    private const val TARGET_RESOURCE = "res/layout/$TARGET_RESOURCE_NAME"
+
+    private lateinit var resourceContext: ResourceContext
+    private lateinit var targetDocumentEditor: DomFileEditor
+    private lateinit var targetElement : Element
+
+    override fun execute(context: ResourceContext) {
+        bottomUiContainerResourceId = ResourceMappingPatch["id", "bottom_ui_container_stub"]
+        controlsLayoutStub = ResourceMappingPatch["id", "controls_layout_stub"]
+        fastForwardRewindHintContainer = ResourceMappingPatch["id", "fast_forward_rewind_hint_container"]
+
+        resourceContext = context
+        targetDocumentEditor = context.xmlEditor[TARGET_RESOURCE]
+
+        // Add all buttons to an inner layout, to prevent
+        // cardboard VR from being inserted into the middle.
+        targetElement = targetDocumentEditor.file.createElement("LinearLayout")
+        targetElement.setAttribute("android:layoutDirection", "ltr")
+        targetElement.setAttribute("android:layout_width", "match_parent")
+        targetElement.setAttribute("android:layout_height", "wrap_content")
+        targetElement.setAttribute("android:orientation", "horizontal")
+
+        val bottomContainer = targetDocumentEditor.file.childNodes.findElementByAttributeValueOrThrow(
+            "android:id",
+            "@id/bottom_end_container"
+        )
+
+        bottomContainer.appendChild(targetElement)
+    }
+
+    /**
+     * Add new controls to the bottom of the YouTube player.
+     *
+     * @param resourceDirectoryName The name of the directory containing the hosting resource.
+     */
+    fun addControls(resourceDirectoryName: String) {
+        val sourceDocumentEditor = resourceContext.xmlEditor[
+            this::class.java.classLoader.getResourceAsStream(
+                "$resourceDirectoryName/host/layout/$TARGET_RESOURCE_NAME",
+            )!!,
+        ]
+
+        val sourceElements = sourceDocumentEditor.file.getElementsByTagName(
+            "android.support.constraint.ConstraintLayout"
+        ).item(0).childNodes
+
+        // Copy the patch layout xml into the target layout file.
+        for (index in 1 until sourceElements.length) {
+            val element = sourceElements.item(index).cloneNode(true)
+
+            targetDocumentEditor.file.adoptNode(element)
+
+            // Add the element as the first view.
+            targetElement.insertFirst(element)
+        }
+
+        sourceDocumentEditor.close()
+    }
+
+    override fun close() = targetDocumentEditor.close()
+}
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerControlsVisibilityFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/ControlsOverlayVisibility.kt
similarity index 70%
rename from src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerControlsVisibilityFingerprint.kt
rename to src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/ControlsOverlayVisibility.kt
index 672086f60d..6655c09c86 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerControlsVisibilityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/ControlsOverlayVisibility.kt
@@ -4,7 +4,10 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
-internal object PlayerControlsVisibilityFingerprint : MethodFingerprint(
+/**
+ * Resolves to the class found in [PlayerTopControlsInflateFingerprint].
+ */
+internal object ControlsOverlayVisibility : MethodFingerprint(
     accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
     returnType = "V",
     parameters = listOf("Z", "Z")
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/MotionOverlayFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/MotionOverlayFingerprint.kt
new file mode 100644
index 0000000000..b82955d831
--- /dev/null
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/MotionOverlayFingerprint.kt
@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.misc.playercontrols.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patches.youtube.misc.playercontrols.PlayerControlsResourcePatch
+import app.revanced.util.patch.LiteralValueFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object MotionOverlayFingerprint : LiteralValueFingerprint(
+    returnType = "V",
+    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
+    parameters = listOf(),
+    literalSupplier = { PlayerControlsResourcePatch.fastForwardRewindHintContainer }
+)
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/MotionOverlayVisibilityFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/MotionOverlayVisibilityFingerprint.kt
new file mode 100644
index 0000000000..3175bde8f8
--- /dev/null
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/MotionOverlayVisibilityFingerprint.kt
@@ -0,0 +1,29 @@
+package app.revanced.patches.youtube.misc.playercontrols.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+/**
+ * Resolves to the class found in [MotionOverlayFingerprint].
+ */
+internal object MotionOverlayVisibilityFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    returnType = "V",
+    parameters = listOf("Z"),
+    opcodes = listOf(
+        Opcode.IPUT_BOOLEAN,
+        Opcode.IGET_BOOLEAN,
+        Opcode.IF_EQZ,
+        Opcode.IGET_OBJECT,
+        Opcode.IPUT_BOOLEAN,
+        Opcode.RETURN_VOID,
+//iput-boolean p1, p0, Lafxx;->j:Z
+//iget-boolean v0, p0, Lafxx;->o:Z
+//if-eqz v0, :cond_a
+//iget-object v0, p0, Lafxx;->i:Lafxr;
+//iput-boolean p1, v0, Lafxr;->f:Z
+//return-void
+        )
+)
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/BottomControlsInflateFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerBottomControlsInflateFingerprint.kt
similarity index 51%
rename from src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/BottomControlsInflateFingerprint.kt
rename to src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerBottomControlsInflateFingerprint.kt
index 9480c6a1e4..c7ff8c7889 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/BottomControlsInflateFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerBottomControlsInflateFingerprint.kt
@@ -1,19 +1,13 @@
 package app.revanced.patches.youtube.misc.playercontrols.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.misc.playercontrols.BottomControlsResourcePatch
+import app.revanced.patches.youtube.misc.playercontrols.PlayerControlsResourcePatch
 import app.revanced.util.patch.LiteralValueFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
 
-internal object BottomControlsInflateFingerprint : LiteralValueFingerprint(
+internal object PlayerBottomControlsInflateFingerprint : LiteralValueFingerprint(
     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL or AccessFlags.SYNTHETIC,
     returnType = "L",
     parameters = listOf(),
-    opcodes = listOf(
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT
-    ),
-    literalSupplier = { BottomControlsResourcePatch.bottomUiContainerResourceId }
+    literalSupplier = { PlayerControlsResourcePatch.bottomUiContainerResourceId }
 )
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerTopControlsInflateFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerTopControlsInflateFingerprint.kt
new file mode 100644
index 0000000000..7b7a952c86
--- /dev/null
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerTopControlsInflateFingerprint.kt
@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.misc.playercontrols.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patches.youtube.misc.playercontrols.PlayerControlsResourcePatch
+import app.revanced.util.patch.LiteralValueFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object PlayerTopControlsInflateFingerprint : LiteralValueFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    returnType = "V",
+    parameters = listOf(),
+    literalSupplier = { PlayerControlsResourcePatch.controlsLayoutStub }
+)
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/speed/button/PlaybackSpeedButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/speed/button/PlaybackSpeedButtonPatch.kt
index 19895fa8ac..c99e5a2005 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/speed/button/PlaybackSpeedButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/speed/button/PlaybackSpeedButtonPatch.kt
@@ -32,7 +32,7 @@ object PlaybackSpeedButtonPatch : BytecodePatch(emptySet()) {
             SwitchPreference("revanced_playback_speed_dialog_button"),
         )
 
-        PlayerControlsBytecodePatch.initializeControl("$SPEED_BUTTON_CLASS_DESCRIPTOR->initializeButton(Landroid/view/View;)V")
-        PlayerControlsBytecodePatch.injectVisibilityCheckCall("$SPEED_BUTTON_CLASS_DESCRIPTOR->changeVisibility(Z)V")
+        PlayerControlsBytecodePatch.initializeBottomControl(SPEED_BUTTON_CLASS_DESCRIPTOR)
+        PlayerControlsBytecodePatch.injectVisibilityCheckCall(SPEED_BUTTON_CLASS_DESCRIPTOR)
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/speed/button/PlaybackSpeedButtonResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/speed/button/PlaybackSpeedButtonResourcePatch.kt
index ffc8d8f1db..b2dcf5f6ce 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/speed/button/PlaybackSpeedButtonResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/speed/button/PlaybackSpeedButtonResourcePatch.kt
@@ -3,12 +3,12 @@ package app.revanced.patches.youtube.video.speed.button
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.youtube.misc.playercontrols.BottomControlsResourcePatch
+import app.revanced.patches.youtube.misc.playercontrols.PlayerControlsResourcePatch
 import app.revanced.util.ResourceGroup
 import app.revanced.util.copyResources
 
 @Patch(
-    dependencies = [BottomControlsResourcePatch::class],
+    dependencies = [PlayerControlsResourcePatch::class],
 )
 internal object PlaybackSpeedButtonResourcePatch : ResourcePatch() {
     override fun execute(context: ResourceContext) {
@@ -20,6 +20,6 @@ internal object PlaybackSpeedButtonResourcePatch : ResourcePatch() {
             ),
         )
 
-        BottomControlsResourcePatch.addControls("speedbutton")
+        PlayerControlsResourcePatch.addControls("speedbutton")
     }
 }

From 2d26a97bbc79e73190feaa1c0c9fb05a18169488 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Sun, 22 Sep 2024 22:20:02 -0400
Subject: [PATCH 10/19] fix bottom buttons not fading out

---
 .../PlayerControlsBytecodePatch.kt            |  2 +
 .../PlayerControlsResourcePatch.kt            | 58 ++++++++++++-------
 .../MotionOverlayVisibilityFingerprint.kt     |  6 --
 .../kotlin/app/revanced/util/ResourceUtils.kt | 10 ++++
 .../youtube_controls_bottom_ui_container.xml  |  4 +-
 .../youtube_controls_bottom_ui_container.xml  |  2 +-
 .../youtube_controls_bottom_ui_container.xml  |  2 +-
 7 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt
index e8394bc706..d86eef1842 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt
@@ -115,6 +115,8 @@ object PlayerControlsBytecodePatch : BytecodePatch(
             "invoke-static { p1 }, $descriptor->changeVisibility(Z)V"
         )
 
+        // Edit: It's not clear if this hook is still needed,
+        // and it only seems to be called on app startup.
         invertVisibilityMethod.addInstruction(
             invertVisibilityInsertIndex++,
             "invoke-static { p1 }, $descriptor->changeVisibilityNegatedImmediate(Z)V"
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch.kt
index 97c59ee09c..f5ee894080 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch.kt
@@ -6,8 +6,7 @@ import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.DomFileEditor
 import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
 import app.revanced.util.findElementByAttributeValueOrThrow
-import app.revanced.util.insertFirst
-import org.w3c.dom.Element
+import org.w3c.dom.Node
 import java.io.Closeable
 
 @Patch(dependencies = [ResourceMappingPatch::class])
@@ -19,9 +18,15 @@ internal object PlayerControlsResourcePatch : ResourcePatch(), Closeable {
     private const val TARGET_RESOURCE_NAME = "youtube_controls_bottom_ui_container.xml"
     private const val TARGET_RESOURCE = "res/layout/$TARGET_RESOURCE_NAME"
 
+    /**
+     * The element to the left of the element being added.
+     */
+    private var lastLeftOf = "@id/fullscreen_button"
+    private lateinit var insertBeforeNode: Node
+
     private lateinit var resourceContext: ResourceContext
     private lateinit var targetDocumentEditor: DomFileEditor
-    private lateinit var targetElement : Element
+    private lateinit var targetElement : Node
 
     override fun execute(context: ResourceContext) {
         bottomUiContainerResourceId = ResourceMappingPatch["id", "bottom_ui_container_stub"]
@@ -31,20 +36,14 @@ internal object PlayerControlsResourcePatch : ResourcePatch(), Closeable {
         resourceContext = context
         targetDocumentEditor = context.xmlEditor[TARGET_RESOURCE]
 
-        // Add all buttons to an inner layout, to prevent
-        // cardboard VR from being inserted into the middle.
-        targetElement = targetDocumentEditor.file.createElement("LinearLayout")
-        targetElement.setAttribute("android:layoutDirection", "ltr")
-        targetElement.setAttribute("android:layout_width", "match_parent")
-        targetElement.setAttribute("android:layout_height", "wrap_content")
-        targetElement.setAttribute("android:orientation", "horizontal")
-
-        val bottomContainer = targetDocumentEditor.file.childNodes.findElementByAttributeValueOrThrow(
-            "android:id",
-            "@id/bottom_end_container"
-        )
+        targetElement = targetDocumentEditor.file.getElementsByTagName(
+            "android.support.constraint.ConstraintLayout"
+        ).item(0)
 
-        bottomContainer.appendChild(targetElement)
+        insertBeforeNode = targetDocumentEditor.file.childNodes.findElementByAttributeValueOrThrow(
+            "android:inflatedId",
+            lastLeftOf
+        )
     }
 
     /**
@@ -67,14 +66,33 @@ internal object PlayerControlsResourcePatch : ResourcePatch(), Closeable {
         for (index in 1 until sourceElements.length) {
             val element = sourceElements.item(index).cloneNode(true)
 
-            targetDocumentEditor.file.adoptNode(element)
+            // If the element has no attributes there's no point to adding it to the destination.
+            if (!element.hasAttributes()) continue
+
+            element.attributes.getNamedItem("yt:layout_constraintRight_toLeftOf").nodeValue = lastLeftOf
+            lastLeftOf = element.attributes.getNamedItem("android:id").nodeValue
 
-            // Add the element as the first view.
-            targetElement.insertFirst(element)
+            targetDocumentEditor.file.adoptNode(element)
+            // Elements do not need to be added in the layout order since a layout constraint is used,
+            // but in order is easier to make sense of while debugging.
+            targetElement.insertBefore(element, insertBeforeNode)
+            insertBeforeNode = element
         }
 
         sourceDocumentEditor.close()
     }
 
-    override fun close() = targetDocumentEditor.close()
+    override fun close() {
+        arrayOf(
+            "@id/bottom_end_container",
+            "@id/multiview_button",
+        ).forEach {
+            targetDocumentEditor.file.childNodes.findElementByAttributeValueOrThrow(
+                "android:id",
+                it
+            ).setAttribute("yt:layout_constraintRight_toLeftOf", lastLeftOf)
+        }
+
+        targetDocumentEditor.close()
+    }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/MotionOverlayVisibilityFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/MotionOverlayVisibilityFingerprint.kt
index 3175bde8f8..78aa1474fc 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/MotionOverlayVisibilityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/MotionOverlayVisibilityFingerprint.kt
@@ -19,11 +19,5 @@ internal object MotionOverlayVisibilityFingerprint : MethodFingerprint(
         Opcode.IGET_OBJECT,
         Opcode.IPUT_BOOLEAN,
         Opcode.RETURN_VOID,
-//iput-boolean p1, p0, Lafxx;->j:Z
-//iget-boolean v0, p0, Lafxx;->o:Z
-//if-eqz v0, :cond_a
-//iget-object v0, p0, Lafxx;->i:Lafxr;
-//iput-boolean p1, v0, Lafxr;->f:Z
-//return-void
         )
 )
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/util/ResourceUtils.kt b/src/main/kotlin/app/revanced/util/ResourceUtils.kt
index bb7bea23f0..2f0d93f840 100644
--- a/src/main/kotlin/app/revanced/util/ResourceUtils.kt
+++ b/src/main/kotlin/app/revanced/util/ResourceUtils.kt
@@ -4,6 +4,7 @@ import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.util.DomFileEditor
 import app.revanced.util.resource.BaseResource
+import org.w3c.dom.Attr
 import org.w3c.dom.Element
 import org.w3c.dom.Node
 import org.w3c.dom.NodeList
@@ -199,3 +200,12 @@ internal fun NodeList.findElementByAttributeValue(attributeName: String, value:
 internal fun NodeList.findElementByAttributeValueOrThrow(attributeName: String, value: String): Element {
     return findElementByAttributeValue(attributeName, value) ?: throw PatchException("Could not find: $attributeName $value")
 }
+
+internal fun Element.copyAttributesFrom(oldContainer: Element) {
+    // Copy attributes from the old element to the new element
+    val attributes = oldContainer.attributes
+    for (i in 0 until attributes.length) {
+        val attr = attributes.item(i) as Attr
+        setAttribute(attr.name, attr.value)
+    }
+}
diff --git a/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
index 864e576c2e..cd797d1b3e 100644
--- a/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_timestamp_button" android:longClickable="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/revanced_yt_copy_timestamp" android:scaleType="center" style="@style/YouTubePlayerButton"/>
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_button" android:longClickable="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/revanced_yt_copy" android:scaleType="center" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_timestamp_button" android:longClickable="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginBottom="2.5dp" android:src="@drawable/revanced_yt_copy_timestamp" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_button" android:longClickable="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginBottom="2.5dp" android:src="@drawable/revanced_yt_copy" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
 </android.support.constraint.ConstraintLayout>
diff --git a/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
index d79ee466e2..daa9ae256b 100644
--- a/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_external_download_button" android:longClickable="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/revanced_yt_download_button" android:scaleType="center" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_external_download_button" android:longClickable="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginBottom="2.5dp" android:src="@drawable/revanced_yt_download_button" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
 </android.support.constraint.ConstraintLayout>
diff --git a/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
index a91ecc2f3b..9f5e077cca 100644
--- a/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_playback_speed_dialog_button" android:longClickable="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/revanced_playback_speed_dialog_button" android:scaleType="center" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_playback_speed_dialog_button" android:longClickable="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginBottom="2.5dp" android:src="@drawable/revanced_playback_speed_dialog_button" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
 </android.support.constraint.ConstraintLayout>

From d732bc4da996de613b1eddb257c71cfff2ac1c3b Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Mon, 23 Sep 2024 03:20:47 -0400
Subject: [PATCH 11/19] fix: Hide bottom buttons when seekbar is scrolled

---
 api/revanced-patches.api                      |  2 +
 .../sponsorblock/SponsorBlockResourcePatch.kt |  1 +
 .../PlayerControlsBytecodePatch.kt            | 49 +++++++++++++------
 .../PlayerControlsResourcePatch.kt            | 12 +++--
 .../fingerprints/MotionOverlayFingerprint.kt  | 13 -----
 .../MotionOverlayVisibilityFingerprint.kt     | 23 ---------
 .../OverlayViewInflateFingerprint.kt          | 17 +++++++
 ...layerControlsIntegrationHookFingerprint.kt | 15 ++++++
 .../kotlin/app/revanced/util/BytecodeUtils.kt | 28 ++++++++++-
 9 files changed, 103 insertions(+), 57 deletions(-)
 delete mode 100644 src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/MotionOverlayFingerprint.kt
 delete mode 100644 src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/MotionOverlayVisibilityFingerprint.kt
 create mode 100644 src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/OverlayViewInflateFingerprint.kt
 create mode 100644 src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerControlsIntegrationHookFingerprint.kt

diff --git a/api/revanced-patches.api b/api/revanced-patches.api
index 21f65acfbe..5fb4ebd00c 100644
--- a/api/revanced-patches.api
+++ b/api/revanced-patches.api
@@ -2173,6 +2173,8 @@ public final class app/revanced/util/BytecodeUtilsKt {
 	public static synthetic fun indexOfFirstInstructionOrThrow$default (Lcom/android/tools/smali/dexlib2/iface/Method;ILkotlin/jvm/functions/Function1;ILjava/lang/Object;)I
 	public static final fun indexOfFirstWideLiteralInstructionValue (Lcom/android/tools/smali/dexlib2/iface/Method;J)I
 	public static final fun indexOfFirstWideLiteralInstructionValueOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;J)I
+	public static final fun indexOfFirstWideLiteralInstructionValueReversed (Lcom/android/tools/smali/dexlib2/iface/Method;J)I
+	public static final fun indexOfFirstWideLiteralInstructionValueReversedOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;J)I
 	public static final fun indexOfIdResource (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/String;)I
 	public static final fun indexOfIdResourceOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/String;)I
 	public static final fun injectHideViewCall (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;IILjava/lang/String;Ljava/lang/String;)V
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockResourcePatch.kt
index 459e7d9d8e..3750abd7aa 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockResourcePatch.kt
@@ -61,6 +61,7 @@ internal object SponsorBlockResourcePatch : ResourcePatch() {
         }
 
         // copy nodes from host resources to their real xml files
+        // TODO: move this to PlayerControlsPatch
 
         val hostingResourceStream =
             inputStreamFromBundledResource(
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt
index d86eef1842..7f54e170c8 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt
@@ -6,17 +6,21 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
+import app.revanced.patches.youtube.misc.playercontrols.fingerprints.ControlsOverlayVisibility
+import app.revanced.patches.youtube.misc.playercontrols.fingerprints.OverlayViewInflateFingerprint
 import app.revanced.patches.youtube.misc.playercontrols.fingerprints.PlayerBottomControlsInflateFingerprint
+import app.revanced.patches.youtube.misc.playercontrols.fingerprints.PlayerControlsIntegrationHookFingerprint
 import app.revanced.patches.youtube.misc.playercontrols.fingerprints.PlayerTopControlsInflateFingerprint
-import app.revanced.patches.youtube.misc.playercontrols.fingerprints.MotionOverlayVisibilityFingerprint
-import app.revanced.patches.youtube.misc.playercontrols.fingerprints.MotionOverlayFingerprint
-import app.revanced.patches.youtube.misc.playercontrols.fingerprints.ControlsOverlayVisibility
 import app.revanced.util.alsoResolve
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.indexOfFirstWideLiteralInstructionValueReversedOrThrow
 import app.revanced.util.resultOrThrow
+import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+import com.android.tools.smali.dexlib2.iface.reference.TypeReference
 
 @Patch(
     description = "Manages the code for the player controls of the YouTube player.",
@@ -26,9 +30,13 @@ object PlayerControlsBytecodePatch : BytecodePatch(
     setOf(
         PlayerTopControlsInflateFingerprint,
         PlayerBottomControlsInflateFingerprint,
-        MotionOverlayFingerprint
+        OverlayViewInflateFingerprint,
+        PlayerControlsIntegrationHookFingerprint
     )
 ) {
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR =
+        "Lapp/revanced/integrations/youtube/patches/PlayerControlsPatch;"
+
     private lateinit var inflateTopControlMethod: MutableMethod
     private var inflateTopControlInsertIndex: Int = -1
     private var inflateTopControlRegister: Int = -1
@@ -40,8 +48,8 @@ object PlayerControlsBytecodePatch : BytecodePatch(
     private lateinit var visibilityMethod: MutableMethod
     private var visibilityInsertIndex: Int = 0
 
-    private lateinit var invertVisibilityMethod: MutableMethod
-    private var invertVisibilityInsertIndex: Int = 0
+    private lateinit var visibilityImmediateMethod: MutableMethod
+    private var visibilityImmediateInsertIndex: Int = 0
 
     override fun execute(context: BytecodeContext) {
         fun MutableMethod.indexOfFirstViewInflateOrThrow() =
@@ -73,11 +81,24 @@ object PlayerControlsBytecodePatch : BytecodePatch(
             visibilityMethod = this
         }
 
-        MotionOverlayVisibilityFingerprint.alsoResolve(
-            context, MotionOverlayFingerprint
-        ).mutableMethod.apply {
-            invertVisibilityMethod = this
+        // Hook the fullscreen close button.  Used to fix visibility
+        // when the buttons immediately are set to hidden.
+        OverlayViewInflateFingerprint.resultOrThrow().mutableMethod.apply {
+            val resourceIndex = indexOfFirstWideLiteralInstructionValueReversedOrThrow(
+                PlayerControlsResourcePatch.fullscreenButton
+            )
+
+            val index = indexOfFirstInstructionOrThrow(resourceIndex) {
+                opcode == Opcode.CHECK_CAST && getReference<TypeReference>()?.type ==
+                        "Landroid/widget/ImageView;"
+            }
+            val register = getInstruction<OneRegisterInstruction>(index).registerA
+
+            addInstruction(index + 1, "invoke-static { v$register }, " +
+                    "$INTEGRATIONS_CLASS_DESCRIPTOR->setFullscreenCloseButton(Landroid/widget/ImageView;)V")
         }
+        
+        visibilityImmediateMethod = PlayerControlsIntegrationHookFingerprint.resultOrThrow().mutableMethod
     }
 
     /**
@@ -115,11 +136,9 @@ object PlayerControlsBytecodePatch : BytecodePatch(
             "invoke-static { p1 }, $descriptor->changeVisibility(Z)V"
         )
 
-        // Edit: It's not clear if this hook is still needed,
-        // and it only seems to be called on app startup.
-        invertVisibilityMethod.addInstruction(
-            invertVisibilityInsertIndex++,
-            "invoke-static { p1 }, $descriptor->changeVisibilityNegatedImmediate(Z)V"
+        visibilityImmediateMethod.addInstruction(
+            visibilityImmediateInsertIndex++,
+            "invoke-static { p0 }, $descriptor->changeVisibilityImmediate(Z)V"
         )
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch.kt
index f5ee894080..2327457521 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch.kt
@@ -11,13 +11,14 @@ import java.io.Closeable
 
 @Patch(dependencies = [ResourceMappingPatch::class])
 internal object PlayerControlsResourcePatch : ResourcePatch(), Closeable {
-    internal var bottomUiContainerResourceId: Long = -1L
-    internal var controlsLayoutStub: Long = -1L
-    internal var fastForwardRewindHintContainer = -1L
-
     private const val TARGET_RESOURCE_NAME = "youtube_controls_bottom_ui_container.xml"
     private const val TARGET_RESOURCE = "res/layout/$TARGET_RESOURCE_NAME"
 
+    internal var bottomUiContainerResourceId: Long = -1L
+    internal var controlsLayoutStub: Long = -1L
+    internal var heatseekerViewstub = -1L
+    internal var fullscreenButton = -1L
+
     /**
      * The element to the left of the element being added.
      */
@@ -31,7 +32,8 @@ internal object PlayerControlsResourcePatch : ResourcePatch(), Closeable {
     override fun execute(context: ResourceContext) {
         bottomUiContainerResourceId = ResourceMappingPatch["id", "bottom_ui_container_stub"]
         controlsLayoutStub = ResourceMappingPatch["id", "controls_layout_stub"]
-        fastForwardRewindHintContainer = ResourceMappingPatch["id", "fast_forward_rewind_hint_container"]
+        heatseekerViewstub = ResourceMappingPatch["id", "heatseeker_viewstub"]
+        fullscreenButton = ResourceMappingPatch["id", "fullscreen_button"]
 
         resourceContext = context
         targetDocumentEditor = context.xmlEditor[TARGET_RESOURCE]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/MotionOverlayFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/MotionOverlayFingerprint.kt
deleted file mode 100644
index b82955d831..0000000000
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/MotionOverlayFingerprint.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.misc.playercontrols.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.misc.playercontrols.PlayerControlsResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-
-internal object MotionOverlayFingerprint : LiteralValueFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
-    parameters = listOf(),
-    literalSupplier = { PlayerControlsResourcePatch.fastForwardRewindHintContainer }
-)
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/MotionOverlayVisibilityFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/MotionOverlayVisibilityFingerprint.kt
deleted file mode 100644
index 78aa1474fc..0000000000
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/MotionOverlayVisibilityFingerprint.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package app.revanced.patches.youtube.misc.playercontrols.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-/**
- * Resolves to the class found in [MotionOverlayFingerprint].
- */
-internal object MotionOverlayVisibilityFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = listOf("Z"),
-    opcodes = listOf(
-        Opcode.IPUT_BOOLEAN,
-        Opcode.IGET_BOOLEAN,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.RETURN_VOID,
-        )
-)
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/OverlayViewInflateFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/OverlayViewInflateFingerprint.kt
new file mode 100644
index 0000000000..21b0592e10
--- /dev/null
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/OverlayViewInflateFingerprint.kt
@@ -0,0 +1,17 @@
+package app.revanced.patches.youtube.misc.playercontrols.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patches.youtube.misc.playercontrols.PlayerControlsResourcePatch
+import app.revanced.util.containsWideLiteralInstructionValue
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object OverlayViewInflateFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    returnType = "V",
+    parameters = listOf("Landroid/view/View;"),
+    customFingerprint = { methodDef, _ ->
+        methodDef.containsWideLiteralInstructionValue(PlayerControlsResourcePatch.fullscreenButton) &&
+                methodDef.containsWideLiteralInstructionValue(PlayerControlsResourcePatch.heatseekerViewstub)
+    }
+)
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerControlsIntegrationHookFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerControlsIntegrationHookFingerprint.kt
new file mode 100644
index 0000000000..2fb86baa44
--- /dev/null
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerControlsIntegrationHookFingerprint.kt
@@ -0,0 +1,15 @@
+package app.revanced.patches.youtube.misc.playercontrols.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object PlayerControlsIntegrationHookFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
+    returnType = "V",
+    parameters = listOf("Z"),
+    customFingerprint = { methodDef, classDef ->
+        methodDef.name == "fullscreenButtonVisibilityChanged" &&
+                classDef.type == "Lapp/revanced/integrations/youtube/patches/PlayerControlsPatch;"
+    }
+)
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/util/BytecodeUtils.kt b/src/main/kotlin/app/revanced/util/BytecodeUtils.kt
index 0f81d8d4e2..d22bfbdbe0 100644
--- a/src/main/kotlin/app/revanced/util/BytecodeUtils.kt
+++ b/src/main/kotlin/app/revanced/util/BytecodeUtils.kt
@@ -15,6 +15,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.WideLiteralInstruction
 import com.android.tools.smali.dexlib2.iface.reference.Reference
 import com.android.tools.smali.dexlib2.util.MethodUtil
+import org.stringtemplate.v4.compiler.Bytecode.instructions
 
 fun MethodFingerprint.resultOrThrow() = result ?: throw exception
 
@@ -73,7 +74,7 @@ fun MutableMethod.injectHideViewCall(
  * @param resourceName the name of the resource to find the id for.
  * @return the index of the first instruction with the id of the given resource name, or -1 if not found.
  * @throws PatchException if the resource cannot be found.
- * @see [indexOfIdResourceOrThrow]
+ * @see [indexOfIdResourceOrThrow], [indexOfFirstWideLiteralInstructionValueReversed]
  */
 fun Method.indexOfIdResource(resourceName: String): Int {
     val resourceId = ResourceMappingPatch["id", resourceName]
@@ -86,6 +87,7 @@ fun Method.indexOfIdResource(resourceName: String): Int {
  * Requires [ResourceMappingPatch] as a dependency.
  *
  * @throws [PatchException] if the resource is not found, or the method does not contain the resource id literal value.
+ * @see [indexOfIdResource], [indexOfFirstWideLiteralInstructionValueReversedOrThrow]
  */
 fun Method.indexOfIdResourceOrThrow(resourceName: String): Int {
     val index = indexOfIdResource(resourceName)
@@ -120,6 +122,30 @@ fun Method.indexOfFirstWideLiteralInstructionValueOrThrow(literal: Long): Int {
     return index
 }
 
+/**
+ * Find the index of the last wide literal instruction with the given value.
+ *
+ * @return the last literal instruction with the value, or -1 if not found.
+ * @see indexOfFirstWideLiteralInstructionValueOrThrow
+ */
+fun Method.indexOfFirstWideLiteralInstructionValueReversed(literal: Long) = implementation?.let {
+    it.instructions.indexOfLast { instruction ->
+        (instruction as? WideLiteralInstruction)?.wideLiteral == literal
+    }
+} ?: -1
+
+/**
+ * Find the index of the last wide literal instruction with the given value,
+ * or throw an exception if not found.
+ *
+ * @return the last literal instruction with the value, or throws [PatchException] if not found.
+ */
+fun Method.indexOfFirstWideLiteralInstructionValueReversedOrThrow(literal: Long): Int {
+    val index = indexOfFirstWideLiteralInstructionValueReversed(literal)
+    if (index < 0) throw PatchException("Could not find literal value: $literal")
+    return index
+}
+
 /**
  * Check if the method contains a literal with the given value.
  *

From 3d9a3111ad32b75b7b678114784bd3c712aac0d1 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Mon, 23 Sep 2024 04:03:15 -0400
Subject: [PATCH 12/19] fix: use 60dip size for bottom buttons

---
 .../host/layout/youtube_controls_bottom_ui_container.xml      | 4 ++--
 .../host/layout/youtube_controls_bottom_ui_container.xml      | 2 +-
 .../host/layout/youtube_controls_bottom_ui_container.xml      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
index cd797d1b3e..7bb12ccc74 100644
--- a/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_timestamp_button" android:longClickable="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginBottom="2.5dp" android:src="@drawable/revanced_yt_copy_timestamp" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_button" android:longClickable="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginBottom="2.5dp" android:src="@drawable/revanced_yt_copy" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_timestamp_button" android:longClickable="false" android:layout_width="60.0dip" android:layout_height="48.0dip" android:layout_marginBottom="2.5dp" android:src="@drawable/revanced_yt_copy_timestamp" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_button" android:longClickable="false" android:layout_width="60.0dip" android:layout_height="48.0dip" android:layout_marginBottom="2.5dp" android:src="@drawable/revanced_yt_copy" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
 </android.support.constraint.ConstraintLayout>
diff --git a/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
index daa9ae256b..d638306bb9 100644
--- a/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_external_download_button" android:longClickable="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginBottom="2.5dp" android:src="@drawable/revanced_yt_download_button" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_external_download_button" android:longClickable="false" android:layout_width="60.0dip" android:layout_height="60.0dip" android:layout_marginBottom="2.5dp" android:src="@drawable/revanced_yt_download_button" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
 </android.support.constraint.ConstraintLayout>
diff --git a/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
index 9f5e077cca..45d4dff47f 100644
--- a/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_playback_speed_dialog_button" android:longClickable="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginBottom="2.5dp" android:src="@drawable/revanced_playback_speed_dialog_button" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_playback_speed_dialog_button" android:longClickable="false" android:layout_width="60.0dip" android:layout_height="60.0dip" android:layout_marginBottom="2.5dp" android:src="@drawable/revanced_playback_speed_dialog_button" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
 </android.support.constraint.ConstraintLayout>

From eb1341ddc126c1625f50b0ce395ae93a1b18c84b Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Mon, 23 Sep 2024 04:05:19 -0400
Subject: [PATCH 13/19] fix xml formatting

---
 .../youtube_controls_bottom_ui_container.xml  | 33 +++++++++++++++++--
 .../youtube_controls_bottom_ui_container.xml  | 20 +++++++++--
 .../youtube_controls_bottom_ui_container.xml  | 20 +++++++++--
 3 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
index 7bb12ccc74..02f5ee44b5 100644
--- a/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
@@ -1,5 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_timestamp_button" android:longClickable="false" android:layout_width="60.0dip" android:layout_height="48.0dip" android:layout_marginBottom="2.5dp" android:src="@drawable/revanced_yt_copy_timestamp" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_copy_video_url_button" android:longClickable="false" android:layout_width="60.0dip" android:layout_height="48.0dip" android:layout_marginBottom="2.5dp" android:src="@drawable/revanced_yt_copy" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:yt="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/youtube_controls_bottom_ui_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layoutDirection="ltr">
+
+    <com.google.android.libraries.youtube.common.ui.TouchImageView
+        android:id="@+id/revanced_copy_video_url_timestamp_button"
+        style="@style/YouTubePlayerButton"
+        android:layout_width="60.0dip"
+        android:layout_height="60.0dip"
+        android:layout_marginBottom="2.5dp"
+        android:longClickable="false"
+        android:scaleType="center"
+        android:src="@drawable/revanced_yt_copy_timestamp"
+        yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container"
+        yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" />
+
+    <com.google.android.libraries.youtube.common.ui.TouchImageView
+        android:id="@+id/revanced_copy_video_url_button"
+        style="@style/YouTubePlayerButton"
+        android:layout_width="60.0dip"
+        android:layout_height="60.0dip"
+        android:layout_marginBottom="2.5dp"
+        android:longClickable="false"
+        android:scaleType="center"
+        android:src="@drawable/revanced_yt_copy"
+        yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container"
+        yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" />
 </android.support.constraint.ConstraintLayout>
diff --git a/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
index d638306bb9..9d0dd12423 100644
--- a/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_external_download_button" android:longClickable="false" android:layout_width="60.0dip" android:layout_height="60.0dip" android:layout_marginBottom="2.5dp" android:src="@drawable/revanced_yt_download_button" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:yt="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/youtube_controls_bottom_ui_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layoutDirection="ltr">
+
+    <com.google.android.libraries.youtube.common.ui.TouchImageView
+        android:id="@+id/revanced_external_download_button"
+        style="@style/YouTubePlayerButton"
+        android:layout_width="60.0dip"
+        android:layout_height="60.0dip"
+        android:layout_marginBottom="2.5dp"
+        android:longClickable="false"
+        android:scaleType="center"
+        android:src="@drawable/revanced_yt_download_button"
+        yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container"
+        yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" />
 </android.support.constraint.ConstraintLayout>
diff --git a/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
index 45d4dff47f..2a105a6f7e 100644
--- a/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/revanced_playback_speed_dialog_button" android:longClickable="false" android:layout_width="60.0dip" android:layout_height="60.0dip" android:layout_marginBottom="2.5dp" android:src="@drawable/revanced_playback_speed_dialog_button" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:yt="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/youtube_controls_bottom_ui_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layoutDirection="ltr">
+
+    <com.google.android.libraries.youtube.common.ui.TouchImageView
+        android:id="@+id/revanced_playback_speed_dialog_button"
+        style="@style/YouTubePlayerButton"
+        android:layout_width="60.0dip"
+        android:layout_height="60.0dip"
+        android:layout_marginBottom="2.5dp"
+        android:longClickable="false"
+        android:scaleType="center"
+        android:src="@drawable/revanced_playback_speed_dialog_button"
+        yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container"
+        yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" />
 </android.support.constraint.ConstraintLayout>

From 0ac69a08ef5414b690f16b767b3864d56e91a86c Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Mon, 23 Sep 2024 04:25:33 -0400
Subject: [PATCH 14/19] fix button alignment

---
 .../host/layout/youtube_controls_bottom_ui_container.xml    | 6 ++++--
 .../host/layout/youtube_controls_bottom_ui_container.xml    | 3 ++-
 .../host/layout/youtube_controls_bottom_ui_container.xml    | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
index 02f5ee44b5..ce805344d7 100644
--- a/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
@@ -11,7 +11,8 @@
         style="@style/YouTubePlayerButton"
         android:layout_width="60.0dip"
         android:layout_height="60.0dip"
-        android:layout_marginBottom="2.5dp"
+        android:paddingTop="6.0dp"
+        android:paddingBottom="0dp"
         android:longClickable="false"
         android:scaleType="center"
         android:src="@drawable/revanced_yt_copy_timestamp"
@@ -23,7 +24,8 @@
         style="@style/YouTubePlayerButton"
         android:layout_width="60.0dip"
         android:layout_height="60.0dip"
-        android:layout_marginBottom="2.5dp"
+        android:paddingTop="6.0dp"
+        android:paddingBottom="0dp"
         android:longClickable="false"
         android:scaleType="center"
         android:src="@drawable/revanced_yt_copy"
diff --git a/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
index 9d0dd12423..2e394c228e 100644
--- a/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
@@ -11,7 +11,8 @@
         style="@style/YouTubePlayerButton"
         android:layout_width="60.0dip"
         android:layout_height="60.0dip"
-        android:layout_marginBottom="2.5dp"
+        android:paddingTop="6.5dp"
+        android:paddingBottom="0dp"
         android:longClickable="false"
         android:scaleType="center"
         android:src="@drawable/revanced_yt_download_button"
diff --git a/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
index 2a105a6f7e..be17fc211c 100644
--- a/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
@@ -11,7 +11,8 @@
         style="@style/YouTubePlayerButton"
         android:layout_width="60.0dip"
         android:layout_height="60.0dip"
-        android:layout_marginBottom="2.5dp"
+        android:paddingTop="6.0dp"
+        android:paddingBottom="0dp"
         android:longClickable="false"
         android:scaleType="center"
         android:src="@drawable/revanced_playback_speed_dialog_button"

From a9e160148252a46fbcba7fbd7bc9eaf91a4d9e06 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Mon, 23 Sep 2024 16:21:23 -0400
Subject: [PATCH 15/19] fix: Do not show player buttons when seeking with
 fullscreen thumbnails.

---
 .../youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt
index 7f54e170c8..47d6e55346 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt
@@ -133,7 +133,7 @@ object PlayerControlsBytecodePatch : BytecodePatch(
     fun injectVisibilityCheckCall(descriptor: String) {
         visibilityMethod.addInstruction(
             visibilityInsertIndex++,
-            "invoke-static { p1 }, $descriptor->changeVisibility(Z)V"
+            "invoke-static { p1 , p2 }, $descriptor->changeVisibility(ZZ)V"
         )
 
         visibilityImmediateMethod.addInstruction(

From 8a8de2d16e4bfdd98e408b62481e13d24ea41d03 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Mon, 23 Sep 2024 16:21:37 -0400
Subject: [PATCH 16/19] fix button padding width

---
 .../host/layout/youtube_controls_bottom_ui_container.xml      | 4 ++--
 .../host/layout/youtube_controls_bottom_ui_container.xml      | 2 +-
 .../host/layout/youtube_controls_bottom_ui_container.xml      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
index ce805344d7..531be4cf5f 100644
--- a/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
@@ -9,7 +9,7 @@
     <com.google.android.libraries.youtube.common.ui.TouchImageView
         android:id="@+id/revanced_copy_video_url_timestamp_button"
         style="@style/YouTubePlayerButton"
-        android:layout_width="60.0dip"
+        android:layout_width="48.0dip"
         android:layout_height="60.0dip"
         android:paddingTop="6.0dp"
         android:paddingBottom="0dp"
@@ -22,7 +22,7 @@
     <com.google.android.libraries.youtube.common.ui.TouchImageView
         android:id="@+id/revanced_copy_video_url_button"
         style="@style/YouTubePlayerButton"
-        android:layout_width="60.0dip"
+        android:layout_width="48.0dip"
         android:layout_height="60.0dip"
         android:paddingTop="6.0dp"
         android:paddingBottom="0dp"
diff --git a/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
index 2e394c228e..a243eea714 100644
--- a/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/downloads/host/layout/youtube_controls_bottom_ui_container.xml
@@ -9,7 +9,7 @@
     <com.google.android.libraries.youtube.common.ui.TouchImageView
         android:id="@+id/revanced_external_download_button"
         style="@style/YouTubePlayerButton"
-        android:layout_width="60.0dip"
+        android:layout_width="48.0dip"
         android:layout_height="60.0dip"
         android:paddingTop="6.5dp"
         android:paddingBottom="0dp"
diff --git a/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
index be17fc211c..3f51307493 100644
--- a/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/speedbutton/host/layout/youtube_controls_bottom_ui_container.xml
@@ -9,7 +9,7 @@
     <com.google.android.libraries.youtube.common.ui.TouchImageView
         android:id="@+id/revanced_playback_speed_dialog_button"
         style="@style/YouTubePlayerButton"
-        android:layout_width="60.0dip"
+        android:layout_width="48.0dip"
         android:layout_height="60.0dip"
         android:paddingTop="6.0dp"
         android:paddingBottom="0dp"

From a1f31b9068711fa18728fd4d7c7542e9f18248b7 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Mon, 23 Sep 2024 16:45:49 -0400
Subject: [PATCH 17/19] fix 18.48 and 19.37

---
 .../PlayerControlsResourcePatch.kt            | 20 +++++++++++++++----
 .../PlayerBottomControlsInflateFingerprint.kt |  5 +----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch.kt
index 2327457521..355e3d943e 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch.kt
@@ -5,6 +5,7 @@ import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.DomFileEditor
 import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
+import app.revanced.util.findElementByAttributeValue
 import app.revanced.util.findElementByAttributeValueOrThrow
 import org.w3c.dom.Node
 import java.io.Closeable
@@ -37,15 +38,26 @@ internal object PlayerControlsResourcePatch : ResourcePatch(), Closeable {
 
         resourceContext = context
         targetDocumentEditor = context.xmlEditor[TARGET_RESOURCE]
+        val document = targetDocumentEditor.file
 
-        targetElement = targetDocumentEditor.file.getElementsByTagName(
+        targetElement = document.getElementsByTagName(
             "android.support.constraint.ConstraintLayout"
         ).item(0)
 
-        insertBeforeNode = targetDocumentEditor.file.childNodes.findElementByAttributeValueOrThrow(
+        var fullscreenNode = document.childNodes.findElementByAttributeValue(
             "android:inflatedId",
             lastLeftOf
         )
+
+        if (fullscreenNode == null) {
+            // Older targets use non inflated id.
+            fullscreenNode = document.childNodes.findElementByAttributeValueOrThrow(
+                "android:id",
+                lastLeftOf
+            )
+        }
+
+        insertBeforeNode = fullscreenNode
     }
 
     /**
@@ -89,10 +101,10 @@ internal object PlayerControlsResourcePatch : ResourcePatch(), Closeable {
             "@id/bottom_end_container",
             "@id/multiview_button",
         ).forEach {
-            targetDocumentEditor.file.childNodes.findElementByAttributeValueOrThrow(
+            targetDocumentEditor.file.childNodes.findElementByAttributeValue(
                 "android:id",
                 it
-            ).setAttribute("yt:layout_constraintRight_toLeftOf", lastLeftOf)
+            )?.setAttribute("yt:layout_constraintRight_toLeftOf", lastLeftOf)
         }
 
         targetDocumentEditor.close()
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerBottomControlsInflateFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerBottomControlsInflateFingerprint.kt
index c7ff8c7889..8deab7b9e3 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerBottomControlsInflateFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerBottomControlsInflateFingerprint.kt
@@ -1,13 +1,10 @@
 package app.revanced.patches.youtube.misc.playercontrols.fingerprints
 
-import app.revanced.patcher.extensions.or
 import app.revanced.patches.youtube.misc.playercontrols.PlayerControlsResourcePatch
 import app.revanced.util.patch.LiteralValueFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
 
 internal object PlayerBottomControlsInflateFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL or AccessFlags.SYNTHETIC,
-    returnType = "L",
+    returnType = "Ljava/lang/Object;",
     parameters = listOf(),
     literalSupplier = { PlayerControlsResourcePatch.bottomUiContainerResourceId }
 )
\ No newline at end of file

From 88185f0121dbb476dd31ee1aeb21446957cc17f1 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Mon, 23 Sep 2024 17:16:59 -0400
Subject: [PATCH 18/19] refactor: Move top player button code from SB to
 correct place

---
 api/revanced-patches.api                      |  8 ++
 .../copyvideourl/CopyVideoUrlResourcePatch.kt |  2 +-
 .../downloads/DownloadsResourcePatch.kt       |  2 +-
 .../sponsorblock/SponsorBlockResourcePatch.kt | 50 +----------
 .../BottomControlsResourcePatch.kt            |  4 +-
 .../PlayerControlsResourcePatch.kt            | 90 +++++++++++++------
 .../PlaybackSpeedButtonResourcePatch.kt       |  2 +-
 .../host/layout/youtube_controls_layout.xml   | 12 +--
 8 files changed, 83 insertions(+), 87 deletions(-)

diff --git a/api/revanced-patches.api b/api/revanced-patches.api
index 5fb4ebd00c..59518ee771 100644
--- a/api/revanced-patches.api
+++ b/api/revanced-patches.api
@@ -2008,6 +2008,14 @@ public final class app/revanced/patches/youtube/misc/playercontrols/PlayerContro
 	public final fun injectVisibilityCheckCall (Ljava/lang/String;)V
 }
 
+public final class app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch : app/revanced/patcher/patch/ResourcePatch, java/io/Closeable {
+	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch;
+	public final fun addBottomControls (Ljava/lang/String;)V
+	public fun close ()V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
+}
+
 public final class app/revanced/patches/youtube/misc/playeroverlay/PlayerOverlaysHookPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/playeroverlay/PlayerOverlaysHookPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlResourcePatch.kt
index 495b999cad..a53216c283 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlResourcePatch.kt
@@ -34,6 +34,6 @@ internal object CopyVideoUrlResourcePatch : ResourcePatch() {
             )
         )
 
-        PlayerControlsResourcePatch.addControls("copyvideourl")
+        PlayerControlsResourcePatch.addBottomControls("copyvideourl")
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsResourcePatch.kt
index 7977497536..8884a296fe 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsResourcePatch.kt
@@ -42,6 +42,6 @@ internal object DownloadsResourcePatch : ResourcePatch() {
             ResourceGroup("drawable", "revanced_yt_download_button.xml"),
         )
 
-        PlayerControlsResourcePatch.addControls("downloads")
+        PlayerControlsResourcePatch.addBottomControls("downloads")
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockResourcePatch.kt
index 3750abd7aa..04c158dd8f 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockResourcePatch.kt
@@ -1,18 +1,16 @@
 package app.revanced.patches.youtube.layout.sponsorblock
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.all.misc.resources.AddResourcesPatch
 import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
 import app.revanced.patches.shared.misc.settings.preference.IntentPreference
+import app.revanced.patches.youtube.misc.playercontrols.PlayerControlsResourcePatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.SettingsResourcePatch
 import app.revanced.util.ResourceGroup
 import app.revanced.util.copyResources
-import app.revanced.util.copyXmlNode
-import app.revanced.util.inputStreamFromBundledResource
 
 @Patch(
     dependencies = [
@@ -60,50 +58,6 @@ internal object SponsorBlockResourcePatch : ResourcePatch() {
             context.copyResources("sponsorblock", resourceGroup)
         }
 
-        // copy nodes from host resources to their real xml files
-        // TODO: move this to PlayerControlsPatch
-
-        val hostingResourceStream =
-            inputStreamFromBundledResource(
-                "sponsorblock",
-                "host/layout/youtube_controls_layout.xml",
-            )!!
-
-        var modifiedControlsLayout = false
-        val editor = context.xmlEditor["res/layout/youtube_controls_layout.xml"]
-        "RelativeLayout".copyXmlNode(
-            context.xmlEditor[hostingResourceStream],
-            editor,
-        ).also {
-            val document = editor.file
-
-            val children = document.getElementsByTagName("RelativeLayout").item(0).childNodes
-
-            // Replace the startOf with the voting button view so that the button does not overlap
-            for (i in 1 until children.length) {
-                val view = children.item(i)
-
-                // Replace the attribute for a specific node only
-                if (!(
-                        view.hasAttributes() &&
-                            view.attributes.getNamedItem(
-                                "android:id",
-                            ).nodeValue.endsWith("live_chat_overlay_button")
-                        )
-                ) {
-                    continue
-                }
-
-                // voting button id from the voting button view from the youtube_controls_layout.xml host file
-                val votingButtonId = "@+id/revanced_sb_voting_button"
-
-                view.attributes.getNamedItem("android:layout_toStartOf").nodeValue = votingButtonId
-
-                modifiedControlsLayout = true
-                break
-            }
-        }.close()
-
-        if (!modifiedControlsLayout) throw PatchException("Could not modify controls layout")
+        PlayerControlsResourcePatch.addTopControls("sponsorblock")
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
index 1deebe993d..b62de28726 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt
@@ -8,12 +8,12 @@ import java.io.Closeable
 @Patch(
     dependencies = [PlayerControlsBytecodePatch::class],
 )
-@Deprecated("Obsolete", replaceWith = ReplaceWith("PlayerControlsBytecodePatch"))
+@Deprecated("Patch renamed to PlayerControlsResourcePatch", replaceWith = ReplaceWith("PlayerControlsBytecodePatch"))
 object BottomControlsResourcePatch : ResourcePatch(), Closeable {
     override fun execute(context: ResourceContext) {}
 
     fun addControls(resourceDirectoryName: String) {
-        PlayerControlsResourcePatch.addControls(resourceDirectoryName)
+        PlayerControlsResourcePatch.addBottomControls(resourceDirectoryName)
     }
 
     override fun close() {}
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch.kt
index 355e3d943e..f78bc92592 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch.kt
@@ -1,17 +1,20 @@
 package app.revanced.patches.youtube.misc.playercontrols
 
 import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.DomFileEditor
 import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
+import app.revanced.util.copyXmlNode
 import app.revanced.util.findElementByAttributeValue
 import app.revanced.util.findElementByAttributeValueOrThrow
+import app.revanced.util.inputStreamFromBundledResource
 import org.w3c.dom.Node
 import java.io.Closeable
 
 @Patch(dependencies = [ResourceMappingPatch::class])
-internal object PlayerControlsResourcePatch : ResourcePatch(), Closeable {
+object PlayerControlsResourcePatch : ResourcePatch(), Closeable {
     private const val TARGET_RESOURCE_NAME = "youtube_controls_bottom_ui_container.xml"
     private const val TARGET_RESOURCE = "res/layout/$TARGET_RESOURCE_NAME"
 
@@ -20,15 +23,15 @@ internal object PlayerControlsResourcePatch : ResourcePatch(), Closeable {
     internal var heatseekerViewstub = -1L
     internal var fullscreenButton = -1L
 
+    private lateinit var resourceContext: ResourceContext
+
     /**
      * The element to the left of the element being added.
      */
-    private var lastLeftOf = "@id/fullscreen_button"
-    private lateinit var insertBeforeNode: Node
-
-    private lateinit var resourceContext: ResourceContext
-    private lateinit var targetDocumentEditor: DomFileEditor
-    private lateinit var targetElement : Node
+    private var bottomLastLeftOf = "@id/fullscreen_button"
+    private lateinit var bottomInsertBeforeNode: Node
+    private lateinit var bottomTargetDocumentEditor: DomFileEditor
+    private lateinit var bottomTargetElement : Node
 
     override fun execute(context: ResourceContext) {
         bottomUiContainerResourceId = ResourceMappingPatch["id", "bottom_ui_container_stub"]
@@ -37,27 +40,58 @@ internal object PlayerControlsResourcePatch : ResourcePatch(), Closeable {
         fullscreenButton = ResourceMappingPatch["id", "fullscreen_button"]
 
         resourceContext = context
-        targetDocumentEditor = context.xmlEditor[TARGET_RESOURCE]
-        val document = targetDocumentEditor.file
+        bottomTargetDocumentEditor = context.xmlEditor[TARGET_RESOURCE]
+        val document = bottomTargetDocumentEditor.file
 
-        targetElement = document.getElementsByTagName(
+        bottomTargetElement = document.getElementsByTagName(
             "android.support.constraint.ConstraintLayout"
         ).item(0)
 
-        var fullscreenNode = document.childNodes.findElementByAttributeValue(
+        bottomInsertBeforeNode = document.childNodes.findElementByAttributeValue(
             "android:inflatedId",
-            lastLeftOf
+            bottomLastLeftOf
+        ) ?: document.childNodes.findElementByAttributeValueOrThrow(
+            "android:id", // Older targets use non inflated id.
+            bottomLastLeftOf
         )
+    }
 
-        if (fullscreenNode == null) {
-            // Older targets use non inflated id.
-            fullscreenNode = document.childNodes.findElementByAttributeValueOrThrow(
-                "android:id",
-                lastLeftOf
-            )
+    // Internal until this is modified to work with any patch (and not just SponsorBlock).
+    internal fun addTopControls(resourceDirectoryName: String) {
+        val hostingResourceStream = inputStreamFromBundledResource(
+            resourceDirectoryName,
+            "host/layout/youtube_controls_layout.xml",
+        )!!
+
+        val editor = resourceContext.xmlEditor["res/layout/youtube_controls_layout.xml"]
+
+        "RelativeLayout".copyXmlNode(
+            resourceContext.xmlEditor[hostingResourceStream],
+            editor,
+        ).use {
+            val document = editor.file
+            val children = document.getElementsByTagName("RelativeLayout").item(0).childNodes
+
+            // Replace the startOf with the voting button view so that the button does not overlap
+            for (index in 1 until children.length) {
+                val view = children.item(index)
+
+                // FIXME: This uses hard coded values that only works with SponsorBlock.
+                // If other top buttons are added by other patches, this code must be changed.
+                if (view.hasAttributes() && view.attributes.getNamedItem("android:id")
+                        .nodeValue.endsWith("live_chat_overlay_button")
+                ) {
+                    // voting button id from the voting button view from the youtube_controls_layout.xml host file
+                    val votingButtonId = "@+id/revanced_sb_voting_button"
+                    view.attributes.getNamedItem("android:layout_toStartOf").nodeValue =
+                        votingButtonId
+
+                    return
+                }
+            }
         }
 
-        insertBeforeNode = fullscreenNode
+        throw PatchException("Could not find expected xml to modify")
     }
 
     /**
@@ -65,7 +99,7 @@ internal object PlayerControlsResourcePatch : ResourcePatch(), Closeable {
      *
      * @param resourceDirectoryName The name of the directory containing the hosting resource.
      */
-    fun addControls(resourceDirectoryName: String) {
+    fun addBottomControls(resourceDirectoryName: String) {
         val sourceDocumentEditor = resourceContext.xmlEditor[
             this::class.java.classLoader.getResourceAsStream(
                 "$resourceDirectoryName/host/layout/$TARGET_RESOURCE_NAME",
@@ -83,14 +117,14 @@ internal object PlayerControlsResourcePatch : ResourcePatch(), Closeable {
             // If the element has no attributes there's no point to adding it to the destination.
             if (!element.hasAttributes()) continue
 
-            element.attributes.getNamedItem("yt:layout_constraintRight_toLeftOf").nodeValue = lastLeftOf
-            lastLeftOf = element.attributes.getNamedItem("android:id").nodeValue
+            element.attributes.getNamedItem("yt:layout_constraintRight_toLeftOf").nodeValue = bottomLastLeftOf
+            bottomLastLeftOf = element.attributes.getNamedItem("android:id").nodeValue
 
-            targetDocumentEditor.file.adoptNode(element)
+            bottomTargetDocumentEditor.file.adoptNode(element)
             // Elements do not need to be added in the layout order since a layout constraint is used,
             // but in order is easier to make sense of while debugging.
-            targetElement.insertBefore(element, insertBeforeNode)
-            insertBeforeNode = element
+            bottomTargetElement.insertBefore(element, bottomInsertBeforeNode)
+            bottomInsertBeforeNode = element
         }
 
         sourceDocumentEditor.close()
@@ -101,12 +135,12 @@ internal object PlayerControlsResourcePatch : ResourcePatch(), Closeable {
             "@id/bottom_end_container",
             "@id/multiview_button",
         ).forEach {
-            targetDocumentEditor.file.childNodes.findElementByAttributeValue(
+            bottomTargetDocumentEditor.file.childNodes.findElementByAttributeValue(
                 "android:id",
                 it
-            )?.setAttribute("yt:layout_constraintRight_toLeftOf", lastLeftOf)
+            )?.setAttribute("yt:layout_constraintRight_toLeftOf", bottomLastLeftOf)
         }
 
-        targetDocumentEditor.close()
+        bottomTargetDocumentEditor.close()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/speed/button/PlaybackSpeedButtonResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/speed/button/PlaybackSpeedButtonResourcePatch.kt
index b2dcf5f6ce..b35975f7cf 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/speed/button/PlaybackSpeedButtonResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/speed/button/PlaybackSpeedButtonResourcePatch.kt
@@ -20,6 +20,6 @@ internal object PlaybackSpeedButtonResourcePatch : ResourcePatch() {
             ),
         )
 
-        PlayerControlsResourcePatch.addControls("speedbutton")
+        PlayerControlsResourcePatch.addBottomControls("speedbutton")
     }
 }
diff --git a/src/main/resources/sponsorblock/host/layout/youtube_controls_layout.xml b/src/main/resources/sponsorblock/host/layout/youtube_controls_layout.xml
index 7c2d539183..aec11d7c52 100644
--- a/src/main/resources/sponsorblock/host/layout/youtube_controls_layout.xml
+++ b/src/main/resources/sponsorblock/host/layout/youtube_controls_layout.xml
@@ -1,7 +1,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android">
 
     <com.google.android.libraries.youtube.common.ui.TouchImageView
-        android:id="@+id/revanced_sb_create_segment_button"
+        android:id="@+id/revanced_sb_voting_button"
         style="@style/YouTubePlayerButton"
         android:layout_width="@dimen/controls_overlay_action_button_size"
         android:layout_height="@dimen/controls_overlay_action_button_size"
@@ -9,12 +9,12 @@
         android:layout_alignParentTop="true"
         android:layout_marginTop="2dp"
         android:layout_marginEnd="4dp"
-        android:layout_toStartOf="@+id/player_additional_view_container"
+        android:layout_toStartOf="@+id/revanced_sb_create_segment_button"
         android:padding="@dimen/controls_overlay_action_button_padding"
-        android:src="@drawable/revanced_sb_logo" />
+        android:src="@drawable/revanced_sb_voting" />
 
     <com.google.android.libraries.youtube.common.ui.TouchImageView
-        android:id="@+id/revanced_sb_voting_button"
+        android:id="@+id/revanced_sb_create_segment_button"
         style="@style/YouTubePlayerButton"
         android:layout_width="@dimen/controls_overlay_action_button_size"
         android:layout_height="@dimen/controls_overlay_action_button_size"
@@ -22,7 +22,7 @@
         android:layout_alignParentTop="true"
         android:layout_marginTop="2dp"
         android:layout_marginEnd="4dp"
-        android:layout_toStartOf="@+id/revanced_sb_create_segment_button"
+        android:layout_toStartOf="@+id/player_additional_view_container"
         android:padding="@dimen/controls_overlay_action_button_padding"
-        android:src="@drawable/revanced_sb_voting" />
+        android:src="@drawable/revanced_sb_logo" />
 </RelativeLayout>

From 7ea8e3f338efdb07708526bf86d09e3fe17e22f5 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Mon, 23 Sep 2024 18:44:21 -0400
Subject: [PATCH 19/19] fix: Top controls is not public yet, since it's still
 hard coded to assume it's SponsorBlock

---
 api/revanced-patches.api                             |  1 -
 .../playercontrols/PlayerControlsBytecodePatch.kt    | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/api/revanced-patches.api b/api/revanced-patches.api
index 59518ee771..8185c9e021 100644
--- a/api/revanced-patches.api
+++ b/api/revanced-patches.api
@@ -2004,7 +2004,6 @@ public final class app/revanced/patches/youtube/misc/playercontrols/PlayerContro
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 	public final fun initializeBottomControl (Ljava/lang/String;)V
 	public final fun initializeControl (Ljava/lang/String;)V
-	public final fun initializeTopControl (Ljava/lang/String;)V
 	public final fun injectVisibilityCheckCall (Ljava/lang/String;)V
 }
 
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt
index 47d6e55346..b9de57d151 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch.kt
@@ -82,7 +82,7 @@ object PlayerControlsBytecodePatch : BytecodePatch(
         }
 
         // Hook the fullscreen close button.  Used to fix visibility
-        // when the buttons immediately are set to hidden.
+        // when seeking and other situations.
         OverlayViewInflateFingerprint.resultOrThrow().mutableMethod.apply {
             val resourceIndex = indexOfFirstWideLiteralInstructionValueReversedOrThrow(
                 PlayerControlsResourcePatch.fullscreenButton
@@ -105,7 +105,7 @@ object PlayerControlsBytecodePatch : BytecodePatch(
      * Injects the code to initialize the controls.
      * @param descriptor The descriptor of the method which should be called.
      */
-    fun initializeTopControl(descriptor: String) {
+    internal fun initializeTopControl(descriptor: String) {
         inflateTopControlMethod.addInstruction(
             inflateTopControlInsertIndex++,
             "invoke-static { v$inflateTopControlRegister }, $descriptor->initialize(Landroid/view/View;)V"
@@ -122,10 +122,6 @@ object PlayerControlsBytecodePatch : BytecodePatch(
             "invoke-static { v$inflateBottomControlRegister }, $descriptor->initializeButton(Landroid/view/View;)V"
         )
     }
-
-    @Deprecated("Obsolete", replaceWith = ReplaceWith("initializeBottomControl"))
-    fun initializeControl(descriptor: String)= initializeBottomControl(descriptor)
-
     /**
      * Injects the code to change the visibility of controls.
      * @param descriptor The descriptor of the method which should be called.
@@ -141,4 +137,8 @@ object PlayerControlsBytecodePatch : BytecodePatch(
             "invoke-static { p0 }, $descriptor->changeVisibilityImmediate(Z)V"
         )
     }
+
+
+    @Deprecated("Obsolete", replaceWith = ReplaceWith("initializeBottomControl"))
+    fun initializeControl(descriptor: String)= initializeBottomControl(descriptor)
 }
\ No newline at end of file