From ebcadd5c6fdbcf7972ff32003817b19dc9875944 Mon Sep 17 00:00:00 2001
From: inotia00 <108592928+inotia00@users.noreply.github.com>
Date: Tue, 7 Nov 2023 21:16:19 +0900
Subject: [PATCH] fix(YouTube/SponsorBlock): applying the outline icon makes
 skip button overlaps

---
 .../utils/sponsorblock/SponsorBlockPatch.kt   | 18 ++++++----
 .../outline/layout/inline_sponsor_overlay.xml | 35 -------------------
 .../outline/layout/skip_sponsor_button.xml    | 35 -------------------
 .../layout/inline_sponsor_overlay.xml         |  0
 .../layout/skip_sponsor_button.xml            |  0
 5 files changed, 12 insertions(+), 76 deletions(-)
 delete mode 100644 src/main/resources/youtube/sponsorblock/outline/layout/inline_sponsor_overlay.xml
 delete mode 100644 src/main/resources/youtube/sponsorblock/outline/layout/skip_sponsor_button.xml
 rename src/main/resources/youtube/sponsorblock/{default => shared}/layout/inline_sponsor_overlay.xml (100%)
 rename src/main/resources/youtube/sponsorblock/{default => shared}/layout/skip_sponsor_button.xml (100%)

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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <app.revanced.integrations.sponsorblock.ui.SkipSponsorButton
-        android:id="@+id/sb_skip_highlight_button"
-        android:contentDescription="@string/sb_skip_button_compact_highlight"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true" android:layout_marginRight="20dp"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="@dimen/inline_controls_bottom_bar_height"
-        android:focusable="true"
-        android:visibility="gone" />
-
-    <app.revanced.integrations.sponsorblock.ui.SkipSponsorButton
-        android:id="@+id/sb_skip_sponsor_button"
-        android:contentDescription="@string/sb_skip_button_compact"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="@dimen/inline_controls_bottom_bar_height"
-        android:focusable="true"
-        android:visibility="gone" />
-
-    <app.revanced.integrations.sponsorblock.ui.NewSegmentLayout
-        android:id="@+id/sb_new_segment_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true" android:layout_marginRight="20dp"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="@dimen/brand_interaction_default_bottom_margin"
-        android:focusable="true"
-        android:visibility="gone" />
-</merge>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:yt="http://schemas.android.com/apk/res-auto">
-
-    <LinearLayout
-        android:id="@+id/sb_skip_sponsor_button_container"
-        android:layout_width="wrap_content"
-        android:layout_height="32dp"
-        android:layout_gravity="center_vertical"
-        android:orientation="horizontal"
-        android:padding="8dp">
-
-        <com.google.android.libraries.youtube.common.ui.YouTubeTextView
-            android:id="@+id/sb_skip_sponsor_button_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:includeFontPadding="false"
-            android:paddingRight="@dimen/ad_overlay_ad_text_padding"
-            android:singleLine="true"
-            android:text="@string/sb_skip_button_compact"
-            android:textColor="@color/skip_ad_button_foreground_color"
-            android:textSize="@dimen/extra_small_font_size"
-            yt:robotoFont="light" />
-
-        <ImageView
-            android:id="@+id/sb_skip_sponsor_button_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:alpha="0.8"
-            android:contentDescription="@null"
-            android:src="@drawable/quantum_ic_skip_next_white_24" />
-    </LinearLayout>
-</merge>
\ 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