use more consistent SponsorBlock path and ids

Author: LisoUseInAIKyrios

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikeResourcePatch.kt

@@ -20,7 +20,7 @@ internal object ReturnYouTubeDislikeResourcePatch : ResourcePatch() {
             Preference(
                 "revanced_ryd_settings_title",
                 "revanced_ryd_settings_summary",
-                SettingsPatch.createReVancedSettingsIntent("ryd_settings_intent")
+                SettingsPatch.createReVancedSettingsIntent("revanced_ryd_settings_intent")
             )
         )
 

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockResourcePatch.kt

@@ -1,6 +1,7 @@
 package app.revanced.patches.youtube.layout.sponsorblock
 
 import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.shared.mapping.misc.ResourceMappingPatch
@@ -18,9 +19,9 @@ internal object SponsorBlockResourcePatch : ResourcePatch() {
         StringsPatch.includePatchStrings("SponsorBlock")
         SettingsPatch.addPreference(
             Preference(
-                "revanced_sponsorblock_settings_title",
-                "revanced_sponsorblock_settings_summary",
-                SettingsPatch.createReVancedSettingsIntent("sponsorblock_settings_intent")
+                "revanced_sb_settings_title",
+                "revanced_sb_settings_summary",
+                SettingsPatch.createReVancedSettingsIntent("revanced_sb_settings_intent")
             )
         )
 
@@ -34,28 +35,18 @@ internal object SponsorBlockResourcePatch : ResourcePatch() {
             "youtube/sponsorblock",
             ResourceGroup(
                 "drawable",
-                "revanced_ic_sb_adjust.xml",
-                "revanced_ic_sb_compare.xml",
-                "revanced_ic_sb_edit.xml",
-                "revanced_ic_sb_logo.xml",
-                "revanced_ic_sb_publish.xml",
-                "revanced_ic_sb_voting.xml"
+                "revanced_sb_adjust.xml",
+                "revanced_sb_compare.xml",
+                "revanced_sb_edit.xml",
+                "revanced_sb_logo.xml",
+                "revanced_sb_publish.xml",
+                "revanced_sb_voting.xml"
             ),
             ResourceGroup(
                 "layout",
-                "inline_sponsor_overlay.xml",
-                "new_segment.xml",
-                "skip_sponsor_button.xml"
-            ),
-            ResourceGroup(
-                // required resource for back button, because when the base APK is used, this resource will not exist
-                "drawable",
-                "revanced_ic_sb_adjust.xml",
-                "revanced_ic_sb_compare.xml",
-                "revanced_ic_sb_edit.xml",
-                "revanced_ic_sb_logo.xml",
-                "revanced_ic_sb_publish.xml",
-                "revanced_ic_sb_voting.xml"
+                "revanced_sb_inline_sponsor_overlay.xml",
+                "revanced_sb_new_segment.xml",
+                "revanced_sb_skip_sponsor_button.xml"
             ),
             ResourceGroup(
                 // required resource for back button, because when the base APK is used, this resource will not exist
@@ -71,6 +62,8 @@ internal object SponsorBlockResourcePatch : ResourcePatch() {
         val hostingResourceStream =
             classLoader.getResourceAsStream("youtube/sponsorblock/host/layout/youtube_controls_layout.xml")!!
 
+        var modifiedYouTubeControlsLayout = false
+
         val targetXmlEditor = context.xmlEditor["res/layout/youtube_controls_layout.xml"]
         "RelativeLayout".copyXmlNode(
             context.xmlEditor[hostingResourceStream],
@@ -94,8 +87,11 @@ internal object SponsorBlockResourcePatch : ResourcePatch() {
 
                 view.attributes.getNamedItem("android:layout_toStartOf").nodeValue = votingButtonId
 
+                modifiedYouTubeControlsLayout = true
                 break
             }
+
+            if (!modifiedYouTubeControlsLayout) throw PatchException("Could not modify control layout")
         }.close() // close afterwards
     }
 }

src/main/resources/youtube/sponsorblock/drawable/revanced_ic_sb_adjust.xml renamed to src/main/resources/youtube/sponsorblock/drawable/revanced_sb_adjust.xml

@@ -1,7 +1,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android">
 
     <com.google.android.libraries.youtube.common.ui.TouchImageView
-        android:id="@+id/revanced_sb_sponsorblock_button"
+        android:id="@+id/revanced_sb_create_segment_button"
         style="@style/YouTubePlayerButton"
         android:layout_width="@dimen/controls_overlay_action_button_size"
         android:layout_height="@dimen/controls_overlay_action_button_size"
@@ -11,7 +11,7 @@
         android:layout_marginEnd="4dp"
         android:layout_toStartOf="@+id/player_additional_view_container"
         android:padding="@dimen/controls_overlay_action_button_padding"
-        android:src="@drawable/revanced_ic_sb_logo" />
+        android:src="@drawable/revanced_sb_logo" />
 
     <com.google.android.libraries.youtube.common.ui.TouchImageView
         android:id="@+id/revanced_sb_voting_button"
@@ -22,7 +22,7 @@
         android:layout_alignParentTop="true"
         android:layout_marginTop="2dp"
         android:layout_marginEnd="4dp"
-        android:layout_toStartOf="@+id/revanced_sb_sponsorblock_button"
+        android:layout_toStartOf="@+id/revanced_sb_create_segment_button"
         android:padding="@dimen/controls_overlay_action_button_padding"
-        android:src="@drawable/revanced_ic_sb_voting" />
+        android:src="@drawable/revanced_sb_voting" />
 </RelativeLayout>

src/main/resources/youtube/sponsorblock/drawable/revanced_ic_sb_compare.xml renamed to src/main/resources/youtube/sponsorblock/drawable/revanced_sb_compare.xml

@@ -54,7 +54,7 @@
                 android:paddingTop="3.0dip"
                 android:paddingEnd="10.0dip"
                 android:paddingBottom="3.0dip"
-                android:src="@drawable/revanced_ic_sb_adjust" />
+                android:src="@drawable/revanced_sb_adjust" />
         </LinearLayout>
 
         <LinearLayout
@@ -73,7 +73,7 @@
                 android:paddingTop="3.0dip"
                 android:paddingEnd="5.0dip"
                 android:paddingBottom="3.0dip"
-                android:src="@drawable/revanced_ic_sb_compare" />
+                android:src="@drawable/revanced_sb_compare" />
 
             <ImageButton
                 android:id="@+id/revanced_sb_new_segment_edit"
@@ -87,7 +87,7 @@
                 android:paddingTop="3.0dip"
                 android:paddingEnd="5.0dip"
                 android:paddingBottom="3.0dip"
-                android:src="@drawable/revanced_ic_sb_edit" />
+                android:src="@drawable/revanced_sb_edit" />
 
             <ImageButton
                 android:id="@+id/revanced_sb_new_segment_publish"
@@ -101,7 +101,7 @@
                 android:paddingTop="3.0dip"
                 android:paddingEnd="10.0dip"
                 android:paddingBottom="3.0dip"
-                android:src="@drawable/revanced_ic_sb_publish" />
+                android:src="@drawable/revanced_sb_publish" />
         </LinearLayout>
     </LinearLayout>
 </merge>

src/main/resources/youtube/sponsorblock/drawable/revanced_ic_sb_edit.xml renamed to src/main/resources/youtube/sponsorblock/drawable/revanced_sb_edit.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="revanced_sponsorblock_settings_title">SponsorBlock</string>
-    <string name="revanced_sponsorblock_settings_summary">SponsorBlock related settings</string>
+    <string name="revanced_sb_settings_title">SponsorBlock</string>
+    <string name="revanced_sb_settings_summary">SponsorBlock related settings</string>
 
     <string name="revanced_sb_enable_sb">Enable SponsorBlock</string>
     <string name="revanced_sb_enable_sb_sum">SponsorBlock is a crowd-sourced system for skipping annoying parts of YouTube videos</string>

src/main/resources/youtube/sponsorblock/drawable/revanced_ic_sb_logo.xml renamed to src/main/resources/youtube/sponsorblock/drawable/revanced_sb_logo.xml

@@ -329,7 +329,7 @@
     <string name="revanced_show_old_video_quality_menu_summary_off">L\'ancien menu de qualité vidéo n\'est pas utilisé</string>
     <string name="revanced_show_old_video_quality_menu_summary_on">L\'ancien menu de qualité vidéo est utilisé</string>
     <string name="revanced_show_old_video_quality_menu_title">Utiliser l\'ancien menu du lecteur de qualité vidéo</string>
-    <string name="revanced_sponsorblock_settings_summary">Paramètres liés à SponsorBlock</string>
+    <string name="revanced_sb_settings_summary">Paramètres liés à SponsorBlock</string>
     <string name="revanced_spoof_app_version_summary_off">Version non usurpée</string>
     <string name="revanced_spoof_app_version_summary_on">Version usurpée</string>
     <string name="revanced_spoof_app_version_target_entry_1">17.30.35 - Restaurer l\'ancienne disposition de l\'interface utilisateur</string>

src/main/resources/youtube/sponsorblock/drawable/revanced_ic_sb_publish.xml renamed to src/main/resources/youtube/sponsorblock/drawable/revanced_sb_publish.xml

@@ -330,7 +330,7 @@
     <string name="revanced_show_old_video_quality_menu_summary_off">לא נעשה שימוש בתפריט איכות הווידאו הישן</string>
     <string name="revanced_show_old_video_quality_menu_summary_on">נעשה שימוש בתפריט איכות וידאו ישן</string>
     <string name="revanced_show_old_video_quality_menu_title">השתמש בתפריט נגן איכות וידאו ישן</string>
-    <string name="revanced_sponsorblock_settings_summary">הגדרות הקשורות לחסימת חסות</string>
+    <string name="revanced_sb_settings_summary">הגדרות הקשורות לחסימת חסות</string>
     <string name="revanced_spoof_app_version_summary_off">הגרסה לא מזויפת</string>
     <string name="revanced_spoof_app_version_summary_on">הגרסה מזויפת</string>
     <string name="revanced_spoof_app_version_target_entry_1">17.30.35 - שחזור פריסת ממשק משתמש ישנה</string>

src/main/resources/youtube/sponsorblock/drawable/revanced_ic_sb_voting.xml renamed to src/main/resources/youtube/sponsorblock/drawable/revanced_sb_voting.xml

@@ -331,7 +331,7 @@
     <string name="revanced_show_old_video_quality_menu_summary_off">كونا سىن سۈپىتى تىزىملىكى ئىشلىتىلمەيدۇ</string>
     <string name="revanced_show_old_video_quality_menu_summary_on">كونا سىن سۈپىتى تىزىملىكى ئىشلىتىلگەن</string>
     <string name="revanced_show_old_video_quality_menu_title">كونا سىن سۈپىتى قويغۇچ تىزىملىكىنى ئىشلىتىڭ</string>
-    <string name="revanced_sponsorblock_settings_summary">SponsorBlock مۇناسىۋەتلىك تەڭشەكلەر</string>
+    <string name="revanced_sb_settings_summary">SponsorBlock مۇناسىۋەتلىك تەڭشەكلەر</string>
     <string name="revanced_spoof_app_version_summary_off">نەشىرى بۇزۇلمىدى</string>
     <string name="revanced_spoof_app_version_summary_on">نەشىرى بۇزۇلدى</string>
     <string name="revanced_spoof_app_version_target_entry_1">17.30.35 - كونا UI ئورۇنلاشتۇرۇشىنى ئەسلىگە كەلتۈرۈڭ</string>

src/main/resources/youtube/sponsorblock/host/layout/youtube_controls_layout.xml

@@ -329,7 +329,7 @@
     <string name="revanced_show_old_video_quality_menu_summary_off">پرانا ویڈیو کوالٹی مینو استعمال نہیں کیا جاتا ہے۔</string>
     <string name="revanced_show_old_video_quality_menu_summary_on">پرانا ویڈیو کوالٹی مینو استعمال کیا جاتا ہے۔</string>
     <string name="revanced_show_old_video_quality_menu_title">پرانا ویڈیو کوالٹی پلیئر مینو استعمال کریں۔</string>
-    <string name="revanced_sponsorblock_settings_summary">اسپانسر بلاک سے متعلق ترتیبات</string>
+    <string name="revanced_sb_settings_summary">اسپانسر بلاک سے متعلق ترتیبات</string>
     <string name="revanced_spoof_app_version_summary_off">ورژن جعلی نہیں ہے۔</string>
     <string name="revanced_spoof_app_version_summary_on">ورژن جعلساز</string>
     <string name="revanced_spoof_app_version_target_entry_1">17.30.35 - پرانے UI لے آؤٹ کو بحال کریں۔</string>

src/main/resources/youtube/sponsorblock/layout/inline_sponsor_overlay.xml renamed to src/main/resources/youtube/sponsorblock/layout/revanced_sb_inline_sponsor_overlay.xml

@@ -329,7 +329,7 @@
     <string name="revanced_show_old_video_quality_menu_summary_off">不使用旧的视频质量菜单</string>
     <string name="revanced_show_old_video_quality_menu_summary_on">使用旧的视频质量菜单</string>
     <string name="revanced_show_old_video_quality_menu_title">使用旧的视频质量播放器菜单</string>
-    <string name="revanced_sponsorblock_settings_summary">SponsorBlock 相关设置</string>
+    <string name="revanced_sb_settings_summary">SponsorBlock 相关设置</string>
     <string name="revanced_spoof_app_version_summary_off">版本未被欺骗</string>
     <string name="revanced_spoof_app_version_summary_on">版本欺骗</string>
     <string name="revanced_spoof_app_version_target_entry_1">17.30.35 - 恢复旧的 UI 布局</string>

src/main/resources/youtube/sponsorblock/layout/new_segment.xml renamed to src/main/resources/youtube/sponsorblock/layout/revanced_sb_new_segment.xml

@@ -329,7 +329,7 @@
     <string name="revanced_show_old_video_quality_menu_summary_off">Imenyu yekhwalithi yevidiyo endala ayisetshenziswa</string>
     <string name="revanced_show_old_video_quality_menu_summary_on">Kusetshenziswa imenyu yekhwalithi yevidiyo endala</string>
     <string name="revanced_show_old_video_quality_menu_title">Sebenzisa imenyu yesidlali sekhwalithi yevidiyo endala</string>
-    <string name="revanced_sponsorblock_settings_summary">Izilungiselelo ezihlobene ne-SponsorBlock</string>
+    <string name="revanced_sb_settings_summary">Izilungiselelo ezihlobene ne-SponsorBlock</string>
     <string name="revanced_spoof_app_version_summary_off">Inguqulo ayiphazwanga</string>
     <string name="revanced_spoof_app_version_summary_on">Inguqulo yonakele</string>
     <string name="revanced_spoof_app_version_target_entry_1">17.30.35 - Buyisela ukwakheka kwe-UI endala</string>