From 65f7a35ec2f930c4bbbadc597aeb33e74dd75fae Mon Sep 17 00:00:00 2001
From: inotia00 <108592928+inotia00@users.noreply.github.com>
Date: Tue, 23 Jan 2024 07:16:18 +0900
Subject: [PATCH] feat(YouTube Music): change patch name `Enable new player
 background` to `Enable old player background`

---
 .../OldPlayerBackgroundPatch.kt}              | 25 ++++++++++---------
 .../OldPlayerBackgroundFingerprint.kt}        |  4 +--
 .../music/settings/host/values/strings.xml    |  8 +++---
 3 files changed, 18 insertions(+), 19 deletions(-)
 rename src/main/kotlin/app/revanced/patches/music/player/{newplayerbackground/NewPlayerBackgroundPatch.kt => oldplayerbackground/OldPlayerBackgroundPatch.kt} (64%)
 rename src/main/kotlin/app/revanced/patches/music/player/{newplayerbackground/fingerprints/NewPlayerBackgroundFingerprint.kt => oldplayerbackground/fingerprints/OldPlayerBackgroundFingerprint.kt} (56%)

diff --git a/src/main/kotlin/app/revanced/patches/music/player/newplayerbackground/NewPlayerBackgroundPatch.kt b/src/main/kotlin/app/revanced/patches/music/player/oldplayerbackground/OldPlayerBackgroundPatch.kt
similarity index 64%
rename from src/main/kotlin/app/revanced/patches/music/player/newplayerbackground/NewPlayerBackgroundPatch.kt
rename to src/main/kotlin/app/revanced/patches/music/player/oldplayerbackground/OldPlayerBackgroundPatch.kt
index ddf2f3953..7e641c54a 100644
--- a/src/main/kotlin/app/revanced/patches/music/player/newplayerbackground/NewPlayerBackgroundPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/player/oldplayerbackground/OldPlayerBackgroundPatch.kt
@@ -1,19 +1,19 @@
-package app.revanced.patches.music.player.newplayerbackground
+package app.revanced.patches.music.player.oldplayerbackground
 
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 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.player.newplayerbackground.fingerprints.NewPlayerBackgroundFingerprint
+import app.revanced.patches.music.player.oldplayerbackground.fingerprints.OldPlayerBackgroundFingerprint
 import app.revanced.patches.music.utils.integrations.Constants.PLAYER
 import app.revanced.patches.music.utils.settings.CategoryType
 import app.revanced.patches.music.utils.settings.SettingsPatch
-import app.revanced.util.exception
 
 @Patch(
-    name = "Enable new player background",
-    description = "Adds an option to enable the new player background.",
+    name = "Enable old player background",
+    description = "Adds an option to return the player background to the old style. Deprecated on YT Music 6.34.51+.",
     dependencies = [SettingsPatch::class],
     compatiblePackages = [
         CompatiblePackage(
@@ -31,29 +31,30 @@ import app.revanced.util.exception
                 "6.33.52"
             ]
         )
-    ]
+    ],
+    use = false
 )
 @Suppress("unused")
-object NewPlayerBackgroundPatch : BytecodePatch(
-    setOf(NewPlayerBackgroundFingerprint)
+object OldPlayerBackgroundPatch : BytecodePatch(
+    setOf(OldPlayerBackgroundFingerprint)
 ) {
     override fun execute(context: BytecodeContext) {
 
-        NewPlayerBackgroundFingerprint.result?.let {
+        OldPlayerBackgroundFingerprint.result?.let {
             it.mutableMethod.apply {
                 addInstructions(
                     0, """
-                        invoke-static {}, $PLAYER->enableNewPlayerBackground()Z
+                        invoke-static {}, $PLAYER->enableOldPlayerBackground()Z
                         move-result v0
                         return v0
                         """
                 )
             }
-        } ?: throw NewPlayerBackgroundFingerprint.exception
+        } ?: throw PatchException("This version is not supported. Please use YT Music 6.33.52 or earlier.")
 
         SettingsPatch.addMusicPreference(
             CategoryType.PLAYER,
-            "revanced_enable_new_player_background",
+            "revanced_enable_old_player_background",
             "false"
         )
 
diff --git a/src/main/kotlin/app/revanced/patches/music/player/newplayerbackground/fingerprints/NewPlayerBackgroundFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/player/oldplayerbackground/fingerprints/OldPlayerBackgroundFingerprint.kt
similarity index 56%
rename from src/main/kotlin/app/revanced/patches/music/player/newplayerbackground/fingerprints/NewPlayerBackgroundFingerprint.kt
rename to src/main/kotlin/app/revanced/patches/music/player/oldplayerbackground/fingerprints/OldPlayerBackgroundFingerprint.kt
index aadefac60..47b0d9b07 100644
--- a/src/main/kotlin/app/revanced/patches/music/player/newplayerbackground/fingerprints/NewPlayerBackgroundFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/player/oldplayerbackground/fingerprints/OldPlayerBackgroundFingerprint.kt
@@ -1,8 +1,8 @@
-package app.revanced.patches.music.player.newplayerbackground.fingerprints
+package app.revanced.patches.music.player.oldplayerbackground.fingerprints
 
 import app.revanced.util.fingerprint.LiteralValueFingerprint
 
-object NewPlayerBackgroundFingerprint : LiteralValueFingerprint(
+object OldPlayerBackgroundFingerprint : LiteralValueFingerprint(
     returnType = "Z",
     parameters = emptyList(),
     literalSupplier = { 45415319 }
diff --git a/src/main/resources/music/settings/host/values/strings.xml b/src/main/resources/music/settings/host/values/strings.xml
index 0151eb61a..da88a4ba4 100644
--- a/src/main/resources/music/settings/host/values/strings.xml
+++ b/src/main/resources/music/settings/host/values/strings.xml
@@ -52,12 +52,10 @@ Known issues:
     <string name="revanced_enable_force_minimized_player_title">Enable force minimized player</string>
     <string name="revanced_enable_landscape_mode_summary">Enables landscape mode when rotating the screen on phones.</string>
     <string name="revanced_enable_landscape_mode_title">Enable landscape mode</string>
-    <string name="revanced_enable_new_player_background_summary">Enables the new player background.</string>
-    <string name="revanced_enable_new_player_background_title">Enable new player background</string>
+    <string name="revanced_enable_old_player_background_summary">Returns the player background to the old style.</string>
+    <string name="revanced_enable_old_player_background_title">Enable old player background</string>
     <string name="revanced_enable_old_player_layout_summary">"Returns the player layout to the old style.
-Some features may not work properly in the old player layout.
-
-WARNING: Do not enable "New player background" while this is enabled."</string>
+Some features may not work properly in the old player layout."</string>
     <string name="revanced_enable_old_player_layout_title">Enable old player layout</string>
     <string name="revanced_enable_old_style_library_shelf_summary">Returns the library tab to the old style. (Experimental)</string>
     <string name="revanced_enable_old_style_library_shelf_title">Enable old style library shelf</string>