diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/Fingerprints.kt index e1b8bfcbf..2dbff83a2 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/Fingerprints.kt @@ -11,8 +11,8 @@ internal val setWordmarkHeaderFingerprint = fingerprint { returns("V") parameters("Landroid/widget/ImageView;") custom { methodDef, _ -> - methodDef.containsLiteralInstruction(ytWordmarkHeaderId) && - methodDef.containsLiteralInstruction(ytPremiumWordmarkHeaderId) + methodDef.containsLiteralInstruction(ytPremiumWordmarkHeaderId) && + methodDef.containsLiteralInstruction(ytWordmarkHeaderId) } } diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt index 89920b53c..988bd0a30 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt @@ -17,7 +17,6 @@ import app.revanced.util.addInstructionsAtControlFlowLabel import app.revanced.util.findInstructionIndicesReversedOrThrow import app.revanced.util.getReference import app.revanced.util.indexOfFirstInstructionOrThrow -import app.revanced.util.indexOfFirstLiteralInstructionOrThrow import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction import com.android.tools.smali.dexlib2.iface.reference.MethodReference @@ -48,7 +47,7 @@ private val wideSearchbarResourcePatch = resourcePatch { actionBarRingoId = resourceMappings[ "layout", - "action_bar_ringo_background", + "action_bar_ringo", ] } } @@ -111,18 +110,18 @@ val wideSearchbarPatch = bytecodePatch( // Fix missing left padding when using wide searchbar. wideSearchbarLayoutFingerprint.method.apply { - val layoutIndex = indexOfFirstLiteralInstructionOrThrow(actionBarRingoId) - val inflateIndex = indexOfFirstInstructionOrThrow(layoutIndex) { + findInstructionIndicesReversedOrThrow { val reference = getReference() reference?.definingClass == "Landroid/view/LayoutInflater;" && reference.name == "inflate" - } - val register = getInstruction(inflateIndex + 1).registerA + }.forEach { inflateIndex -> + val register = getInstruction(inflateIndex + 1).registerA - addInstruction( - inflateIndex + 2, - "invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->setActionBar(Landroid/view/View;)V" - ) + addInstruction( + inflateIndex + 2, + "invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->setActionBar(Landroid/view/View;)V" + ) + } } } }