diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/HidePlayerButtonBackgroundPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/HidePlayerButtonBackgroundPatch.kt
index 8bf9c61f0..c23309eed 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/HidePlayerButtonBackgroundPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/HidePlayerButtonBackgroundPatch.kt
@@ -1,23 +1,17 @@
package app.revanced.patches.youtube.player.playerbuttonbg
-import app.revanced.extensions.exception
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.extensions.doRecursively
+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.youtube.player.playerbuttonbg.fingerprints.PlayerPatchFingerprint
-import app.revanced.patches.youtube.utils.playerbutton.PlayerButtonHookPatch
import app.revanced.patches.youtube.utils.settings.SettingsPatch
-import app.revanced.util.integrations.Constants.INTEGRATIONS_PATH
+import org.w3c.dom.Element
@Patch(
name = "Hide player button background",
description = "Hide player button background.",
- dependencies = [
- PlayerButtonHookPatch::class,
- SettingsPatch::class
- ],
+ dependencies = [SettingsPatch::class],
compatiblePackages = [
CompatiblePackage(
"com.google.android.youtube",
@@ -41,20 +35,24 @@ import app.revanced.util.integrations.Constants.INTEGRATIONS_PATH
"18.43.45"
]
)
- ]
+ ],
+ use = false
)
@Suppress("unused")
-object HidePlayerButtonBackgroundPatch : BytecodePatch(
- setOf(PlayerPatchFingerprint)
-) {
- override fun execute(context: BytecodeContext) {
+object HidePlayerButtonBackgroundPatch : ResourcePatch() {
+ override fun execute(context: ResourceContext) {
- PlayerPatchFingerprint.result?.mutableMethod?.addInstruction(
- 0,
- "invoke-static {p0}, " +
- "$INTEGRATIONS_PATH/utils/ResourceHelper;->" +
- "hidePlayerButtonBackground(Landroid/view/View;)V"
- ) ?: throw PlayerPatchFingerprint.exception
+ context.xmlEditor["res/drawable/player_button_circle_background.xml"].use { editor ->
+ editor.file.doRecursively { node ->
+ arrayOf("color").forEach replacement@{ replacement ->
+ if (node !is Element) return@replacement
+
+ node.getAttributeNode("android:$replacement")?.let { attribute ->
+ attribute.textContent = "@android:color/transparent"
+ }
+ }
+ }
+ }
/**
* Add settings
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/fingerprints/PlayerPatchFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/fingerprints/PlayerPatchFingerprint.kt
deleted file mode 100644
index 646955010..000000000
--- a/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/fingerprints/PlayerPatchFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.youtube.player.playerbuttonbg.fingerprints
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-
-object PlayerPatchFingerprint : MethodFingerprint(
- customFingerprint = { methodDef, _ ->
- methodDef.definingClass == "Lapp/revanced/integrations/patches/layout/PlayerPatch;"
- && methodDef.name == "hidePlayerButton"
- }
-)
\ No newline at end of file
diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml
index 096047a46..e06ee15ff 100644
--- a/src/main/resources/youtube/settings/host/values/strings.xml
+++ b/src/main/resources/youtube/settings/host/values/strings.xml
@@ -419,9 +419,6 @@ Some components may not be hidden."
Place sections are shown.
Place sections are hidden.
Hide place sections
- Player button background is shown.
- Player button background is hidden.
- Hide player button background
Ambient mode menu is shown.
Ambient mode menu is hidden.
Hide ambient mode menu
diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index 3696c03a5..886d7d489 100644
--- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -548,9 +548,6 @@
-
-