diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt index 0742b5cdb..065d2fa9f 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt @@ -53,13 +53,21 @@ object SponsorBlockPatch : ResourcePatch() { /** * merge SponsorBlock drawables to main drawables */ + arrayOf( + ResourceUtils.ResourceGroup( + "layout", + "inline_sponsor_overlay.xml", + "skip_sponsor_button.xml" + ) + ).forEach { resourceGroup -> + context.copyResources("youtube/sponsorblock/shared", resourceGroup) + } + if (OutlineIcon == true) { arrayOf( ResourceUtils.ResourceGroup( "layout", - "inline_sponsor_overlay.xml", - "new_segment.xml", - "skip_sponsor_button.xml" + "new_segment.xml" ), ResourceUtils.ResourceGroup( "drawable", @@ -80,9 +88,7 @@ object SponsorBlockPatch : ResourcePatch() { arrayOf( ResourceUtils.ResourceGroup( "layout", - "inline_sponsor_overlay.xml", - "new_segment.xml", - "skip_sponsor_button.xml" + "new_segment.xml" ), ResourceUtils.ResourceGroup( "drawable", diff --git a/src/main/resources/youtube/sponsorblock/outline/layout/inline_sponsor_overlay.xml b/src/main/resources/youtube/sponsorblock/outline/layout/inline_sponsor_overlay.xml deleted file mode 100644 index 05469bafb..000000000 --- a/src/main/resources/youtube/sponsorblock/outline/layout/inline_sponsor_overlay.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/youtube/sponsorblock/outline/layout/skip_sponsor_button.xml b/src/main/resources/youtube/sponsorblock/outline/layout/skip_sponsor_button.xml deleted file mode 100644 index 185960ec9..000000000 --- a/src/main/resources/youtube/sponsorblock/outline/layout/skip_sponsor_button.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/youtube/sponsorblock/default/layout/inline_sponsor_overlay.xml b/src/main/resources/youtube/sponsorblock/shared/layout/inline_sponsor_overlay.xml similarity index 100% rename from src/main/resources/youtube/sponsorblock/default/layout/inline_sponsor_overlay.xml rename to src/main/resources/youtube/sponsorblock/shared/layout/inline_sponsor_overlay.xml diff --git a/src/main/resources/youtube/sponsorblock/default/layout/skip_sponsor_button.xml b/src/main/resources/youtube/sponsorblock/shared/layout/skip_sponsor_button.xml similarity index 100% rename from src/main/resources/youtube/sponsorblock/default/layout/skip_sponsor_button.xml rename to src/main/resources/youtube/sponsorblock/shared/layout/skip_sponsor_button.xml