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

feat(YouTube Music): remove Enable new layout patch

Browse Source
This commit is contained in:
inotia00
2023-10-13 02:27:28 +09:00
parent ae75910c4f
commit e2fc841461
6 changed files with 16 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/kotlin/app/revanced/patches/music/player/newplayerbackground/NewPlayerBackgroundPatch.kt
View File

@ -7,7 +7,6 @@ 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.newplayerbackground.fingerprints.NewPlayerBackgroundFingerprint
import app.revanced.patches.music.utils.playerlayouthook.PlayerLayoutHookPatch
import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.enum.CategoryType
import app.revanced.util.integrations.Constants.MUSIC_PLAYER
@ -15,11 +14,7 @@ import app.revanced.util.integrations.Constants.MUSIC_PLAYER
@Patch(
name = "Enable new player background",
description = "Enable new player background.",
dependencies =
[
PlayerLayoutHookPatch::class,
SettingsPatch::class
],
dependencies = [SettingsPatch::class],
compatiblePackages = [
CompatiblePackage(
"com.google.android.apps.youtube.music",

51
src/main/kotlin/app/revanced/patches/music/player/newplayerlayout/NewPlayerLayoutPatch.kt
View File

@ -1,51 +0,0 @@
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() {
private const val YOUTUBE_MUSIC_SETTINGS_PATH = "res/xml/settings_headers.xml"
override fun execute(context: ResourceContext) {
SettingsPatch.addMusicPreference(
CategoryType.PLAYER,
"revanced_enable_new_player_layout",
"true"
)
val prefs = context[YOUTUBE_MUSIC_SETTINGS_PATH]
prefs.writeText(
prefs.readText()
.replace(
"revanced_enable_new_player_background\"",
"revanced_enable_new_player_background\" android:dependency=\"revanced_enable_new_player_layout\""
)
)
}
}

32
src/main/kotlin/app/revanced/patches/music/utils/playerlayouthook/PlayerLayoutHookPatch.kt
View File

@ -1,32 +0,0 @@
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
}
}

14
src/main/kotlin/app/revanced/patches/music/utils/settings/SettingsBytecodePatch.kt
View File

@ -7,6 +7,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.music.utils.integrations.IntegrationsPatch
import app.revanced.patches.music.utils.settings.fingerprints.NewPlayerLayoutFingerprint
import app.revanced.patches.music.utils.settings.fingerprints.PreferenceFingerprint
import app.revanced.patches.music.utils.settings.fingerprints.SettingsHeadersFragmentFingerprint
import app.revanced.util.bytecode.BytecodeHelper.injectInit
@ -20,12 +21,25 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
)
object SettingsBytecodePatch : BytecodePatch(
setOf(
NewPlayerLayoutFingerprint,
PreferenceFingerprint,
SettingsHeadersFragmentFingerprint
)
) {
override fun execute(context: BytecodeContext) {
NewPlayerLayoutFingerprint.result?.let {
it.mutableMethod.apply {
val insertIndex = implementation!!.instructions.size - 1
val targetRegister = getInstruction<OneRegisterInstruction>(insertIndex).registerA
addInstruction(
insertIndex,
"const/4 v$targetRegister, 0x1"
)
}
} ?: throw NewPlayerLayoutFingerprint.exception
SettingsHeadersFragmentFingerprint.result?.let {
it.mutableMethod.apply {
val targetIndex = it.scanResult.patternScanResult!!.endIndex

2
src/main/kotlin/app/revanced/patches/music/utils/playerlayouthook/fingerprints/NewPlayerLayoutFingerprint.kt → src/main/kotlin/app/revanced/patches/music/utils/settings/fingerprints/NewPlayerLayoutFingerprint.kt
View File

@ -1,4 +1,4 @@
package app.revanced.patches.music.utils.playerlayouthook.fingerprints
package app.revanced.patches.music.utils.settings.fingerprints
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import app.revanced.util.bytecode.isWide32LiteralExists

2
src/main/resources/music/settings/host/values/strings.xml
View File

@ -36,8 +36,6 @@
<string name="revanced_enable_landscape_mode_title">Enable landscape mode</string>
<string name="revanced_enable_new_player_background_summary">Enables new player background.</string>
<string name="revanced_enable_new_player_background_title">Enable new player background</string>
<string name="revanced_enable_new_player_layout_summary">Enable new player layouts.</string>
<string name="revanced_enable_new_player_layout_title">Enable new player layout</string>
<string name="revanced_enable_old_style_library_shelf_summary">Return the library shelf to old style. (Experimental)</string>
<string name="revanced_enable_old_style_library_shelf_title">Enable old style library shelf</string>
<string name="revanced_enable_old_style_mini_player_summary">Return the mini players to old style.</string>