chore(release): 2.57.0 [skip ci]

# [2.57.0](https://github.com/revanced/revanced-patches/compare/v2.56.1...v2.57.0) (2022-09-16)

### Features

* **amoled:** remove in favour of `theme` patch ([0032301](47fbe3cb25))
* **theme:** arbitrary background color for dark theme ([afd5502](1791525b54))

CHANGELOG.md

@@ -1,3 +1,11 @@
+# [2.57.0](https://github.com/revanced/revanced-patches/compare/v2.56.1...v2.57.0) (2022-09-16)
+
+
+### Features
+
+* **amoled:** remove in favour of `theme` patch ([0032301](https://github.com/revanced/revanced-patches/commit/00323010ed7356a639e4e86916dcbae96a53f7f6))
+* **theme:** arbitrary background color for dark theme ([afd5502](https://github.com/revanced/revanced-patches/commit/afd5502afdb207d5f52516653869b26fae7e5d21))
+
 ## [2.56.1](https://github.com/revanced/revanced-patches/compare/v2.56.0...v2.56.1) (2022-09-15)
 
 

README.md

@@ -82,7 +82,6 @@ The official Patch bundle provided by ReVanced and the community.
 | `swipe-controls` | Adds volume and brightness swipe controls. | 17.33.42 |
 | `downloads` | Enables downloading music and videos from YouTube. | 17.33.42 |
 | `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.33.42 |
-| `amoled` | Enables pure black theme. | all |
 | `disable-create-button` | Hides the create button in the navigation bar. | 17.33.42 |
 | `hide-cast-button` | Hides the cast button in the video player. | all |
 | `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.33.42 |
@@ -91,7 +90,7 @@ The official Patch bundle provided by ReVanced and the community.
 | `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
 | `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.33.42 |
 | `old-quality-layout` | Enables the original quality flyout menu. | 17.33.42 |
-| `theme` | Enables a custom theme. | all |
+| `theme` | Applies a custom theme. | all |
 | `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.33.42 |
 | `hide-watermark` | Hides creator's watermarks on videos. | 17.33.42 |
 | `sponsorblock` | Integrate SponsorBlock. | 17.33.42 |

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.56.1
+version = 2.57.0

src/main/kotlin/app/revanced/patches/youtube/layout/amoled/annotations/AmoledCompatibility.kt

@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.layout.amoled.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube")])
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class AmoledCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/amoled/patch/AmoledPatch.kt

@@ -1,28 +0,0 @@
-package app.revanced.patches.youtube.layout.amoled.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.PatchDeprecated
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.ResourceData
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.ResourcePatch
-import app.revanced.patches.youtube.layout.amoled.annotations.AmoledCompatibility
-import app.revanced.patches.youtube.layout.theme.patch.ThemePatch
-import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
-
-@Patch
-@DependsOn([FixLocaleConfigErrorPatch::class])
-@Name("amoled")
-@Description("Enables pure black theme.")
-@AmoledCompatibility
-@Version("0.0.1")
-@PatchDeprecated("Theme patch already includes the Amoled theme.", ThemePatch::class)
-class AmoledPatch : ResourcePatch() {
-    override fun execute(data: ResourceData): PatchResult {
-        ThemePatch.theme = ThemePatch.Themes.Amoled.name
-        return ThemePatch().execute(data)
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/ThemePatch.kt

@@ -4,7 +4,10 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.ResourceData
-import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.OptionsContainer
+import app.revanced.patcher.patch.PatchOption
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.ResourcePatch
@@ -15,19 +18,24 @@ import org.w3c.dom.Element
 @Patch
 @DependsOn([FixLocaleConfigErrorPatch::class])
 @Name("theme")
-@Description("Enables a custom theme.")
+@Description("Applies a custom theme.")
 @ThemeCompatibility
 @Version("0.0.1")
 class ThemePatch : ResourcePatch() {
     override fun execute(data: ResourceData): PatchResult {
-        val theme = Themes.of(theme!!) ?: return PatchResultError("Theme '$theme' not found.")
+        val backgroundColor = backgroundColor!!
 
         data.xmlEditor["res/values/colors.xml"].use { editor ->
             val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
 
             for (i in 0 until resourcesNode.childNodes.length) {
                 val node = resourcesNode.childNodes.item(i) as? Element ?: continue
-                node.textContent = theme.apply(node.getAttribute("name")) ?: continue
+
+                node.textContent = when (node.getAttribute("name")) {
+                    "yt_black1", "yt_black1_opacity95", "yt_black2", "yt_black3", "yt_black4",
+                    "yt_status_bar_background_dark" -> backgroundColor
+                    else -> continue
+                }
             }
         }
 
@@ -35,33 +43,13 @@ class ThemePatch : ResourcePatch() {
     }
 
     companion object : OptionsContainer() {
-        var theme: String? by option(
-            PatchOption.StringListOption(
-                key = "theme",
-                default = Themes.Amoled.name,
-                options = Themes.names,
-                title = "Theme",
-                description = "Select a theme.",
-                required = true
+        var backgroundColor: String? by option(
+            PatchOption.StringOption(
+                key = "darkThemeBackgroundColor",
+                default = "@android:color/black",
+                title = "Background color for the dark theme",
+                description = "The background color of the dark theme. Can be a hex color or a resource reference.",
             )
         )
     }
-
-    enum class Themes(val apply: (String) -> String?) {
-        Amoled({ attr ->
-            when (attr) {
-                "yt_black1", "yt_black1_opacity95", "yt_black2", "yt_black3", "yt_black4",
-                "yt_status_bar_background_dark" -> "@android:color/black"
-
-                "yt_selected_nav_label_dark" -> "#ffdf0000"
-                else -> null
-            }
-        });
-
-        companion object {
-            val names = values().map { it.name }
-
-            fun of(name: String) = values().firstOrNull { it.name == name }
-        }
-    }
 }