chore(release): 4.0.0-dev.12 [skip ci]

# [4.0.0-dev.12](https://github.com/ReVanced/revanced-patches/compare/v4.0.0-dev.11...v4.0.0-dev.12) (2024-01-24)

### Features

* **YouTube:** Support version `19.03.35` ([#2640](https://github.com/ReVanced/revanced-patches/issues/2640)) ([eac360e](eac360ee7c))

CHANGELOG.md

@@ -1,3 +1,38 @@
+# [4.0.0-dev.12](https://github.com/ReVanced/revanced-patches/compare/v4.0.0-dev.11...v4.0.0-dev.12) (2024-01-24)
+
+
+### Features
+
+* **YouTube:** Support version `19.03.35` ([#2640](https://github.com/ReVanced/revanced-patches/issues/2640)) ([ff08f58](https://github.com/ReVanced/revanced-patches/commit/ff08f58ac4ff4d66a8dce599caa1ce47f3366fc6))
+
+# [4.0.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v4.0.0-dev.10...v4.0.0-dev.11) (2024-01-17)
+
+
+### Features
+
+* **YouTube:** Support version `19.02.34` ([#2627](https://github.com/ReVanced/revanced-patches/issues/2627)) ([94e08b7](https://github.com/ReVanced/revanced-patches/commit/94e08b74ced394abf9ae7d4fe6355bfe4d0be248))
+
+# [4.0.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v4.0.0-dev.9...v4.0.0-dev.10) (2024-01-16)
+
+
+### Features
+
+* **YouTube:** Support versions `18.48.39`, `18.49.37` and `19.01.34` ([#2551](https://github.com/ReVanced/revanced-patches/issues/2551)) ([a938e73](https://github.com/ReVanced/revanced-patches/commit/a938e736fa2aed1792cfdce5656efa15d0791d71))
+
+# [4.0.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v4.0.0-dev.8...v4.0.0-dev.9) (2024-01-11)
+
+
+### Bug Fixes
+
+* **YouTube - Enable slide to seek:** Change patch default to excluded and add description disclaimer ([#2610](https://github.com/ReVanced/revanced-patches/issues/2610)) ([2fdc4c2](https://github.com/ReVanced/revanced-patches/commit/2fdc4c23b5f39153ad71071359274c39129d691f))
+
+# [4.0.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v4.0.0-dev.7...v4.0.0-dev.8) (2024-01-10)
+
+
+### Bug Fixes
+
+* **YouTube:** Shorten setting titles to fit on screen ([#2579](https://github.com/ReVanced/revanced-patches/issues/2579)) ([b2a5dd3](https://github.com/ReVanced/revanced-patches/commit/b2a5dd3efc39ae8a42159858b9c00b5b2f8655a4))
+
 # [4.0.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v4.0.0-dev.6...v4.0.0-dev.7) (2024-01-10)
 
 

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 4.0.0-dev.7
+version = 4.0.0-dev.12

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-revanced-patcher = "19.1.0"
+revanced-patcher = "19.2.0"
 smali = "3.0.3"
 guava = "33.0.0-jre"
 gson = "2.10.1"

src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt

@@ -24,15 +24,18 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
     ],
     compatiblePackages = [
         CompatiblePackage(
-            "com.google.android.youtube",
+            "com.google.android.youtube", [
-            [
                 "18.32.39",
                 "18.37.36",
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

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

@@ -25,8 +25,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

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

@@ -29,8 +29,12 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt

@@ -17,15 +17,12 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
     ],
     compatiblePackages = [
         CompatiblePackage(
-            "com.google.android.youtube",
+            "com.google.android.youtube", [
-            [
+                "18.48.39",
-                "18.32.39",
+                "18.49.37",
-                "18.37.36",
+                "19.01.34",
-                "18.38.44",
+                "19.02.39",
-                "18.43.45",
+                "19.03.35"
-                "18.44.41",
-                "18.45.41",
-                "18.45.43"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt

@@ -21,7 +21,19 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
     dependencies = [IntegrationsPatch::class, SettingsPatch::class],
     compatiblePackages = [
         CompatiblePackage(
-            "com.google.android.youtube"
+            "com.google.android.youtube", [
+                "18.32.39",
+                "18.37.36",
+                "18.38.44",
+                "18.43.45",
+                "18.44.41",
+                "18.45.43",
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
+            ]
         )
     ]
 )

src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/ExternalDownloadsBytecodePatch.kt

@@ -17,15 +17,12 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
     ],
     compatiblePackages = [
         CompatiblePackage(
-            "com.google.android.youtube",
+            "com.google.android.youtube", [
-            [
+                "18.48.39",
-                "18.32.39",
+                "18.49.37",
-                "18.37.36",
+                "19.01.34",
-                "18.38.44",
+                "19.02.39",
-                "18.43.45",
+                "19.03.35"
-                "18.44.41",
-                "18.45.41",
-                "18.45.43"
             ]
         ),
     ]

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt

@@ -27,8 +27,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt

@@ -29,8 +29,12 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
             [
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt

@@ -17,7 +17,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch(
     name = "Enable slide to seek",
-    description = "Adds an option to enable slide to seek instead of playing at 2x speed when pressing and holding in the video player.",
+    description = "Adds an option to enable slide to seek instead of playing at 2x speed when pressing and holding in the video player.  Including this patch may cause issues with tapping or double tapping the video player overlay.",
     dependencies = [IntegrationsPatch::class, SettingsPatch::class],
     compatiblePackages = [
         CompatiblePackage(
@@ -25,11 +25,16 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
             [
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
-    ]
+    ],
+    use = false
 )
 @Suppress("unused")
 object EnableSlideToSeekPatch : BytecodePatch(

src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsBytecodePatch.kt

@@ -1,7 +1,5 @@
 package app.revanced.patches.youtube.interaction.swipecontrols
 
-import app.revanced.util.transformMethods
-import app.revanced.util.traverseClassHierarchy
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
@@ -10,7 +8,9 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMu
 import app.revanced.patches.youtube.interaction.swipecontrols.fingerprints.SwipeControlsHostActivityFingerprint
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.playertype.PlayerTypeHookPatch
-import app.revanced.patches.youtube.shared.fingerprints.WatchWhileActivityFingerprint
+import app.revanced.patches.youtube.shared.fingerprints.MainActivityFingerprint
+import app.revanced.util.transformMethods
+import app.revanced.util.traverseClassHierarchy
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
 
@@ -31,8 +31,12 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]
@@ -40,19 +44,19 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
 @Suppress("unused")
 object SwipeControlsBytecodePatch : BytecodePatch(
     setOf(
-        WatchWhileActivityFingerprint,
+        MainActivityFingerprint,
         SwipeControlsHostActivityFingerprint
     )
 ) {
     override fun execute(context: BytecodeContext) {
         val wrapperClass = SwipeControlsHostActivityFingerprint.result!!.mutableClass
-        val targetClass = WatchWhileActivityFingerprint.result!!.mutableClass
+        val targetClass = MainActivityFingerprint.result!!.mutableClass
 
-        // inject the wrapper class from integrations into the class hierarchy of WatchWhileActivity
+        // Inject the wrapper class from integrations into the class hierarchy of MainActivity.
         wrapperClass.setSuperClass(targetClass.superclass)
         targetClass.setSuperClass(wrapperClass.type)
 
-        // ensure all classes and methods in the hierarchy are non-final, so we can override them in integrations
+        // Ensure all classes and methods in the hierarchy are non-final, so we can override them in integrations.
         context.traverseClassHierarchy(targetClass) {
             accessFlags = accessFlags and AccessFlags.FINAL.value.inv()
             transformMethods {

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

@@ -29,8 +29,12 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ],

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt

@@ -27,8 +27,12 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/HideAutoplayButtonPatch.kt

@@ -37,8 +37,12 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/HideCaptionsButtonPatch.kt

@@ -28,8 +28,12 @@ import com.android.tools.smali.dexlib2.Opcode
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt

@@ -34,8 +34,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsPatch.kt

@@ -32,8 +32,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction3rc
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/AlbumCardsPatch.kt

@@ -27,8 +27,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsPatch.kt

@@ -27,8 +27,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/CommentsPatch.kt

@@ -26,8 +26,12 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/CrowdfundingBoxPatch.kt

@@ -27,8 +27,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt

@@ -30,8 +30,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction21c
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/HideFilterBarPatch.kt

@@ -27,8 +27,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/HideFloatingMicrophoneButtonPatch.kt

@@ -23,8 +23,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt

@@ -23,8 +23,12 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt

@@ -37,8 +37,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]
@@ -97,7 +101,7 @@ object HideLayoutComponentsPatch : BytecodePatch(
                 "revanced_hide_search_result_recommendations",
                 StringResource(
                     "revanced_hide_search_result_recommendations_title",
-                    "Hide search result recommendations (e.g People also watched)"
+                    "Hide \\\'People also watched\\\' recommendations"
                 ),
                 StringResource(
                     "revanced_hide_search_result_recommendations_summary_on",

src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt

@@ -34,8 +34,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonPatch.kt

@@ -23,8 +23,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/HideEmailAddressPatch.kt

@@ -23,8 +23,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt

@@ -20,15 +20,21 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
         SettingsPatch::class
     ],
     compatiblePackages = [
-        CompatiblePackage("com.google.android.youtube", [
+        CompatiblePackage(
-            "18.32.39",
+            "com.google.android.youtube", [
-            "18.37.36",
+                "18.32.39",
-            "18.38.44",
+                "18.37.36",
-            "18.43.45",
+                "18.38.44",
-            "18.44.41",
+                "18.43.45",
-            "18.45.41",
+                "18.44.41",
-            "18.45.43"
+                "18.45.43",
-        ])
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
+            ]
+        )
     ]
 )
 @Suppress("unused")

src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt

@@ -25,8 +25,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
             "com.google.android.youtube", [
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

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

@@ -31,8 +31,12 @@ import app.revanced.patches.youtube.shared.fingerprints.SeekbarOnDrawFingerprint
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt

@@ -35,8 +35,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]
@@ -56,6 +60,8 @@ object HideShortsComponentsPatch : BytecodePatch(
     override fun execute(context: BytecodeContext) {
         // region Hide the Shorts shelf.
 
+        // This patch point is not present in 19.03.x and greater.
+        // If 19.02.x and lower is dropped, then this section of code and the fingerprint should be removed.
         ReelConstructorFingerprint.result?.let {
             it.mutableMethod.apply {
                 val insertIndex = it.scanResult.patternScanResult!!.startIndex + 2
@@ -68,7 +74,7 @@ object HideShortsComponentsPatch : BytecodePatch(
                     "hideShortsShelf"
                 )
             }
-        } ?: throw ReelConstructorFingerprint.exception
+        } // Do not throw an exception if not resolved.
 
         // endregion
 

src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsResourcePatch.kt

@@ -97,9 +97,15 @@ object HideShortsComponentsResourcePatch : ResourcePatch() {
             )
         )
 
-        fun String.getId() = ResourceMappingPatch.resourceMappings.single { it.name == this }.id
+        ResourceMappingPatch.resourceMappings.find {
+            it.type == "layout" && it.name == "reel_multiple_items_shelf"
+        }?.also {
+            reelMultipleItemShelfId = it.id
+        }
 
-        reelMultipleItemShelfId = "reel_multiple_items_shelf".getId()
+        reelPlayerRightCellButtonHeight =
-        reelPlayerRightCellButtonHeight = "reel_player_right_cell_button_height".getId()
+            ResourceMappingPatch.resourceMappings.single {
+                it.type == "dimen" && it.name == "reel_player_right_cell_button_height"
+            }.id
     }
 }

src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/fingerprints/ReelConstructorFingerprint.kt

@@ -1,13 +1,19 @@
 package app.revanced.patches.youtube.layout.hide.shorts.fingerprints
 
 import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.youtube.layout.hide.shorts.HideShortsComponentsResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
+import app.revanced.util.containsWideLiteralInstructionValue
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
-internal object ReelConstructorFingerprint : LiteralValueFingerprint(
+internal object ReelConstructorFingerprint : MethodFingerprint(
     accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
     opcodes = listOf(Opcode.INVOKE_VIRTUAL),
-    literalSupplier = { HideShortsComponentsResourcePatch.reelMultipleItemShelfId }
+    customFingerprint = { methodDef, _ ->
+        // Cannot use LiteralValueFingerprint, because the resource id may not be present.
+        val reelMultipleItemShelfId = HideShortsComponentsResourcePatch.reelMultipleItemShelfId
+        reelMultipleItemShelfId != -1L
+                && methodDef.containsWideLiteralInstructionValue(reelMultipleItemShelfId)
+    }
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenPatch.kt

@@ -22,8 +22,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt

@@ -19,13 +19,16 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
     compatiblePackages = [
         CompatiblePackage(
             "com.google.android.youtube", [
-                "18.32.39",
                 "18.37.36",
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt

@@ -24,8 +24,12 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/player/background/PlayerControlsBackgroundPatch.kt

@@ -18,8 +18,12 @@ import org.w3c.dom.Element
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ],

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt

@@ -5,7 +5,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchException
@@ -18,7 +17,7 @@ import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.Lik
 import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.RemoveLikeFingerprint
 import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.RollingNumberMeasureAnimatedTextFingerprint
 import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.RollingNumberMeasureStaticLabelFingerprint
-import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.RollingNumberMeasureTextParentFingerprint
+import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.RollingNumberMeasureStaticLabelParentFingerprint
 import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.RollingNumberSetterFingerprint
 import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.RollingNumberTextViewFingerprint
 import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.ShortsTextViewFingerprint
@@ -55,11 +54,10 @@ import com.android.tools.smali.dexlib2.iface.reference.TypeReference
     compatiblePackages = [
         CompatiblePackage(
             "com.google.android.youtube", [
-                "18.38.44",
+                "18.49.37",
-                "18.43.45",
+                "19.01.34",
-                "18.44.41",
+                "19.02.39",
-                "18.45.41",
+                "19.03.35"
-                "18.45.43"
             ]
         )
     ]
@@ -76,7 +74,8 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
         DislikeFingerprint,
         RemoveLikeFingerprint,
         RollingNumberSetterFingerprint,
-        RollingNumberMeasureTextParentFingerprint,
+        RollingNumberMeasureStaticLabelParentFingerprint,
+        RollingNumberMeasureAnimatedTextFingerprint,
         RollingNumberTextViewFingerprint,
         RollingNumberTextViewAnimationUpdateFingerprint
     )
@@ -276,37 +275,30 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
 
         // Rolling Number text views use the measured width of the raw string for layout.
         // Modify the measure text calculation to include the left drawable separator if needed.
-        RollingNumberMeasureAnimatedTextFingerprint.also {
+        RollingNumberMeasureAnimatedTextFingerprint.result?.also {
-            if (!it.resolve(context, RollingNumberMeasureTextParentFingerprint.result!!.classDef))
+            val scanResult = it.scanResult.patternScanResult!!
-                throw it.exception
+            // Additional check to verify the opcodes are at the start of the method
-        }.result?.also {
+            if (scanResult.startIndex != 0) throw PatchException("Unexpected opcode location")
+            val endIndex = scanResult.endIndex
             it.mutableMethod.apply {
-                val returnInstructionIndex = it.scanResult.patternScanResult!!.endIndex
+                val measuredTextWidthRegister = getInstruction<OneRegisterInstruction>(endIndex).registerA
-                val measuredTextWidthRegister =
-                    getInstruction<OneRegisterInstruction>(returnInstructionIndex).registerA
 
-                replaceInstruction( // Replace instruction to preserve control flow label.
-                    returnInstructionIndex,
-                    "invoke-static {p1, v$measuredTextWidthRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->onRollingNumberMeasured(Ljava/lang/String;F)F"
-                )
                 addInstructions(
-                    returnInstructionIndex + 1,
+                    endIndex + 1,
-                    """
-                        move-result v$measuredTextWidthRegister
-                        return v$measuredTextWidthRegister
                     """
+                    invoke-static {p1, v$measuredTextWidthRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->onRollingNumberMeasured(Ljava/lang/String;F)F
+                    move-result v$measuredTextWidthRegister
+                """
                 )
             }
         } ?: throw RollingNumberMeasureAnimatedTextFingerprint.exception
 
         // Additional text measurement method. Used if YouTube decides not to animate the likes count
         // and sometimes used for initial video load.
-        RollingNumberMeasureStaticLabelFingerprint.also {
+        RollingNumberMeasureStaticLabelFingerprint.resolve(context, RollingNumberMeasureStaticLabelParentFingerprint.resultOrThrow().classDef)
-            if (!it.resolve(context, RollingNumberMeasureTextParentFingerprint.result!!.classDef))
+        RollingNumberMeasureStaticLabelFingerprint.result?.also {
-                throw it.exception
+            val measureTextIndex = it.scanResult.patternScanResult!!.startIndex + 1
-        }.result?.also {
             it.mutableMethod.apply {
-                val measureTextIndex = it.scanResult.patternScanResult!!.startIndex + 1
                 val freeRegister = getInstruction<TwoRegisterInstruction>(0).registerA
 
                 addInstructions(

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RollingNumberMeasureAnimatedTextFingerprint.kt

@@ -5,19 +5,24 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
-/**
- * Resolves to class found in [RollingNumberMeasureTextParentFingerprint].
- */
 internal object RollingNumberMeasureAnimatedTextFingerprint : MethodFingerprint(
-    returnType = "F",
+    returnType = "Lj\$/util/Optional;",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    parameters = listOf("Ljava/lang/String;"),
+    parameters = listOf(
+        "L",
+        "Ljava/lang/String;",
+        "L"
+    ),
     opcodes = listOf(
-        Opcode.INVOKE_VIRTUAL,
+        Opcode.IGET, // First instruction of method
+        Opcode.IGET_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.CONST_HIGH16,
+        Opcode.INVOKE_STATIC,
         Opcode.MOVE_RESULT,
-        Opcode.ADD_FLOAT_2ADDR,
+        Opcode.CONST_4,
-        Opcode.ADD_INT_LIT8,
+        Opcode.AGET,
-        Opcode.GOTO,
+        Opcode.CONST_4,
-        Opcode.RETURN
+        Opcode.CONST_4, // Measured text width
     )
 )

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RollingNumberMeasureStaticLabelFingerprint.kt

@@ -6,7 +6,7 @@ import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
 /**
- * Resolves to class found in [RollingNumberMeasureTextParentFingerprint].
+ * Resolves to class found in [RollingNumberMeasureStaticLabelParentFingerprint].
  */
 internal object RollingNumberMeasureStaticLabelFingerprint : MethodFingerprint(
     returnType = "F",

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RollingNumberMeasureStaticLabelParentFingerprint.kt

@@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
-internal object RollingNumberMeasureTextParentFingerprint : MethodFingerprint(
+internal object RollingNumberMeasureStaticLabelParentFingerprint : MethodFingerprint(
     returnType = "Ljava/lang/String;",
     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
     parameters = listOf(),

src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt

@@ -26,8 +26,12 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.37.36",
                 "18.38.44",
                 "18.43.45",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/RestoreOldSeekbarThumbnailsPatch.kt

@@ -23,8 +23,12 @@ import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockBytecodePatch.kt

@@ -38,13 +38,11 @@ import com.android.tools.smali.dexlib2.iface.reference.StringReference
     compatiblePackages = [
         CompatiblePackage(
             "com.google.android.youtube", [
-                "18.32.39",
+                "18.48.39",
-                "18.37.36",
+                "18.49.37",
-                "18.38.44",
+                "19.01.34",
-                "18.43.45",
+                "19.02.39",
-                "18.44.41",
+                "19.03.35"
-                "18.45.41",
-                "18.45.43"
             ]
         )
     ],

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

@@ -28,8 +28,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt

@@ -24,8 +24,12 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

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

@@ -32,8 +32,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             )
         )
     ]

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

@@ -35,8 +35,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt

@@ -40,8 +40,12 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch.kt

@@ -10,7 +10,7 @@ import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
-import app.revanced.patches.youtube.shared.fingerprints.WatchWhileActivityFingerprint
+import app.revanced.patches.youtube.shared.fingerprints.MainActivityFingerprint
 import com.android.tools.smali.dexlib2.Opcode
 
 @Patch(
@@ -21,15 +21,15 @@ import com.android.tools.smali.dexlib2.Opcode
 )
 @Suppress("unused")
 object AnnouncementsPatch : BytecodePatch(
-    setOf(WatchWhileActivityFingerprint)
+    setOf(MainActivityFingerprint)
 ) {
     private const val INTEGRATIONS_CLASS_DESCRIPTOR =
         "Lapp/revanced/integrations/youtube/patches/announcements/AnnouncementsPatch;"
 
     override fun execute(context: BytecodeContext) {
-        val onCreateMethod = WatchWhileActivityFingerprint.result?.let {
+        val onCreateMethod = MainActivityFingerprint.result?.let {
             it.mutableClass.methods.find { method -> method.name == "onCreate" }
-        } ?: throw WatchWhileActivityFingerprint.exception
+        } ?: throw MainActivityFingerprint.exception
 
         val superCallIndex = onCreateMethod.getInstructions().indexOfFirst { it.opcode == Opcode.INVOKE_SUPER_RANGE }
 
@@ -43,7 +43,7 @@ object AnnouncementsPatch : BytecodePatch(
                 "revanced_announcements",
                 StringResource(
                     "revanced_announcements_title",
-                    "Show announcements from ReVanced"
+                    "Show ReVanced announcements"
                 ),
                 StringResource(
                     "revanced_announcements_summary_on",

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

@@ -28,8 +28,12 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt

@@ -23,12 +23,17 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]
 )
+@Suppress("unused")
 object SpoofDeviceDimensionsPatch : BytecodePatch(
     setOf(DeviceDimensionsModelToStringFingerprint)
 ) {

src/main/kotlin/app/revanced/patches/youtube/misc/fix/backtoexitgesture/FixBackToExitGesturePatch.kt

@@ -1,6 +1,5 @@
 package app.revanced.patches.youtube.misc.fix.backtoexitgesture
 
-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.fingerprint.MethodFingerprint
@@ -10,6 +9,7 @@ import app.revanced.patches.youtube.misc.fix.backtoexitgesture.fingerprints.OnBa
 import app.revanced.patches.youtube.misc.fix.backtoexitgesture.fingerprints.RecyclerViewScrollingFingerprint
 import app.revanced.patches.youtube.misc.fix.backtoexitgesture.fingerprints.RecyclerViewTopScrollingFingerprint
 import app.revanced.patches.youtube.misc.fix.backtoexitgesture.fingerprints.RecyclerViewTopScrollingParentFingerprint
+import app.revanced.util.exception
 
 @Patch(description = "Fixes the swipe back to exit gesture.")
 @Suppress("unused")
@@ -37,7 +37,7 @@ internal object FixBackToExitGesturePatch : BytecodePatch(
                 methodName = "onScrollingViews"
             ),
             OnBackPressedFingerprint to IntegrationsMethod(
-                "p0", "onBackPressed", "Lcom/google/android/apps/youtube/app/watchwhile/WatchWhileActivity;"
+                "p0", "onBackPressed", "Landroid/app/Activity;"
             )
         ).forEach { (fingerprint, target) -> fingerprint.injectCall(target) }
     }

src/main/kotlin/app/revanced/patches/youtube/misc/fix/backtoexitgesture/fingerprints/OnBackPressedFingerprint.kt

@@ -12,7 +12,9 @@ internal object OnBackPressedFingerprint : MethodFingerprint(
         Opcode.RETURN_VOID
     ),
     customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("WatchWhileActivity;")
+        (methodDef.definingClass.endsWith("MainActivity;") ||
+                // Old versions of YouTube called this class "WatchWhileActivity" instead.
+                methodDef.definingClass.endsWith("WatchWhileActivity;"))
         && methodDef.name == "onBackPressed"
     }
 )

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/ClientSpoofPatch.kt

@@ -10,22 +10,18 @@ import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.youtube.misc.fix.playback.fingerprints.UserAgentHeaderBuilderFingerprint
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 
-
 @Patch(
     name = "Client spoof",
     description = "Adds options to spoof the client to allow video playback.",
     dependencies = [SpoofSignaturePatch::class],
     compatiblePackages = [
         CompatiblePackage(
-            "com.google.android.youtube",
+            "com.google.android.youtube", [
-            [
+                "18.48.39",
-                "18.32.39",
+                "18.49.37",
-                "18.37.36",
+                "19.01.34",
-                "18.38.44",
+                "19.02.39",
-                "18.43.45",
+                "19.03.35"
-                "18.44.41",
-                "18.45.41",
-                "18.45.43"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch.kt

@@ -33,13 +33,11 @@ object GmsCoreSupportPatch : AbstractGmsCoreSupportPatch(
     compatiblePackages = setOf(
         CompatiblePackage(
             "com.google.android.youtube", setOf(
-                "18.32.39",
+                "18.48.39",
-                "18.37.36",
+                "18.49.37",
-                "18.38.44",
+                "19.01.34",
-                "18.43.45",
+                "19.02.39",
-                "18.44.41",
+                "19.03.35"
-                "18.45.41",
-                "18.45.43"
             )
         )
     ),

src/main/kotlin/app/revanced/patches/youtube/misc/links/BypassURLRedirectsPatch.kt

@@ -25,12 +25,17 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
             [
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]
 )
+@Suppress("unused")
 object BypassURLRedirectsPatch : BytecodePatch(
     setOf(ABUriParserFingerprint, HTTPUriParserFingerprint)
 ) {

src/main/kotlin/app/revanced/patches/youtube/misc/links/OpenLinksExternallyPatch.kt

@@ -28,8 +28,12 @@ import com.android.tools.smali.dexlib2.iface.reference.StringReference
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

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

@@ -34,13 +34,11 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
         CompatiblePackage(
             "com.google.android.youtube",
             [
-                "18.32.39",
+                "18.48.39",
-                "18.37.36",
+                "18.49.37",
-                "18.38.44",
+                "19.01.34",
-                "18.43.45",
+                "19.02.39",
-                "18.44.41",
+                "19.03.35"
-                "18.45.41",
-                "18.45.43"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatch.kt

@@ -30,8 +30,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
             [
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/shared/fingerprints/MainActivityFingerprint.kt

@@ -4,10 +4,12 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
-internal object WatchWhileActivityFingerprint : MethodFingerprint(
+internal object MainActivityFingerprint : MethodFingerprint(
     accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
     parameters = listOf(),
     customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("WatchWhileActivity;")
+        methodDef.definingClass.endsWith("MainActivity;")
+                // Old versions of YouTube called this class "WatchWhileActivity" instead.
+                || methodDef.definingClass.endsWith("WatchWhileActivity;")
     }
 )

src/main/kotlin/app/revanced/patches/youtube/video/hdrbrightness/HDRBrightnessPatch.kt

@@ -26,8 +26,12 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/video/information/VideoInformationPatch.kt

@@ -1,6 +1,5 @@
 package app.revanced.patches.youtube.video.information
 
-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
@@ -14,13 +13,14 @@ import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.video.information.fingerprints.*
 import app.revanced.patches.youtube.video.playerresponse.PlayerResponseMethodHookPatch
 import app.revanced.patches.youtube.video.videoid.VideoIdPatch
+import app.revanced.util.exception
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.builder.BuilderInstruction
 import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
-import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 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.TwoRegisterInstruction
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter
 import com.android.tools.smali.dexlib2.util.MethodUtil
@@ -135,23 +135,24 @@ object VideoInformationPatch : BytecodePatch(
          */
         videoTimeHook(INTEGRATIONS_CLASS_DESCRIPTOR, "setVideoTime")
 
-
         /*
          * Hook the user playback speed selection
          */
-        OnPlaybackSpeedItemClickFingerprint.result?.apply {
+        OnPlaybackSpeedItemClickFingerprint.result?.mutableMethod?.apply {
-            speedSelectionInsertMethod = mutableMethod
+            speedSelectionInsertMethod = this
-            speedSelectionInsertIndex = scanResult.patternScanResult!!.startIndex - 3
+            val speedSelectionMethodInstructions = this.implementation!!.instructions
+            val speedSelectionValueInstructionIndex = speedSelectionMethodInstructions.indexOfFirst {
+                it.opcode == Opcode.IGET
+            }
             speedSelectionValueRegister =
-                mutableMethod.getInstruction<FiveRegisterInstruction>(speedSelectionInsertIndex).registerD
+                getInstruction<TwoRegisterInstruction>(speedSelectionValueInstructionIndex).registerA
-
+            setPlaybackSpeedClassFieldReference =
-            val speedSelectionMethodInstructions = mutableMethod.implementation!!.instructions
+                getInstruction<ReferenceInstruction>(speedSelectionValueInstructionIndex + 1).reference.toString()
+            setPlaybackSpeedMethodReference =
+                getInstruction<ReferenceInstruction>(speedSelectionValueInstructionIndex + 2).reference.toString()
             setPlaybackSpeedContainerClassFieldReference =
                 getReference(speedSelectionMethodInstructions, -1, Opcode.IF_EQZ)
-            setPlaybackSpeedClassFieldReference =
+            speedSelectionInsertIndex = speedSelectionValueInstructionIndex + 1
-                getReference(speedSelectionMethodInstructions, 1, Opcode.IGET)
-            setPlaybackSpeedMethodReference =
-                getReference(speedSelectionMethodInstructions, 2, Opcode.IGET)
         } ?: throw OnPlaybackSpeedItemClickFingerprint.exception
 
         userSelectedPlaybackSpeedHook(INTEGRATIONS_CLASS_DESCRIPTOR, "userSelectedPlaybackSpeed")

src/main/kotlin/app/revanced/patches/youtube/video/information/fingerprints/OnPlaybackSpeedItemClickFingerprint.kt

@@ -2,18 +2,19 @@ package app.revanced.patches.youtube.video.information.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.util.getReference
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 
 internal object OnPlaybackSpeedItemClickFingerprint : MethodFingerprint(
     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
     returnType = "V",
     parameters = listOf("L", "L", "I", "J"),
-    customFingerprint = { methodDef, _ -> methodDef.name == "onItemClick" },
+    customFingerprint = { methodDef, _ ->
-    opcodes = listOf(
+        methodDef.name == "onItemClick" && methodDef.implementation?.instructions?.find {
-        Opcode.MOVE_RESULT_OBJECT,
+            it.opcode == Opcode.IGET_OBJECT &&
-        Opcode.INVOKE_VIRTUAL,
+                    it.getReference<FieldReference>()!!.type == "Lcom/google/android/libraries/youtube/innertube/model/player/PlayerResponseModel;"
-        Opcode.INVOKE_VIRTUAL,
+        } != null
-        Opcode.RETURN_VOID
+    }
-    )
 )

src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/PlayerResponseMethodHookPatch.kt

@@ -18,29 +18,44 @@ object PlayerResponseMethodHookPatch :
     BytecodePatch(setOf(PlayerParameterBuilderFingerprint)),
     Closeable,
     MutableSet<PlayerResponseMethodHookPatch.Hook> by mutableSetOf() {
-    private const val VIDEO_ID_PARAMETER = 1
+
-    private const val IS_SHORT_AND_OPENING_OR_PLAYING_PARAMETER = 11
+    // Parameter numbers of the patched method.
-    private const val PROTO_BUFFER_PARAMETER_PARAMETER = 3
+    private const val PARAMETER_VIDEO_ID = 1
+    private const val PARAMETER_PROTO_BUFFER = 3
+    private const val PARAMETER_IS_SHORT_AND_OPENING_OR_PLAYING = 11
+
+    // Temporary 4-bit registers used to pass the parameters to integrations.
+    private const val REGISTER_VIDEO_ID = 0
+    private const val REGISTER_PROTO_BUFFER = 1
+    private const val REGISTER_IS_SHORT_AND_OPENING_OR_PLAYING = 2
 
     private lateinit var playerResponseMethod: MutableMethod
 
+    private var numberOfInstructionsAdded = 0
+
     override fun execute(context: BytecodeContext) {
         playerResponseMethod = PlayerParameterBuilderFingerprint.result?.mutableMethod
             ?: throw PlayerParameterBuilderFingerprint.exception
     }
 
     override fun close() {
-        fun hookVideoId(hook: Hook) = playerResponseMethod.addInstruction(
+        fun hookVideoId(hook: Hook) {
-            0, "invoke-static {p$VIDEO_ID_PARAMETER, p$IS_SHORT_AND_OPENING_OR_PLAYING_PARAMETER}, $hook"
+            playerResponseMethod.addInstruction(
-        )
+                0, "invoke-static {v$REGISTER_VIDEO_ID, v$REGISTER_IS_SHORT_AND_OPENING_OR_PLAYING}, $hook"
+            )
+            numberOfInstructionsAdded++
+        }
 
-        fun hookProtoBufferParameter(hook: Hook) = playerResponseMethod.addInstructions(
+        fun hookProtoBufferParameter(hook: Hook) {
-            0,
+            playerResponseMethod.addInstructions(
+                0,
+                """
+                    invoke-static {v$REGISTER_PROTO_BUFFER, v$REGISTER_IS_SHORT_AND_OPENING_OR_PLAYING}, $hook
+                    move-result-object v$REGISTER_PROTO_BUFFER
             """
-                invoke-static {p$PROTO_BUFFER_PARAMETER_PARAMETER, p$IS_SHORT_AND_OPENING_OR_PLAYING_PARAMETER}, $hook
+            )
-                move-result-object p$PROTO_BUFFER_PARAMETER_PARAMETER
+            numberOfInstructionsAdded += 2
-            """
+        }
-        )
 
         // Reverse the order in order to preserve insertion order of the hooks.
         val beforeVideoIdHooks = filterIsInstance<Hook.ProtoBufferParameterBeforeVideoId>().asReversed()
@@ -51,6 +66,23 @@ object PlayerResponseMethodHookPatch :
         afterVideoIdHooks.forEach(::hookProtoBufferParameter)
         videoIdHooks.forEach(::hookVideoId)
         beforeVideoIdHooks.forEach(::hookProtoBufferParameter)
+
+        // On some app targets the method has too many registers pushing the parameters past v15.
+        // Move the parameters to 4-bit registers so they can be passed to integrations.
+        playerResponseMethod.addInstructions(
+            0, """
+                move-object/from16 v$REGISTER_VIDEO_ID, p$PARAMETER_VIDEO_ID
+                move-object/from16 v$REGISTER_PROTO_BUFFER, p$PARAMETER_PROTO_BUFFER
+                move/from16        v$REGISTER_IS_SHORT_AND_OPENING_OR_PLAYING, p$PARAMETER_IS_SHORT_AND_OPENING_OR_PLAYING
+            """,
+        )
+        numberOfInstructionsAdded += 3
+
+        // Move the modified register back.
+        playerResponseMethod.addInstruction(
+            numberOfInstructionsAdded,
+            "move-object/from16 p$PARAMETER_PROTO_BUFFER, v$REGISTER_PROTO_BUFFER"
+        )
     }
 
     internal abstract class Hook(private val methodDescriptor: String) {

src/main/kotlin/app/revanced/patches/youtube/video/quality/RememberVideoQualityPatch.kt

@@ -31,13 +31,11 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
     compatiblePackages = [
         CompatiblePackage(
             "com.google.android.youtube", [
-                "18.32.39",
+                "18.48.39",
-                "18.37.36",
+                "18.49.37",
-                "18.38.44",
+                "19.01.34",
-                "18.43.45",
+                "19.02.39",
-                "18.44.41",
+                "19.03.35"
-                "18.45.41",
-                "18.45.43"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt

@@ -14,13 +14,11 @@ import app.revanced.patches.youtube.video.speed.remember.RememberPlaybackSpeedPa
     compatiblePackages = [
         CompatiblePackage(
             "com.google.android.youtube", [
-                "18.32.39",
+                "18.48.39",
-                "18.37.36",
+                "18.49.37",
-                "18.38.44",
+                "19.01.34",
-                "18.43.45",
+                "19.02.39",
-                "18.44.41",
+                "19.03.35"
-                "18.45.41",
-                "18.45.43"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/video/speed/custom/CustomPlaybackSpeedPatch.kt

@@ -29,7 +29,13 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableField
 
 @Patch(
     description = "Adds custom playback speed options.",
-    dependencies = [IntegrationsPatch::class, LithoFilterPatch::class, SettingsPatch::class, RecyclerViewTreeHookPatch::class]
+    dependencies = [
+        IntegrationsPatch::class,
+        LithoFilterPatch::class,
+        SettingsPatch::class,
+        RecyclerViewTreeHookPatch::class,
+        CustomPlaybackSpeedResourcePatch::class
+    ]
 )
 object CustomPlaybackSpeedPatch : BytecodePatch(
     setOf(

src/main/kotlin/app/revanced/patches/youtube/video/speed/custom/CustomPlaybackSpeedResourcePatch.kt

@@ -0,0 +1,15 @@
+package app.revanced.patches.youtube.video.speed.custom
+
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patches.shared.mapping.misc.ResourceMappingPatch
+
+internal object CustomPlaybackSpeedResourcePatch : ResourcePatch() {
+    var speedUnavailableId: Long = -1
+
+    override fun execute(context: ResourceContext) {
+        speedUnavailableId = ResourceMappingPatch.resourceMappings.single {
+            it.type == "string" && it.name == "varispeed_unavailable_message"
+        }.id
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/video/speed/custom/fingerprints/ShowOldPlaybackSpeedMenuFingerprint.kt

@@ -1,7 +1,10 @@
 package app.revanced.patches.youtube.video.speed.custom.fingerprints
 
-import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patches.youtube.video.speed.custom.CustomPlaybackSpeedResourcePatch
+import app.revanced.util.patch.LiteralValueFingerprint
 
-internal object ShowOldPlaybackSpeedMenuFingerprint : MethodFingerprint(
+internal object ShowOldPlaybackSpeedMenuFingerprint : LiteralValueFingerprint(
-    strings = listOf("PLAYBACK_RATE_MENU_BOTTOM_SHEET_FRAGMENT")
+    literalSupplier = {
+        CustomPlaybackSpeedResourcePatch.speedUnavailableId
+    }
 )

src/main/kotlin/app/revanced/patches/youtube/video/videoid/VideoIdPatch.kt

@@ -1,6 +1,5 @@
 package app.revanced.patches.youtube.video.videoid
 
-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
@@ -13,6 +12,7 @@ import app.revanced.patches.youtube.misc.playertype.PlayerTypeHookPatch
 import app.revanced.patches.youtube.video.playerresponse.PlayerResponseMethodHookPatch
 import app.revanced.patches.youtube.video.videoid.fingerprint.VideoIdFingerprint
 import app.revanced.patches.youtube.video.videoid.fingerprint.VideoIdFingerprintBackgroundPlay
+import app.revanced.util.exception
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch(
@@ -49,7 +49,7 @@ object VideoIdPatch : BytecodePatch(
                 consumer(it, insertIndex, videoIdRegister)
 
             }
-        } ?: throw VideoIdFingerprint.exception
+        } ?: throw exception
 
         VideoIdFingerprint.setFields { method, index, register ->
             videoIdMethod = method

src/main/kotlin/app/revanced/patches/youtube/video/videoid/fingerprint/VideoIdFingerprint.kt

@@ -10,19 +10,13 @@ internal object VideoIdFingerprint : MethodFingerprint(
     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
     parameters = listOf("L"),
     opcodes = listOf(
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
         Opcode.MOVE_RESULT_OBJECT,
         Opcode.IF_EQZ,
         Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
+        Opcode.IGET_OBJECT,
-        Opcode.MOVE_RESULT_OBJECT,
         Opcode.INVOKE_INTERFACE,
         Opcode.MOVE_RESULT_OBJECT,
         Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT
+        Opcode.MOVE_RESULT_OBJECT,
     )
 )

src/main/kotlin/app/revanced/patches/youtube/video/videoid/fingerprint/VideoIdFingerprintBackgroundPlay.kt

@@ -10,18 +10,10 @@ internal object VideoIdFingerprintBackgroundPlay : MethodFingerprint(
     accessFlags = AccessFlags.DECLARED_SYNCHRONIZED or AccessFlags.FINAL or AccessFlags.PUBLIC,
     parameters = listOf("L"),
     opcodes = listOf(
-        Opcode.MONITOR_EXIT,
-        Opcode.RETURN_VOID,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.NEW_ARRAY,
-        Opcode.SGET_OBJECT,
-        Opcode.APUT_OBJECT,
         Opcode.INVOKE_VIRTUAL,
         Opcode.MOVE_RESULT,
         Opcode.IF_EQZ,
-        Opcode.INVOKE_VIRTUAL,
+        Opcode.IGET_OBJECT,
-        Opcode.MOVE_RESULT_OBJECT,
         Opcode.IF_EQZ,
         Opcode.INVOKE_INTERFACE,
         Opcode.MOVE_RESULT_OBJECT,

src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/RestoreOldVideoQualityMenuPatch.kt

@@ -30,8 +30,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.38.44",
                 "18.43.45",
                 "18.44.41",
-                "18.45.41",
+                "18.45.43",
-                "18.45.43"
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]