feat(youtube): support version 18.23.35 (#2461)

Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>

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

@@ -3,6 +3,6 @@ package app.revanced.patches.youtube.video.hdrbrightness.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35"))])
+@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
 @Target(AnnotationTarget.CLASS)
 internal annotation class HDRBrightnessCompatibility

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

@@ -3,6 +3,6 @@ package app.revanced.patches.youtube.video.information.annotation
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35"))])
+@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
 @Target(AnnotationTarget.CLASS)
 internal annotation class VideoInformationCompatibility

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

@@ -1,44 +0,0 @@
-package app.revanced.patches.youtube.video.oldqualitylayout.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.video.oldqualitylayout.annotations.OldQualityLayoutCompatibility
-import app.revanced.patches.youtube.video.oldqualitylayout.fingerprints.QualityMenuViewInflateFingerprint
-import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
-
-@Patch
-@DependsOn([IntegrationsPatch::class, OldQualityLayoutResourcePatch::class])
-@Name("old-quality-layout")
-@Description("Enables the original video quality flyout in the video player settings.")
-@OldQualityLayoutCompatibility
-@Version("0.0.1")
-class OldQualityLayoutPatch : BytecodePatch(listOf(QualityMenuViewInflateFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val inflateFingerprintResult = QualityMenuViewInflateFingerprint.result!!
-        val method = inflateFingerprintResult.mutableMethod
-        val instructions = method.implementation!!.instructions
-
-        // at this index the listener is added to the list view
-        val listenerInvokeRegister = instructions.size - 1 - 1
-
-        // get the register which stores the quality menu list view
-        val onItemClickViewRegister = (instructions[listenerInvokeRegister] as FiveRegisterInstruction).registerC
-
-        // insert the integrations method
-        method.addInstruction(
-            listenerInvokeRegister, // insert the integrations instructions right before the listener
-            "invoke-static { v$onItemClickViewRegister }, Lapp/revanced/integrations/patches/playback/quality/OldQualityLayoutPatch;->showOldQualityMenu(Landroid/widget/ListView;)V"
-        )
-
-        return PatchResultSuccess()
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/video/oldqualitylayout/patch/OldQualityLayoutResourcePatch.kt

@@ -1,36 +0,0 @@
-package app.revanced.patches.youtube.video.oldqualitylayout.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
-class OldQualityLayoutResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.VIDEO.addPreferences(
-            SwitchPreference(
-                "revanced_show_old_video_menu",
-                StringResource("revanced_show_old_video_menu_title", "Use old video quality player menu"),
-                StringResource("revanced_show_old_video_menu_summary_on", "Old video quality menu is used"),
-                StringResource("revanced_show_old_video_menu_summary_off", "Old video quality menu is not used")
-            )
-        )
-
-        videoQualityBottomSheetListFragmentTitle =
-            ResourceMappingPatch.resourceMappings.find { it.name == "video_quality_bottom_sheet_list_fragment_title" }
-                ?.id ?: return PatchResultError("Could not find resource")
-
-        return PatchResultSuccess()
-    }
-
-    internal companion object {
-        var videoQualityBottomSheetListFragmentTitle = -1L
-    }
-}

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

@@ -3,6 +3,6 @@ package app.revanced.patches.youtube.video.quality.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35"))])
+@Compatibility([Package("com.google.android.youtube", arrayOf("18.19.35", "18.20.39", "18.23.35"))])
 @Target(AnnotationTarget.CLASS)
 internal annotation class RememberVideoQualityCompatibility

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

@@ -0,0 +1,32 @@
+package app.revanced.patches.youtube.video.quality.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+object NewVideoQualityChangedFingerprint : MethodFingerprint(
+    returnType = "L",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf("L"),
+    opcodes = listOf(
+        Opcode.IGET,  // Video resolution (human readable).
+        Opcode.IGET_OBJECT,
+        Opcode.IGET_BOOLEAN,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.GOTO,
+        Opcode.CONST_4,
+        Opcode.IF_NE,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IGET,
+    )
+)

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

@@ -3,6 +3,9 @@ package app.revanced.patches.youtube.video.quality.fingerprints
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.Opcode
 
+/**
+ * Resolves with the class found in [VideoQualitySetterFingerprint].
+ */
 object SetQualityByIndexMethodClassFieldReferenceFingerprint : MethodFingerprint(
     returnType = "V",
     parameters = listOf("L"),

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

@@ -7,6 +7,7 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
@@ -22,10 +23,12 @@ import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.video.information.patch.VideoInformationPatch
 import app.revanced.patches.youtube.video.quality.annotations.RememberVideoQualityCompatibility
+import app.revanced.patches.youtube.video.quality.fingerprints.NewVideoQualityChangedFingerprint
 import app.revanced.patches.youtube.video.quality.fingerprints.SetQualityByIndexMethodClassFieldReferenceFingerprint
 import app.revanced.patches.youtube.video.quality.fingerprints.VideoQualityItemOnClickParentFingerprint
 import app.revanced.patches.youtube.video.quality.fingerprints.VideoQualitySetterFingerprint
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
 import org.jf.dexlib2.iface.reference.FieldReference
 
 @Patch
@@ -37,7 +40,8 @@ import org.jf.dexlib2.iface.reference.FieldReference
 class RememberVideoQualityPatch : BytecodePatch(
     listOf(
         VideoQualitySetterFingerprint,
-        VideoQualityItemOnClickParentFingerprint
+        VideoQualityItemOnClickParentFingerprint,
+        NewVideoQualityChangedFingerprint
     )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
@@ -113,6 +117,7 @@ class RememberVideoQualityPatch : BytecodePatch(
 
         VideoInformationPatch.onCreateHook(INTEGRATIONS_CLASS_DESCRIPTOR, "newVideoStarted")
 
+
         // Inject a call to set the remembered quality once a video loads.
         VideoQualitySetterFingerprint.result?.also {
             if (!SetQualityByIndexMethodClassFieldReferenceFingerprint.resolve(context, it.classDef))
@@ -159,6 +164,7 @@ class RememberVideoQualityPatch : BytecodePatch(
             )
         } ?: return VideoQualitySetterFingerprint.toErrorResult()
 
+
         // Inject a call to remember the selected quality.
         VideoQualityItemOnClickParentFingerprint.result?.let {
             val onItemClickMethod = it.mutableClass.methods.find { method -> method.name == "onItemClick" }
@@ -172,6 +178,22 @@ class RememberVideoQualityPatch : BytecodePatch(
                 )
             } ?: return PatchResultError("Failed to find onItemClick method")
         } ?: return VideoQualityItemOnClickParentFingerprint.toErrorResult()
+
+
+        // Remember video quality if not using old layout menu.
+        NewVideoQualityChangedFingerprint.result?.apply {
+            mutableMethod.apply {
+                val index = scanResult.patternScanResult!!.startIndex
+                val qualityRegister = getInstruction<TwoRegisterInstruction>(index).registerA
+
+                addInstruction(
+                    index + 1,
+                    "invoke-static {v$qualityRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->userChangedQualityInNewFlyout(I)V"
+                )
+            }
+        } ?: return NewVideoQualityChangedFingerprint.toErrorResult()
+
+
         return PatchResultSuccess()
     }
 

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

@@ -19,9 +19,7 @@ import app.revanced.patches.youtube.video.speed.remember.patch.RememberPlaybackS
 @VideoSpeedCompatibility
 @Version("0.0.1")
 class VideoSpeed : BytecodePatch() {
-
     override fun execute(context: BytecodeContext): PatchResult {
         return PatchResultSuccess() // All patches this patch depends on succeed.
     }
-
 }

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

@@ -3,6 +3,6 @@ package app.revanced.patches.youtube.video.speed
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35"))])
+@Compatibility([Package("com.google.android.youtube", arrayOf("18.20.39", "18.23.35"))])
 @Target(AnnotationTarget.CLASS)
 internal annotation class VideoSpeedCompatibility

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

@@ -0,0 +1,8 @@
+package app.revanced.patches.youtube.video.speed.custom.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object GetOldVideoSpeedsFingerprint : MethodFingerprint(
+    parameters = listOf("[L", "I"),
+    strings = listOf("menu_item_playback_speed")
+)

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

@@ -0,0 +1,7 @@
+package app.revanced.patches.youtube.video.speed.custom.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object ShowOldVideoSpeedMenuFingerprint : MethodFingerprint(
+    strings = listOf("PLAYBACK_RATE_MENU_BOTTOM_SHEET_FRAGMENT")
+)

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

@@ -0,0 +1,7 @@
+package app.revanced.patches.youtube.video.speed.custom.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object ShowOldVideoSpeedMenuIntegrationsFingerprint : MethodFingerprint(
+    customFingerprint = { method, _ -> method.name == "showOldVideoSpeedMenu" }
+)

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

@@ -1,36 +1,46 @@
 package app.revanced.patches.youtube.video.speed.custom.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.settings.preference.impl.InputType
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.TextPreference
+import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable
+import app.revanced.patches.shared.settings.preference.impl.*
+import app.revanced.patches.youtube.misc.bottomsheet.hook.patch.BottomSheetHookPatch
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.litho.filter.patch.LithoFilterPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.youtube.video.speed.custom.fingerprints.SpeedArrayGeneratorFingerprint
-import app.revanced.patches.youtube.video.speed.custom.fingerprints.SpeedLimiterFingerprint
+import app.revanced.patches.youtube.video.speed.custom.fingerprints.*
+import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
 import org.jf.dexlib2.iface.reference.FieldReference
 import org.jf.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.immutable.ImmutableField
 
 @Name("custom-video-speed")
 @Description("Adds custom video speed options.")
-@DependsOn([IntegrationsPatch::class])
+@DependsOn([IntegrationsPatch::class, LithoFilterPatch::class, SettingsPatch::class, BottomSheetHookPatch::class])
 @Version("0.0.1")
 class CustomVideoSpeedPatch : BytecodePatch(
     listOf(
-        SpeedArrayGeneratorFingerprint, SpeedLimiterFingerprint
+        SpeedArrayGeneratorFingerprint,
+        SpeedLimiterFingerprint,
+        GetOldVideoSpeedsFingerprint,
+        ShowOldVideoSpeedMenuIntegrationsFingerprint
     )
 ) {
 
@@ -45,7 +55,7 @@ class CustomVideoSpeedPatch : BytecodePatch(
                 inputType = InputType.TEXT_MULTI_LINE,
                 summary = StringResource(
                     "revanced_custom_playback_speeds_summary",
-                    "Add or change the video speeds available"
+                    "Add or change the available playback speeds"
                 )
             )
         )
@@ -71,7 +81,7 @@ class CustomVideoSpeedPatch : BytecodePatch(
 
         val arrayLengthConstDestination = (arrayLengthConst as OneRegisterInstruction).registerA
 
-        val videoSpeedsArrayType = "Lapp/revanced/integrations/patches/playback/speed/CustomVideoSpeedPatch;->customVideoSpeeds:[F"
+        val videoSpeedsArrayType = "$INTEGRATIONS_CLASS_DESCRIPTOR->customVideoSpeeds:[F"
 
         arrayGenMethod.addInstructions(
             arrayLengthConstIndex + 1,
@@ -111,14 +121,72 @@ class CustomVideoSpeedPatch : BytecodePatch(
         // edit: alternatively this might work by overriding with fixed values such as 0.1x and 10x
         limiterMethod.replaceInstruction(
             limiterMinConstIndex,
-            "sget v$limiterMinConstDestination, Lapp/revanced/integrations/patches/playback/speed/CustomVideoSpeedPatch;->minVideoSpeed:F"
+            "sget v$limiterMinConstDestination, $INTEGRATIONS_CLASS_DESCRIPTOR->minVideoSpeed:F"
         )
         limiterMethod.replaceInstruction(
             limiterMaxConstIndex,
-            "sget v$limiterMaxConstDestination, Lapp/revanced/integrations/patches/playback/speed/CustomVideoSpeedPatch;->maxVideoSpeed:F"
+            "sget v$limiterMaxConstDestination, $INTEGRATIONS_CLASS_DESCRIPTOR->maxVideoSpeed:F"
         )
 
+        // region Force old video quality menu.
+        // This is necessary, because there is no known way of adding custom video speeds to the new menu.
+
+        BottomSheetHookPatch.addHook(INTEGRATIONS_CLASS_DESCRIPTOR)
+
+        // Required to check if the video speed menu is currently shown.
+        LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
+
+        GetOldVideoSpeedsFingerprint.result?.let { result ->
+            // Add a static INSTANCE field to the class.
+            // This is later used to call "showOldVideoSpeedMenu" on the instance.
+            val instanceField = ImmutableField(
+                result.classDef.type,
+                "INSTANCE",
+                result.classDef.type,
+                AccessFlags.PUBLIC or AccessFlags.STATIC,
+                null,
+                null,
+                null
+            ).toMutable()
+
+            result.mutableClass.staticFields.add(instanceField)
+            // Set the INSTANCE field to the instance of the class.
+            // In order to prevent a conflict with another patch, add the instruction at index 1.
+            result.mutableMethod.addInstruction(1, "sput-object p0, $instanceField")
+
+            // Get the "showOldVideoSpeedMenu" method.
+            // This is later called on the field INSTANCE.
+            val showOldVideoSpeedMenuMethod = ShowOldVideoSpeedMenuFingerprint.also {
+                if (!it.resolve(context, result.classDef))
+                    throw ShowOldVideoSpeedMenuFingerprint.toErrorResult()
+            }.result!!.method.toString()
+
+            // Insert the call to the "showOldVideoSpeedMenu" method on the field INSTANCE.
+            ShowOldVideoSpeedMenuIntegrationsFingerprint.result?.mutableMethod?.apply {
+                addInstructionsWithLabels(
+                    implementation!!.instructions.lastIndex,
+                    """
+                        sget-object v0, $instanceField
+                        if-nez v0, :not_null
+                        return-void
+                        :not_null
+                        invoke-virtual { v0 }, $showOldVideoSpeedMenuMethod
+                    """
+                )
+            } ?: return ShowOldVideoSpeedMenuIntegrationsFingerprint.toErrorResult()
+        } ?: return GetOldVideoSpeedsFingerprint.toErrorResult()
+
+        // endregion
+
         return PatchResultSuccess()
     }
 
+    private companion object {
+        private const val FILTER_CLASS_DESCRIPTOR =
+            "Lapp/revanced/integrations/patches/components/VideoSpeedMenuFilterPatch;"
+
+        private const val INTEGRATIONS_CLASS_DESCRIPTOR =
+            "Lapp/revanced/integrations/patches/playback/speed/CustomVideoSpeedPatch;"
+
+    }
 }

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

@@ -3,6 +3,6 @@ package app.revanced.patches.youtube.video.videoid.annotation
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35"))])
+@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
 @Target(AnnotationTarget.CLASS)
 internal annotation class VideoIdCompatibility

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

@@ -1,8 +1,8 @@
-package app.revanced.patches.youtube.video.oldqualitylayout.annotations
+package app.revanced.patches.youtube.video.videoqualitymenu.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35"))])
+@Compatibility([Package("com.google.android.youtube", arrayOf("18.20.39", "18.23.35"))])
 @Target(AnnotationTarget.CLASS)
-internal annotation class OldQualityLayoutCompatibility
+internal annotation class OldVideoQualityMenuCompatibility

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

@@ -1,12 +1,12 @@
-package app.revanced.patches.youtube.video.oldqualitylayout.fingerprints
+package app.revanced.patches.youtube.video.videoqualitymenu.fingerprints
 
 import app.revanced.patcher.extensions.or
+import app.revanced.patches.youtube.video.videoqualitymenu.patch.OldVideoQualityMenuResourcePatch
 import app.revanced.util.patch.LiteralValueFingerprint
-import app.revanced.patches.youtube.video.oldqualitylayout.patch.OldQualityLayoutResourcePatch
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-object QualityMenuViewInflateFingerprint : LiteralValueFingerprint(
+object VideoQualityMenuViewInflateFingerprint : LiteralValueFingerprint(
     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
     parameters = listOf("L", "L", "L"),
     returnType = "L",
@@ -26,5 +26,5 @@ object QualityMenuViewInflateFingerprint : LiteralValueFingerprint(
         Opcode.MOVE_RESULT_OBJECT,
         Opcode.CHECK_CAST
     ),
-    literal = OldQualityLayoutResourcePatch.videoQualityBottomSheetListFragmentTitle
+    literal = OldVideoQualityMenuResourcePatch.videoQualityBottomSheetListFragmentTitle
 )

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

@@ -0,0 +1,73 @@
+package app.revanced.patches.youtube.video.videoqualitymenu.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.youtube.misc.bottomsheet.hook.patch.BottomSheetHookPatch
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.litho.filter.patch.LithoFilterPatch
+import app.revanced.patches.youtube.video.videoqualitymenu.annotations.OldVideoQualityMenuCompatibility
+import app.revanced.patches.youtube.video.videoqualitymenu.fingerprints.VideoQualityMenuViewInflateFingerprint
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Patch
+@DependsOn([
+    IntegrationsPatch::class,
+    OldVideoQualityMenuResourcePatch::class,
+    LithoFilterPatch::class,
+    BottomSheetHookPatch::class
+])
+@Name("old-video-quality-menu")
+@Description("Shows the old video quality with the advanced video quality options instead of the new one.")
+@OldVideoQualityMenuCompatibility
+@Version("0.0.1")
+class OldVideoQualityMenuPatch : BytecodePatch(
+    listOf(VideoQualityMenuViewInflateFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        // region Patch for the old type of the video quality menu.
+
+        VideoQualityMenuViewInflateFingerprint.result?.let {
+            it.mutableMethod.apply {
+                val checkCastIndex = it.scanResult.patternScanResult!!.endIndex
+                val listViewRegister = getInstruction<OneRegisterInstruction>(checkCastIndex).registerA
+
+                addInstruction(
+                    checkCastIndex + 1,
+                    "invoke-static { v$listViewRegister }, " +
+                            "$INTEGRATIONS_CLASS_DESCRIPTOR->" +
+                            "showOldVideoQualityMenu(Landroid/widget/ListView;)V"
+                )
+            }
+        }
+
+        // endregion
+
+        // region Patch for the new type of the video quality menu.
+
+        BottomSheetHookPatch.addHook(INTEGRATIONS_CLASS_DESCRIPTOR)
+
+        // Required to check if the video quality menu is currently shown in order to click on the "Advanced" item.
+        LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
+
+        // endregion
+
+        return PatchResultSuccess()
+    }
+
+    private companion object {
+        private const val FILTER_CLASS_DESCRIPTOR =
+            "Lapp/revanced/integrations/patches/components/VideoQualityMenuFilterPatch;"
+
+        private const val INTEGRATIONS_CLASS_DESCRIPTOR =
+            "Lapp/revanced/integrations/patches/playback/quality/OldVideoQualityMenuPatch;"
+    }
+}

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

@@ -0,0 +1,42 @@
+package app.revanced.patches.youtube.video.videoqualitymenu.patch
+
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
+import app.revanced.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+
+@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
+class OldVideoQualityMenuResourcePatch : ResourcePatch {
+    override fun execute(context: ResourceContext): PatchResult {
+        SettingsPatch.PreferenceScreen.VIDEO.addPreferences(
+            SwitchPreference(
+                "revanced_show_old_video_quality_menu",
+                StringResource("revanced_show_old_video_quality_menu_title", "Show old video quality menu"),
+                StringResource("revanced_show_old_video_quality_menu_summary_on", "Old video quality menu is shown"),
+                StringResource("revanced_show_old_video_quality_menu_summary_off", "New video quality menu is hidden")
+            )
+        )
+
+        fun findResource(name: String) = ResourceMappingPatch.resourceMappings.find { it.name == name }?.id
+            ?: throw PatchResultError("Could not find resource")
+
+        // Used for the old type of the video quality menu.
+        videoQualityBottomSheetListFragmentTitle = findResource("video_quality_bottom_sheet_list_fragment_title")
+
+        // Used for the new type of the video quality menu.
+        bottomSheetMargins = findResource("bottom_sheet_margins")
+
+        return PatchResultSuccess()
+    }
+
+    internal companion object {
+        var videoQualityBottomSheetListFragmentTitle = -1L
+        var bottomSheetMargins = -1L
+    }
+}