From c1a0f2c0355b45d3e8baa4cc28633ee0e992a507 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Thu, 30 Jun 2022 02:39:24 +0200 Subject: [PATCH] refactor: `hide-autoplay-button` & refactor: `hide-autoplay-button` && `premium-heading` patch --- .../fingerprints/AutonavInformerFingerprint.kt | 2 +- .../fingerprints/LayoutConstructorFingerprint.kt | 2 +- ...utoplayButtonRemoverPatch.kt => HideAutoplayButton.kt} | 8 ++++---- .../layout/branding/header/patch/PremiumHeadingPatch.kt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) rename src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/{AutoplayButtonRemoverPatch.kt => HideAutoplayButton.kt} (95%) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/AutonavInformerFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/AutonavInformerFingerprint.kt index 4ef4a6b8a..54cb65330 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/AutonavInformerFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/AutonavInformerFingerprint.kt @@ -12,7 +12,7 @@ import org.jf.dexlib2.Opcode @Name("autonav-informer-fingerprint") @MatchingMethod( - "com/google/android/libraries/youtube/player/features/prefetch/WillAutonavInformer;", "k" + "LWillAutonavInformer;", "k" ) @FuzzyPatternScanMethod(2) @AutoplayButtonCompatibility diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/LayoutConstructorFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/LayoutConstructorFingerprint.kt index d584709cf..e870501d9 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/LayoutConstructorFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/LayoutConstructorFingerprint.kt @@ -12,7 +12,7 @@ import org.jf.dexlib2.Opcode @Name("layout-constructor-fingerprint") @MatchingMethod( - "Lcom/google/android/apps/youtube/app/player/overlay/YouTubeControlsOverlay;", "F" + "LYouTubeControlsOverlay;", "F" ) @FuzzyPatternScanMethod(2) @AutoplayButtonCompatibility diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/AutoplayButtonRemoverPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/HideAutoplayButton.kt similarity index 95% rename from src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/AutoplayButtonRemoverPatch.kt rename to src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/HideAutoplayButton.kt index 403233314..3de5b590d 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/AutoplayButtonRemoverPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/HideAutoplayButton.kt @@ -19,11 +19,11 @@ import org.jf.dexlib2.iface.instruction.WideLiteralInstruction @Patch @Dependencies(dependencies = [ResourceIdMappingProviderResourcePatch::class]) -@Name("disable-autoplay-button") +@Name("hide-autoplay-button") @Description("Disable the autoplay button.") @AutoplayButtonCompatibility @Version("0.0.1") -class AutoplayButtonRemoverPatch : BytecodePatch( +class HideAutoplayButton : BytecodePatch( listOf( LayoutConstructorFingerprint, AutonavInformerFingerprint ) @@ -51,8 +51,8 @@ class AutoplayButtonRemoverPatch : BytecodePatch( autonavInformerMethod.replaceInstructions( 0, """ - const/4 v0, 0x0 - return v0 + const/4 v0, 0x0 + return v0 """ ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/patch/PremiumHeadingPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/patch/PremiumHeadingPatch.kt index 5173dcb74..786e7a1a9 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/patch/PremiumHeadingPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/patch/PremiumHeadingPatch.kt @@ -26,7 +26,7 @@ import kotlin.io.path.exists @Version("0.0.1") class PremiumHeadingPatch : ResourcePatch() { override fun execute(data: ResourceData): PatchResult { - val resDirectory = data.get("res") + val resDirectory = data["res"] if (!resDirectory.isDirectory) return PatchResultError("The res folder can not be found.") val (original, replacement) = "yt_premium_wordmark_header" to "yt_wordmark_header"