diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d4cf65b2..418cc8561 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +# [3.1.0-dev.2](https://github.com/anddea/revanced-patches/compare/v3.1.0-dev.1...v3.1.0-dev.2) (2024-12-27) + + +### Bug Fixes + +* **YouTube - Custom branding icon:** Missing string for `Xisr Holiday` ([f18649f](https://github.com/anddea/revanced-patches/commit/f18649f8e594e1ecb5744ffc101749065fc3f29c)) + +# [3.1.0-dev.1](https://github.com/anddea/revanced-patches/compare/v3.0.0...v3.1.0-dev.1) (2024-12-27) + + +### Features + +* **YouTube - Custom branding icon:** Add `Xisr Holiday` icon ([7ca94a6](https://github.com/anddea/revanced-patches/commit/7ca94a664457980346aba83e41a41375a9557bf0)) + # [3.0.0](https://github.com/anddea/revanced-patches/compare/v2.231.0...v3.0.0) (2024-12-25) diff --git a/gradle.properties b/gradle.properties index 033faf093..43b7df556 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ org.gradle.parallel = true android.useAndroidX = true kotlin.code.style = official kotlin.jvm.target.validation.mode = IGNORE -version = 3.0.0 +version = 3.1.0-dev.2 diff --git a/patches.json b/patches.json index da0084599..539afade9 100644 --- a/patches.json +++ b/patches.json @@ -351,7 +351,7 @@ "description": "The icon to apply to the app.\n\nIf a path to a folder is provided, the folder must contain the following folders:\n\n- mipmap-xxxhdpi\n- mipmap-xxhdpi\n- mipmap-xhdpi\n- mipmap-hdpi\n- mipmap-mdpi\n\nEach of these folders must contain the following files:\n\n- adaptiveproduct_youtube_background_color_108.png\n- adaptiveproduct_youtube_foreground_color_108.png\n- ic_launcher.png\n- ic_launcher_round.png", "required": true, "type": "kotlin.String", - "default": "xisr_yellow", + "default": "xisr_holiday", "values": { "AFN Blue": "afn_blue", "AFN Red": "afn_red", @@ -367,6 +367,7 @@ "Vanced Black": "vanced_black", "Vanced Light": "vanced_light", "Xisr Yellow": "xisr_yellow", + "Xisr Holiday": "xisr_holiday", "YouTube": "youtube", "YouTube Black": "youtube_black" } diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconPatch.kt index 9895fbf2d..f1d1b93ac 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconPatch.kt @@ -11,6 +11,7 @@ import app.revanced.patches.youtube.utils.playservice.versionCheckPatch import app.revanced.patches.youtube.utils.settings.ResourceUtils.updatePatchStatusIcon import app.revanced.patches.youtube.utils.settings.settingsPatch import app.revanced.util.ResourceGroup +import app.revanced.util.Utils.printWarn import app.revanced.util.Utils.trimIndentMultiline import app.revanced.util.copyAdaptiveIcon import app.revanced.util.copyFile @@ -26,7 +27,7 @@ private const val ADAPTIVE_ICON_FOREGROUND_FILE_NAME = "adaptiveproduct_youtube_foreground_color_108" private const val ADAPTIVE_ICON_MONOCHROME_FILE_NAME = "adaptive_monochrome_ic_youtube_launcher" -private const val DEFAULT_ICON = "xisr_yellow" +private const val DEFAULT_ICON = "xisr_holiday" private val availableIcon = mapOf( "AFN Blue" to "afn_blue", @@ -42,7 +43,8 @@ private val availableIcon = mapOf( "Revancify Red" to "revancify_red", "Vanced Black" to "vanced_black", "Vanced Light" to "vanced_light", - "Xisr Yellow" to DEFAULT_ICON, + "Xisr Yellow" to "xisr_yellow", + "Xisr Holiday" to DEFAULT_ICON, "YouTube" to "youtube", "YouTube Black" to "youtube_black", ) @@ -216,41 +218,46 @@ val customBrandingIconPatch = resourcePatch( } } - val styleMap = mutableMapOf() - styleMap["Base.Theme.YouTube.Launcher"] = - "@style/Theme.AppCompat.DayNight.NoActionBar" + val avdAnimPath = get("res").resolve("drawable").resolve("avd_anim.xml") + if (avdAnimPath.exists()) { + val styleMap = mutableMapOf() + styleMap["Base.Theme.YouTube.Launcher"] = + "@style/Theme.AppCompat.DayNight.NoActionBar" - if (is_19_32_or_greater) { - styleMap["Theme.YouTube.Home"] = "@style/Base.V27.Theme.YouTube.Home" - } + if (is_19_32_or_greater) { + styleMap["Theme.YouTube.Home"] = "@style/Base.V27.Theme.YouTube.Home" + } + + styleMap.forEach { (nodeAttributeName, nodeAttributeParent) -> + document("res/values-v31/styles.xml").use { document -> + val resourcesNode = + document.getElementsByTagName("resources").item(0) as Element + + val style = document.createElement("style") + style.setAttribute("name", nodeAttributeName) + style.setAttribute("parent", nodeAttributeParent) + + val primaryItem = document.createElement("item") + primaryItem.setAttribute("name", "android:windowSplashScreenAnimatedIcon") + primaryItem.textContent = "@drawable/avd_anim" + val secondaryItem = document.createElement("item") + secondaryItem.setAttribute( + "name", + "android:windowSplashScreenAnimationDuration" + ) + secondaryItem.textContent = if (appIcon.startsWith("revancify")) + "1500" + else + "1000" + + style.appendChild(primaryItem) + style.appendChild(secondaryItem) - styleMap.forEach { (nodeAttributeName, nodeAttributeParent) -> - document("res/values-v31/styles.xml").use { document -> - val resourcesNode = - document.getElementsByTagName("resources").item(0) as Element - - val style = document.createElement("style") - style.setAttribute("name", nodeAttributeName) - style.setAttribute("parent", nodeAttributeParent) - - val primaryItem = document.createElement("item") - primaryItem.setAttribute("name", "android:windowSplashScreenAnimatedIcon") - primaryItem.textContent = "@drawable/avd_anim" - val secondaryItem = document.createElement("item") - secondaryItem.setAttribute( - "name", - "android:windowSplashScreenAnimationDuration" - ) - secondaryItem.textContent = if (appIcon.startsWith("revancify")) - "1500" - else - "1000" - - style.appendChild(primaryItem) - style.appendChild(secondaryItem) - - resourcesNode.appendChild(style) + resourcesNode.appendChild(style) + } } + } else { + printWarn("Splash animation is not available for \"$appIcon\".") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/player/seekbar/SeekbarComponentsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/player/seekbar/SeekbarComponentsPatch.kt index 7ff457117..683ff0ebf 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/player/seekbar/SeekbarComponentsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/player/seekbar/SeekbarComponentsPatch.kt @@ -112,14 +112,14 @@ val seekbarComponentsPatch = bytecodePatch( val cairoStartColor by stringOption( key = "cairoStartColor", - default = "#FFFF2791", + default = "#FFFF0033", title = "Cairo start color", description = "Set Cairo start color for the seekbar." ) val cairoEndColor by stringOption( key = "cairoEndColor", - default = "#FFFF0033", + default = "#FFFF2791", title = "Cairo end color", description = "Set Cairo end color for the seekbar." ) diff --git a/patches/src/main/resources/youtube/branding/mmt_blue/splash/values-v31/styles.xml b/patches/src/main/resources/youtube/branding/mmt_blue/splash/values-v31/styles.xml deleted file mode 100644 index c7462f74a..000000000 --- a/patches/src/main/resources/youtube/branding/mmt_blue/splash/values-v31/styles.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/patches/src/main/resources/youtube/branding/mmt_green/splash/values-v31/styles.xml b/patches/src/main/resources/youtube/branding/mmt_green/splash/values-v31/styles.xml deleted file mode 100644 index c7462f74a..000000000 --- a/patches/src/main/resources/youtube/branding/mmt_green/splash/values-v31/styles.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/patches/src/main/resources/youtube/branding/mmt_orange/splash/values-v31/styles.xml b/patches/src/main/resources/youtube/branding/mmt_orange/splash/values-v31/styles.xml deleted file mode 100644 index c7462f74a..000000000 --- a/patches/src/main/resources/youtube/branding/mmt_orange/splash/values-v31/styles.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/patches/src/main/resources/youtube/branding/mmt_pink/splash/values-v31/styles.xml b/patches/src/main/resources/youtube/branding/mmt_pink/splash/values-v31/styles.xml deleted file mode 100644 index c7462f74a..000000000 --- a/patches/src/main/resources/youtube/branding/mmt_pink/splash/values-v31/styles.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/patches/src/main/resources/youtube/branding/mmt_turquoise/splash/values-v31/styles.xml b/patches/src/main/resources/youtube/branding/mmt_turquoise/splash/values-v31/styles.xml deleted file mode 100644 index c7462f74a..000000000 --- a/patches/src/main/resources/youtube/branding/mmt_turquoise/splash/values-v31/styles.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/patches/src/main/resources/youtube/branding/mmt_yellow/splash/values-v31/styles.xml b/patches/src/main/resources/youtube/branding/mmt_yellow/splash/values-v31/styles.xml deleted file mode 100644 index c7462f74a..000000000 --- a/patches/src/main/resources/youtube/branding/mmt_yellow/splash/values-v31/styles.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-hdpi/yt_premium_wordmark_header_dark.png b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-hdpi/yt_premium_wordmark_header_dark.png new file mode 100644 index 000000000..91ac3c5dc Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-hdpi/yt_premium_wordmark_header_dark.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-hdpi/yt_premium_wordmark_header_light.png b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-hdpi/yt_premium_wordmark_header_light.png new file mode 100644 index 000000000..2cb6cc923 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-hdpi/yt_premium_wordmark_header_light.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-hdpi/yt_wordmark_header_dark.png b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-hdpi/yt_wordmark_header_dark.png new file mode 100644 index 000000000..2ab2575a2 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-hdpi/yt_wordmark_header_dark.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-hdpi/yt_wordmark_header_light.png b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-hdpi/yt_wordmark_header_light.png new file mode 100644 index 000000000..908a9a078 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-hdpi/yt_wordmark_header_light.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-mdpi/yt_premium_wordmark_header_dark.png b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-mdpi/yt_premium_wordmark_header_dark.png new file mode 100644 index 000000000..99d7f12e2 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-mdpi/yt_premium_wordmark_header_dark.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-mdpi/yt_premium_wordmark_header_light.png b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-mdpi/yt_premium_wordmark_header_light.png new file mode 100644 index 000000000..35c09abc6 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-mdpi/yt_premium_wordmark_header_light.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-mdpi/yt_wordmark_header_dark.png b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-mdpi/yt_wordmark_header_dark.png new file mode 100644 index 000000000..04ae2594c Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-mdpi/yt_wordmark_header_dark.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-mdpi/yt_wordmark_header_light.png b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-mdpi/yt_wordmark_header_light.png new file mode 100644 index 000000000..c1d2e9ed9 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-mdpi/yt_wordmark_header_light.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xhdpi/yt_premium_wordmark_header_dark.png b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xhdpi/yt_premium_wordmark_header_dark.png new file mode 100644 index 000000000..919c47756 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xhdpi/yt_premium_wordmark_header_dark.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xhdpi/yt_premium_wordmark_header_light.png b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xhdpi/yt_premium_wordmark_header_light.png new file mode 100644 index 000000000..b18a1cf28 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xhdpi/yt_premium_wordmark_header_light.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xhdpi/yt_wordmark_header_dark.png b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xhdpi/yt_wordmark_header_dark.png new file mode 100644 index 000000000..8447dafef Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xhdpi/yt_wordmark_header_dark.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xhdpi/yt_wordmark_header_light.png b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xhdpi/yt_wordmark_header_light.png new file mode 100644 index 000000000..737a1ef32 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xhdpi/yt_wordmark_header_light.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxhdpi/yt_premium_wordmark_header_dark.png b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxhdpi/yt_premium_wordmark_header_dark.png new file mode 100644 index 000000000..a414b6e36 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxhdpi/yt_premium_wordmark_header_dark.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxhdpi/yt_premium_wordmark_header_light.png b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxhdpi/yt_premium_wordmark_header_light.png new file mode 100644 index 000000000..bf2603ae8 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxhdpi/yt_premium_wordmark_header_light.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxhdpi/yt_wordmark_header_dark.png b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxhdpi/yt_wordmark_header_dark.png new file mode 100644 index 000000000..c78083d1a Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxhdpi/yt_wordmark_header_dark.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxhdpi/yt_wordmark_header_light.png b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxhdpi/yt_wordmark_header_light.png new file mode 100644 index 000000000..9232198bb Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxhdpi/yt_wordmark_header_light.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxxhdpi/yt_premium_wordmark_header_dark.png b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxxhdpi/yt_premium_wordmark_header_dark.png new file mode 100644 index 000000000..addf7ee86 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxxhdpi/yt_premium_wordmark_header_dark.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxxhdpi/yt_premium_wordmark_header_light.png b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxxhdpi/yt_premium_wordmark_header_light.png new file mode 100644 index 000000000..c027b9929 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxxhdpi/yt_premium_wordmark_header_light.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxxhdpi/yt_wordmark_header_dark.png b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxxhdpi/yt_wordmark_header_dark.png new file mode 100644 index 000000000..52fbc6711 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxxhdpi/yt_wordmark_header_dark.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxxhdpi/yt_wordmark_header_light.png b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxxhdpi/yt_wordmark_header_light.png new file mode 100644 index 000000000..c014f12c1 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/header/drawable-xxxhdpi/yt_wordmark_header_light.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png new file mode 100644 index 000000000..ba96a959b Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-hdpi/adaptiveproduct_youtube_foreground_color_108.png b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-hdpi/adaptiveproduct_youtube_foreground_color_108.png new file mode 100644 index 000000000..b48183ded Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-hdpi/adaptiveproduct_youtube_foreground_color_108.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-hdpi/ic_launcher.png b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..199fb9aa8 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-hdpi/ic_launcher.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-hdpi/ic_launcher_round.png b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 000000000..b48183ded Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-hdpi/ic_launcher_round.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png new file mode 100644 index 000000000..bc0df4e9d Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-mdpi/adaptiveproduct_youtube_foreground_color_108.png b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-mdpi/adaptiveproduct_youtube_foreground_color_108.png new file mode 100644 index 000000000..14a265b4a Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-mdpi/adaptiveproduct_youtube_foreground_color_108.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-mdpi/ic_launcher.png b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..58d24797c Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-mdpi/ic_launcher.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-mdpi/ic_launcher_round.png b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 000000000..14a265b4a Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-mdpi/ic_launcher_round.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png new file mode 100644 index 000000000..36b3152df Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png new file mode 100644 index 000000000..de96cdbef Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xhdpi/ic_launcher.png b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..08eaf530f Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xhdpi/ic_launcher.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xhdpi/ic_launcher_round.png b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 000000000..de96cdbef Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png new file mode 100644 index 000000000..d36ad32c9 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png new file mode 100644 index 000000000..93bad4a05 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxhdpi/ic_launcher.png b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..fd4b7d37c Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxhdpi/ic_launcher.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxhdpi/ic_launcher_round.png b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..93bad4a05 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png new file mode 100644 index 000000000..5e59970ce Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png new file mode 100644 index 000000000..9822d8822 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxxhdpi/ic_launcher.png b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..3d83cde53 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxxhdpi/ic_launcher_round.png b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..9822d8822 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/launcher/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/monochrome/drawable/adaptive_monochrome_ic_youtube_launcher.xml b/patches/src/main/resources/youtube/branding/xisr_holiday/monochrome/drawable/adaptive_monochrome_ic_youtube_launcher.xml new file mode 100644 index 000000000..80578bd61 --- /dev/null +++ b/patches/src/main/resources/youtube/branding/xisr_holiday/monochrome/drawable/adaptive_monochrome_ic_youtube_launcher.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/settings/drawable/revanced_extended_settings_key_icon.xml b/patches/src/main/resources/youtube/branding/xisr_holiday/settings/drawable/revanced_extended_settings_key_icon.xml new file mode 100755 index 000000000..628225bf9 --- /dev/null +++ b/patches/src/main/resources/youtube/branding/xisr_holiday/settings/drawable/revanced_extended_settings_key_icon.xml @@ -0,0 +1,1038 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-hdpi/product_logo_youtube_color_144.png b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-hdpi/product_logo_youtube_color_144.png new file mode 100644 index 000000000..0cf172baf Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-hdpi/product_logo_youtube_color_144.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-hdpi/product_logo_youtube_color_192.png b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-hdpi/product_logo_youtube_color_192.png new file mode 100644 index 000000000..9aab05d4c Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-hdpi/product_logo_youtube_color_192.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-hdpi/product_logo_youtube_color_24.png b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-hdpi/product_logo_youtube_color_24.png new file mode 100644 index 000000000..a7fe6433d Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-hdpi/product_logo_youtube_color_24.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-hdpi/product_logo_youtube_color_36.png b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-hdpi/product_logo_youtube_color_36.png new file mode 100644 index 000000000..7c28d5e60 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-hdpi/product_logo_youtube_color_36.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-mdpi/product_logo_youtube_color_144.png b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-mdpi/product_logo_youtube_color_144.png new file mode 100644 index 000000000..c1020daf6 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-mdpi/product_logo_youtube_color_144.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-mdpi/product_logo_youtube_color_192.png b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-mdpi/product_logo_youtube_color_192.png new file mode 100644 index 000000000..a22a42e25 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-mdpi/product_logo_youtube_color_192.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-mdpi/product_logo_youtube_color_24.png b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-mdpi/product_logo_youtube_color_24.png new file mode 100644 index 000000000..4879b3fc4 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-mdpi/product_logo_youtube_color_24.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-mdpi/product_logo_youtube_color_36.png b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-mdpi/product_logo_youtube_color_36.png new file mode 100644 index 000000000..c2e19aa74 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-mdpi/product_logo_youtube_color_36.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xhdpi/product_logo_youtube_color_144.png b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xhdpi/product_logo_youtube_color_144.png new file mode 100644 index 000000000..582eff6b0 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xhdpi/product_logo_youtube_color_144.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xhdpi/product_logo_youtube_color_192.png b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xhdpi/product_logo_youtube_color_192.png new file mode 100644 index 000000000..12c00e2e0 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xhdpi/product_logo_youtube_color_192.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xhdpi/product_logo_youtube_color_24.png b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xhdpi/product_logo_youtube_color_24.png new file mode 100644 index 000000000..4af6370ab Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xhdpi/product_logo_youtube_color_24.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xhdpi/product_logo_youtube_color_36.png b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xhdpi/product_logo_youtube_color_36.png new file mode 100644 index 000000000..ee2f0fe2e Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xhdpi/product_logo_youtube_color_36.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxhdpi/product_logo_youtube_color_144.png b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxhdpi/product_logo_youtube_color_144.png new file mode 100644 index 000000000..9f54217f6 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxhdpi/product_logo_youtube_color_144.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxhdpi/product_logo_youtube_color_192.png b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxhdpi/product_logo_youtube_color_192.png new file mode 100644 index 000000000..ee9d91d68 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxhdpi/product_logo_youtube_color_192.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxhdpi/product_logo_youtube_color_24.png b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxhdpi/product_logo_youtube_color_24.png new file mode 100644 index 000000000..b62199a2f Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxhdpi/product_logo_youtube_color_24.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxhdpi/product_logo_youtube_color_36.png b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxhdpi/product_logo_youtube_color_36.png new file mode 100644 index 000000000..3b2240f2c Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxhdpi/product_logo_youtube_color_36.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxxhdpi/product_logo_youtube_color_144.png b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxxhdpi/product_logo_youtube_color_144.png new file mode 100644 index 000000000..d8ccf8a7d Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxxhdpi/product_logo_youtube_color_144.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png new file mode 100644 index 000000000..528a35a3f Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxxhdpi/product_logo_youtube_color_24.png b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxxhdpi/product_logo_youtube_color_24.png new file mode 100644 index 000000000..efe0daf4a Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxxhdpi/product_logo_youtube_color_24.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxxhdpi/product_logo_youtube_color_36.png b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxxhdpi/product_logo_youtube_color_36.png new file mode 100644 index 000000000..3bfc433f6 Binary files /dev/null and b/patches/src/main/resources/youtube/branding/xisr_holiday/splash/drawable-xxxhdpi/product_logo_youtube_color_36.png differ diff --git a/patches/src/main/resources/youtube/branding/xisr_yellow/splash/values-v31/styles.xml b/patches/src/main/resources/youtube/branding/xisr_yellow/splash/values-v31/styles.xml deleted file mode 100644 index c7462f74a..000000000 --- a/patches/src/main/resources/youtube/branding/xisr_yellow/splash/values-v31/styles.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/patches/src/main/resources/youtube/settings/host/values/strings.xml b/patches/src/main/resources/youtube/settings/host/values/strings.xml index 1983cee50..05de68fec 100644 --- a/patches/src/main/resources/youtube/settings/host/values/strings.xml +++ b/patches/src/main/resources/youtube/settings/host/values/strings.xml @@ -1163,6 +1163,7 @@ If a YouTube Doodle is currently showing in your region and this setting is on, Vanced Black Vanced Light Xisr Yellow + Xisr Holiday YouTube YouTube Black Keeps landscape mode when turning the screen off and on in fullscreen. diff --git a/patches/src/main/resources/youtube/translations/pl-rPL/strings.xml b/patches/src/main/resources/youtube/translations/pl-rPL/strings.xml index aac3a2a5e..9236ea02b 100644 --- a/patches/src/main/resources/youtube/translations/pl-rPL/strings.xml +++ b/patches/src/main/resources/youtube/translations/pl-rPL/strings.xml @@ -1158,6 +1158,7 @@ Jeśli YouTube Doodles pojawiają się obecnie w Twoim regionie, a opcja ukrywan Czarna Vanced Jasna Vanced Żółta Xisr + Wakacyjna Xisr YouTube Czarna YouTube Zachowuje tryb poziomy, gdy wyłączysz i włączysz ekran w trybie pełnoekranowym.