ReVanced/revanced-patches-ex
1
0
Fork 0
mirror of https://github.com/inotia00/revanced-patches.git synced 2025-06-13 13:47:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(YouTube/Hide suggested video overlay): miniplayer's play button appears incorrectly when the video ends

Browse Source
This commit is contained in:
inotia00
2024-03-25 10:02:01 +09:00
parent 83d37d047c
commit 2ddd47bfaf
2 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/kotlin/app/revanced/patches/youtube/player/suggestedvideooverlay/SuggestedVideoOverlayPatch.kt
View File

@ -2,24 +2,23 @@ package app.revanced.patches.youtube.player.suggestedvideooverlay
import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.PatchException
import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.youtube.player.suggestedvideooverlay.fingerprints.CoreContainerBuilderFingerprint
import app.revanced.patches.youtube.player.suggestedvideooverlay.fingerprints.MiniPlayerPlayButtonFingerprint
import app.revanced.patches.youtube.player.suggestedvideooverlay.fingerprints.TouchAreaOnClickListenerFingerprint
import app.revanced.patches.youtube.utils.integrations.Constants.PLAYER
import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch.CoreContainer
import app.revanced.patches.youtube.utils.settings.SettingsPatch
import app.revanced.util.exception
import app.revanced.util.getWideLiteralInstructionIndex
import com.android.tools.smali.dexlib2.Opcode
import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
import com.android.tools.smali.dexlib2.iface.reference.MethodReference
@ -69,23 +68,32 @@ object SuggestedVideoOverlayPatch : BytecodePatch(
) {
override fun execute(context: BytecodeContext) {
CoreContainerBuilderFingerprint.result?.let {
it.mutableMethod.apply {
val targetIndex = getWideLiteralInstructionIndex(CoreContainer) + 4
val targetReference =
getInstruction<ReferenceInstruction>(targetIndex).reference
if (!targetReference.toString().endsWith("Landroid/view/ViewGroup;"))
throw PatchException("Reference did not match: $targetReference")
val targetRegister =
getInstruction<TwoRegisterInstruction>(targetIndex).registerA
CoreContainerBuilderFingerprint.result?.let { parentResult ->
parentResult.mutableMethod.apply {
val addOnClickEventListenerIndex = parentResult.scanResult.patternScanResult!!.endIndex - 1
val viewRegister = getInstruction<FiveRegisterInstruction>(addOnClickEventListenerIndex).registerC
addInstruction(
targetIndex,
"invoke-static {v$targetRegister}, $PLAYER->hideSuggestedVideoOverlay(Landroid/view/ViewGroup;)V"
addOnClickEventListenerIndex + 1,
"invoke-static {v$viewRegister}, $PLAYER->hideSuggestedVideoOverlay(Landroid/widget/ImageView;)V"
)
}
// Resolves fingerprints
MiniPlayerPlayButtonFingerprint.resolve(context, parentResult.classDef)
MiniPlayerPlayButtonFingerprint.result?.let {
it.mutableMethod.apply {
addInstructionsWithLabels(
0, """
invoke-static {}, $PLAYER->hideSuggestedVideoOverlay()Z
move-result v0
if-eqz v0, :show
return-void
""", ExternalLabel("show", getInstruction(0))
)
}
} ?: throw MiniPlayerPlayButtonFingerprint.exception
} ?: throw CoreContainerBuilderFingerprint.exception
TouchAreaOnClickListenerFingerprint.result?.let {

11
src/main/kotlin/app/revanced/patches/youtube/player/suggestedvideooverlay/fingerprints/MiniPlayerPlayButtonFingerprint.kt Normal file
View File

@ -0,0 +1,11 @@
package app.revanced.patches.youtube.player.suggestedvideooverlay.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags
object MiniPlayerPlayButtonFingerprint : MethodFingerprint(
returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = listOf("Landroid/content/Context;", "Landroid/view/View;")
)