fix hide category bar

ReVanced · Mar 27, 2024 · 0f6708f · 0f6708f
1 parent a2aa7e9
commit 0f6708f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 18 deletions.
diff --git a/api/revanced-patches.api b/api/revanced-patches.api
@@ -356,6 +356,12 @@ public final class app/revanced/patches/music/layout/compactheader/CompactHeader
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/music/layout/compactheader/HideCategoryBar : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/music/layout/compactheader/HideCategoryBar;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/music/layout/minimizedplayback/MinimizedPlaybackPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/music/layout/minimizedplayback/MinimizedPlaybackPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V

diff --git a/...ayout/compactheader/CompactHeaderPatch.kt → ...c/layout/compactheader/HideCategoryBar.kt b/...ayout/compactheader/CompactHeaderPatch.kt → ...c/layout/compactheader/HideCategoryBar.kt
@@ -6,24 +6,24 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.music.layout.compactheader.fingerprints.ConstructCompactHeaderFingerprint
+import app.revanced.patches.music.layout.compactheader.fingerprints.ConstructCategoryBarFingerprint
 import app.revanced.util.exception
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch(
-    name = "Compact header",
-    description = "Hides the music category bar at the top of the homepage.",
+    name = "Hide category bar",
+    description = "Hides the category bar at the top of the homepage.",
     compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")],
     use = false,
 )
 @Suppress("unused")
-object CompactHeaderPatch : BytecodePatch(
-    setOf(ConstructCompactHeaderFingerprint),
+object HideCategoryBar : BytecodePatch(
+    setOf(ConstructCategoryBarFingerprint),
 ) {
     override fun execute(context: BytecodeContext) {
-        ConstructCompactHeaderFingerprint.result?.let {
+        ConstructCategoryBarFingerprint.result?.let {
             it.mutableMethod.apply {
-                val insertIndex = it.scanResult.patternScanResult!!.endIndex
+                val insertIndex = it.scanResult.patternScanResult!!.startIndex
                 val register = getInstruction<OneRegisterInstruction>(insertIndex - 1).registerA
 
                 addInstructions(
@@ -34,6 +34,14 @@ object CompactHeaderPatch : BytecodePatch(
                     """,
                 )
             }
-        } ?: throw ConstructCompactHeaderFingerprint.exception
+        } ?: throw ConstructCategoryBarFingerprint.exception
+    }
+}
+
+@Deprecated("This patch class has been renamed to HideCategoryBar.")
+object CompactHeaderPatch : BytecodePatch(
+    dependencies = setOf(HideCategoryBar::class),
+) {
+    override fun execute(context: BytecodeContext) {
     }
 }
diff --git a/...ints/ConstructCompactHeaderFingerprint.kt → ...prints/ConstructCategoryBarFingerprint.kt b/...ints/ConstructCompactHeaderFingerprint.kt → ...prints/ConstructCategoryBarFingerprint.kt
@@ -5,22 +5,19 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
-internal object ConstructCompactHeaderFingerprint : MethodFingerprint(
+internal object ConstructCategoryBarFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    listOf("L", "L", "L", "L", "L"),
+    listOf("Landroid/content/Context;", "L", "L", "L"),
     listOf(
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
         Opcode.IPUT_OBJECT,
+        Opcode.CONST,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
         Opcode.IPUT_OBJECT,
+        Opcode.CONST,
+        Opcode.INVOKE_VIRTUAL,
         Opcode.NEW_INSTANCE,
         Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.CONST,
-        Opcode.CONST_4,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
     ),
 )