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

refactor: fix patch structure

Browse Source
This commit is contained in:
inotia00 2024-04-03 22:36:31 +09:00
parent 19adea7a86
commit 3a3ee89518
657 changed files with 4374 additions and 9404 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/kotlin/app/revanced/patches/music/account/component/MenuComponentPatch.kt
View File

@ -3,63 +3,41 @@ package app.revanced.patches.music.account.component
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction 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.patches.music.account.component.fingerprints.MenuEntryFingerprint import app.revanced.patches.music.account.component.fingerprints.MenuEntryFingerprint
import app.revanced.patches.music.utils.integrations.Constants.ACCOUNT import app.revanced.patches.music.utils.integrations.Constants.ACCOUNT_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.getTargetIndexWithMethodReferenceName
import app.revanced.util.patch.BaseBytecodePatch
import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction 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.reference.MethodReference
@Patch( @Suppress("unused")
object MenuComponentPatch : BaseBytecodePatch(
name = "Hide account menu", name = "Hide account menu",
description = "Adds the ability to hide account menu elements using a custom filter.", description = "Adds the ability to hide account menu elements using a custom filter.",
dependencies = [ dependencies = setOf(
SettingsPatch::class, SettingsPatch::class,
SharedResourceIdPatch::class SharedResourceIdPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(MenuEntryFingerprint)
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object MenuComponentPatch : BytecodePatch(
setOf(MenuEntryFingerprint)
) { ) {
override fun execute(context: BytecodeContext) { override fun execute(context: BytecodeContext) {
MenuEntryFingerprint.result?.let { MenuEntryFingerprint.result?.let {
it.mutableMethod.apply { it.mutableMethod.apply {
val textIndex = targetIndex("setText") val textIndex = getTargetIndexWithMethodReferenceName("setText")
val viewIndex = targetIndex("addView") val viewIndex = getTargetIndexWithMethodReferenceName("addView")
val textRegister = getInstruction<FiveRegisterInstruction>(textIndex).registerD val textRegister = getInstruction<FiveRegisterInstruction>(textIndex).registerD
val viewRegister = getInstruction<FiveRegisterInstruction>(viewIndex).registerD val viewRegister = getInstruction<FiveRegisterInstruction>(viewIndex).registerD
addInstruction( addInstruction(
textIndex + 1, textIndex + 1,
"invoke-static {v$textRegister, v$viewRegister}, $ACCOUNT->hideAccountMenu(Ljava/lang/CharSequence;Landroid/view/View;)V" "invoke-static {v$textRegister, v$viewRegister}, $ACCOUNT_CLASS_DESCRIPTOR->hideAccountMenu(Ljava/lang/CharSequence;Landroid/view/View;)V"
) )
} }
} ?: throw MenuEntryFingerprint.exception } ?: throw MenuEntryFingerprint.exception
@ -81,12 +59,4 @@ object MenuComponentPatch : BytecodePatch(
"revanced_hide_account_menu" "revanced_hide_account_menu"
) )
} }
private fun MutableMethod.targetIndex(descriptor: String): Int {
return implementation?.let {
it.instructions.indexOfFirst { instruction ->
((instruction as? ReferenceInstruction)?.reference as? MethodReference)?.name == descriptor
}
} ?: throw PatchException("No Method Implementation found!")
}
} }

2
src/main/kotlin/app/revanced/patches/music/account/component/fingerprints/MenuEntryFingerprint.kt
View File

@ -3,7 +3,7 @@ package app.revanced.patches.music.account.component.fingerprints
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.MenuEntry import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.MenuEntry
import app.revanced.util.fingerprint.LiteralValueFingerprint import app.revanced.util.fingerprint.LiteralValueFingerprint
object MenuEntryFingerprint : LiteralValueFingerprint( internal object MenuEntryFingerprint : LiteralValueFingerprint(
returnType = "V", returnType = "V",
literalSupplier = { MenuEntry } literalSupplier = { MenuEntry }
) )

41
src/main/kotlin/app/revanced/patches/music/account/handle/HideHandlePatch.kt → src/main/kotlin/app/revanced/patches/music/account/handle/HandlePatch.kt
View File

@ -4,48 +4,29 @@ import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
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.account.handle.fingerprints.AccountSwitcherAccessibilityLabelFingerprint import app.revanced.patches.music.account.handle.fingerprints.AccountSwitcherAccessibilityLabelFingerprint
import app.revanced.patches.music.account.handle.fingerprints.NamesInactiveAccountThumbnailSizeFingerprint import app.revanced.patches.music.account.handle.fingerprints.NamesInactiveAccountThumbnailSizeFingerprint
import app.revanced.patches.music.utils.integrations.Constants.ACCOUNT import app.revanced.patches.music.utils.integrations.Constants.ACCOUNT_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.getTargetIndexWithMethodReferenceName import app.revanced.util.getTargetIndexWithMethodReferenceName
import app.revanced.util.patch.BaseBytecodePatch
import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@Patch( @Suppress("unused")
object HandlePatch : BaseBytecodePatch(
name = "Hide handle", name = "Hide handle",
description = "Adds an option to hide the handle in the account menu.", description = "Adds an option to hide the handle in the account menu.",
dependencies = [ dependencies = setOf(
SettingsPatch::class, SettingsPatch::class,
SharedResourceIdPatch::class SharedResourceIdPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object HideHandlePatch : BytecodePatch(
setOf(
AccountSwitcherAccessibilityLabelFingerprint, AccountSwitcherAccessibilityLabelFingerprint,
NamesInactiveAccountThumbnailSizeFingerprint NamesInactiveAccountThumbnailSizeFingerprint
) )
@ -64,7 +45,7 @@ object HideHandlePatch : BytecodePatch(
replaceInstruction( replaceInstruction(
setVisibilityIndex, setVisibilityIndex,
"invoke-static {v${textViewInstruction.registerC}, v${textViewInstruction.registerD}}, $ACCOUNT->hideHandle(Landroid/widget/TextView;I)V" "invoke-static {v${textViewInstruction.registerC}, v${textViewInstruction.registerD}}, $ACCOUNT_CLASS_DESCRIPTOR->hideHandle(Landroid/widget/TextView;I)V"
) )
} }
} ?: throw AccountSwitcherAccessibilityLabelFingerprint.exception } ?: throw AccountSwitcherAccessibilityLabelFingerprint.exception
@ -79,7 +60,7 @@ object HideHandlePatch : BytecodePatch(
addInstructions( addInstructions(
targetIndex, """ targetIndex, """
invoke-static {v$targetRegister}, $ACCOUNT->hideHandle(Z)Z invoke-static {v$targetRegister}, $ACCOUNT_CLASS_DESCRIPTOR->hideHandle(Z)Z
move-result v$targetRegister move-result v$targetRegister
""" """
) )

2
src/main/kotlin/app/revanced/patches/music/account/handle/fingerprints/AccountSwitcherAccessibilityLabelFingerprint.kt
View File

@ -3,7 +3,7 @@ package app.revanced.patches.music.account.handle.fingerprints
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.AccountSwitcherAccessibility import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.AccountSwitcherAccessibility
import app.revanced.util.fingerprint.LiteralValueFingerprint import app.revanced.util.fingerprint.LiteralValueFingerprint
object AccountSwitcherAccessibilityLabelFingerprint : LiteralValueFingerprint( internal object AccountSwitcherAccessibilityLabelFingerprint : LiteralValueFingerprint(
returnType = "V", returnType = "V",
parameters = listOf("L", "Ljava/lang/Object;"), parameters = listOf("L", "Ljava/lang/Object;"),
literalSupplier = { AccountSwitcherAccessibility } literalSupplier = { AccountSwitcherAccessibility }

2
src/main/kotlin/app/revanced/patches/music/account/handle/fingerprints/NamesInactiveAccountThumbnailSizeFingerprint.kt
View File

@ -4,7 +4,7 @@ import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.NamesIn
import app.revanced.util.fingerprint.LiteralValueFingerprint import app.revanced.util.fingerprint.LiteralValueFingerprint
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
object NamesInactiveAccountThumbnailSizeFingerprint : LiteralValueFingerprint( internal object NamesInactiveAccountThumbnailSizeFingerprint : LiteralValueFingerprint(
returnType = "V", returnType = "V",
parameters = listOf("L", "Ljava/lang/Object;"), parameters = listOf("L", "Ljava/lang/Object;"),
opcodes = listOf( opcodes = listOf(

69
src/main/kotlin/app/revanced/patches/music/account/tos/TermsContainerPatch.kt
View File

@ -4,83 +4,46 @@ import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction 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.patches.music.account.tos.fingerprints.TermsOfServiceFingerprint import app.revanced.patches.music.account.tos.fingerprints.TermsOfServiceFingerprint
import app.revanced.patches.music.utils.integrations.Constants.ACCOUNT import app.revanced.patches.music.utils.integrations.Constants.ACCOUNT_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.exception import app.revanced.util.exception
import com.android.tools.smali.dexlib2.Opcode import app.revanced.util.getTargetIndexWithReference
import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction import app.revanced.util.patch.BaseBytecodePatch
import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
@Patch( @Suppress("unused")
object TermsContainerPatch : BaseBytecodePatch(
name = "Hide terms container", name = "Hide terms container",
description = "Adds an option to hide the terms of service container in the account menu.", description = "Adds an option to hide the terms of service container in the account menu.",
dependencies = [ dependencies = setOf(
SettingsPatch::class, SettingsPatch::class,
SharedResourceIdPatch::class SharedResourceIdPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(TermsOfServiceFingerprint)
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object TermsContainerPatch : BytecodePatch(
setOf(TermsOfServiceFingerprint)
) { ) {
override fun execute(context: BytecodeContext) { override fun execute(context: BytecodeContext) {
TermsOfServiceFingerprint.result?.let { TermsOfServiceFingerprint.result?.let {
it.mutableMethod.apply { it.mutableMethod.apply {
var insertIndex = 0 val insertIndex = getTargetIndexWithReference("/PrivacyTosFooter;->setVisibility(I)V")
for (index in implementation!!.instructions.size - 1 downTo 0) {
if (getInstruction(index).opcode != Opcode.INVOKE_VIRTUAL) continue
val targetReference =
getInstruction<ReferenceInstruction>(index).reference.toString()
if (targetReference.endsWith("/PrivacyTosFooter;->setVisibility(I)V")) {
insertIndex = index
val visibilityRegister = val visibilityRegister =
getInstruction<Instruction35c>(insertIndex).registerD getInstruction<FiveRegisterInstruction>(insertIndex).registerD
addInstruction( addInstruction(
index + 1, insertIndex + 1,
"const/4 v$visibilityRegister, 0x0" "const/4 v$visibilityRegister, 0x0"
) )
addInstructions( addInstructions(
index, """ insertIndex, """
invoke-static {}, $ACCOUNT->hideTermsContainer()I invoke-static {}, $ACCOUNT_CLASS_DESCRIPTOR->hideTermsContainer()I
move-result v$visibilityRegister move-result v$visibilityRegister
""" """
) )
break
}
}
if (insertIndex == 0)
throw PatchException("target Instruction not found!")
} }
} ?: throw TermsOfServiceFingerprint.exception } ?: throw TermsOfServiceFingerprint.exception

2
src/main/kotlin/app/revanced/patches/music/account/tos/fingerprints/TermsOfServiceFingerprint.kt
View File

@ -3,7 +3,7 @@ package app.revanced.patches.music.account.tos.fingerprints
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.TosFooter import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.TosFooter
import app.revanced.util.fingerprint.LiteralValueFingerprint import app.revanced.util.fingerprint.LiteralValueFingerprint
object TermsOfServiceFingerprint : LiteralValueFingerprint( internal object TermsOfServiceFingerprint : LiteralValueFingerprint(
returnType = "Landroid/view/View;", returnType = "Landroid/view/View;",
literalSupplier = { TosFooter } literalSupplier = { TosFooter }
) )

86
src/main/kotlin/app/revanced/patches/music/actionbar/component/ActionBarComponentPatch.kt
View File

@ -6,91 +6,68 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patcher.util.smali.ExternalLabel import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.music.actionbar.component.fingerprints.ActionBarComponentFingerprint import app.revanced.patches.music.actionbar.component.fingerprints.ActionBarComponentFingerprint
import app.revanced.patches.music.actionbar.component.fingerprints.LikeDislikeContainerFingerprint import app.revanced.patches.music.actionbar.component.fingerprints.LikeDislikeContainerFingerprint
import app.revanced.patches.music.actionbar.component.fingerprints.LikeDislikeContainerVisibilityFingerprint import app.revanced.patches.music.actionbar.component.fingerprints.LikeDislikeContainerVisibilityFingerprint
import app.revanced.patches.music.utils.integrations.Constants.ACTIONBAR import app.revanced.patches.music.utils.integrations.Constants.ACTIONBAR_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.LikeDislikeContainer import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.LikeDislikeContainer
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.patches.music.video.information.VideoInformationPatch import app.revanced.patches.music.video.information.VideoInformationPatch
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.getTargetIndexWithMethodReferenceName
import app.revanced.util.getTargetIndexWithReference
import app.revanced.util.getWideLiteralInstructionIndex import app.revanced.util.getWideLiteralInstructionIndex
import app.revanced.util.indexOfFirstInstruction
import app.revanced.util.patch.BaseBytecodePatch
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction 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.TwoRegisterInstruction
import com.android.tools.smali.dexlib2.iface.reference.MethodReference
import kotlin.math.min import kotlin.math.min
@Patch( @Suppress("unused")
object ActionBarComponentPatch : BaseBytecodePatch(
name = "Hide action bar component", name = "Hide action bar component",
description = "Adds options to hide action bar components and replace the offline download button with an external download button.", description = "Adds options to hide action bar components and replace the offline download button with an external download button.",
dependencies = [ dependencies = setOf(
SettingsPatch::class, SettingsPatch::class,
SharedResourceIdPatch::class, SharedResourceIdPatch::class,
VideoInformationPatch::class VideoInformationPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object ActionBarComponentPatch : BytecodePatch(
setOf(
ActionBarComponentFingerprint, ActionBarComponentFingerprint,
LikeDislikeContainerFingerprint LikeDislikeContainerFingerprint
) )
) { ) {
private var spannedReference = ""
override fun execute(context: BytecodeContext) { override fun execute(context: BytecodeContext) {
ActionBarComponentFingerprint.result?.let { ActionBarComponentFingerprint.result?.let {
it.mutableMethod.apply { it.mutableMethod.apply {
val instructions = implementation!!.instructions
// hook download button // hook download button
val addViewIndex = instructions.indexOfLast { instruction -> val addViewIndex = getTargetIndexWithMethodReferenceName("addView")
((instruction as? ReferenceInstruction)?.reference as? MethodReference)?.name == "addView"
}
val addViewRegister = getInstruction<FiveRegisterInstruction>(addViewIndex).registerD val addViewRegister = getInstruction<FiveRegisterInstruction>(addViewIndex).registerD
addInstruction( addInstruction(
addViewIndex + 1, addViewIndex + 1,
"invoke-static {v$addViewRegister}, $ACTIONBAR->hookDownloadButton(Landroid/view/View;)V" "invoke-static {v$addViewRegister}, $ACTIONBAR_CLASS_DESCRIPTOR->hookDownloadButton(Landroid/view/View;)V"
) )
// hide action button label // hide action button label
val noLabelIndex = instructions.indexOfFirst { instruction -> val noLabelIndex = indexOfFirstInstruction {
val reference = (instruction as? ReferenceInstruction)?.reference.toString() val reference = (this as? ReferenceInstruction)?.reference.toString()
instruction.opcode == Opcode.INVOKE_DIRECT opcode == Opcode.INVOKE_DIRECT
&& reference.endsWith("<init>(Landroid/content/Context;)V") && reference.endsWith("<init>(Landroid/content/Context;)V")
&& !reference.contains("Lcom/google/android/libraries/youtube/common/ui/YouTubeButton;") && !reference.contains("Lcom/google/android/libraries/youtube/common/ui/YouTubeButton;")
} - 2 } - 2
val replaceIndex = indexOfFirstInstruction {
val replaceIndex = instructions.indexOfFirst { instruction -> val reference = (this as? ReferenceInstruction)?.reference.toString()
val reference = (instruction as? ReferenceInstruction)?.reference.toString() opcode == Opcode.INVOKE_DIRECT
instruction.opcode == Opcode.INVOKE_DIRECT
&& reference.endsWith("Lcom/google/android/libraries/youtube/common/ui/YouTubeButton;-><init>(Landroid/content/Context;)V") && reference.endsWith("Lcom/google/android/libraries/youtube/common/ui/YouTubeButton;-><init>(Landroid/content/Context;)V")
} - 2 } - 2
val replaceInstruction = getInstruction<TwoRegisterInstruction>(replaceIndex) val replaceInstruction = getInstruction<TwoRegisterInstruction>(replaceIndex)
@ -98,7 +75,7 @@ object ActionBarComponentPatch : BytecodePatch(
addInstructionsWithLabels( addInstructionsWithLabels(
replaceIndex + 1, """ replaceIndex + 1, """
invoke-static {}, $ACTIONBAR->hideActionBarLabel()Z invoke-static {}, $ACTIONBAR_CLASS_DESCRIPTOR->hideActionBarLabel()Z
move-result v${replaceInstruction.registerA} move-result v${replaceInstruction.registerA}
if-nez v${replaceInstruction.registerA}, :hidden if-nez v${replaceInstruction.registerA}, :hidden
iget-object v${replaceInstruction.registerA}, v${replaceInstruction.registerB}, $replaceReference iget-object v${replaceInstruction.registerA}, v${replaceInstruction.registerB}, $replaceReference
@ -107,21 +84,16 @@ object ActionBarComponentPatch : BytecodePatch(
removeInstruction(replaceIndex) removeInstruction(replaceIndex)
// hide action button // hide action button
val hasNextIndex = instructions.indexOfFirst { instruction -> val hasNextIndex = getTargetIndexWithMethodReferenceName("hasNext")
((instruction as? ReferenceInstruction)?.reference as? MethodReference)?.name == "hasNext"
}
val freeRegister = min(implementation!!.registerCount - parameters.size - 2, 15) val freeRegister = min(implementation!!.registerCount - parameters.size - 2, 15)
val spannedIndex = instructions.indexOfFirst { instruction -> val spannedIndex = getTargetIndexWithReference(")Landroid/text/Spanned;")
spannedReference = (instruction as? ReferenceInstruction)?.reference.toString()
spannedReference.endsWith("Landroid/text/Spanned;")
}
val spannedRegister = getInstruction<FiveRegisterInstruction>(spannedIndex).registerC val spannedRegister = getInstruction<FiveRegisterInstruction>(spannedIndex).registerC
val spannedReference = getInstruction<ReferenceInstruction>(spannedIndex).reference
addInstructionsWithLabels( addInstructionsWithLabels(
spannedIndex + 1, """ spannedIndex + 1, """
invoke-static {}, $ACTIONBAR->hideActionButton()Z invoke-static {}, $ACTIONBAR_CLASS_DESCRIPTOR->hideActionButton()Z
move-result v$freeRegister move-result v$freeRegister
if-nez v$freeRegister, :hidden if-nez v$freeRegister, :hidden
invoke-static {v$spannedRegister}, $spannedReference invoke-static {v$spannedRegister}, $spannedReference
@ -138,12 +110,12 @@ object ActionBarComponentPatch : BytecodePatch(
addInstruction( addInstruction(
buttonTypeIndex + 2, buttonTypeIndex + 2,
"invoke-static {v$buttonTypeRegister}, $ACTIONBAR->setButtonType(Ljava/lang/Object;)V" "invoke-static {v$buttonTypeRegister}, $ACTIONBAR_CLASS_DESCRIPTOR->setButtonType(Ljava/lang/Object;)V"
) )
addInstruction( addInstruction(
buttonTypeDownloadIndex, buttonTypeDownloadIndex,
"invoke-static {v$buttonTypeDownloadRegister}, $ACTIONBAR->setButtonTypeDownload(I)V" "invoke-static {v$buttonTypeDownloadRegister}, $ACTIONBAR_CLASS_DESCRIPTOR->setButtonTypeDownload(I)V"
) )
} }
} ?: throw ActionBarComponentFingerprint.exception } ?: throw ActionBarComponentFingerprint.exception
@ -163,7 +135,7 @@ object ActionBarComponentPatch : BytecodePatch(
addInstructions( addInstructions(
targetIndex + 1, """ targetIndex + 1, """
invoke-static {v$targetRegister}, $ACTIONBAR->hideLikeDislikeButton(Z)Z invoke-static {v$targetRegister}, $ACTIONBAR_CLASS_DESCRIPTOR->hideLikeDislikeButton(Z)Z
move-result v$targetRegister move-result v$targetRegister
""" """
) )
@ -176,7 +148,7 @@ object ActionBarComponentPatch : BytecodePatch(
addInstruction( addInstruction(
insertIndex + 1, insertIndex + 1,
"invoke-static {v$insertRegister}, $ACTIONBAR->hideLikeDislikeButton(Landroid/view/View;)V" "invoke-static {v$insertRegister}, $ACTIONBAR_CLASS_DESCRIPTOR->hideLikeDislikeButton(Landroid/view/View;)V"
) )
} }
} ?: throw LikeDislikeContainerFingerprint.exception } ?: throw LikeDislikeContainerFingerprint.exception

2
src/main/kotlin/app/revanced/patches/music/actionbar/component/fingerprints/ActionBarComponentFingerprint.kt
View File

@ -5,7 +5,7 @@ import app.revanced.util.fingerprint.LiteralValueFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
object ActionBarComponentFingerprint : LiteralValueFingerprint( internal object ActionBarComponentFingerprint : LiteralValueFingerprint(
returnType = "V", returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = listOf("L", "L"), parameters = listOf("L", "L"),

2
src/main/kotlin/app/revanced/patches/music/actionbar/component/fingerprints/LikeDislikeContainerFingerprint.kt
View File

@ -5,7 +5,7 @@ import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.LikeDis
import app.revanced.util.fingerprint.LiteralValueFingerprint import app.revanced.util.fingerprint.LiteralValueFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
object LikeDislikeContainerFingerprint : LiteralValueFingerprint( internal object LikeDislikeContainerFingerprint : LiteralValueFingerprint(
returnType = "V", returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
literalSupplier = { LikeDislikeContainer } literalSupplier = { LikeDislikeContainer }

100
src/main/kotlin/app/revanced/patches/music/ads/general/GeneralAdsPatch.kt
View File

@ -4,17 +4,14 @@ import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction 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.patcher.util.smali.ExternalLabel import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.music.ads.general.fingerprints.FloatingLayoutFingerprint import app.revanced.patches.music.ads.general.fingerprints.FloatingLayoutFingerprint
import app.revanced.patches.music.ads.general.fingerprints.InterstitialsContainerFingerprint import app.revanced.patches.music.ads.general.fingerprints.InterstitialsContainerFingerprint
import app.revanced.patches.music.ads.general.fingerprints.NotifierShelfFingerprint import app.revanced.patches.music.ads.general.fingerprints.NotifierShelfFingerprint
import app.revanced.patches.music.ads.general.fingerprints.ShowDialogCommandFingerprint import app.revanced.patches.music.ads.general.fingerprints.ShowDialogCommandFingerprint
import app.revanced.patches.music.ads.music.MusicAdsPatch import app.revanced.patches.music.ads.music.MusicAdsPatch
import app.revanced.patches.music.navigation.component.NavigationBarComponentPatch
import app.revanced.patches.music.utils.integrations.Constants.ADS_PATH import app.revanced.patches.music.utils.integrations.Constants.ADS_PATH
import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.integrations.Constants.COMPONENTS_PATH import app.revanced.patches.music.utils.integrations.Constants.COMPONENTS_PATH
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.ButtonContainer import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.ButtonContainer
@ -25,39 +22,21 @@ import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.patches.shared.litho.LithoFilterPatch import app.revanced.patches.shared.litho.LithoFilterPatch
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.getWideLiteralInstructionIndex import app.revanced.util.getWideLiteralInstructionIndex
import app.revanced.util.patch.BaseBytecodePatch
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@Patch( @Suppress("unused")
object GeneralAdsPatch : BaseBytecodePatch(
name = "Hide general ads", name = "Hide general ads",
description = "Adds options to hide general ads.", description = "Adds options to hide general ads.",
dependencies = [ dependencies = setOf(
LithoFilterPatch::class, LithoFilterPatch::class,
MusicAdsPatch::class, MusicAdsPatch::class,
NavigationBarComponentPatch::class,
SettingsPatch::class, SettingsPatch::class,
SharedResourceIdPatch::class SharedResourceIdPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object GeneralAdsPatch : BytecodePatch(
setOf(
FloatingLayoutFingerprint, FloatingLayoutFingerprint,
InterstitialsContainerFingerprint, InterstitialsContainerFingerprint,
NotifierShelfFingerprint, NotifierShelfFingerprint,
@ -103,14 +82,6 @@ object GeneralAdsPatch : BytecodePatch(
it.mutableMethod.apply { it.mutableMethod.apply {
// In this method, custom dialog is created and shown. // In this method, custom dialog is created and shown.
// There were no issues despite adding “return-void” to the first index. // There were no issues despite adding “return-void” to the first index.
//
// If an issue occurs due to patching due to server-side changes in the future,
// Find the instruction whose name is "show" in [MethodReference] and click the 'AlertDialog.BUTTON_POSITIVE' button.
//
// In this case, an instruction for 'getButton' must be added to smali, not in integrations
// (This custom dialog cannot be cast to [AlertDialog] or [Dialog])
//
// See the comments below.
addInstructionsWithLabels( addInstructionsWithLabels(
0, 0,
""" """
@ -121,33 +92,38 @@ object GeneralAdsPatch : BytecodePatch(
""", ExternalLabel("show", getInstruction(0)) """, ExternalLabel("show", getInstruction(0))
) )
/* // If an issue occurs due to patching due to server-side changes in the future,
val dialogIndex = getTargetIndexWithMethodReferenceName("show") // Find the instruction whose name is "show" in [MethodReference] and click the 'AlertDialog.BUTTON_POSITIVE' button.
val dialogReference = getInstruction<ReferenceInstruction>(dialogIndex).reference //
val dialogDefiningClass = (dialogReference as MethodReference).definingClass // In this case, an instruction for 'getButton' must be added to smali, not in integrations
val getButtonMethod = context.findClass(dialogDefiningClass)!! // (This custom dialog cannot be cast to [AlertDialog] or [Dialog])
.mutableClass.methods.first { method -> //
method.parameters == listOf("I") // See the comments below.
&& method.returnType == "Landroid/widget/Button;"
}
val getButtonCall = dialogDefiningClass + "->" + getButtonMethod.name + "(I)Landroid/widget/Button;"
val dialogRegister = getInstruction<FiveRegisterInstruction>(dialogIndex).registerC // val dialogIndex = getTargetIndexWithMethodReferenceName("show")
val freeIndex = getTargetIndex(dialogIndex, Opcode.IF_EQZ) // val dialogReference = getInstruction<ReferenceInstruction>(dialogIndex).reference
val freeRegister = getInstruction<OneRegisterInstruction>(freeIndex).registerA // val dialogDefiningClass = (dialogReference as MethodReference).definingClass
// val getButtonMethod = context.findClass(dialogDefiningClass)!!
// .mutableClass.methods.first { method ->
// method.parameters == listOf("I")
// && method.returnType == "Landroid/widget/Button;"
// }
// val getButtonCall = dialogDefiningClass + "->" + getButtonMethod.name + "(I)Landroid/widget/Button;"
// val dialogRegister = getInstruction<FiveRegisterInstruction>(dialogIndex).registerC
// val freeIndex = getTargetIndex(dialogIndex, Opcode.IF_EQZ)
// val freeRegister = getInstruction<OneRegisterInstruction>(freeIndex).registerA
addInstructions( // addInstructions(
dialogIndex + 1, """ // dialogIndex + 1, """
# Get the 'AlertDialog.BUTTON_POSITIVE' from custom dialog // # Get the 'AlertDialog.BUTTON_POSITIVE' from custom dialog
# Since this custom dialog cannot be cast to AlertDialog or Dialog, // # Since this custom dialog cannot be cast to AlertDialog or Dialog,
# It should come from smali, not integrations. // # It should come from smali, not integrations.
const/4 v$freeRegister, -0x1 // const/4 v$freeRegister, -0x1
invoke-virtual {v$dialogRegister, $freeRegister}, $getButtonCall // invoke-virtual {v$dialogRegister, $freeRegister}, $getButtonCall
move-result-object $freeRegister // move-result-object $freeRegister
invoke-static {$freeRegister}, $FULLSCREEN_ADS_CLASS_DESCRIPTOR->confirmDialog(Landroid/widget/Button;)V // invoke-static {$freeRegister}, $FULLSCREEN_ADS_CLASS_DESCRIPTOR->confirmDialog(Landroid/widget/Button;)V
""" // """
) // )
*/
} }
} ?: throw ShowDialogCommandFingerprint.exception } ?: throw ShowDialogCommandFingerprint.exception

2
src/main/kotlin/app/revanced/patches/music/ads/general/fingerprints/FloatingLayoutFingerprint.kt
View File

@ -5,7 +5,7 @@ import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.Floatin
import app.revanced.util.fingerprint.LiteralValueFingerprint import app.revanced.util.fingerprint.LiteralValueFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
object FloatingLayoutFingerprint : LiteralValueFingerprint( internal object FloatingLayoutFingerprint : LiteralValueFingerprint(
returnType = "Landroid/view/View;", returnType = "Landroid/view/View;",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = emptyList(), parameters = emptyList(),

2
src/main/kotlin/app/revanced/patches/music/ads/general/fingerprints/InterstitialsContainerFingerprint.kt
View File

@ -3,7 +3,7 @@ package app.revanced.patches.music.ads.general.fingerprints
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.InterstitialsContainer import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.InterstitialsContainer
import app.revanced.util.fingerprint.LiteralValueFingerprint import app.revanced.util.fingerprint.LiteralValueFingerprint
object InterstitialsContainerFingerprint : LiteralValueFingerprint( internal object InterstitialsContainerFingerprint : LiteralValueFingerprint(
returnType = "V", returnType = "V",
strings= listOf("overlay_controller_param"), strings= listOf("overlay_controller_param"),
literalSupplier = { InterstitialsContainer } literalSupplier = { InterstitialsContainer }

2
src/main/kotlin/app/revanced/patches/music/ads/general/fingerprints/NotifierShelfFingerprint.kt
View File

@ -7,7 +7,7 @@ import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.MusicNo
import app.revanced.util.containsWideLiteralInstructionIndex import app.revanced.util.containsWideLiteralInstructionIndex
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
object NotifierShelfFingerprint : MethodFingerprint( internal object NotifierShelfFingerprint : MethodFingerprint(
returnType = "V", returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
customFingerprint = { methodDef, _ -> customFingerprint = { methodDef, _ ->

2
src/main/kotlin/app/revanced/patches/music/ads/general/fingerprints/ShowDialogCommandFingerprint.kt
View File

@ -3,7 +3,7 @@ package app.revanced.patches.music.ads.general.fingerprints
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.SlidingDialogAnimation import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.SlidingDialogAnimation
import app.revanced.util.fingerprint.LiteralValueFingerprint import app.revanced.util.fingerprint.LiteralValueFingerprint
object ShowDialogCommandFingerprint : LiteralValueFingerprint( internal object ShowDialogCommandFingerprint : LiteralValueFingerprint(
returnType = "V", returnType = "V",
literalSupplier = { SlidingDialogAnimation } literalSupplier = { SlidingDialogAnimation }
) )

4
src/main/kotlin/app/revanced/patches/music/ads/music/MusicAdsPatch.kt
View File

@ -1,9 +1,9 @@
package app.revanced.patches.music.ads.music package app.revanced.patches.music.ads.music
import app.revanced.patches.music.utils.integrations.Constants.ADS_PATH import app.revanced.patches.music.utils.integrations.Constants.ADS_PATH
import app.revanced.patches.shared.ads.AbstractAdsPatch import app.revanced.patches.shared.ads.BaseAdsPatch
object MusicAdsPatch : AbstractAdsPatch( object MusicAdsPatch : BaseAdsPatch(
"$ADS_PATH/MusicAdsPatch;", "$ADS_PATH/MusicAdsPatch;",
"hideMusicAds" "hideMusicAds"
) )

51
src/main/kotlin/app/revanced/patches/music/flyoutpanel/compactdialog/CompactDialogPatch.kt
View File

@ -2,61 +2,36 @@ package app.revanced.patches.music.flyoutpanel.compactdialog
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
import app.revanced.patcher.patch.BytecodePatch
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.patches.music.flyoutpanel.compactdialog.fingerprints.DialogSolidFingerprint import app.revanced.patches.music.flyoutpanel.compactdialog.fingerprints.DialogSolidFingerprint
import app.revanced.patches.music.utils.integrations.Constants.FLYOUT import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.integrations.Constants.FLYOUT_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.getWalkerMethod
import app.revanced.util.patch.BaseBytecodePatch
@Patch( @Suppress("unused")
object CompactDialogPatch : BaseBytecodePatch(
name = "Enable compact dialog", name = "Enable compact dialog",
description = "Adds an option to enable the compact flyout menu on phones.", description = "Adds an option to enable the compact flyout menu on phones.",
dependencies = [ dependencies = setOf(
SettingsPatch::class, SettingsPatch::class,
SharedResourceIdPatch::class SharedResourceIdPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(DialogSolidFingerprint)
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object CompactDialogPatch : BytecodePatch(
setOf(DialogSolidFingerprint)
) { ) {
override fun execute(context: BytecodeContext) { override fun execute(context: BytecodeContext) {
DialogSolidFingerprint.result?.let { DialogSolidFingerprint.result?.let {
with( val walkerMethod = it.getWalkerMethod(context, it.scanResult.patternScanResult!!.endIndex)
context walkerMethod.addInstructions(
.toMethodWalker(it.method)
.nextMethod(it.scanResult.patternScanResult!!.endIndex, true)
.getMethod() as MutableMethod
) {
addInstructions(
2, """ 2, """
invoke-static {p0}, $FLYOUT->enableCompactDialog(I)I invoke-static {p0}, $FLYOUT_CLASS_DESCRIPTOR->enableCompactDialog(I)I
move-result p0 move-result p0
""" """
) )
}
} ?: throw DialogSolidFingerprint.exception } ?: throw DialogSolidFingerprint.exception
SettingsPatch.addMusicPreference( SettingsPatch.addMusicPreference(

2
src/main/kotlin/app/revanced/patches/music/flyoutpanel/compactdialog/fingerprints/DialogSolidFingerprint.kt
View File

@ -6,7 +6,7 @@ import app.revanced.util.fingerprint.LiteralValueFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
object DialogSolidFingerprint : LiteralValueFingerprint( internal object DialogSolidFingerprint : LiteralValueFingerprint(
returnType = "V", returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = listOf("L"), parameters = listOf("L"),

45
src/main/kotlin/app/revanced/patches/music/flyoutpanel/component/FlyoutPanelPatch.kt
View File

@ -3,14 +3,12 @@ package app.revanced.patches.music.flyoutpanel.component
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction 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.flyoutpanel.component.fingerprints.EndButtonsContainerFingerprint import app.revanced.patches.music.flyoutpanel.component.fingerprints.EndButtonsContainerFingerprint
import app.revanced.patches.music.flyoutpanel.component.fingerprints.SleepTimerFingerprint import app.revanced.patches.music.flyoutpanel.component.fingerprints.SleepTimerFingerprint
import app.revanced.patches.music.flyoutpanel.shared.FlyoutPanelMenuItemPatch import app.revanced.patches.music.flyoutpanel.shared.FlyoutPanelMenuItemPatch
import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.integrations.Constants.COMPONENTS_PATH import app.revanced.patches.music.utils.integrations.Constants.COMPONENTS_PATH
import app.revanced.patches.music.utils.integrations.Constants.FLYOUT import app.revanced.patches.music.utils.integrations.Constants.FLYOUT_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.EndButtonsContainer import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.EndButtonsContainer
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
@ -19,43 +17,29 @@ import app.revanced.patches.shared.litho.LithoFilterPatch
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.getTargetIndex import app.revanced.util.getTargetIndex
import app.revanced.util.getWideLiteralInstructionIndex import app.revanced.util.getWideLiteralInstructionIndex
import app.revanced.util.patch.BaseBytecodePatch
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@Patch( @Suppress("unused")
object FlyoutPanelPatch : BaseBytecodePatch(
name = "Hide flyout panel", name = "Hide flyout panel",
description = "Adds options to hide flyout panel components.", description = "Adds options to hide flyout panel components.",
dependencies = [ dependencies = setOf(
FlyoutPanelMenuItemPatch::class, FlyoutPanelMenuItemPatch::class,
LithoFilterPatch::class, LithoFilterPatch::class,
SettingsPatch::class, SettingsPatch::class,
SharedResourceIdPatch::class SharedResourceIdPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object FlyoutPanelPatch : BytecodePatch(
setOf(
EndButtonsContainerFingerprint, EndButtonsContainerFingerprint,
SleepTimerFingerprint SleepTimerFingerprint
) )
) { ) {
private const val FILTER_CLASS_DESCRIPTOR =
"$COMPONENTS_PATH/PlayerFlyoutPanelsFilter;"
override fun execute(context: BytecodeContext) { override fun execute(context: BytecodeContext) {
FlyoutPanelMenuItemPatch.hideComponents() FlyoutPanelMenuItemPatch.hideComponents()
@ -67,7 +51,7 @@ object FlyoutPanelPatch : BytecodePatch(
addInstruction( addInstruction(
targetIndex + 1, targetIndex + 1,
"invoke-static {v$targetRegister}, $FLYOUT->hideLikeDislikeContainer(Landroid/view/View;)V" "invoke-static {v$targetRegister}, $FLYOUT_CLASS_DESCRIPTOR->hideLikeDislikeContainer(Landroid/view/View;)V"
) )
} }
} ?: throw EndButtonsContainerFingerprint.exception } ?: throw EndButtonsContainerFingerprint.exception
@ -234,7 +218,4 @@ object FlyoutPanelPatch : BytecodePatch(
"false" "false"
) )
} }
private const val FILTER_CLASS_DESCRIPTOR =
"$COMPONENTS_PATH/PlayerFlyoutPanelsFilter;"
} }

2
src/main/kotlin/app/revanced/patches/music/flyoutpanel/component/fingerprints/EndButtonsContainerFingerprint.kt
View File

@ -3,7 +3,7 @@ package app.revanced.patches.music.flyoutpanel.component.fingerprints
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.EndButtonsContainer import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.EndButtonsContainer
import app.revanced.util.fingerprint.LiteralValueFingerprint import app.revanced.util.fingerprint.LiteralValueFingerprint
object EndButtonsContainerFingerprint : LiteralValueFingerprint( internal object EndButtonsContainerFingerprint : LiteralValueFingerprint(
returnType = "V", returnType = "V",
literalSupplier = { EndButtonsContainer } literalSupplier = { EndButtonsContainer }
) )

2
src/main/kotlin/app/revanced/patches/music/flyoutpanel/component/fingerprints/SleepTimerFingerprint.kt
View File

@ -2,7 +2,7 @@ package app.revanced.patches.music.flyoutpanel.component.fingerprints
import app.revanced.util.fingerprint.LiteralValueFingerprint import app.revanced.util.fingerprint.LiteralValueFingerprint
object SleepTimerFingerprint : LiteralValueFingerprint( internal object SleepTimerFingerprint : LiteralValueFingerprint(
returnType = "Z", returnType = "Z",
parameters = emptyList(), parameters = emptyList(),
literalSupplier = { 45372767 } literalSupplier = { 45372767 }

34
src/main/kotlin/app/revanced/patches/music/flyoutpanel/replace/ReplaceDismissQueuePatch.kt
View File

@ -1,42 +1,24 @@
package app.revanced.patches.music.flyoutpanel.replace package app.revanced.patches.music.flyoutpanel.replace
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
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.flyoutpanel.shared.FlyoutPanelMenuItemPatch import app.revanced.patches.music.flyoutpanel.shared.FlyoutPanelMenuItemPatch
import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.patches.music.video.information.VideoInformationPatch import app.revanced.patches.music.video.information.VideoInformationPatch
import app.revanced.util.patch.BaseBytecodePatch
@Patch( @Suppress("unused")
object ReplaceDismissQueuePatch : BaseBytecodePatch(
name = "Replace dismiss queue", name = "Replace dismiss queue",
description = "Adds an option to replace \"Dismiss queue\" with \"Watch on YouTube\" in the flyout menu.", description = "Adds an option to replace \"Dismiss queue\" with \"Watch on YouTube\" in the flyout menu.",
dependencies = [ dependencies = setOf(
FlyoutPanelMenuItemPatch::class, FlyoutPanelMenuItemPatch::class,
SettingsPatch::class, SettingsPatch::class,
VideoInformationPatch::class VideoInformationPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE
CompatiblePackage( ) {
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object ReplaceDismissQueuePatch : BytecodePatch(emptySet()) {
override fun execute(context: BytecodeContext) { override fun execute(context: BytecodeContext) {
FlyoutPanelMenuItemPatch.replaceComponents() FlyoutPanelMenuItemPatch.replaceComponents()

39
src/main/kotlin/app/revanced/patches/music/flyoutpanel/replace/ReplaceReportPatch.kt
View File

@ -3,51 +3,32 @@ package app.revanced.patches.music.flyoutpanel.replace
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction 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.flyoutpanel.replace.fingerprints.TouchOutsideFingerprint import app.revanced.patches.music.flyoutpanel.replace.fingerprints.TouchOutsideFingerprint
import app.revanced.patches.music.flyoutpanel.shared.FlyoutPanelMenuItemPatch import app.revanced.patches.music.flyoutpanel.shared.FlyoutPanelMenuItemPatch
import app.revanced.patches.music.utils.integrations.Constants.FLYOUT import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.integrations.Constants.FLYOUT_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.overridespeed.OverrideSpeedHookPatch import app.revanced.patches.music.utils.overridespeed.OverrideSpeedHookPatch
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.getTargetIndexWithMethodReferenceName import app.revanced.util.getTargetIndexWithMethodReferenceName
import app.revanced.util.patch.BaseBytecodePatch
import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
@Patch( @Suppress("unused")
object ReplaceReportPatch : BaseBytecodePatch(
name = "Replace report", name = "Replace report",
description = "Adds an option to replace \"Report\" with \"Playback speed\" in the flyout menu.", description = "Adds an option to replace \"Report\" with \"Playback speed\" in the flyout menu.",
dependencies = [ dependencies = setOf(
FlyoutPanelMenuItemPatch::class, FlyoutPanelMenuItemPatch::class,
OverrideSpeedHookPatch::class, OverrideSpeedHookPatch::class,
ReplaceReportResourcePatch::class, ReplaceReportResourcePatch::class,
SettingsPatch::class, SettingsPatch::class,
SharedResourceIdPatch::class SharedResourceIdPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(TouchOutsideFingerprint)
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object ReplaceReportPatch : BytecodePatch(
setOf(TouchOutsideFingerprint)
) { ) {
override fun execute(context: BytecodeContext) { override fun execute(context: BytecodeContext) {
FlyoutPanelMenuItemPatch.replaceComponents() FlyoutPanelMenuItemPatch.replaceComponents()
@ -59,7 +40,7 @@ object ReplaceReportPatch : BytecodePatch(
addInstruction( addInstruction(
setOnClickListenerIndex + 1, setOnClickListenerIndex + 1,
"sput-object v$setOnClickListenerRegister, $FLYOUT->touchOutSideView:Landroid/view/View;" "sput-object v$setOnClickListenerRegister, $FLYOUT_CLASS_DESCRIPTOR->touchOutSideView:Landroid/view/View;"
) )
} }
} ?: throw TouchOutsideFingerprint.exception } ?: throw TouchOutsideFingerprint.exception

2
src/main/kotlin/app/revanced/patches/music/flyoutpanel/replace/fingerprints/TouchOutsideFingerprint.kt
View File

@ -3,7 +3,7 @@ package app.revanced.patches.music.flyoutpanel.replace.fingerprints
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.TouchOutside import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.TouchOutside
import app.revanced.util.fingerprint.LiteralValueFingerprint import app.revanced.util.fingerprint.LiteralValueFingerprint
object TouchOutsideFingerprint : LiteralValueFingerprint( internal object TouchOutsideFingerprint : LiteralValueFingerprint(
returnType = "Landroid/view/View;", returnType = "Landroid/view/View;",
literalSupplier = { TouchOutside } literalSupplier = { TouchOutside }
) )

6
src/main/kotlin/app/revanced/patches/music/flyoutpanel/shared/FlyoutPanelMenuItemPatch.kt
View File

@ -8,7 +8,7 @@ import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
import app.revanced.patcher.util.smali.ExternalLabel import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.music.flyoutpanel.shared.fingerprints.MenuItemFingerprint import app.revanced.patches.music.flyoutpanel.shared.fingerprints.MenuItemFingerprint
import app.revanced.patches.music.utils.integrations.Constants.FLYOUT import app.revanced.patches.music.utils.integrations.Constants.FLYOUT_CLASS_DESCRIPTOR
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.getTargetIndex import app.revanced.util.getTargetIndex
import app.revanced.util.indexOfFirstInstruction import app.revanced.util.indexOfFirstInstruction
@ -58,7 +58,7 @@ object FlyoutPanelMenuItemPatch : BytecodePatch(
addInstructionsWithLabels( addInstructionsWithLabels(
enumIndex + 1, """ enumIndex + 1, """
invoke-static {v$enumRegister}, $FLYOUT->hideComponents(Ljava/lang/Enum;)Z invoke-static {v$enumRegister}, $FLYOUT_CLASS_DESCRIPTOR->hideComponents(Ljava/lang/Enum;)Z
move-result v$freeRegister move-result v$freeRegister
if-nez v$freeRegister, :hide if-nez v$freeRegister, :hide
""", ExternalLabel("hide", getInstruction(implementation!!.instructions.size - 1)) """, ExternalLabel("hide", getInstruction(implementation!!.instructions.size - 1))
@ -74,7 +74,7 @@ object FlyoutPanelMenuItemPatch : BytecodePatch(
addInstruction( addInstruction(
enumIndex + 1, enumIndex + 1,
"invoke-static {v$enumRegister, v$textViewRegister, v$imageViewRegister}, $FLYOUT->replaceComponents(Ljava/lang/Enum;Landroid/widget/TextView;Landroid/widget/ImageView;)V" "invoke-static {v$enumRegister, v$textViewRegister, v$imageViewRegister}, $FLYOUT_CLASS_DESCRIPTOR->replaceComponents(Ljava/lang/Enum;Landroid/widget/TextView;Landroid/widget/ImageView;)V"
) )
} }
instructionAdded = true instructionAdded = true

2
src/main/kotlin/app/revanced/patches/music/flyoutpanel/shared/fingerprints/MenuItemFingerprint.kt
View File

@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
object MenuItemFingerprint : MethodFingerprint( internal object MenuItemFingerprint : MethodFingerprint(
returnType = "V", returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = emptyList(), parameters = emptyList(),

32
src/main/kotlin/app/revanced/patches/music/general/amoled/AmoledPatch.kt
View File

@ -1,37 +1,19 @@
package app.revanced.patches.music.general.amoled package app.revanced.patches.music.general.amoled
import app.revanced.patcher.data.ResourceContext import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.ResourcePatch import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.music.utils.integrations.Constants.UTILS_PATH import app.revanced.patches.music.utils.integrations.Constants.UTILS_PATH
import app.revanced.patches.shared.drawable.DrawableColorPatch import app.revanced.patches.shared.drawable.DrawableColorPatch
import app.revanced.util.patch.BaseResourcePatch
import org.w3c.dom.Element import org.w3c.dom.Element
@Patch( @Suppress("DEPRECATION", "unused")
object AmoledPatch : BaseResourcePatch(
name = "Amoled", name = "Amoled",
description = "Applies a pure black theme to some components.", description = "Applies a pure black theme to some components.",
dependencies = [DrawableColorPatch::class], dependencies = setOf(DrawableColorPatch::class),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE
CompatiblePackage( ) {
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
],
)
@Suppress("unused")
object AmoledPatch : ResourcePatch() {
override fun execute(context: ResourceContext) { override fun execute(context: ResourceContext) {
DrawableColorPatch.injectCall("$UTILS_PATH/DrawableColorPatch;->getColor(I)I") DrawableColorPatch.injectCall("$UTILS_PATH/DrawableColorPatch;->getColor(I)I")

6
src/main/kotlin/app/revanced/patches/music/general/autocaptions/AutoCaptionsBytecodePatch.kt Normal file
View File

@ -0,0 +1,6 @@
package app.revanced.patches.music.general.autocaptions
import app.revanced.patches.music.utils.integrations.Constants.GENERAL_CLASS_DESCRIPTOR
import app.revanced.patches.shared.captions.BaseAutoCaptionsPatch
object AutoCaptionsBytecodePatch : BaseAutoCaptionsPatch(GENERAL_CLASS_DESCRIPTOR)

44
src/main/kotlin/app/revanced/patches/music/general/autocaptions/AutoCaptionsPatch.kt
View File

@ -1,47 +1,27 @@
package app.revanced.patches.music.general.autocaptions package app.revanced.patches.music.general.autocaptions
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patcher.patch.annotation.Patch import app.revanced.patches.music.utils.integrations.Constants.GENERAL_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.integrations.Constants.GENERAL
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.patches.music.video.videoid.VideoIdPatch import app.revanced.patches.music.video.videoid.VideoIdPatch
import app.revanced.patches.shared.captions.AbstractAutoCaptionsPatch import app.revanced.util.patch.BaseResourcePatch
@Patch( @Suppress("unused")
object AutoCaptionsPatch : BaseResourcePatch(
name = "Disable auto captions", name = "Disable auto captions",
description = "Adds an option to disable captions from being automatically enabled.", description = "Adds an option to disable captions from being automatically enabled.",
dependencies = [ dependencies = setOf(
AutoCaptionsBytecodePatch::class,
SettingsPatch::class, SettingsPatch::class,
VideoIdPatch::class VideoIdPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE
CompatiblePackage(
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
],
)
@Suppress("unused")
object AutoCaptionsPatch : AbstractAutoCaptionsPatch(
GENERAL
) { ) {
override fun execute(context: BytecodeContext) { override fun execute(context: ResourceContext) {
super.execute(context)
VideoIdPatch.hookBackgroundPlayVideoId("$GENERAL->newVideoStarted(Ljava/lang/String;)V") VideoIdPatch.hookBackgroundPlayVideoId("$GENERAL_CLASS_DESCRIPTOR->newVideoStarted(Ljava/lang/String;)V")
SettingsPatch.addMusicPreference( SettingsPatch.addMusicPreference(
CategoryType.GENERAL, CategoryType.GENERAL,

47
src/main/kotlin/app/revanced/patches/music/general/buttonshelf/HideButtonShelfPatch.kt → src/main/kotlin/app/revanced/patches/music/general/buttonshelf/ButtonShelfPatch.kt
View File

@ -1,42 +1,28 @@
package app.revanced.patches.music.general.buttonshelf package app.revanced.patches.music.general.buttonshelf
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.BytecodePatch import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.music.utils.integrations.Constants.COMPONENTS_PATH import app.revanced.patches.music.utils.integrations.Constants.COMPONENTS_PATH
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.patches.shared.litho.LithoFilterPatch import app.revanced.patches.shared.litho.LithoFilterPatch
import app.revanced.util.patch.BaseResourcePatch
@Patch( @Suppress("unused")
object ButtonShelfPatch : BaseResourcePatch(
name = "Hide button shelf", name = "Hide button shelf",
description = "Adds an option to hide the button shelf from the homepage and explore tab.", description = "Adds an option to hide the button shelf from the homepage and explore tab.",
dependencies = [ dependencies = setOf(
LithoFilterPatch::class, LithoFilterPatch::class,
SettingsPatch::class SettingsPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE
CompatiblePackage( ) {
"com.google.android.apps.youtube.music", private const val FILTER_CLASS_DESCRIPTOR =
[ "$COMPONENTS_PATH/ButtonShelfFilter;"
"6.21.52",
"6.22.52", override fun execute(context: ResourceContext) {
"6.23.56", LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object HideButtonShelfPatch : BytecodePatch(emptySet()) {
override fun execute(context: BytecodeContext) {
SettingsPatch.addMusicPreference( SettingsPatch.addMusicPreference(
CategoryType.GENERAL, CategoryType.GENERAL,
@ -44,10 +30,5 @@ object HideButtonShelfPatch : BytecodePatch(emptySet()) {
"false" "false"
) )
LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
} }
private const val FILTER_CLASS_DESCRIPTOR =
"$COMPONENTS_PATH/ButtonShelfFilter;"
} }

47
src/main/kotlin/app/revanced/patches/music/general/carouselshelf/HideCarouselShelfPatch.kt → src/main/kotlin/app/revanced/patches/music/general/carouselshelf/CarouselShelfPatch.kt
View File

@ -1,42 +1,28 @@
package app.revanced.patches.music.general.carouselshelf package app.revanced.patches.music.general.carouselshelf
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.BytecodePatch import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.music.utils.integrations.Constants.COMPONENTS_PATH import app.revanced.patches.music.utils.integrations.Constants.COMPONENTS_PATH
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.patches.shared.litho.LithoFilterPatch import app.revanced.patches.shared.litho.LithoFilterPatch
import app.revanced.util.patch.BaseResourcePatch
@Patch( @Suppress("unused")
object CarouselShelfPatch : BaseResourcePatch(
name = "Hide carousel shelf", name = "Hide carousel shelf",
description = "Adds an option to hide the carousel shelf from the homepage and explore tab.", description = "Adds an option to hide the carousel shelf from the homepage and explore tab.",
dependencies = [ dependencies = setOf(
LithoFilterPatch::class, LithoFilterPatch::class,
SettingsPatch::class SettingsPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE
CompatiblePackage( ) {
"com.google.android.apps.youtube.music", private const val FILTER_CLASS_DESCRIPTOR =
[ "$COMPONENTS_PATH/CarouselShelfFilter;"
"6.21.52",
"6.22.52", override fun execute(context: ResourceContext) {
"6.23.56", LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object HideCarouselShelfPatch : BytecodePatch(emptySet()) {
override fun execute(context: BytecodeContext) {
SettingsPatch.addMusicPreference( SettingsPatch.addMusicPreference(
CategoryType.GENERAL, CategoryType.GENERAL,
@ -44,10 +30,5 @@ object HideCarouselShelfPatch : BytecodePatch(emptySet()) {
"false" "false"
) )
LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
} }
private const val FILTER_CLASS_DESCRIPTOR =
"$COMPONENTS_PATH/CarouselShelfFilter;"
} }

41
src/main/kotlin/app/revanced/patches/music/general/castbutton/HideCastButtonPatch.kt → src/main/kotlin/app/revanced/patches/music/general/castbutton/CastButtonPatch.kt
View File

@ -4,49 +4,30 @@ import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.PatchException import app.revanced.patcher.patch.PatchException
import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.music.general.castbutton.fingerprints.MediaRouteButtonFingerprint import app.revanced.patches.music.general.castbutton.fingerprints.MediaRouteButtonFingerprint
import app.revanced.patches.music.general.castbutton.fingerprints.PlayerOverlayChipFingerprint import app.revanced.patches.music.general.castbutton.fingerprints.PlayerOverlayChipFingerprint
import app.revanced.patches.music.utils.integrations.Constants.GENERAL import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.integrations.Constants.GENERAL_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.PlayerOverlayChip import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.PlayerOverlayChip
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.getWideLiteralInstructionIndex import app.revanced.util.getWideLiteralInstructionIndex
import app.revanced.util.patch.BaseBytecodePatch
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@Patch( @Suppress("unused")
object CastButtonPatch : BaseBytecodePatch(
name = "Hide cast button", name = "Hide cast button",
description = "Adds an option to hide the cast button.", description = "Adds an option to hide the cast button.",
dependencies = [ dependencies = setOf(
SettingsPatch::class, SettingsPatch::class,
SharedResourceIdPatch::class SharedResourceIdPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object HideCastButtonPatch : BytecodePatch(
setOf(
MediaRouteButtonFingerprint, MediaRouteButtonFingerprint,
PlayerOverlayChipFingerprint PlayerOverlayChipFingerprint
) )
@ -63,7 +44,7 @@ object HideCastButtonPatch : BytecodePatch(
setVisibilityMethod?.apply { setVisibilityMethod?.apply {
addInstructions( addInstructions(
0, """ 0, """
invoke-static {p1}, $GENERAL->hideCastButton(I)I invoke-static {p1}, $GENERAL_CLASS_DESCRIPTOR->hideCastButton(I)I
move-result p1 move-result p1
""" """
) )
@ -80,7 +61,7 @@ object HideCastButtonPatch : BytecodePatch(
addInstruction( addInstruction(
targetIndex + 1, targetIndex + 1,
"invoke-static {v$targetRegister}, $GENERAL->hideCastButton(Landroid/view/View;)V" "invoke-static {v$targetRegister}, $GENERAL_CLASS_DESCRIPTOR->hideCastButton(Landroid/view/View;)V"
) )
} }
} ?: throw PlayerOverlayChipFingerprint.exception } ?: throw PlayerOverlayChipFingerprint.exception

2
src/main/kotlin/app/revanced/patches/music/general/castbutton/fingerprints/MediaRouteButtonFingerprint.kt
View File

@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.MethodFingerprint import app.revanced.patcher.fingerprint.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
object MediaRouteButtonFingerprint : MethodFingerprint( internal object MediaRouteButtonFingerprint : MethodFingerprint(
returnType = "Z", returnType = "Z",
accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL, accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
strings = listOf("MediaRouteButton") strings = listOf("MediaRouteButton")

2
src/main/kotlin/app/revanced/patches/music/general/castbutton/fingerprints/PlayerOverlayChipFingerprint.kt
View File

@ -5,7 +5,7 @@ import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.PlayerO
import app.revanced.util.fingerprint.LiteralValueFingerprint import app.revanced.util.fingerprint.LiteralValueFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
object PlayerOverlayChipFingerprint : LiteralValueFingerprint( internal object PlayerOverlayChipFingerprint : LiteralValueFingerprint(
returnType = "L", returnType = "L",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
literalSupplier = { PlayerOverlayChip } literalSupplier = { PlayerOverlayChip }

39
src/main/kotlin/app/revanced/patches/music/general/categorybar/CategoryBarPatch.kt
View File

@ -3,45 +3,26 @@ package app.revanced.patches.music.general.categorybar
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction 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.general.categorybar.fingerprints.ChipCloudFingerprint import app.revanced.patches.music.general.categorybar.fingerprints.ChipCloudFingerprint
import app.revanced.patches.music.utils.integrations.Constants.GENERAL import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.integrations.Constants.GENERAL_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.patch.BaseBytecodePatch
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@Patch( @Suppress("unused")
object CategoryBarPatch : BaseBytecodePatch(
name = "Hide category bar", name = "Hide category bar",
description = "Adds an option to hide the category bar.", description = "Adds an option to hide the category bar.",
dependencies = [ dependencies = setOf(
SettingsPatch::class, SettingsPatch::class,
SharedResourceIdPatch::class SharedResourceIdPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(ChipCloudFingerprint)
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object CategoryBarPatch : BytecodePatch(
setOf(ChipCloudFingerprint)
) { ) {
override fun execute(context: BytecodeContext) { override fun execute(context: BytecodeContext) {
ChipCloudFingerprint.result?.let { ChipCloudFingerprint.result?.let {
@ -51,7 +32,7 @@ object CategoryBarPatch : BytecodePatch(
addInstruction( addInstruction(
targetIndex + 1, targetIndex + 1,
"invoke-static { v$targetRegister }, $GENERAL->hideCategoryBar(Landroid/view/View;)V" "invoke-static { v$targetRegister }, $GENERAL_CLASS_DESCRIPTOR->hideCategoryBar(Landroid/view/View;)V"
) )
} }
} ?: throw ChipCloudFingerprint.exception } ?: throw ChipCloudFingerprint.exception

2
src/main/kotlin/app/revanced/patches/music/general/categorybar/fingerprints/ChipCloudFingerprint.kt
View File

@ -4,7 +4,7 @@ import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.ChipClo
import app.revanced.util.fingerprint.LiteralValueFingerprint import app.revanced.util.fingerprint.LiteralValueFingerprint
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
object ChipCloudFingerprint : LiteralValueFingerprint( internal object ChipCloudFingerprint : LiteralValueFingerprint(
returnType = "V", returnType = "V",
opcodes = listOf( opcodes = listOf(
Opcode.CONST, Opcode.CONST,

47
src/main/kotlin/app/revanced/patches/music/general/channelguidelines/HideChannelGuidelinesPatch.kt → src/main/kotlin/app/revanced/patches/music/general/channelguidelines/ChannelGuidelinesPatch.kt
View File

@ -1,42 +1,28 @@
package app.revanced.patches.music.general.channelguidelines package app.revanced.patches.music.general.channelguidelines
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.BytecodePatch import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.music.utils.integrations.Constants.COMPONENTS_PATH import app.revanced.patches.music.utils.integrations.Constants.COMPONENTS_PATH
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.patches.shared.litho.LithoFilterPatch import app.revanced.patches.shared.litho.LithoFilterPatch
import app.revanced.util.patch.BaseResourcePatch
@Patch( @Suppress("unused")
object ChannelGuidelinesPatch : BaseResourcePatch(
name = "Hide channel guidelines", name = "Hide channel guidelines",
description = "Adds an option to hide the channel guidelines at the top of the comments section.", description = "Adds an option to hide the channel guidelines at the top of the comments section.",
dependencies = [ dependencies = setOf(
LithoFilterPatch::class, LithoFilterPatch::class,
SettingsPatch::class SettingsPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE
CompatiblePackage( ) {
"com.google.android.apps.youtube.music", private const val FILTER_CLASS_DESCRIPTOR =
[ "$COMPONENTS_PATH/ChannelGuidelinesFilter;"
"6.21.52",
"6.22.52", override fun execute(context: ResourceContext) {
"6.23.56", LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object HideChannelGuidelinesPatch : BytecodePatch(emptySet()) {
override fun execute(context: BytecodeContext) {
SettingsPatch.addMusicPreference( SettingsPatch.addMusicPreference(
CategoryType.GENERAL, CategoryType.GENERAL,
@ -44,10 +30,5 @@ object HideChannelGuidelinesPatch : BytecodePatch(emptySet()) {
"true" "true"
) )
LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
} }
private const val FILTER_CLASS_DESCRIPTOR =
"$COMPONENTS_PATH/ChannelGuidelinesFilter;"
} }

47
src/main/kotlin/app/revanced/patches/music/general/customfilter/CustomFilterPatch.kt
View File

@ -1,42 +1,28 @@
package app.revanced.patches.music.general.customfilter package app.revanced.patches.music.general.customfilter
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.BytecodePatch import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.music.utils.integrations.Constants.COMPONENTS_PATH import app.revanced.patches.music.utils.integrations.Constants.COMPONENTS_PATH
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.patches.shared.litho.LithoFilterPatch import app.revanced.patches.shared.litho.LithoFilterPatch
import app.revanced.util.patch.BaseResourcePatch
@Patch( @Suppress("unused")
object CustomFilterPatch : BaseResourcePatch(
name = "Enable custom filter", name = "Enable custom filter",
description = "Adds a custom filter which can be used to hide layout components.", description = "Adds a custom filter which can be used to hide layout components.",
dependencies = [ dependencies = setOf(
LithoFilterPatch::class, LithoFilterPatch::class,
SettingsPatch::class SettingsPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE
CompatiblePackage( ) {
"com.google.android.apps.youtube.music", private const val FILTER_CLASS_DESCRIPTOR =
[ "$COMPONENTS_PATH/CustomFilter;"
"6.21.52",
"6.22.52", override fun execute(context: ResourceContext) {
"6.23.56", LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object CustomFilterPatch : BytecodePatch(emptySet()) {
override fun execute(context: BytecodeContext) {
SettingsPatch.addMusicPreference( SettingsPatch.addMusicPreference(
CategoryType.GENERAL, CategoryType.GENERAL,
@ -49,10 +35,5 @@ object CustomFilterPatch : BytecodePatch(emptySet()) {
"revanced_custom_filter" "revanced_custom_filter"
) )
LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
} }
private const val FILTER_CLASS_DESCRIPTOR =
"$COMPONENTS_PATH/CustomFilter;"
} }

47
src/main/kotlin/app/revanced/patches/music/general/dialog/RemoveViewerDiscretionDialogPatch.kt
View File

@ -1,47 +0,0 @@
package app.revanced.patches.music.general.dialog
import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.music.utils.integrations.Constants.GENERAL
import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.patches.shared.dialog.AbstractRemoveViewerDiscretionDialogPatch
@Patch(
name = "Remove viewer discretion dialog",
description = "Adds an option to remove the dialog that appears when opening a video that has been age-restricted " +
"by accepting it automatically. This does not bypass the age restriction.",
dependencies = [SettingsPatch::class],
compatiblePackages = [
CompatiblePackage(
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object RemoveViewerDiscretionDialogPatch : AbstractRemoveViewerDiscretionDialogPatch(
GENERAL
) {
override fun execute(context: BytecodeContext) {
super.execute(context)
SettingsPatch.addMusicPreference(
CategoryType.GENERAL,
"revanced_remove_viewer_discretion_dialog",
"false"
)
}
}

6
src/main/kotlin/app/revanced/patches/music/general/dialog/ViewerDiscretionDialogBytecodePatch.kt Normal file
View File

@ -0,0 +1,6 @@
package app.revanced.patches.music.general.dialog
import app.revanced.patches.music.utils.integrations.Constants.GENERAL_CLASS_DESCRIPTOR
import app.revanced.patches.shared.dialog.BaseViewerDiscretionDialogPatch
object ViewerDiscretionDialogBytecodePatch : BaseViewerDiscretionDialogPatch(GENERAL_CLASS_DESCRIPTOR)

28
src/main/kotlin/app/revanced/patches/music/general/dialog/ViewerDiscretionDialogPatch.kt Normal file
View File

@ -0,0 +1,28 @@
package app.revanced.patches.music.general.dialog
import app.revanced.patcher.data.ResourceContext
import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.patch.BaseResourcePatch
@Suppress("unused")
object ViewerDiscretionDialogPatch : BaseResourcePatch(
name = "Remove viewer discretion dialog",
description = "Adds an option to remove the dialog that appears when opening a video that has been age-restricted " +
"by accepting it automatically. This does not bypass the age restriction.",
dependencies = setOf(
SettingsPatch::class,
ViewerDiscretionDialogBytecodePatch::class
),
compatiblePackages = COMPATIBLE_PACKAGE
) {
override fun execute(context: ResourceContext) {
SettingsPatch.addMusicPreference(
CategoryType.GENERAL,
"revanced_remove_viewer_discretion_dialog",
"false"
)
}
}

47
src/main/kotlin/app/revanced/patches/music/general/emojipicker/HideEmojiPickerPatch.kt → src/main/kotlin/app/revanced/patches/music/general/emojipicker/EmojiPickerPatch.kt
View File

@ -1,42 +1,28 @@
package app.revanced.patches.music.general.emojipicker package app.revanced.patches.music.general.emojipicker
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.BytecodePatch import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.music.utils.integrations.Constants.COMPONENTS_PATH import app.revanced.patches.music.utils.integrations.Constants.COMPONENTS_PATH
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.patches.shared.litho.LithoFilterPatch import app.revanced.patches.shared.litho.LithoFilterPatch
import app.revanced.util.patch.BaseResourcePatch
@Patch( @Suppress("unused")
object EmojiPickerPatch : BaseResourcePatch(
name = "Hide emoji picker and time stamp", name = "Hide emoji picker and time stamp",
description = "Adds an option to hide the emoji picker and time stamp when typing comments.", description = "Adds an option to hide the emoji picker and time stamp when typing comments.",
dependencies = [ dependencies = setOf(
LithoFilterPatch::class, LithoFilterPatch::class,
SettingsPatch::class SettingsPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE
CompatiblePackage( ) {
"com.google.android.apps.youtube.music", private const val FILTER_CLASS_DESCRIPTOR =
[ "$COMPONENTS_PATH/EmojiPickerFilter;"
"6.21.52",
"6.22.52", override fun execute(context: ResourceContext) {
"6.23.56", LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object HideEmojiPickerPatch : BytecodePatch(emptySet()) {
override fun execute(context: BytecodeContext) {
SettingsPatch.addMusicPreference( SettingsPatch.addMusicPreference(
CategoryType.GENERAL, CategoryType.GENERAL,
@ -44,10 +30,5 @@ object HideEmojiPickerPatch : BytecodePatch(emptySet()) {
"false" "false"
) )
LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
} }
private const val FILTER_CLASS_DESCRIPTOR =
"$COMPONENTS_PATH/EmojiPickerFilter;"
} }

39
src/main/kotlin/app/revanced/patches/music/general/floatingbutton/NewPlaylistButtonPatch.kt → src/main/kotlin/app/revanced/patches/music/general/floatingbutton/FloatingButtonPatch.kt
View File

@ -3,46 +3,27 @@ package app.revanced.patches.music.general.floatingbutton
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction 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.patcher.util.smali.ExternalLabel import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.music.general.floatingbutton.fingerprints.FloatingButtonFingerprint import app.revanced.patches.music.general.floatingbutton.fingerprints.FloatingButtonFingerprint
import app.revanced.patches.music.general.floatingbutton.fingerprints.FloatingButtonParentFingerprint import app.revanced.patches.music.general.floatingbutton.fingerprints.FloatingButtonParentFingerprint
import app.revanced.patches.music.utils.integrations.Constants.GENERAL import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.integrations.Constants.GENERAL_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.patch.BaseBytecodePatch
@Patch( @Suppress("unused")
object FloatingButtonPatch : BaseBytecodePatch(
name = "Hide new playlist button", name = "Hide new playlist button",
description = "Adds an option to hide the \"New playlist\" button in the library.", description = "Adds an option to hide the \"New playlist\" button in the library.",
dependencies = [ dependencies = setOf(
SettingsPatch::class, SettingsPatch::class,
SharedResourceIdPatch::class SharedResourceIdPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(FloatingButtonParentFingerprint)
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object NewPlaylistButtonPatch : BytecodePatch(
setOf(FloatingButtonParentFingerprint)
) { ) {
override fun execute(context: BytecodeContext) { override fun execute(context: BytecodeContext) {
@ -56,7 +37,7 @@ object NewPlaylistButtonPatch : BytecodePatch(
it.mutableMethod.apply { it.mutableMethod.apply {
addInstructionsWithLabels( addInstructionsWithLabels(
1, """ 1, """
invoke-static {}, $GENERAL->hideNewPlaylistButton()Z invoke-static {}, $GENERAL_CLASS_DESCRIPTOR->hideNewPlaylistButton()Z
move-result v0 move-result v0
if-eqz v0, :show if-eqz v0, :show
return-void return-void

2
src/main/kotlin/app/revanced/patches/music/general/floatingbutton/fingerprints/FloatingButtonFingerprint.kt
View File

@ -3,7 +3,7 @@ package app.revanced.patches.music.general.floatingbutton.fingerprints
import app.revanced.patcher.fingerprint.MethodFingerprint import app.revanced.patcher.fingerprint.MethodFingerprint
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
object FloatingButtonFingerprint : MethodFingerprint( internal object FloatingButtonFingerprint : MethodFingerprint(
returnType = "V", returnType = "V",
parameters = listOf("L"), parameters = listOf("L"),
opcodes = listOf(Opcode.AND_INT_LIT16) opcodes = listOf(Opcode.AND_INT_LIT16)

2
src/main/kotlin/app/revanced/patches/music/general/floatingbutton/fingerprints/FloatingButtonParentFingerprint.kt
View File

@ -5,7 +5,7 @@ import app.revanced.util.fingerprint.LiteralValueFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
object FloatingButtonParentFingerprint : LiteralValueFingerprint( internal object FloatingButtonParentFingerprint : LiteralValueFingerprint(
returnType = "V", returnType = "V",
accessFlags = AccessFlags.PROTECTED or AccessFlags.FINAL, accessFlags = AccessFlags.PROTECTED or AccessFlags.FINAL,
parameters = listOf("L"), parameters = listOf("L"),

39
src/main/kotlin/app/revanced/patches/music/general/historybutton/HideHistoryButtonPatch.kt → src/main/kotlin/app/revanced/patches/music/general/historybutton/HistoryButtonPatch.kt
View File

@ -3,46 +3,27 @@ package app.revanced.patches.music.general.historybutton
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction 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.general.historybutton.fingerprints.HistoryMenuItemFingerprint import app.revanced.patches.music.general.historybutton.fingerprints.HistoryMenuItemFingerprint
import app.revanced.patches.music.general.historybutton.fingerprints.HistoryMenuItemOfflineTabFingerprint import app.revanced.patches.music.general.historybutton.fingerprints.HistoryMenuItemOfflineTabFingerprint
import app.revanced.patches.music.utils.integrations.Constants.GENERAL import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.integrations.Constants.GENERAL_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.patch.BaseBytecodePatch
import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
@Patch( @Suppress("unused")
object HistoryButtonPatch : BaseBytecodePatch(
name = "Hide history button", name = "Hide history button",
description = "Adds an option to hide the history button in the toolbar.", description = "Adds an option to hide the history button in the toolbar.",
dependencies = [ dependencies = setOf(
SettingsPatch::class, SettingsPatch::class,
SharedResourceIdPatch::class SharedResourceIdPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object HideHistoryButtonPatch : BytecodePatch(
setOf(
HistoryMenuItemFingerprint, HistoryMenuItemFingerprint,
HistoryMenuItemOfflineTabFingerprint HistoryMenuItemOfflineTabFingerprint
) )
@ -60,7 +41,7 @@ object HideHistoryButtonPatch : BytecodePatch(
addInstructions( addInstructions(
insertIndex, """ insertIndex, """
invoke-static {v$insertRegister}, $GENERAL->hideHistoryButton(Z)Z invoke-static {v$insertRegister}, $GENERAL_CLASS_DESCRIPTOR->hideHistoryButton(Z)Z
move-result v$insertRegister move-result v$insertRegister
""" """
) )

2
src/main/kotlin/app/revanced/patches/music/general/historybutton/fingerprints/HistoryMenuItemFingerprint.kt
View File

@ -7,7 +7,7 @@ import app.revanced.util.containsWideLiteralInstructionIndex
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
object HistoryMenuItemFingerprint : MethodFingerprint( internal object HistoryMenuItemFingerprint : MethodFingerprint(
returnType = "V", returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = listOf("Landroid/view/Menu;"), parameters = listOf("Landroid/view/Menu;"),

2
src/main/kotlin/app/revanced/patches/music/general/historybutton/fingerprints/HistoryMenuItemOfflineTabFingerprint.kt
View File

@ -8,7 +8,7 @@ import app.revanced.util.containsWideLiteralInstructionIndex
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
object HistoryMenuItemOfflineTabFingerprint : MethodFingerprint( internal object HistoryMenuItemOfflineTabFingerprint : MethodFingerprint(
returnType = "V", returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = listOf("Landroid/view/Menu;"), parameters = listOf("Landroid/view/Menu;"),

52
src/main/kotlin/app/revanced/patches/music/general/landscapemode/LandScapeModePatch.kt
View File

@ -2,53 +2,41 @@ package app.revanced.patches.music.general.landscapemode
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.music.general.landscapemode.fingerprints.TabletIdentifierFingerprint import app.revanced.patches.music.general.landscapemode.fingerprints.TabletIdentifierFingerprint
import app.revanced.patches.music.utils.integrations.Constants.GENERAL import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.integrations.Constants.GENERAL_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.patch.BaseBytecodePatch
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@Patch( @Suppress("unused")
object LandScapeModePatch : BaseBytecodePatch(
name = "Enable landscape mode", name = "Enable landscape mode",
description = "Adds an option to enable landscape mode when rotating the screen on phones.", description = "Adds an option to enable landscape mode when rotating the screen on phones.",
dependencies = [ dependencies = setOf(
SettingsPatch::class, SettingsPatch::class,
SharedResourceIdPatch::class SharedResourceIdPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(TabletIdentifierFingerprint)
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object LandScapeModePatch : BytecodePatch(
setOf(TabletIdentifierFingerprint)
) { ) {
override fun execute(context: BytecodeContext) { override fun execute(context: BytecodeContext) {
TabletIdentifierFingerprint.result?.let { TabletIdentifierFingerprint.result?.let {
it.mutableMethod.addInstructions( it.mutableMethod.apply {
it.scanResult.patternScanResult!!.endIndex + 1, """ val targetIndex = it.scanResult.patternScanResult!!.endIndex
invoke-static {p0}, $GENERAL->enableLandScapeMode(Z)Z val targetRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA
move-result p0
addInstructions(
targetIndex + 1, """
invoke-static {v$targetRegister}, $GENERAL_CLASS_DESCRIPTOR->enableLandScapeMode(Z)Z
move-result v$targetRegister
""" """
) )
}
} ?: throw TabletIdentifierFingerprint.exception } ?: throw TabletIdentifierFingerprint.exception
SettingsPatch.addMusicPreference( SettingsPatch.addMusicPreference(

2
src/main/kotlin/app/revanced/patches/music/general/landscapemode/fingerprints/TabletIdentifierFingerprint.kt
View File

@ -6,7 +6,7 @@ import app.revanced.util.fingerprint.LiteralValueFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
object TabletIdentifierFingerprint : LiteralValueFingerprint( internal object TabletIdentifierFingerprint : LiteralValueFingerprint(
returnType = "Z", returnType = "Z",
accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC, accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
parameters = listOf("L"), parameters = listOf("L"),

42
src/main/kotlin/app/revanced/patches/music/general/oldstylelibraryshelf/OldStyleLibraryShelfPatch.kt
View File

@ -3,53 +3,37 @@ package app.revanced.patches.music.general.oldstylelibraryshelf
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction 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.general.oldstylelibraryshelf.fingerprints.BrowseIdFingerprint import app.revanced.patches.music.general.oldstylelibraryshelf.fingerprints.BrowseIdFingerprint
import app.revanced.patches.music.utils.integrations.Constants.GENERAL import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.integrations.Constants.GENERAL_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.getStringInstructionIndex import app.revanced.util.getStringInstructionIndex
import app.revanced.util.getTargetIndexReversed
import app.revanced.util.patch.BaseBytecodePatch
import com.android.tools.smali.dexlib2.Opcode
import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
@Patch( @Suppress("unused")
object OldStyleLibraryShelfPatch : BaseBytecodePatch(
name = "Enable old style library shelf", name = "Enable old style library shelf",
description = "Adds an option to return the library tab to the old style.", description = "Adds an option to return the library tab to the old style.",
dependencies = [SettingsPatch::class], dependencies = setOf(SettingsPatch::class),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(BrowseIdFingerprint)
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object OldStyleLibraryShelfPatch : BytecodePatch(
setOf(BrowseIdFingerprint)
) { ) {
override fun execute(context: BytecodeContext) { override fun execute(context: BytecodeContext) {
BrowseIdFingerprint.result?.let { BrowseIdFingerprint.result?.let {
it.mutableMethod.apply { it.mutableMethod.apply {
val targetIndex = getStringInstructionIndex("FEmusic_offline") - 5 val stringIndex = getStringInstructionIndex("FEmusic_offline")
val targetIndex = getTargetIndexReversed(stringIndex, Opcode.IGET_OBJECT)
val targetRegister = getInstruction<TwoRegisterInstruction>(targetIndex).registerA val targetRegister = getInstruction<TwoRegisterInstruction>(targetIndex).registerA
addInstructions( addInstructions(
targetIndex + 1, """ targetIndex + 1, """
invoke-static {v$targetRegister}, $GENERAL->enableOldStyleLibraryShelf(Ljava/lang/String;)Ljava/lang/String; invoke-static {v$targetRegister}, $GENERAL_CLASS_DESCRIPTOR->enableOldStyleLibraryShelf(Ljava/lang/String;)Ljava/lang/String;
move-result-object v$targetRegister move-result-object v$targetRegister
""" """
) )

2
src/main/kotlin/app/revanced/patches/music/general/oldstylelibraryshelf/fingerprints/BrowseIdFingerprint.kt
View File

@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or
import app.revanced.util.fingerprint.LiteralValueFingerprint import app.revanced.util.fingerprint.LiteralValueFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
object BrowseIdFingerprint : LiteralValueFingerprint( internal object BrowseIdFingerprint : LiteralValueFingerprint(
returnType = "L", returnType = "L",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = listOf("L"), parameters = listOf("L"),

47
src/main/kotlin/app/revanced/patches/music/general/playlistcard/HidePlaylistCardPatch.kt → src/main/kotlin/app/revanced/patches/music/general/playlistcard/PlaylistCardPatch.kt
View File

@ -1,42 +1,28 @@
package app.revanced.patches.music.general.playlistcard package app.revanced.patches.music.general.playlistcard
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.BytecodePatch import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.music.utils.integrations.Constants.COMPONENTS_PATH import app.revanced.patches.music.utils.integrations.Constants.COMPONENTS_PATH
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.patches.shared.litho.LithoFilterPatch import app.revanced.patches.shared.litho.LithoFilterPatch
import app.revanced.util.patch.BaseResourcePatch
@Patch( @Suppress("unused")
object PlaylistCardPatch : BaseResourcePatch(
name = "Hide playlist card", name = "Hide playlist card",
description = "Adds an option to hide the playlist card from the homepage.", description = "Adds an option to hide the playlist card from the homepage.",
dependencies = [ dependencies = setOf(
LithoFilterPatch::class, LithoFilterPatch::class,
SettingsPatch::class SettingsPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE
CompatiblePackage( ) {
"com.google.android.apps.youtube.music", private const val FILTER_CLASS_DESCRIPTOR =
[ "$COMPONENTS_PATH/PlaylistCardFilter;"
"6.21.52",
"6.22.52", override fun execute(context: ResourceContext) {
"6.23.56", LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object HidePlaylistCardPatch : BytecodePatch(emptySet()) {
override fun execute(context: BytecodeContext) {
SettingsPatch.addMusicPreference( SettingsPatch.addMusicPreference(
CategoryType.GENERAL, CategoryType.GENERAL,
@ -44,10 +30,5 @@ object HidePlaylistCardPatch : BytecodePatch(emptySet()) {
"false" "false"
) )
LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
} }
private const val FILTER_CLASS_DESCRIPTOR =
"$COMPONENTS_PATH/PlaylistCardFilter;"
} }

37
src/main/kotlin/app/revanced/patches/music/general/redirection/DislikeRedirectionPatch.kt
View File

@ -3,14 +3,12 @@ package app.revanced.patches.music.general.redirection
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction 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.patcher.util.proxy.mutableTypes.MutableMethod import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
import app.revanced.patcher.util.smali.ExternalLabel import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.music.general.redirection.fingerprints.DislikeButtonOnClickListenerFingerprint import app.revanced.patches.music.general.redirection.fingerprints.DislikeButtonOnClickListenerFingerprint
import app.revanced.patches.music.utils.fingerprints.PendingIntentReceiverFingerprint import app.revanced.patches.music.utils.fingerprints.PendingIntentReceiverFingerprint
import app.revanced.patches.music.utils.integrations.Constants.GENERAL import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.integrations.Constants.GENERAL_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.exception import app.revanced.util.exception
@ -19,37 +17,20 @@ import app.revanced.util.getTargetIndexReversed
import app.revanced.util.getTargetIndexWithReference import app.revanced.util.getTargetIndexWithReference
import app.revanced.util.getWalkerMethod import app.revanced.util.getWalkerMethod
import app.revanced.util.indexOfFirstInstruction import app.revanced.util.indexOfFirstInstruction
import app.revanced.util.patch.BaseBytecodePatch
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
import com.android.tools.smali.dexlib2.iface.reference.MethodReference import com.android.tools.smali.dexlib2.iface.reference.MethodReference
import com.android.tools.smali.dexlib2.iface.reference.Reference import com.android.tools.smali.dexlib2.iface.reference.Reference
@Patch( @Suppress("unused")
object DislikeRedirectionPatch : BaseBytecodePatch(
name = "Disable dislike redirection", name = "Disable dislike redirection",
description = "Adds an option to disable redirection to the next track when clicking dislike button.", description = "Adds an option to disable redirection to the next track when clicking dislike button.",
dependencies = [SettingsPatch::class], dependencies = setOf(SettingsPatch::class),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object DislikeRedirectionPatch : BytecodePatch(
setOf(
DislikeButtonOnClickListenerFingerprint, DislikeButtonOnClickListenerFingerprint,
PendingIntentReceiverFingerprint PendingIntentReceiverFingerprint
) )
@ -105,7 +86,7 @@ object DislikeRedirectionPatch : BytecodePatch(
addInstructionsWithLabels( addInstructionsWithLabels(
targetIndex + 1, """ targetIndex + 1, """
invoke-static {}, $GENERAL->disableDislikeRedirection()Z invoke-static {}, $GENERAL_CLASS_DESCRIPTOR->disableDislikeRedirection()Z
move-result v$insertRegister move-result v$insertRegister
if-nez v$insertRegister, :disable if-nez v$insertRegister, :disable
""", ExternalLabel("disable", getInstruction(onClickIndex + 1)) """, ExternalLabel("disable", getInstruction(onClickIndex + 1))

47
src/main/kotlin/app/revanced/patches/music/general/sampleshelf/HideSampleShelfPatch.kt → src/main/kotlin/app/revanced/patches/music/general/sampleshelf/SampleShelfPatch.kt
View File

@ -1,42 +1,28 @@
package app.revanced.patches.music.general.sampleshelf package app.revanced.patches.music.general.sampleshelf
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.BytecodePatch import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.music.utils.integrations.Constants.COMPONENTS_PATH import app.revanced.patches.music.utils.integrations.Constants.COMPONENTS_PATH
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.patches.shared.litho.LithoFilterPatch import app.revanced.patches.shared.litho.LithoFilterPatch
import app.revanced.util.patch.BaseResourcePatch
@Patch( @Suppress("unused")
object SampleShelfPatch : BaseResourcePatch(
name = "Hide sample shelf", name = "Hide sample shelf",
description = "Adds an option to hide the sample shelf from the homepage.", description = "Adds an option to hide the sample shelf from the homepage.",
dependencies = [ dependencies = setOf(
LithoFilterPatch::class, LithoFilterPatch::class,
SettingsPatch::class SettingsPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE
CompatiblePackage( ) {
"com.google.android.apps.youtube.music", private const val FILTER_CLASS_DESCRIPTOR =
[ "$COMPONENTS_PATH/SampleShelfFilter;"
"6.21.52",
"6.22.52", override fun execute(context: ResourceContext) {
"6.23.56", LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object HideSampleShelfPatch : BytecodePatch(emptySet()) {
override fun execute(context: BytecodeContext) {
SettingsPatch.addMusicPreference( SettingsPatch.addMusicPreference(
CategoryType.GENERAL, CategoryType.GENERAL,
@ -44,10 +30,5 @@ object HideSampleShelfPatch : BytecodePatch(emptySet()) {
"false" "false"
) )
LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
} }
private const val FILTER_CLASS_DESCRIPTOR =
"$COMPONENTS_PATH/SampleShelfFilter;"
} }

37
src/main/kotlin/app/revanced/patches/music/general/startpage/ChangeStartPagePatch.kt
View File

@ -4,43 +4,24 @@ import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
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.general.startpage.fingerprints.ColdStartUpFingerprint import app.revanced.patches.music.general.startpage.fingerprints.ColdStartUpFingerprint
import app.revanced.patches.music.utils.integrations.Constants.GENERAL import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.integrations.Constants.GENERAL_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.patches.music.utils.settings.SettingsPatch.contexts import app.revanced.patches.music.utils.settings.SettingsPatch.contexts
import app.revanced.util.copyXmlNode import app.revanced.util.copyXmlNode
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.patch.BaseBytecodePatch
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@Patch( @Suppress("unused")
object ChangeStartPagePatch : BaseBytecodePatch(
name = "Change start page", name = "Change start page",
description = "Adds an option to set which page the app opens in instead of the homepage.", description = "Adds an option to set which page the app opens in instead of the homepage.",
dependencies = [SettingsPatch::class], dependencies = setOf(SettingsPatch::class),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(ColdStartUpFingerprint)
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object ChangeStartPagePatch : BytecodePatch(
setOf(ColdStartUpFingerprint)
) { ) {
override fun execute(context: BytecodeContext) { override fun execute(context: BytecodeContext) {
@ -51,7 +32,7 @@ object ChangeStartPagePatch : BytecodePatch(
addInstructions( addInstructions(
targetIndex + 1, """ targetIndex + 1, """
invoke-static {v$targetRegister}, $GENERAL->changeStartPage(Ljava/lang/String;)Ljava/lang/String; invoke-static {v$targetRegister}, $GENERAL_CLASS_DESCRIPTOR->changeStartPage(Ljava/lang/String;)Ljava/lang/String;
move-result-object v$targetRegister move-result-object v$targetRegister
return-object v$targetRegister return-object v$targetRegister
""" """

2
src/main/kotlin/app/revanced/patches/music/general/startpage/fingerprints/ColdStartUpFingerprint.kt
View File

@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
object ColdStartUpFingerprint : MethodFingerprint( internal object ColdStartUpFingerprint : MethodFingerprint(
returnType = "Ljava/lang/String;", returnType = "Ljava/lang/String;",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = emptyList(), parameters = emptyList(),

37
src/main/kotlin/app/revanced/patches/music/general/taptoupdate/HideTapToUpdateButtonPatch.kt → src/main/kotlin/app/revanced/patches/music/general/taptoupdate/TapToUpdateButtonPatch.kt
View File

@ -3,41 +3,22 @@ package app.revanced.patches.music.general.taptoupdate
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction 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.patcher.util.smali.ExternalLabel import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.music.general.taptoupdate.fingerprints.ContentPillInFingerprint import app.revanced.patches.music.general.taptoupdate.fingerprints.ContentPillInFingerprint
import app.revanced.patches.music.utils.integrations.Constants.GENERAL import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.integrations.Constants.GENERAL_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.patch.BaseBytecodePatch
@Patch( @Suppress("unused")
object TapToUpdateButtonPatch : BaseBytecodePatch(
name = "Hide tap to update button", name = "Hide tap to update button",
description = "Adds an option to hide the tap to update button.", description = "Adds an option to hide the tap to update button.",
dependencies = [SettingsPatch::class], dependencies = setOf(SettingsPatch::class),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(ContentPillInFingerprint)
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object HideTapToUpdateButtonPatch : BytecodePatch(
setOf(ContentPillInFingerprint)
) { ) {
override fun execute(context: BytecodeContext) { override fun execute(context: BytecodeContext) {
@ -46,7 +27,7 @@ object HideTapToUpdateButtonPatch : BytecodePatch(
addInstructionsWithLabels( addInstructionsWithLabels(
0, 0,
""" """
invoke-static {}, $GENERAL->hideTapToUpdateButton()Z invoke-static {}, $GENERAL_CLASS_DESCRIPTOR->hideTapToUpdateButton()Z
move-result v0 move-result v0
if-eqz v0, :show if-eqz v0, :show
return-void return-void

2
src/main/kotlin/app/revanced/patches/music/general/taptoupdate/fingerprints/ContentPillInFingerprint.kt
View File

@ -2,7 +2,7 @@ package app.revanced.patches.music.general.taptoupdate.fingerprints
import app.revanced.patcher.fingerprint.MethodFingerprint import app.revanced.patcher.fingerprint.MethodFingerprint
object ContentPillInFingerprint : MethodFingerprint( internal object ContentPillInFingerprint : MethodFingerprint(
returnType = "V", returnType = "V",
strings = listOf("Content pill VE is null") strings = listOf("Content pill VE is null")
) )

33
src/main/kotlin/app/revanced/patches/music/general/tooltip/TooltipContentViewPatch.kt
View File

@ -2,38 +2,19 @@ package app.revanced.patches.music.general.tooltip
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
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.general.tooltip.fingerprints.TooltipContentViewFingerprint import app.revanced.patches.music.general.tooltip.fingerprints.TooltipContentViewFingerprint
import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.patch.BaseBytecodePatch
@Patch( @Suppress("unused")
object TooltipContentViewPatch : BaseBytecodePatch(
name = "Hide tooltip content", name = "Hide tooltip content",
description = "Hides the tooltip box that appears when opening the app for the first time.", description = "Hides the tooltip box that appears when opening the app for the first time.",
dependencies = [SharedResourceIdPatch::class], dependencies = setOf(SharedResourceIdPatch::class),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(TooltipContentViewFingerprint)
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object TooltipContentViewPatch : BytecodePatch(
setOf(TooltipContentViewFingerprint)
) { ) {
override fun execute(context: BytecodeContext) { override fun execute(context: BytecodeContext) {

2
src/main/kotlin/app/revanced/patches/music/general/tooltip/fingerprints/TooltipContentViewFingerprint.kt
View File

@ -5,7 +5,7 @@ import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.ToolTip
import app.revanced.util.fingerprint.LiteralValueFingerprint import app.revanced.util.fingerprint.LiteralValueFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
object TooltipContentViewFingerprint : LiteralValueFingerprint( internal object TooltipContentViewFingerprint : LiteralValueFingerprint(
returnType = "V", returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = listOf("L"), parameters = listOf("L"),

40
src/main/kotlin/app/revanced/patches/music/general/voicesearch/VoiceSearchButtonPatch.kt
View File

@ -1,33 +1,23 @@
package app.revanced.patches.music.general.voicesearch package app.revanced.patches.music.general.voicesearch
import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.annotation.Patch import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.shared.voicesearch.AbstractVoiceSearchButtonPatch import app.revanced.patches.shared.voicesearch.VoiceSearchUtils.patchXml
import app.revanced.util.patch.BaseResourcePatch
@Patch( @Suppress("unused")
object VoiceSearchButtonPatch : BaseResourcePatch(
name = "Hide voice search button", name = "Hide voice search button",
description = "Hides the voice search button in the search bar.", description = "Hides the voice search button in the search bar.",
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage(
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
],
use = false use = false
) ) {
@Suppress("unused") override fun execute(context: ResourceContext) {
object VoiceSearchButtonPatch : AbstractVoiceSearchButtonPatch(
context.patchXml(
arrayOf("search_toolbar_view.xml"), arrayOf("search_toolbar_view.xml"),
arrayOf("height", "width") arrayOf("height", "width")
) )
}
}

30
src/main/kotlin/app/revanced/patches/music/layout/branding/icon/CustomBrandingIconPatch.kt
View File

@ -2,38 +2,20 @@ package app.revanced.patches.music.layout.branding.icon
import app.revanced.patcher.data.ResourceContext import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.PatchException import app.revanced.patcher.patch.PatchException
import app.revanced.patcher.patch.ResourcePatch
import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.util.ResourceGroup import app.revanced.util.ResourceGroup
import app.revanced.util.copyResources import app.revanced.util.copyResources
import app.revanced.util.patch.BaseResourcePatch
import java.io.File import java.io.File
import java.nio.file.Files import java.nio.file.Files
@Patch( @Suppress("DEPRECATION", "unused")
object CustomBrandingIconPatch : BaseResourcePatch(
name = "Custom branding icon YouTube Music", name = "Custom branding icon YouTube Music",
description = "Changes the YouTube Music app icon to the icon specified in options.json.", description = "Changes the YouTube Music app icon to the icon specified in options.json.",
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE
CompatiblePackage( ) {
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object CustomBrandingIconPatch : ResourcePatch() {
private const val DEFAULT_ICON_KEY = "Revancify Blue" private const val DEFAULT_ICON_KEY = "Revancify Blue"
private val availableIcon = mapOf( private val availableIcon = mapOf(

38
src/main/kotlin/app/revanced/patches/music/layout/branding/name/CustomBrandingNamePatch.kt
View File

@ -2,37 +2,17 @@ package app.revanced.patches.music.layout.branding.name
import app.revanced.patcher.data.ResourceContext import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.PatchException import app.revanced.patcher.patch.PatchException
import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.integrations.Constants.LANGUAGE_LIST import app.revanced.patches.music.utils.integrations.Constants.LANGUAGE_LIST
import app.revanced.patches.shared.elements.AbstractRemoveStringsElementsPatch import app.revanced.patches.shared.elements.StringsElementsUtils.removeStringsElements
import app.revanced.util.patch.BaseResourcePatch
@Patch( @Suppress("DEPRECATION", "unused")
object CustomBrandingNamePatch : BaseResourcePatch(
name = "Custom branding name YouTube Music", name = "Custom branding name YouTube Music",
description = "Renames the YouTube Music app to the name specified in options.json.", description = "Renames the YouTube Music app to the name specified in options.json.",
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE
CompatiblePackage(
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object CustomBrandingNamePatch : AbstractRemoveStringsElementsPatch(
LANGUAGE_LIST,
arrayOf("app_launcher_name", "app_name")
) { ) {
private const val APP_NAME_NOTIFICATION = "ReVanced Extended Music" private const val APP_NAME_NOTIFICATION = "ReVanced Extended Music"
private const val APP_NAME_LAUNCHER = "RVX Music" private const val APP_NAME_LAUNCHER = "RVX Music"
@ -62,7 +42,11 @@ object CustomBrandingNamePatch : AbstractRemoveStringsElementsPatch(
) )
override fun execute(context: ResourceContext) { override fun execute(context: ResourceContext) {
super.execute(context)
context.removeStringsElements(
LANGUAGE_LIST,
arrayOf("app_launcher_name", "app_name")
)
AppNameNotification?.let { notificationName -> AppNameNotification?.let { notificationName ->
AppNameLauncher?.let { launcherName -> AppNameLauncher?.let { launcherName ->

42
src/main/kotlin/app/revanced/patches/music/layout/doubletapbackground/DoubleTapOverlayBackgroundPatch.kt
View File

@ -1,33 +1,21 @@
package app.revanced.patches.music.layout.doubletapbackground package app.revanced.patches.music.layout.doubletapbackground
import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.annotation.Patch import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.shared.overlaybackground.AbstractOverlayBackgroundPatch import app.revanced.patches.shared.overlaybackground.OverlayBackgroundUtils.removeOverlayBackground
import app.revanced.util.patch.BaseResourcePatch
@Patch(
name = "Hide double tap overlay filter",
description = "Removes the dark overlay when double-tapping to seek.",
compatiblePackages = [
CompatiblePackage(
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
],
use = false
)
@Suppress("unused") @Suppress("unused")
object DoubleTapOverlayBackgroundPatch : AbstractOverlayBackgroundPatch( object DoubleTapOverlayBackgroundPatch : BaseResourcePatch(
name = "Hide double tap overlay filter",
description = "Hides the dark overlay when double-tapping to seek.",
compatiblePackages = COMPATIBLE_PACKAGE,
use = false
) {
override fun execute(context: ResourceContext) {
context.removeOverlayBackground(
arrayOf("quick_seek_overlay.xml"), arrayOf("quick_seek_overlay.xml"),
arrayOf("tap_bloom_view", "dark_background") arrayOf("tap_bloom_view", "dark_background")
) )
}
}

4
src/main/kotlin/app/revanced/patches/music/layout/overlayfilter/OverlayFilterBytecodePatch.kt
View File

@ -6,7 +6,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.annotation.Patch import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.music.layout.overlayfilter.fingerprints.DesignBottomSheetDialogFingerprint import app.revanced.patches.music.layout.overlayfilter.fingerprints.DesignBottomSheetDialogFingerprint
import app.revanced.patches.music.utils.integrations.Constants.GENERAL import app.revanced.patches.music.utils.integrations.Constants.GENERAL_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.integrations.IntegrationsPatch import app.revanced.patches.music.utils.integrations.IntegrationsPatch
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.util.exception import app.revanced.util.exception
@ -33,7 +33,7 @@ object OverlayFilterBytecodePatch : BytecodePatch(
insertIndex, """ insertIndex, """
invoke-virtual {p0}, $definingClass->getWindow()Landroid/view/Window; invoke-virtual {p0}, $definingClass->getWindow()Landroid/view/Window;
move-result-object v$freeRegister move-result-object v$freeRegister
invoke-static {v$freeRegister}, $GENERAL->disableDimBehind(Landroid/view/Window;)V invoke-static {v$freeRegister}, $GENERAL_CLASS_DESCRIPTOR->disableDimBehind(Landroid/view/Window;)V
""" """
) )
} }

37
src/main/kotlin/app/revanced/patches/music/layout/overlayfilter/OverlayFilterPatch.kt
View File

@ -1,36 +1,17 @@
package app.revanced.patches.music.layout.overlayfilter package app.revanced.patches.music.layout.overlayfilter
import app.revanced.patcher.data.ResourceContext import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.ResourcePatch import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.util.patch.BaseResourcePatch
import app.revanced.patcher.patch.annotation.Patch
@Patch( @Suppress("DEPRECATION", "unused")
name = "Disable overlay filter", object OverlayFilterPatch : BaseResourcePatch(
description = "Removes the dark overlay when comment, share, save to playlist, and flyout panels are open.", name = "Hide overlay filter",
dependencies = [OverlayFilterBytecodePatch::class], description = "Hides the dark overlay when comment, share, save to playlist, and flyout panels are open.",
compatiblePackages = [ dependencies = setOf(OverlayFilterBytecodePatch::class),
CompatiblePackage( compatiblePackages = COMPATIBLE_PACKAGE,
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
],
use = false use = false
) ) {
@Suppress("unused")
object OverlayFilterPatch : ResourcePatch() {
override fun execute(context: ResourceContext) { override fun execute(context: ResourceContext) {
val styleFile = context["res/values/styles.xml"] val styleFile = context["res/values/styles.xml"]

2
src/main/kotlin/app/revanced/patches/music/layout/overlayfilter/fingerprints/DesignBottomSheetDialogFingerprint.kt
View File

@ -4,7 +4,7 @@ import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.DesignB
import app.revanced.util.fingerprint.LiteralValueFingerprint import app.revanced.util.fingerprint.LiteralValueFingerprint
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
object DesignBottomSheetDialogFingerprint : LiteralValueFingerprint( internal object DesignBottomSheetDialogFingerprint : LiteralValueFingerprint(
returnType = "V", returnType = "V",
parameters = emptyList(), parameters = emptyList(),
opcodes = listOf( opcodes = listOf(

44
src/main/kotlin/app/revanced/patches/music/layout/playeroverlay/PlayerOverlayFilterPatch.kt
View File

@ -1,33 +1,21 @@
package app.revanced.patches.music.layout.doubletapbackground package app.revanced.patches.music.layout.playeroverlay
import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.annotation.Patch import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.shared.overlaybackground.AbstractOverlayBackgroundPatch import app.revanced.patches.shared.overlaybackground.OverlayBackgroundUtils.removeOverlayBackground
import app.revanced.util.patch.BaseResourcePatch
@Patch(
name = "Hide player overlay filter",
description = "Removes the dark overlay when single-tapping player.",
compatiblePackages = [
CompatiblePackage(
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
],
use = false
)
@Suppress("unused") @Suppress("unused")
object PlayerOverlayFilterPatch : AbstractOverlayBackgroundPatch( object PlayerOverlayFilterPatch : BaseResourcePatch(
name = "Hide player overlay filter",
description = "Hides the dark overlay when single-tapping player.",
compatiblePackages = COMPATIBLE_PACKAGE,
use = false
) {
override fun execute(context: ResourceContext) {
context.removeOverlayBackground(
arrayOf("music_controls_overlay.xml"), arrayOf("music_controls_overlay.xml"),
arrayOf("player_control_screen") arrayOf("player_control_screen")
) )
}
}

31
src/main/kotlin/app/revanced/patches/music/misc/backgroundplay/BackgroundPlayPatch.kt
View File

@ -2,36 +2,17 @@ package app.revanced.patches.music.misc.backgroundplay
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
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.misc.backgroundplay.fingerprints.BackgroundPlaybackFingerprint import app.revanced.patches.music.misc.backgroundplay.fingerprints.BackgroundPlaybackFingerprint
import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.patch.BaseBytecodePatch
@Patch( @Suppress("unused")
object BackgroundPlayPatch : BaseBytecodePatch(
name = "Background play", name = "Background play",
description = "Enables playing music in the background.", description = "Enables playing music in the background.",
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(BackgroundPlaybackFingerprint)
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object BackgroundPlayPatch : BytecodePatch(
setOf(BackgroundPlaybackFingerprint)
) { ) {
override fun execute(context: BytecodeContext) { override fun execute(context: BytecodeContext) {

2
src/main/kotlin/app/revanced/patches/music/misc/backgroundplay/fingerprints/BackgroundPlaybackFingerprint.kt
View File

@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or
import app.revanced.util.fingerprint.LiteralValueFingerprint import app.revanced.util.fingerprint.LiteralValueFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
object BackgroundPlaybackFingerprint : LiteralValueFingerprint( internal object BackgroundPlaybackFingerprint : LiteralValueFingerprint(
returnType = "Z", returnType = "Z",
accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC, accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
parameters = listOf("L"), parameters = listOf("L"),

30
src/main/kotlin/app/revanced/patches/music/misc/bitrate/BitrateDefaultValuePatch.kt
View File

@ -1,33 +1,15 @@
package app.revanced.patches.music.misc.bitrate package app.revanced.patches.music.misc.bitrate
import app.revanced.patcher.data.ResourceContext import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.ResourcePatch import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.util.patch.BaseResourcePatch
import app.revanced.patcher.patch.annotation.Patch
@Patch( @Suppress("DEPRECATION", "unused")
object BitrateDefaultValuePatch : BaseResourcePatch(
name = "Bitrate default value", name = "Bitrate default value",
description = "Sets the audio quality to \"Always High\" when you first install the app.", description = "Sets the audio quality to \"Always High\" when you first install the app.",
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE
CompatiblePackage( ) {
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object BitrateDefaultValuePatch : ResourcePatch() {
override fun execute(context: ResourceContext) { override fun execute(context: ResourceContext) {
context.xmlEditor[RESOURCE_FILE_PATH].use { editor -> context.xmlEditor[RESOURCE_FILE_PATH].use { editor ->
editor.file.getElementsByTagName("com.google.android.apps.youtube.music.ui.preference.PreferenceCategoryCompat") editor.file.getElementsByTagName("com.google.android.apps.youtube.music.ui.preference.PreferenceCategoryCompat")

47
src/main/kotlin/app/revanced/patches/music/misc/codecs/CodecsUnlockPatch.kt
View File

@ -1,47 +0,0 @@
package app.revanced.patches.music.misc.codecs
import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.music.utils.integrations.Constants.MISC_PATH
import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.patches.shared.opus.AbstractOpusCodecsPatch
@Patch(
name = "Enable opus codec",
description = "Adds an option use the opus audio codec instead of the mp4a audio codec.",
dependencies = [SettingsPatch::class],
compatiblePackages = [
CompatiblePackage(
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object CodecsUnlockPatch : AbstractOpusCodecsPatch(
"$MISC_PATH/OpusCodecPatch;->enableOpusCodec()Z"
) {
override fun execute(context: BytecodeContext) {
super.execute(context)
SettingsPatch.addMusicPreference(
CategoryType.MISC,
"revanced_enable_opus_codec",
"true"
)
}
}

8
src/main/kotlin/app/revanced/patches/music/misc/codecs/ForceOpusCodecBytecodePatch.kt Normal file
View File

@ -0,0 +1,8 @@
package app.revanced.patches.music.misc.codecs
import app.revanced.patches.music.utils.integrations.Constants.MISC_PATH
import app.revanced.patches.shared.opus.BaseOpusCodecsPatch
object ForceOpusCodecBytecodePatch : BaseOpusCodecsPatch(
"$MISC_PATH/OpusCodecPatch;->enableOpusCodec()Z"
)

29
src/main/kotlin/app/revanced/patches/music/misc/codecs/ForceOpusCodecPatch.kt Normal file
View File

@ -0,0 +1,29 @@
package app.revanced.patches.music.misc.codecs
import app.revanced.patcher.data.ResourceContext
import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.patch.BaseResourcePatch
@Suppress("unused")
object ForceOpusCodecPatch : BaseResourcePatch(
name = "Enable opus codec",
description = "Adds an option use the opus audio codec instead of the mp4a audio codec.",
dependencies = setOf(
ForceOpusCodecBytecodePatch::class,
SettingsPatch::class
),
compatiblePackages = COMPATIBLE_PACKAGE
) {
override fun execute(context: ResourceContext) {
SettingsPatch.addMusicPreference(
CategoryType.MISC,
"revanced_enable_opus_codec",
"true"
)
}
}

32
src/main/kotlin/app/revanced/patches/music/misc/debugging/DebuggingPatch.kt
View File

@ -1,37 +1,19 @@
package app.revanced.patches.music.misc.debugging package app.revanced.patches.music.misc.debugging
import app.revanced.patcher.data.ResourceContext import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.ResourcePatch import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.patch.BaseResourcePatch
@Patch( @Suppress("unused")
object DebuggingPatch : BaseResourcePatch(
name = "Enable debug logging", name = "Enable debug logging",
description = "Adds an option to enable debug logging.", description = "Adds an option to enable debug logging.",
dependencies = [SettingsPatch::class], dependencies = setOf(SettingsPatch::class),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage(
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
],
use = false use = false
) ) {
@Suppress("unused")
object DebuggingPatch : ResourcePatch() {
override fun execute(context: ResourceContext) { override fun execute(context: ResourceContext) {
SettingsPatch.addMusicPreference( SettingsPatch.addMusicPreference(

44
src/main/kotlin/app/revanced/patches/music/misc/exclusiveaudio/ExclusiveAudioPatch.kt
View File

@ -4,44 +4,25 @@ import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction 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.patcher.util.proxy.mutableTypes.MutableMethod
import app.revanced.patches.music.misc.exclusiveaudio.fingerprints.DataSavingSettingsFragmentFingerprint import app.revanced.patches.music.misc.exclusiveaudio.fingerprints.DataSavingSettingsFragmentFingerprint
import app.revanced.patches.music.misc.exclusiveaudio.fingerprints.MusicBrowserServiceFingerprint import app.revanced.patches.music.misc.exclusiveaudio.fingerprints.MusicBrowserServiceFingerprint
import app.revanced.patches.music.misc.exclusiveaudio.fingerprints.PodCastConfigFingerprint import app.revanced.patches.music.misc.exclusiveaudio.fingerprints.PodCastConfigFingerprint
import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.getStringInstructionIndex import app.revanced.util.getStringInstructionIndex
import app.revanced.util.getWalkerMethod
import app.revanced.util.patch.BaseBytecodePatch
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
@Patch( @Suppress("unused")
object ExclusiveAudioPatch : BaseBytecodePatch(
name = "Exclusive audio playback", name = "Exclusive audio playback",
description = "Unlocks the option to play music without video.", description = "Unlocks the option to play music without video.",
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object ExclusiveAudioPatch : BytecodePatch(
setOf(
DataSavingSettingsFragmentFingerprint, DataSavingSettingsFragmentFingerprint,
MusicBrowserServiceFingerprint, MusicBrowserServiceFingerprint,
PodCastConfigFingerprint PodCastConfigFingerprint
@ -64,19 +45,14 @@ object ExclusiveAudioPatch : BytecodePatch(
if (!targetReference.toString().endsWith("()Z")) continue if (!targetReference.toString().endsWith("()Z")) continue
with( val walkerMethod = getWalkerMethod(context, index)
context
.toMethodWalker(it.method) walkerMethod.addInstructions(
.nextMethod(index, true)
.getMethod() as MutableMethod
) {
addInstructions(
0, """ 0, """
const/4 v0, 0x1 const/4 v0, 0x1
return v0 return v0
""" """
) )
}
break break
} }
} }

7
src/main/kotlin/app/revanced/patches/music/misc/exclusiveaudio/fingerprints/DataSavingSettingsFragmentFingerprint.kt
View File

@ -2,9 +2,12 @@ package app.revanced.patches.music.misc.exclusiveaudio.fingerprints
import app.revanced.patcher.fingerprint.MethodFingerprint import app.revanced.patcher.fingerprint.MethodFingerprint
object DataSavingSettingsFragmentFingerprint : MethodFingerprint( internal object DataSavingSettingsFragmentFingerprint : MethodFingerprint(
returnType = "V", returnType = "V",
parameters = listOf("Landroid/os/Bundle;", "Ljava/lang/String;"), parameters = listOf("Landroid/os/Bundle;", "Ljava/lang/String;"),
strings = listOf("pref_key_dont_play_nma_video"), strings = listOf("pref_key_dont_play_nma_video"),
customFingerprint = { methodDef, _ -> methodDef.definingClass.endsWith("/DataSavingSettingsFragment;") && methodDef.name == "onCreatePreferences" } customFingerprint = { methodDef, _ ->
methodDef.definingClass.endsWith("/DataSavingSettingsFragment;")
&& methodDef.name == "onCreatePreferences"
}
) )

2
src/main/kotlin/app/revanced/patches/music/misc/exclusiveaudio/fingerprints/MusicBrowserServiceFingerprint.kt
View File

@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.MethodFingerprint import app.revanced.patcher.fingerprint.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
object MusicBrowserServiceFingerprint : MethodFingerprint( internal object MusicBrowserServiceFingerprint : MethodFingerprint(
returnType = "L", returnType = "L",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = listOf("Ljava/lang/String;", "Landroid/os/Bundle;"), parameters = listOf("Ljava/lang/String;", "Landroid/os/Bundle;"),

2
src/main/kotlin/app/revanced/patches/music/misc/exclusiveaudio/fingerprints/PodCastConfigFingerprint.kt
View File

@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or
import app.revanced.util.fingerprint.LiteralValueFingerprint import app.revanced.util.fingerprint.LiteralValueFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
object PodCastConfigFingerprint : LiteralValueFingerprint( internal object PodCastConfigFingerprint : LiteralValueFingerprint(
returnType = "Z", returnType = "Z",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = emptyList(), parameters = emptyList(),

31
src/main/kotlin/app/revanced/patches/music/misc/minimizedplayback/MinimizedPlaybackPatch.kt
View File

@ -2,36 +2,17 @@ package app.revanced.patches.music.misc.minimizedplayback
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
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.misc.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint import app.revanced.patches.music.misc.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.patch.BaseBytecodePatch
@Patch( @Suppress("unused")
object MinimizedPlaybackPatch : BaseBytecodePatch(
name = "Enable minimized playback", name = "Enable minimized playback",
description = "Enables playback in miniplayer for Kids music.", description = "Enables playback in miniplayer for Kids music.",
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(MinimizedPlaybackManagerFingerprint)
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object MinimizedPlaybackPatch : BytecodePatch(
setOf(MinimizedPlaybackManagerFingerprint)
) { ) {
override fun execute(context: BytecodeContext) { override fun execute(context: BytecodeContext) {

2
src/main/kotlin/app/revanced/patches/music/misc/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt
View File

@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
object MinimizedPlaybackManagerFingerprint : MethodFingerprint( internal object MinimizedPlaybackManagerFingerprint : MethodFingerprint(
returnType = "V", returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = listOf("I", "L", "Z"), parameters = listOf("I", "L", "Z"),

90
src/main/kotlin/app/revanced/patches/music/misc/premium/GetPremiumPatch.kt Normal file
View File

@ -0,0 +1,90 @@
package app.revanced.patches.music.misc.premium
import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patches.music.misc.premium.fingerprints.AccountMenuFooterFingerprint
import app.revanced.patches.music.misc.premium.fingerprints.HideGetPremiumFingerprint
import app.revanced.patches.music.misc.premium.fingerprints.MembershipSettingsFingerprint
import app.revanced.patches.music.misc.premium.fingerprints.MembershipSettingsParentFingerprint
import app.revanced.patches.music.navigation.component.NavigationBarComponentPatch
import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.PrivacyTosFooter
import app.revanced.util.exception
import app.revanced.util.getTargetIndex
import app.revanced.util.getTargetIndexWithReference
import app.revanced.util.getWalkerMethod
import app.revanced.util.getWideLiteralInstructionIndex
import app.revanced.util.patch.BaseBytecodePatch
import com.android.tools.smali.dexlib2.Opcode
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
@Suppress("unused")
object GetPremiumPatch : BaseBytecodePatch(
name = "Hide get premium",
description = "Hides the \"Get Music Premium\" label from the account menu and settings.",
dependencies = setOf(
NavigationBarComponentPatch::class,
SharedResourceIdPatch::class
),
compatiblePackages = COMPATIBLE_PACKAGE,
fingerprints = setOf(
AccountMenuFooterFingerprint,
HideGetPremiumFingerprint,
MembershipSettingsParentFingerprint
)
) {
override fun execute(context: BytecodeContext) {
// Hides get premium button at the bottom of the account switching menu
HideGetPremiumFingerprint.result?.let {
it.mutableMethod.apply {
val insertIndex = it.scanResult.patternScanResult!!.startIndex
val register = getInstruction<TwoRegisterInstruction>(insertIndex).registerA
addInstruction(
insertIndex + 1,
"const/4 v$register, 0x0"
)
}
} ?: throw HideGetPremiumFingerprint.exception
// Hides get premium button at the top of the account switching menu
AccountMenuFooterFingerprint.result?.let {
it.mutableMethod.apply {
val constIndex = getWideLiteralInstructionIndex(PrivacyTosFooter)
val walkerIndex = getTargetIndex(constIndex + 2, Opcode.INVOKE_VIRTUAL)
val viewIndex = getTargetIndex(constIndex, Opcode.IGET_OBJECT)
val viewReference = getInstruction<ReferenceInstruction>(viewIndex).reference.toString()
val walkerMethod = getWalkerMethod(context, walkerIndex)
walkerMethod.apply {
val insertIndex = getTargetIndexWithReference(viewReference)
val nullCheckIndex = getTargetIndex(insertIndex - 1, Opcode.IF_NEZ)
val nullCheckRegister = getInstruction<OneRegisterInstruction>(nullCheckIndex).registerA
addInstruction(
nullCheckIndex,
"const/4 v$nullCheckRegister, 0x0"
)
}
}
} ?: throw AccountMenuFooterFingerprint.exception
// Hides premium membership menu in settings
MembershipSettingsParentFingerprint.result?.classDef?.let { classDef ->
MembershipSettingsFingerprint.resolve(context, classDef)
MembershipSettingsFingerprint.result?.mutableMethod?.addInstructions(
0, """
const/4 v0, 0x0
return-object v0
"""
) ?: throw MembershipSettingsFingerprint.exception
} ?: throw MembershipSettingsParentFingerprint.exception
}
}

123
src/main/kotlin/app/revanced/patches/music/misc/premium/HideGetPremiumPatch.kt
View File

@ -1,123 +0,0 @@
package app.revanced.patches.music.misc.premium
import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
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.patcher.util.proxy.mutableTypes.MutableMethod
import app.revanced.patches.music.misc.premium.fingerprints.AccountMenuFooterFingerprint
import app.revanced.patches.music.misc.premium.fingerprints.HideGetPremiumFingerprint
import app.revanced.patches.music.misc.premium.fingerprints.MembershipSettingsFingerprint
import app.revanced.patches.music.misc.premium.fingerprints.MembershipSettingsParentFingerprint
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.PrivacyTosFooter
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.OneRegisterInstruction
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.reference.Reference
@Patch(
name = "Hide get premium",
description = "Hides the \"Get Music Premium\" label from the account menu and settings.",
dependencies = [SharedResourceIdPatch::class],
compatiblePackages = [
CompatiblePackage(
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object HideGetPremiumPatch : BytecodePatch(
setOf(
AccountMenuFooterFingerprint,
HideGetPremiumFingerprint,
MembershipSettingsParentFingerprint
)
) {
override fun execute(context: BytecodeContext) {
HideGetPremiumFingerprint.result?.let {
it.mutableMethod.apply {
val insertIndex = it.scanResult.patternScanResult!!.startIndex
val register = getInstruction<TwoRegisterInstruction>(insertIndex).registerA
addInstruction(
insertIndex + 1,
"const/4 v$register, 0x0"
)
}
} ?: throw HideGetPremiumFingerprint.exception
AccountMenuFooterFingerprint.result?.let {
it.mutableMethod.apply {
val targetIndex = getWideLiteralInstructionIndex(PrivacyTosFooter) + 4
targetReference = getInstruction<ReferenceInstruction>(targetIndex + 1).reference
with(
context
.toMethodWalker(this)
.nextMethod(targetIndex, true)
.getMethod() as MutableMethod
) {
this.implementation!!.instructions.apply {
for ((index, instruction) in withIndex()) {
if (instruction.opcode != Opcode.IGET_OBJECT) continue
if (getInstruction<ReferenceInstruction>(index).reference == targetReference) {
val targetRegister =
getInstruction<OneRegisterInstruction>(index + 2).registerA
addInstruction(
index,
"const/16 v$targetRegister, 0x8"
)
break
}
}
}
}
}
} ?: throw AccountMenuFooterFingerprint.exception
MembershipSettingsParentFingerprint.result?.let { parentResult ->
MembershipSettingsFingerprint.also {
it.resolve(
context,
parentResult.classDef
)
}.result?.let {
it.mutableMethod.apply {
addInstructions(
0, """
const/4 v0, 0x0
return-object v0
"""
)
}
} ?: throw MembershipSettingsFingerprint.exception
} ?: throw MembershipSettingsParentFingerprint.exception
}
private lateinit var targetReference: Reference
}

2
src/main/kotlin/app/revanced/patches/music/misc/premium/fingerprints/AccountMenuFooterFingerprint.kt
View File

@ -6,7 +6,7 @@ import app.revanced.util.fingerprint.LiteralValueFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
object AccountMenuFooterFingerprint : LiteralValueFingerprint( internal object AccountMenuFooterFingerprint : LiteralValueFingerprint(
returnType = "L", returnType = "L",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
opcodes = listOf( opcodes = listOf(

2
src/main/kotlin/app/revanced/patches/music/misc/premium/fingerprints/HideGetPremiumFingerprint.kt
View File

@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
object HideGetPremiumFingerprint : MethodFingerprint( internal object HideGetPremiumFingerprint : MethodFingerprint(
returnType = "V", returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = emptyList(), parameters = emptyList(),

2
src/main/kotlin/app/revanced/patches/music/misc/premium/fingerprints/MembershipSettingsFingerprint.kt
View File

@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.MethodFingerprint import app.revanced.patcher.fingerprint.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
object MembershipSettingsFingerprint : MethodFingerprint( internal object MembershipSettingsFingerprint : MethodFingerprint(
returnType = "Ljava/lang/CharSequence;", returnType = "Ljava/lang/CharSequence;",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = emptyList() parameters = emptyList()

2
src/main/kotlin/app/revanced/patches/music/misc/premium/fingerprints/MembershipSettingsParentFingerprint.kt
View File

@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.MethodFingerprint import app.revanced.patcher.fingerprint.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
object MembershipSettingsParentFingerprint : MethodFingerprint( internal object MembershipSettingsParentFingerprint : MethodFingerprint(
returnType = "L", returnType = "L",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = emptyList(), parameters = emptyList(),

8
src/main/kotlin/app/revanced/patches/music/misc/spoofappversion/SpoofAppVersionBytecodePatch.kt Normal file
View File

@ -0,0 +1,8 @@
package app.revanced.patches.music.misc.spoofappversion
import app.revanced.patches.music.utils.integrations.Constants.MISC_PATH
import app.revanced.patches.shared.spoofappversion.BaseSpoofAppVersionPatch
object SpoofAppVersionBytecodePatch : BaseSpoofAppVersionPatch(
"$MISC_PATH/SpoofAppVersionPatch;->getVersionOverride(Ljava/lang/String;)Ljava/lang/String;"
)

44
src/main/kotlin/app/revanced/patches/music/misc/spoofappversion/SpoofAppVersionPatch.kt
View File

@ -1,49 +1,29 @@
package app.revanced.patches.music.misc.spoofappversion package app.revanced.patches.music.misc.spoofappversion
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.music.utils.integrations.Constants.MISC_PATH
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.patches.music.utils.settings.SettingsPatch.contexts
import app.revanced.patches.shared.versionspoof.AbstractVersionSpoofPatch
import app.revanced.util.copyXmlNode import app.revanced.util.copyXmlNode
import app.revanced.util.patch.BaseResourcePatch
@Patch( @Suppress("unused")
object SpoofAppVersionPatch : BaseResourcePatch(
name = "Spoof app version", name = "Spoof app version",
description = "Adds options to spoof the YouTube Music client version. " + description = "Adds options to spoof the YouTube Music client version. " +
"This can remove the radio mode restriction in Canadian regions or disable real-time lyrics.", "This can remove the radio mode restriction in Canadian regions or disable real-time lyrics.",
dependencies = [SettingsPatch::class], dependencies = setOf(
compatiblePackages = [ SettingsPatch::class,
CompatiblePackage( SpoofAppVersionBytecodePatch::class
"com.google.android.apps.youtube.music", ),
[ compatiblePackages = COMPATIBLE_PACKAGE
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object SpoofAppVersionPatch : AbstractVersionSpoofPatch(
"$MISC_PATH/SpoofAppVersionPatch;->getVersionOverride(Ljava/lang/String;)Ljava/lang/String;"
) { ) {
override fun execute(context: BytecodeContext) { override fun execute(context: ResourceContext) {
super.execute(context)
/** /**
* Copy arrays * Copy arrays
*/ */
contexts.copyXmlNode("music/spoofappversion/host", "values/arrays.xml", "resources") context.copyXmlNode("music/spoofappversion/host", "values/arrays.xml", "resources")
SettingsPatch.addMusicPreference( SettingsPatch.addMusicPreference(
CategoryType.MISC, CategoryType.MISC,

33
src/main/kotlin/app/revanced/patches/music/misc/tastebuilder/TasteBuilderPatch.kt
View File

@ -4,44 +4,25 @@ import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction 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.misc.tastebuilder.fingerprints.TasteBuilderConstructorFingerprint import app.revanced.patches.music.misc.tastebuilder.fingerprints.TasteBuilderConstructorFingerprint
import app.revanced.patches.music.misc.tastebuilder.fingerprints.TasteBuilderSyntheticFingerprint import app.revanced.patches.music.misc.tastebuilder.fingerprints.TasteBuilderSyntheticFingerprint
import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.MusicTasteBuilderShelf import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.MusicTasteBuilderShelf
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.getTargetIndex import app.revanced.util.getTargetIndex
import app.revanced.util.getWideLiteralInstructionIndex import app.revanced.util.getWideLiteralInstructionIndex
import app.revanced.util.patch.BaseBytecodePatch
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@Patch( @Suppress("unused")
object TasteBuilderPatch : BaseBytecodePatch(
name = "Hide taste builder", name = "Hide taste builder",
description = "Hides the \"Tell us which artists you like\" card from the homepage.", description = "Hides the \"Tell us which artists you like\" card from the homepage.",
dependencies = [SharedResourceIdPatch::class], dependencies = setOf(SharedResourceIdPatch::class),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(TasteBuilderConstructorFingerprint)
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object TasteBuilderPatch : BytecodePatch(
setOf(TasteBuilderConstructorFingerprint)
) { ) {
override fun execute(context: BytecodeContext) { override fun execute(context: BytecodeContext) {
TasteBuilderConstructorFingerprint.result?.let { parentResult -> TasteBuilderConstructorFingerprint.result?.let { parentResult ->

2
src/main/kotlin/app/revanced/patches/music/misc/tastebuilder/fingerprints/TasteBuilderConstructorFingerprint.kt
View File

@ -5,7 +5,7 @@ import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.MusicTa
import app.revanced.util.fingerprint.LiteralValueFingerprint import app.revanced.util.fingerprint.LiteralValueFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
object TasteBuilderConstructorFingerprint : LiteralValueFingerprint( internal object TasteBuilderConstructorFingerprint : LiteralValueFingerprint(
returnType = "V", returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
literalSupplier = { MusicTasteBuilderShelf } literalSupplier = { MusicTasteBuilderShelf }

2
src/main/kotlin/app/revanced/patches/music/misc/tastebuilder/fingerprints/TasteBuilderSyntheticFingerprint.kt
View File

@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
object TasteBuilderSyntheticFingerprint : MethodFingerprint( internal object TasteBuilderSyntheticFingerprint : MethodFingerprint(
returnType = "V", returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL or AccessFlags.SYNTHETIC, accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL or AccessFlags.SYNTHETIC,
parameters = listOf("L", "Ljava/lang/Object;"), parameters = listOf("L", "Ljava/lang/Object;"),

15
src/main/kotlin/app/revanced/patches/music/misc/tracking/SanitizeUrlQueryBytecodePatch.kt Normal file
View File

@ -0,0 +1,15 @@
package app.revanced.patches.music.misc.tracking
import app.revanced.patches.music.misc.tracking.fingerprints.ShareLinkFormatterFingerprint
import app.revanced.patches.music.utils.integrations.Constants.MISC_PATH
import app.revanced.patches.shared.tracking.BaseSanitizeUrlQueryPatch
import app.revanced.patches.shared.tracking.fingerprints.CopyTextEndpointFingerprint
object SanitizeUrlQueryBytecodePatch : BaseSanitizeUrlQueryPatch(
"$MISC_PATH/SanitizeUrlQueryPatch;",
listOf(
CopyTextEndpointFingerprint,
ShareLinkFormatterFingerprint
),
null
)

46
src/main/kotlin/app/revanced/patches/music/misc/tracking/SanitizeUrlQueryPatch.kt
View File

@ -1,48 +1,22 @@
package app.revanced.patches.music.misc.tracking package app.revanced.patches.music.misc.tracking
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.music.misc.tracking.fingerprints.ShareLinkFormatterFingerprint
import app.revanced.patches.music.utils.integrations.Constants.MISC_PATH
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.patches.shared.tracking.AbstractSanitizeUrlQueryPatch import app.revanced.util.patch.BaseResourcePatch
import app.revanced.patches.shared.tracking.fingerprints.CopyTextEndpointFingerprint
@Patch( @Suppress("unused")
object SanitizeUrlQueryPatch : BaseResourcePatch(
name = "Sanitize sharing links", name = "Sanitize sharing links",
description = "Adds an option to remove tracking query parameters from URLs when sharing links.", description = "Adds an option to remove tracking query parameters from URLs when sharing links.",
dependencies = [SettingsPatch::class], dependencies = setOf(
compatiblePackages = [ SanitizeUrlQueryBytecodePatch::class,
CompatiblePackage( SettingsPatch::class
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object SanitizeUrlQueryPatch : AbstractSanitizeUrlQueryPatch(
"$MISC_PATH/SanitizeUrlQueryPatch;",
listOf(
CopyTextEndpointFingerprint,
ShareLinkFormatterFingerprint
), ),
null compatiblePackages = COMPATIBLE_PACKAGE
) { ) {
override fun execute(context: BytecodeContext) { override fun execute(context: ResourceContext) {
super.execute(context)
SettingsPatch.addMusicPreference( SettingsPatch.addMusicPreference(
CategoryType.MISC, CategoryType.MISC,

2
src/main/kotlin/app/revanced/patches/music/misc/tracking/fingerprints/ShareLinkFormatterFingerprint.kt
View File

@ -8,7 +8,7 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
/** /**
* Sharing panel of YouTube Music * Sharing panel of YouTube Music
*/ */
object ShareLinkFormatterFingerprint : MethodFingerprint( internal object ShareLinkFormatterFingerprint : MethodFingerprint(
returnType = "V", returnType = "V",
parameters = listOf("L", "Ljava/util/Map;"), parameters = listOf("L", "Ljava/util/Map;"),
opcodes = listOf( opcodes = listOf(

41
src/main/kotlin/app/revanced/patches/music/misc/translations/TranslationsPatch.kt
View File

@ -1,34 +1,20 @@
package app.revanced.patches.music.misc.translations package app.revanced.patches.music.misc.translations
import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.annotation.Patch import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.patches.shared.translations.AbstractTranslationsPatch import app.revanced.patches.shared.translations.TranslationsUtils.copyXml
import app.revanced.util.patch.BaseResourcePatch
@Patch( @Suppress("unused")
object TranslationsPatch : BaseResourcePatch(
name = "Translations", name = "Translations",
description = "Adds Crowdin translations for YouTube Music.", description = "Adds Crowdin translations for YouTube Music.",
dependencies = [SettingsPatch::class], dependencies = setOf(SettingsPatch::class),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE
CompatiblePackage( ) {
"com.google.android.apps.youtube.music", override fun execute(context: ResourceContext) {
[ context.copyXml(
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object TranslationsPatch : AbstractTranslationsPatch(
"music", "music",
arrayOf( arrayOf(
"bg-rBG", "bg-rBG",
@ -53,4 +39,7 @@ object TranslationsPatch : AbstractTranslationsPatch(
"zh-rCN", "zh-rCN",
"zh-rTW" "zh-rTW"
) )
) )
}
}

39
src/main/kotlin/app/revanced/patches/music/navigation/black/BlackNavigationBarPatch.kt
View File

@ -3,45 +3,26 @@ package app.revanced.patches.music.navigation.black
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction 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.navigation.black.fingerprints.TabLayoutFingerprint import app.revanced.patches.music.navigation.black.fingerprints.TabLayoutFingerprint
import app.revanced.patches.music.utils.integrations.Constants.NAVIGATION import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.integrations.Constants.NAVIGATION_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.patch.BaseBytecodePatch
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@Patch( @Suppress("unused")
object BlackNavigationBarPatch : BaseBytecodePatch(
name = "Enable black navigation bar", name = "Enable black navigation bar",
description = "Adds an option to set the navigation bar color to black.", description = "Adds an option to set the navigation bar color to black.",
dependencies = [ dependencies = setOf(
SettingsPatch::class, SettingsPatch::class,
SharedResourceIdPatch::class SharedResourceIdPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(TabLayoutFingerprint)
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object BlackNavigationBarPatch : BytecodePatch(
setOf(TabLayoutFingerprint)
) { ) {
override fun execute(context: BytecodeContext) { override fun execute(context: BytecodeContext) {
@ -52,7 +33,7 @@ object BlackNavigationBarPatch : BytecodePatch(
addInstructions( addInstructions(
targetIndex + 1, """ targetIndex + 1, """
invoke-static {}, $NAVIGATION->enableBlackNavigationBar()I invoke-static {}, $NAVIGATION_CLASS_DESCRIPTOR->enableBlackNavigationBar()I
move-result v$targetRegister move-result v$targetRegister
""" """
) )

2
src/main/kotlin/app/revanced/patches/music/navigation/black/fingerprints/TabLayoutFingerprint.kt
View File

@ -6,7 +6,7 @@ import app.revanced.util.fingerprint.LiteralValueFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
object TabLayoutFingerprint : LiteralValueFingerprint( internal object TabLayoutFingerprint : LiteralValueFingerprint(
returnType = "V", returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = emptyList(), parameters = emptyList(),

66
src/main/kotlin/app/revanced/patches/music/navigation/component/NavigationBarComponentPatch.kt
View File

@ -3,59 +3,45 @@ package app.revanced.patches.music.navigation.component
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.PatchException import app.revanced.patcher.patch.PatchException
import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.music.navigation.component.fingerprints.TabLayoutTextFingerprint import app.revanced.patches.music.navigation.component.fingerprints.TabLayoutTextFingerprint
import app.revanced.patches.music.utils.integrations.Constants.NAVIGATION import app.revanced.patches.music.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.integrations.Constants.NAVIGATION_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.exception import app.revanced.util.exception
import app.revanced.util.getTargetIndex
import app.revanced.util.getTargetIndexWithMethodReferenceName
import app.revanced.util.getWideLiteralInstructionIndex import app.revanced.util.getWideLiteralInstructionIndex
import app.revanced.util.patch.BaseBytecodePatch
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
import com.android.tools.smali.dexlib2.iface.reference.MethodReference
@Patch( @Suppress("DEPRECATION", "SpellCheckingInspection", "unused")
object NavigationBarComponentPatch : BaseBytecodePatch(
name = "Hide navigation bar component", name = "Hide navigation bar component",
description = "Adds options to hide navigation bar components.", description = "Adds options to hide navigation bar components.",
dependencies = [ dependencies = setOf(
SettingsPatch::class, SettingsPatch::class,
SharedResourceIdPatch::class SharedResourceIdPatch::class
], ),
compatiblePackages = [ compatiblePackages = COMPATIBLE_PACKAGE,
CompatiblePackage( fingerprints = setOf(TabLayoutTextFingerprint)
"com.google.android.apps.youtube.music",
[
"6.21.52",
"6.22.52",
"6.23.56",
"6.25.53",
"6.26.51",
"6.27.54",
"6.28.53",
"6.29.58",
"6.31.55",
"6.33.52"
]
)
]
)
@Suppress("unused")
object NavigationBarComponentPatch : BytecodePatch(
setOf(TabLayoutTextFingerprint)
) { ) {
private const val FLAG = "android:layout_weight"
private const val RESOURCE_FILE_PATH = "res/layout/image_with_text_tab.xml"
override fun execute(context: BytecodeContext) { override fun execute(context: BytecodeContext) {
/** /**
* Hide navigation labels * Hide navigation labels
*/ */
TabLayoutTextFingerprint.result?.let { TabLayoutTextFingerprint.result?.let {
it.mutableMethod.apply { it.mutableMethod.apply {
val targetIndex = getWideLiteralInstructionIndex(SharedResourceIdPatch.Text1) + 3 val constIndex = getWideLiteralInstructionIndex(SharedResourceIdPatch.Text1)
val targetIndex = getTargetIndex(constIndex, Opcode.CHECK_CAST)
val targetParameter = getInstruction<ReferenceInstruction>(targetIndex).reference val targetParameter = getInstruction<ReferenceInstruction>(targetIndex).reference
val targetRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA val targetRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA
@ -64,7 +50,7 @@ object NavigationBarComponentPatch : BytecodePatch(
addInstruction( addInstruction(
targetIndex + 1, targetIndex + 1,
"invoke-static {v$targetRegister}, $NAVIGATION->hideNavigationLabel(Landroid/widget/TextView;)V" "invoke-static {v$targetRegister}, $NAVIGATION_CLASS_DESCRIPTOR->hideNavigationLabel(Landroid/widget/TextView;)V"
) )
} }
} ?: throw TabLayoutTextFingerprint.exception } ?: throw TabLayoutTextFingerprint.exception
@ -89,24 +75,19 @@ object NavigationBarComponentPatch : BytecodePatch(
it.mutableMethod.apply { it.mutableMethod.apply {
val enumIndex = it.scanResult.patternScanResult!!.startIndex + 3 val enumIndex = it.scanResult.patternScanResult!!.startIndex + 3
val enumRegister = getInstruction<OneRegisterInstruction>(enumIndex).registerA val enumRegister = getInstruction<OneRegisterInstruction>(enumIndex).registerA
val insertEnumIndex = getTargetIndex(Opcode.AND_INT_LIT8) - 2
val insertIndex = implementation!!.instructions.indexOfFirst { instruction -> val pivotTabIndex = getTargetIndexWithMethodReferenceName("getVisibility")
instruction.opcode == Opcode.AND_INT_LIT8
} - 2
val pivotTabIndex = implementation!!.instructions.indexOfFirst { instruction ->
((instruction as? ReferenceInstruction)?.reference as? MethodReference)?.name == "getVisibility"
}
val pivotTabRegister = getInstruction<Instruction35c>(pivotTabIndex).registerC val pivotTabRegister = getInstruction<Instruction35c>(pivotTabIndex).registerC
addInstruction( addInstruction(
pivotTabIndex, pivotTabIndex,
"invoke-static {v$pivotTabRegister}, $NAVIGATION->hideNavigationButton(Landroid/view/View;)V" "invoke-static {v$pivotTabRegister}, $NAVIGATION_CLASS_DESCRIPTOR->hideNavigationButton(Landroid/view/View;)V"
) )
addInstruction( addInstruction(
insertIndex, insertEnumIndex,
"sput-object v$enumRegister, $NAVIGATION->lastPivotTab:Ljava/lang/Enum;" "sput-object v$enumRegister, $NAVIGATION_CLASS_DESCRIPTOR->lastPivotTab:Ljava/lang/Enum;"
) )
} }
} ?: throw TabLayoutTextFingerprint.exception } ?: throw TabLayoutTextFingerprint.exception
@ -147,7 +128,4 @@ object NavigationBarComponentPatch : BytecodePatch(
"true" "true"
) )
} }
private const val FLAG = "android:layout_weight"
private const val RESOURCE_FILE_PATH = "res/layout/image_with_text_tab.xml"
} }

Some files were not shown because too many files have changed in this diff Show More