20.28 work in progress (litho filtering is still partially broken)

LisoUseInAIKyrios · LisoUseInAIKyrios · commit b4a6bd683927 · 2025-07-10T16:07:11.000+04:00
diff --git a/patches/api/patches.api b/patches/api/patches.api
@@ -1464,6 +1464,7 @@ public final class app/revanced/patches/youtube/misc/playservice/VersionCheckPat
 	public static final fun is_20_21_or_greater ()Z
 	public static final fun is_20_22_or_greater ()Z
 	public static final fun is_20_26_or_greater ()Z
+	public static final fun is_20_28_or_greater ()Z
 }
 
 public final class app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatchKt {
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt
@@ -73,12 +73,9 @@ val enableSlideToSeekPatch = bytecodePatch(
 
         // Disable the double speed seek gesture.
         if (is_19_17_or_greater) {
-            arrayOf(
-                disableFastForwardGestureFingerprint,
-                disableFastForwardNoticeFingerprint,
-            ).forEach { fingerprint ->
-                fingerprint.method.apply {
-                    val targetIndex = fingerprint.instructionMatches.last().index
+            disableFastForwardGestureFingerprint.let {
+                it.method.apply {
+                    val targetIndex = it.instructionMatches.last().index
                     val targetRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA
 
                     addInstructions(
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/Fingerprints.kt
@@ -69,29 +69,6 @@ internal val disableFastForwardGestureFingerprint by fingerprint {
     }
 }
 
-internal val disableFastForwardNoticeFingerprint by fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("V")
-    parameters()
-    instructions(
-        opcode(Opcode.CHECK_CAST),
-        // opcode(Opcode.IGET_OBJECT), // 20.25+
-        methodCall(opcode = Opcode.INVOKE_VIRTUAL, returnType = "Z", maxAfter = 1),
-        opcode(Opcode.MOVE_RESULT, maxAfter = 0),
-    )
-    custom { method, _ ->
-        // Code is found in different methods with different strings.
-        val findSearchLandingKey = (is_19_34_or_greater && !is_19_47_or_greater)
-                || is_20_19_or_greater
-
-        method.name == "run" && method.indexOfFirstInstruction {
-            val string = getReference<StringReference>()?.string
-            string == "Failed to easy seek haptics vibrate."
-                    || (findSearchLandingKey && string == "search_landing_cache_key")
-        } >= 0
-    }
-}
-
 /**
  * For 20.19 and below, this matches the same method as [disableFastForwardNoticeFingerprint].
  * For 20.20+, this matches a different method.
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/overlay/HidePlayerOverlayButtonsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/overlay/HidePlayerOverlayButtonsPatch.kt
@@ -36,7 +36,7 @@ val hidePlayerOverlayButtonsPatch = bytecodePatch(
         sharedExtensionPatch,
         settingsPatch,
         addResourcesPatch,
-        resourceMappingPatch // Used by fingerprints
+        resourceMappingPatch // Used by fingerprints.
     )
 
     compatibleWith(
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/Fingerprints.kt
@@ -145,26 +145,13 @@ internal val lottieAnimationViewSetAnimationIntFingerprint by fingerprint {
     }
 }
 
-internal val lottieAnimationViewSetAnimationStreamFingerprint by fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    parameters("L")
-    returns("V")
-    instructions(
-        methodCall("Ljava/util/Set;", "add"),
-        literal(0)
-    )
-    custom { _, classDef ->
-        classDef.type == LOTTIE_ANIMATION_VIEW_CLASS_TYPE
-    }
-}
-
 internal val lottieCompositionFactoryZipFingerprint by fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC)
-    parameters("Landroid/content/Context;", "Ljava/lang/String;", "Ljava/lang/String;")
+    parameters("Landroid/content/Context;", "Ljava/util/zip/ZipInputStream;", "Ljava/lang/String;")
     returns("L")
     instructions(
-        string(".zip"),
-        string(".lottie")
+        string("Unable to parse composition"),
+        string(" however it was not found in the animation.")
     )
 }
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/SeekbarColorPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/SeekbarColorPatch.kt
@@ -5,6 +5,7 @@ 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.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.fingerprint
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.resourcePatch
@@ -372,6 +373,14 @@ val seekbarColorPatch = bytecodePatch(
                 factoryStreamReturnType = returnType
             }
 
+            val lottieAnimationViewSetAnimationStreamFingerprint by fingerprint {
+                accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+                parameters(factoryStreamReturnType.toString())
+                returns("V")
+                custom { _, classDef ->
+                    classDef.type == lottieAnimationViewSetAnimationIntFingerprint.originalClassDef.type
+                }
+            }
             val setAnimationStreamName = lottieAnimationViewSetAnimationStreamFingerprint
                 .originalMethod.name
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt
@@ -173,7 +173,7 @@ val themePatch = bytecodePatch(
                 // Fix the splash screen dark mode background color.
                 // In 19.32+ the dark mode splash screen is white and fades to black.
                 // Maybe it's a bug in YT, or maybe it intentionally. Who knows.
-                document("res/values-night-v27/styles.xml").use { document ->
+                document("res/values-night/styles.xml").use { document ->
                     // Create a night mode specific override for the splash screen background.
                     val style = document.createElement("style")
                     style.setAttribute("name", "Theme.YouTube.Home")
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/navigation/NavigationBarHookPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/navigation/NavigationBarHookPatch.kt
@@ -13,6 +13,7 @@ import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.playertype.playerTypeHookPatch
 import app.revanced.patches.youtube.misc.playservice.is_19_35_or_greater
 import app.revanced.patches.youtube.misc.playservice.is_20_21_or_greater
+import app.revanced.patches.youtube.misc.playservice.is_20_28_or_greater
 import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
 import app.revanced.patches.youtube.shared.mainActivityOnBackPressedFingerprint
 import app.revanced.util.getReference
@@ -78,7 +79,7 @@ val navigationBarHookPatch = bytecodePatch(description = "Hooks the active navig
                 )
             }
 
-            if (is_20_21_or_greater) {
+            if (is_20_21_or_greater && !is_20_28_or_greater) {
                 val imageResourceIntTabMethod = pivotBarButtonsCreateResourceIntViewFingerprint.originalMethod
                 addHook(NavigationHook.NAVIGATION_TAB_LOADED) predicate@{
                     MethodUtil.methodSignaturesMatch(
@@ -194,7 +195,7 @@ val navigationBarHookPatch = bytecodePatch(description = "Hooks the active navig
         }
 
         // Fix YT bug of notification tab missing the filled icon.
-        if (is_19_35_or_greater) {
+        if (is_19_35_or_greater && !is_20_28_or_greater) {
             val cairoNotificationEnumReference = imageEnumConstructorFingerprint
                 .instructionMatches.last().getInstruction<ReferenceInstruction>().reference
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playertype/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playertype/Fingerprints.kt
@@ -6,15 +6,21 @@ import app.revanced.patches.shared.misc.mapping.resourceLiteral
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
-internal val playerTypeFingerprint by fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("V")
-    parameters("L")
-    opcodes(
-        Opcode.IF_NE,
-        Opcode.RETURN_VOID,
+internal val playerTypeEnumFingerprint by fingerprint {
+    accessFlags(AccessFlags.STATIC, AccessFlags.CONSTRUCTOR)
+    strings(
+        "NONE",
+        "HIDDEN",
+        "WATCH_WHILE_MINIMIZED",
+        "WATCH_WHILE_MAXIMIZED",
+        "WATCH_WHILE_FULLSCREEN",
+        "WATCH_WHILE_SLIDING_MAXIMIZED_FULLSCREEN",
+        "WATCH_WHILE_SLIDING_MINIMIZED_MAXIMIZED",
+        "WATCH_WHILE_SLIDING_MINIMIZED_DISMISSED",
+        "INLINE_MINIMAL",
+        "VIRTUAL_REALITY_FULLSCREEN",
+        "WATCH_WHILE_PICTURE_IN_PICTURE",
     )
-    custom { _, classDef -> classDef.endsWith("/YouTubePlayerOverlaysLayout;") }
 }
 
 internal val reelWatchPagerFingerprint by fingerprint {
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playertype/PlayerTypeHookPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playertype/PlayerTypeHookPatch.kt
@@ -21,9 +21,18 @@ val playerTypeHookPatch = bytecodePatch(
     dependsOn(sharedExtensionPatch, resourceMappingPatch)
 
     execute {
-        playerTypeFingerprint.method.addInstruction(
+        val playerOverlaysSetPlayerTypeFingerprint by fingerprint {
+            accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+            returns("V")
+            parameters(playerTypeEnumFingerprint.originalClassDef.type)
+            custom { _, classDef ->
+                classDef.endsWith("/YouTubePlayerOverlaysLayout;")
+            }
+        }
+
+        playerOverlaysSetPlayerTypeFingerprint.method.addInstruction(
             0,
-            "invoke-static {p1}, $EXTENSION_CLASS_DESCRIPTOR->setPlayerType(Ljava/lang/Enum;)V",
+            "invoke-static { p1 }, $EXTENSION_CLASS_DESCRIPTOR->setPlayerType(Ljava/lang/Enum;)V",
         )
 
         reelWatchPagerFingerprint.let {
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playservice/VersionCheckPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playservice/VersionCheckPatch.kt
@@ -71,6 +71,8 @@ var is_20_22_or_greater = false
     private set
 var is_20_26_or_greater = false
     private set
+var is_20_28_or_greater = false
+    private set
 
 val versionCheckPatch = resourcePatch(
     description = "Uses the Play Store service version to find the major/minor version of the YouTube target app.",
@@ -115,5 +117,6 @@ val versionCheckPatch = resourcePatch(
         is_20_21_or_greater = 252205000 <= playStoreServicesVersion
         is_20_22_or_greater = 252305000 <= playStoreServicesVersion
         is_20_26_or_greater = 252705000 <= playStoreServicesVersion
+        is_20_28_or_greater = 252905000 <= playStoreServicesVersion
     }
 }
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/shared/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/shared/Fingerprints.kt
@@ -128,16 +128,9 @@ internal val subtitleButtonControllerFingerprint by fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
     returns("V")
     parameters("Lcom/google/android/libraries/youtube/player/subtitles/model/SubtitleTrack;")
-    opcodes(
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.RETURN_VOID,
-        Opcode.IGET_BOOLEAN,
-        Opcode.CONST_4,
-        Opcode.IF_NEZ,
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
+    instructions(
+        resourceLiteral("string", "accessibility_captions_unavailable"),
+        resourceLiteral("string", "accessibility_captions_button_name"),
     )
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1464,6 +1464,7 @@ public final class app/revanced/patches/youtube/misc/playservice/VersionCheckPat`
`1464`	`1464`	`public static final fun is_20_21_or_greater ()Z`
`1465`	`1465`	`public static final fun is_20_22_or_greater ()Z`
`1466`	`1466`	`public static final fun is_20_26_or_greater ()Z`
	`1467`	`+ public static final fun is_20_28_or_greater ()Z`
`1467`	`1468`	`}`
`1468`	`1469`
`1469`	`1470`	`public final class app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatchKt {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ val hidePlayerOverlayButtonsPatch = bytecodePatch(`
`36`	`36`	`sharedExtensionPatch,`
`37`	`37`	`settingsPatch,`
`38`	`38`	`addResourcesPatch,`
`39`		`- resourceMappingPatch // Used by fingerprints`
	`39`	`+ resourceMappingPatch // Used by fingerprints.`
`40`	`40`	`)`
`41`	`41`
`42`	`42`	`compatibleWith(`