feat: update patches to latest version

Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>
2025-06-12 21:27:43 +02:00 · 2022-05-22 17:11:34 +02:00
parent c4c86b65fd
commit bad25dec1d
33 changed files with 64 additions and 207 deletions
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/amoled/annotations/AmoledCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/amoled/annotations/AmoledCompatibility.kt
@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/amoled/patch/AmoledPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/amoled/patch/AmoledPatch.kt
@ -14,7 +14,7 @@ import java.io.File

@Patch
@Name("amoled")
-@Description("Enables black theme (amoled mode)")
+@Description("Enables pure black theme.")
@AmoledCompatibility
@Version("0.0.1")
 class AmoledPatch : ResourcePatch() {
@ -23,18 +23,13 @@ class AmoledPatch : ResourcePatch() {
            val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element

            for (i in 0 until resourcesNode.childNodes.length) {
-                val node = resourcesNode.childNodes.item(i) as Element
+                val node = resourcesNode.childNodes.item(i)
+                if (node !is Element) continue

-                node.nodeValue = when (node.getAttribute("name")) {
-                    "yt_black1",
-                    "yt_black1_opacity95",
-                    "yt_black2",
-                    "yt_black3",
-                    "yt_black4",
-                    "yt_status_bar_background_dark"
-                    -> "@android:color/black"
-                    "yt_selected_nav_label_dark"
-                    -> "#ffdf0000"
+                val element = resourcesNode.childNodes.item(i) as Element
+                element.textContent = when (element.getAttribute("name")) {
+                    "yt_black1", "yt_black1_opacity95", "yt_black2", "yt_black3", "yt_black4", "yt_status_bar_background_dark" -> "@android:color/black"
+                    "yt_selected_nav_label_dark" -> "#ffdf0000"
                    else -> continue
                }
            }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/annotations/CreateButtonCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/annotations/CreateButtonCompatibility.kt
@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/patch/CreateButtonRemoverPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/patch/CreateButtonRemoverPatch.kt
@ -10,15 +10,15 @@ import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultError
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
 import app.revanced.patcher.util.smali.toInstruction
+import app.revanced.patches.youtube.layout.createbutton.annotations.CreateButtonCompatibility
 import app.revanced.patches.youtube.layout.createbutton.signatures.CreateButtonSignature
-import app.revanced.patches.youtube.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.formats.Instruction35c

@Patch
@Name("disable-create-button")
@Description("Disable the create button.")
-@MinimizedPlaybackCompatibility
+@CreateButtonCompatibility
@Version("0.0.1")
 class CreateButtonRemoverPatch : BytecodePatch(
    listOf(
@ -30,14 +30,14 @@ class CreateButtonRemoverPatch : BytecodePatch(

        // Get the required register which holds the view object we need to pass to the method hideCreateButton
        val implementation = result.method.implementation!!
-        val instruction = implementation.instructions[result.scanData.endIndex + 1]
+        val instruction = implementation.instructions[result.scanResult.endIndex + 1]
        if (instruction.opcode != Opcode.INVOKE_STATIC)
            return PatchResultError("Could not find the correct register")
        val register = (instruction as Instruction35c).registerC

        // Hide the button view via proxy by passing it to the hideCreateButton method
        implementation.addInstruction(
-            result.scanData.endIndex + 1,
+            result.scanResult.endIndex + 1,
            "invoke-static { v$register }, Lfi/razerman/youtube/XAdRemover;->hideCreateButton(Landroid/view/View;)V".toInstruction()
        )

--- a/src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/signatures/CreateButtonSignature.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/signatures/CreateButtonSignature.kt
@ -12,7 +12,7 @@ import org.jf.dexlib2.Opcode

@Name("create-button-signature")
@MatchingMethod(
-    "Lkne", "z"
+    "Lknw", "z"
 )
@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
@CreateButtonCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/minimizedplayback/annotations/MinimizedPlaybackCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/minimizedplayback/annotations/MinimizedPlaybackCompatibility.kt
@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/minimizedplayback/signatures/MinimizedPlaybackManagerSignature.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/minimizedplayback/signatures/MinimizedPlaybackManagerSignature.kt
@ -12,7 +12,7 @@ import org.jf.dexlib2.Opcode

@Name("minimized-playback-manager-signature")
@MatchingMethod(
-    "Lype", "j"
+    "Lyuf", "n"
 )
@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
@MinimizedPlaybackCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/oldqualitylayout/annotations/OldQualityLayoutCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/oldqualitylayout/annotations/OldQualityLayoutCompatibility.kt
@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.17.34")
+        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/oldqualitylayout/patch/OldQualityLayoutPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/oldqualitylayout/patch/OldQualityLayoutPatch.kt
@ -51,7 +51,7 @@ class OldQualityLayoutPatch : BytecodePatch(

        // if useOldStyleQualitySettings == true, jump over all instructions
        val jmpInstruction = BuilderInstruction21t(
-            Opcode.IF_NEZ, 0, implementation.instructions[result.scanData.endIndex].location.labels.first()
+            Opcode.IF_NEZ, 0, implementation.instructions[result.scanResult.endIndex].location.labels.first()
        )
        implementation.addInstruction(5, jmpInstruction)
        implementation.addInstructions(
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/reels/patch/HideReelsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/reels/patch/HideReelsPatch.kt
@ -4,7 +4,6 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.implementation.BytecodeData
-import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
@ -12,7 +11,7 @@ import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility
 import app.revanced.patches.youtube.layout.reels.signatures.HideReelsSignature

-@Patch
+//@Patch TODO: converted to litho
@Name("hide-reels")
@Description("Hide reels on the page.")
@HideReelsCompatibility
@ -29,7 +28,7 @@ class HideReelsPatch : BytecodePatch(
        // HideReel will hide the reel view before it is being used,
        // so we pass the view to the HideReel method
        implementation.addInstruction(
-            result.scanData.endIndex,
+            result.scanResult.endIndex,
            "invoke-static { v2 }, Lfi/razerman/youtube/XAdRemover;->HideReel(Landroid/view/View;)V".toInstruction()
        )

--- a/src/main/kotlin/app/revanced/patches/youtube/layout/reels/signatures/HideReelsSignature.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/reels/signatures/HideReelsSignature.kt
@ -8,7 +8,6 @@ import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatt
 import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
 import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility
 import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode

@Name("hide-reels-signature")
@MatchingMethod(
@ -18,41 +17,6 @@ import org.jf.dexlib2.Opcode
@HideReelsCompatibility
@Version("0.0.1")
 object HideReelsSignature : MethodSignature(
-    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf(
-        "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "[B", "[B", "[B", "[B", "[B", "[B"
-    ), listOf(
-        Opcode.MOVE_OBJECT,
-        Opcode.MOVE_OBJECT,
-        Opcode.INVOKE_DIRECT,
-        Opcode.MOVE_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.MOVE_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.MOVE_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.MOVE_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.MOVE_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.IPUT_OBJECT,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.IPUT_OBJECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.IPUT_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CONST,
-        Opcode.CONST_4,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IPUT_OBJECT
-    )
+    null, AccessFlags.PROTECTED or AccessFlags.FINAL, listOf("L", "L"), null,
+    listOf("multiReelDismissalCallback", "reelItemRenderers", "reelDismissalInfo")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/annotations/ShortsButtonCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/annotations/ShortsButtonCompatibility.kt
@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/patch/ShortsButtonRemoverPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/patch/ShortsButtonRemoverPatch.kt
@ -27,24 +27,24 @@ class ShortsButtonRemoverPatch : BytecodePatch(
    override fun execute(data: BytecodeData): PatchResult {
        val result1 = signatures.first().result!!
        val implementation1 = result1.method.implementation!!
-        val moveEnumInstruction = implementation1.instructions[result1.scanData.endIndex]
+        val moveEnumInstruction = implementation1.instructions[result1.scanResult.endIndex]
        val enumRegister = (moveEnumInstruction as Instruction11x).registerA

        val result2 = signatures.last().result!!
        val implementation2 = result2.method.implementation!!
-        val moveViewInstruction = implementation2.instructions[result2.scanData.endIndex]
+        val moveViewInstruction = implementation2.instructions[result2.scanResult.endIndex]
        val viewRegister = (moveViewInstruction as Instruction11x).registerA

        // Save the tab enum in XGlobals to avoid smali/register workarounds
        implementation1.addInstruction(
-            result1.scanData.endIndex + 1,
+            result1.scanResult.endIndex + 1,
            "sput-object v$enumRegister, Lfi/razerman/youtube/XGlobals;->lastPivotTab:Ljava/lang/Enum;".toInstruction()
        )

        // Hide the button view via proxy by passing it to the hideShortsButton method
        // It only hides it if the last tab name is "TAB_SHORTS"
        implementation2.addInstruction(
-            result2.scanData.endIndex + 2,
+            result2.scanResult.endIndex + 2,
            "invoke-static { v$viewRegister }, Lfi/razerman/youtube/XAdRemover;->hideShortsButton(Landroid/view/View;)V".toInstruction()
        )

--- a/src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/signatures/PivotBarButtonTabenumSignature.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/signatures/PivotBarButtonTabenumSignature.kt
@ -12,7 +12,7 @@ import org.jf.dexlib2.Opcode

@Name("pivotbar-buttons-tabenum-signature")
@MatchingMethod(
-    "Lkne", "z"
+    "Lknw", "z"
 )
@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
@ShortsButtonCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/signatures/PivotBarButtonsViewSignature.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/signatures/PivotBarButtonsViewSignature.kt
@ -12,7 +12,7 @@ import org.jf.dexlib2.Opcode

@Name("pivotbar-buttons-view-signature")
@MatchingMethod(
-    "Lkne", "z"
+    "Lknw", "z"
 )
@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
@ShortsButtonCompatibility