feat(youtube): support version 18.19.35

2023-05-19 23:43:47 +02:00
parent 1d0bf1b289
commit 3cfbe206dc
74 changed files with 337 additions and 292 deletions
@@ -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"))])
+@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35"))])
@Target(AnnotationTarget.CLASS)
 internal annotation class HDRBrightnessCompatibility
@@ -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"))])
+@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35"))])
@Target(AnnotationTarget.CLASS)
 internal annotation class VideoInformationCompatibility
@@ -3,6 +3,6 @@ package app.revanced.patches.youtube.video.oldqualitylayout.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37"))])
+@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35"))])
@Target(AnnotationTarget.CLASS)
 internal annotation class OldQualityLayoutCompatibility
@@ -1,12 +1,12 @@
 package app.revanced.patches.youtube.video.oldqualitylayout.fingerprints

-import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
+import app.revanced.patches.youtube.video.oldqualitylayout.patch.OldQualityLayoutResourcePatch
 import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction

 object QualityMenuViewInflateFingerprint : MethodFingerprint(
-    "L", AccessFlags.FINAL or AccessFlags.PUBLIC, listOf("L", "L", "L"), listOf(
+    opcodes = listOf(
        Opcode.INVOKE_SUPER,
        Opcode.CONST,
        Opcode.CONST_4,
@@ -20,12 +20,15 @@ object QualityMenuViewInflateFingerprint : MethodFingerprint(
        Opcode.CONST,
        Opcode.INVOKE_VIRTUAL,
        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.CONST_STRING,
-    )
+        Opcode.CHECK_CAST
+    ),
+    customFingerprint = { methodDef, _ ->
+        methodDef.implementation?.instructions?.any {
+            if (it.opcode != Opcode.CONST) return@any false
+
+            val literal = (it as WideLiteralInstruction).wideLiteral
+
+            literal == OldQualityLayoutResourcePatch.videoQualityBottomSheetListFragmentTitle
+        } ?: false
+    }
 )
@@ -10,35 +10,19 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.video.oldqualitylayout.annotations.OldQualityLayoutCompatibility
 import app.revanced.patches.youtube.video.oldqualitylayout.fingerprints.QualityMenuViewInflateFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction

@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
+@DependsOn([IntegrationsPatch::class, OldQualityLayoutResourcePatch::class])
@Name("old-quality-layout")
-@Description("Enables the original video quality flyout in the video player settings")
+@Description("Enables the original video quality flyout in the video player settings.")
@OldQualityLayoutCompatibility
@Version("0.0.1")
-// new ReVanced users have no idea what it means to use the "old quality layout menu"
-// maybe rename this patch to better describe what it provides (ie: user-selectable-video-resolution )
-class OldQualityLayoutPatch : BytecodePatch(
-    listOf(QualityMenuViewInflateFingerprint)
-) {
+class OldQualityLayoutPatch : BytecodePatch(listOf(QualityMenuViewInflateFingerprint)) {
    override fun execute(context: BytecodeContext): 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")
-            )
-        )
-
        val inflateFingerprintResult = QualityMenuViewInflateFingerprint.result!!
        val method = inflateFingerprintResult.mutableMethod
        val instructions = method.implementation!!.instructions
@@ -57,4 +41,4 @@ class OldQualityLayoutPatch : BytecodePatch(

        return PatchResultSuccess()
    }
-}
+}
@@ -0,0 +1,36 @@
+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
+    }
+}
@@ -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"))])
+@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35"))])
@Target(AnnotationTarget.CLASS)
 internal annotation class RememberVideoQualityCompatibility
@@ -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"))])
+@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35"))])
@Target(AnnotationTarget.CLASS)
 internal annotation class VideoSpeedCompatibility
@@ -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"))])
+@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35"))])
@Target(AnnotationTarget.CLASS)
 internal annotation class VideoIdCompatibility