feat(YouTube Music/Enable new player layout): change patch name Enable new layoutEnable new player layout

This commit is contained in:
inotia00
2023-10-12 17:28:24 +09:00
parent cbafebdc99
commit 8779a99065
5 changed files with 77 additions and 63 deletions

View File

@ -1,59 +0,0 @@
package app.revanced.patches.music.player.newlayout
import app.revanced.extensions.exception
import app.revanced.patcher.data.BytecodeContext
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.patches.music.player.newlayout.fingerprints.NewLayoutFingerprint
import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.enum.CategoryType
import app.revanced.util.integrations.Constants.MUSIC_PLAYER
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@Patch(
name = "Enable new layout",
description = "Enable new player layouts.",
dependencies = [SettingsPatch::class],
compatiblePackages = [
CompatiblePackage(
"com.google.android.apps.youtube.music",
[
"6.15.52",
"6.20.51",
"6.21.51",
"6.22.51"
]
)
]
)
@Suppress("unused")
object NewLayoutPatch : BytecodePatch(
setOf(NewLayoutFingerprint)
) {
override fun execute(context: BytecodeContext) {
NewLayoutFingerprint.result?.let {
it.mutableMethod.apply {
val insertIndex = implementation!!.instructions.size - 1
val targetRegister = getInstruction<OneRegisterInstruction>(insertIndex).registerA
addInstructions(
insertIndex, """
invoke-static {}, $MUSIC_PLAYER->enableNewLayout()Z
move-result v$targetRegister
"""
)
}
} ?: throw NewLayoutFingerprint.exception
SettingsPatch.addMusicPreference(
CategoryType.PLAYER,
"revanced_enable_new_layout",
"true"
)
}
}

View File

@ -0,0 +1,41 @@
package app.revanced.patches.music.player.newplayerlayout
import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.ResourcePatch
import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.music.utils.playerlayouthook.PlayerLayoutHookPatch
import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.enum.CategoryType
@Patch(
name = "Enable new player layout",
description = "Enable new player layouts.",
[
PlayerLayoutHookPatch::class,
SettingsPatch::class
],
compatiblePackages = [
CompatiblePackage(
"com.google.android.apps.youtube.music",
[
"6.15.52",
"6.20.51",
"6.21.51",
"6.22.51"
]
)
]
)
@Suppress("unused")
object NewPlayerLayoutPatch : ResourcePatch() {
override fun execute(context: ResourceContext) {
SettingsPatch.addMusicPreference(
CategoryType.PLAYER,
"revanced_enable_new_player_layout",
"true"
)
}
}

View File

@ -0,0 +1,32 @@
package app.revanced.patches.music.utils.playerlayouthook
import app.revanced.extensions.exception
import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patches.music.utils.playerlayouthook.fingerprints.NewPlayerLayoutFingerprint
import app.revanced.util.integrations.Constants.MUSIC_PLAYER
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
object PlayerLayoutHookPatch : BytecodePatch(
setOf(NewPlayerLayoutFingerprint)
) {
override fun execute(context: BytecodeContext) {
NewPlayerLayoutFingerprint.result?.let {
it.mutableMethod.apply {
val insertIndex = implementation!!.instructions.size - 1
val targetRegister = getInstruction<OneRegisterInstruction>(insertIndex).registerA
addInstructions(
insertIndex, """
invoke-static {}, $MUSIC_PLAYER->enableNewPlayerLayout()Z
move-result v$targetRegister
"""
)
}
} ?: throw NewPlayerLayoutFingerprint.exception
}
}

View File

@ -1,9 +1,9 @@
package app.revanced.patches.music.player.newlayout.fingerprints
package app.revanced.patches.music.utils.playerlayouthook.fingerprints
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import app.revanced.util.bytecode.isWide32LiteralExists
object NewLayoutFingerprint : MethodFingerprint(
object NewPlayerLayoutFingerprint : MethodFingerprint(
returnType = "Z",
parameters = emptyList(),
customFingerprint = { methodDef, _ -> methodDef.isWide32LiteralExists(45399578) }