diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconPatch.kt index 380d07f54..f50f37a39 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconPatch.kt @@ -134,7 +134,6 @@ object CustomBrandingIconPatch : BaseResourcePatch( .underBarOrThrow() val appIconResourcePath = "youtube/branding/$appIcon" - val stockResourcePath = "youtube/branding/stock" // Check if a custom path is used in the patch options. if (!availableIcon.containsValue(appIcon)) { @@ -176,13 +175,12 @@ object CustomBrandingIconPatch : BaseResourcePatch( if (RestoreOldSplashAnimation == true) { oldSplashAnimationResourceGroups.let { resourceGroups -> resourceGroups.forEach { - context.copyResources("$stockResourcePath/splash", it) context.copyResources("$appIconResourcePath/splash", it) } } context.copyXmlNode( - "$stockResourcePath/splash", + "$appIconResourcePath/splash", "values-v31/styles.xml", "resources" ) diff --git a/src/main/kotlin/app/revanced/util/ResourceUtils.kt b/src/main/kotlin/app/revanced/util/ResourceUtils.kt index fd3d4b43f..6a7a21458 100644 --- a/src/main/kotlin/app/revanced/util/ResourceUtils.kt +++ b/src/main/kotlin/app/revanced/util/ResourceUtils.kt @@ -145,13 +145,13 @@ fun ResourceContext.copyXmlNode( resourceDirectory: String, targetResource: String, elementTag: String -) { - val stringsResourceInputStream = - inputStreamFromBundledResource(resourceDirectory, targetResource)!! - +) = inputStreamFromBundledResource( + resourceDirectory, + targetResource +)?.let { inputStream -> // Copy nodes from the resources node to the real resource node elementTag.copyXmlNode( - this.xmlEditor[stringsResourceInputStream], + this.xmlEditor[inputStream], this.xmlEditor["res/$targetResource"] ).close() } diff --git a/src/main/resources/youtube/branding/stock/splash/values-v31/styles.xml b/src/main/resources/youtube/branding/mmt/splash/values-v31/styles.xml similarity index 100% rename from src/main/resources/youtube/branding/stock/splash/values-v31/styles.xml rename to src/main/resources/youtube/branding/mmt/splash/values-v31/styles.xml diff --git a/src/main/resources/youtube/branding/revancify_blue/splash/drawable/avd_anim.xml b/src/main/resources/youtube/branding/revancify_blue/splash/drawable/avd_anim.xml new file mode 100644 index 000000000..43edf1c90 --- /dev/null +++ b/src/main/resources/youtube/branding/revancify_blue/splash/drawable/avd_anim.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/youtube/branding/revancify_blue/splash/values-v31/styles.xml b/src/main/resources/youtube/branding/revancify_blue/splash/values-v31/styles.xml new file mode 100644 index 000000000..58243062d --- /dev/null +++ b/src/main/resources/youtube/branding/revancify_blue/splash/values-v31/styles.xml @@ -0,0 +1,7 @@ + + + + diff --git a/src/main/resources/youtube/branding/revancify_red/splash/drawable/avd_anim.xml b/src/main/resources/youtube/branding/revancify_red/splash/drawable/avd_anim.xml new file mode 100644 index 000000000..952dc696a --- /dev/null +++ b/src/main/resources/youtube/branding/revancify_red/splash/drawable/avd_anim.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/youtube/branding/revancify_red/splash/values-v31/styles.xml b/src/main/resources/youtube/branding/revancify_red/splash/values-v31/styles.xml new file mode 100644 index 000000000..58243062d --- /dev/null +++ b/src/main/resources/youtube/branding/revancify_red/splash/values-v31/styles.xml @@ -0,0 +1,7 @@ + + + + diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__1__0.xml b/src/main/resources/youtube/branding/youtube/splash/drawable/$$avd_anim__1__0.xml similarity index 100% rename from src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__1__0.xml rename to src/main/resources/youtube/branding/youtube/splash/drawable/$$avd_anim__1__0.xml diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__1__1.xml b/src/main/resources/youtube/branding/youtube/splash/drawable/$$avd_anim__1__1.xml similarity index 100% rename from src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__1__1.xml rename to src/main/resources/youtube/branding/youtube/splash/drawable/$$avd_anim__1__1.xml diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__2__0.xml b/src/main/resources/youtube/branding/youtube/splash/drawable/$$avd_anim__2__0.xml similarity index 100% rename from src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__2__0.xml rename to src/main/resources/youtube/branding/youtube/splash/drawable/$$avd_anim__2__0.xml diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__2__1.xml b/src/main/resources/youtube/branding/youtube/splash/drawable/$$avd_anim__2__1.xml similarity index 100% rename from src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__2__1.xml rename to src/main/resources/youtube/branding/youtube/splash/drawable/$$avd_anim__2__1.xml diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__3__0.xml b/src/main/resources/youtube/branding/youtube/splash/drawable/$$avd_anim__3__0.xml similarity index 100% rename from src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__3__0.xml rename to src/main/resources/youtube/branding/youtube/splash/drawable/$$avd_anim__3__0.xml diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__3__1.xml b/src/main/resources/youtube/branding/youtube/splash/drawable/$$avd_anim__3__1.xml similarity index 100% rename from src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__3__1.xml rename to src/main/resources/youtube/branding/youtube/splash/drawable/$$avd_anim__3__1.xml diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__0.xml b/src/main/resources/youtube/branding/youtube/splash/drawable/$avd_anim__0.xml similarity index 100% rename from src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__0.xml rename to src/main/resources/youtube/branding/youtube/splash/drawable/$avd_anim__0.xml diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__1.xml b/src/main/resources/youtube/branding/youtube/splash/drawable/$avd_anim__1.xml similarity index 100% rename from src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__1.xml rename to src/main/resources/youtube/branding/youtube/splash/drawable/$avd_anim__1.xml diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__2.xml b/src/main/resources/youtube/branding/youtube/splash/drawable/$avd_anim__2.xml similarity index 100% rename from src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__2.xml rename to src/main/resources/youtube/branding/youtube/splash/drawable/$avd_anim__2.xml diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__3.xml b/src/main/resources/youtube/branding/youtube/splash/drawable/$avd_anim__3.xml similarity index 100% rename from src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__3.xml rename to src/main/resources/youtube/branding/youtube/splash/drawable/$avd_anim__3.xml diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__4.xml b/src/main/resources/youtube/branding/youtube/splash/drawable/$avd_anim__4.xml similarity index 100% rename from src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__4.xml rename to src/main/resources/youtube/branding/youtube/splash/drawable/$avd_anim__4.xml diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/avd_anim.xml b/src/main/resources/youtube/branding/youtube/splash/drawable/avd_anim.xml similarity index 100% rename from src/main/resources/youtube/branding/stock/splash/drawable/avd_anim.xml rename to src/main/resources/youtube/branding/youtube/splash/drawable/avd_anim.xml diff --git a/src/main/resources/youtube/branding/youtube/splash/values-v31/styles.xml b/src/main/resources/youtube/branding/youtube/splash/values-v31/styles.xml new file mode 100644 index 000000000..c7462f74a --- /dev/null +++ b/src/main/resources/youtube/branding/youtube/splash/values-v31/styles.xml @@ -0,0 +1,7 @@ + + + +