From 81b9f5cdab1c2cd428e7ce19a66a5734be4c35c6 Mon Sep 17 00:00:00 2001
From: inotia00 <108592928+inotia00@users.noreply.github.com>
Date: Sun, 7 Apr 2024 17:12:40 +0900
Subject: [PATCH] feat(YouTube Music/Settings): move SponsorBlock settings and
 Return YouTube Dislike settings to RVX Settings

---
 .../music/settings/values-v21/strings.xml     |  7 ++--
 .../sponsorblock/xml/sponsorblock_prefs.xml   | 41 -------------------
 2 files changed, 4 insertions(+), 44 deletions(-)
 delete mode 100644 src/main/resources/music/sponsorblock/xml/sponsorblock_prefs.xml

diff --git a/src/main/resources/music/settings/values-v21/strings.xml b/src/main/resources/music/settings/values-v21/strings.xml
index 3a7009460..997922164 100644
--- a/src/main/resources/music/settings/values-v21/strings.xml
+++ b/src/main/resources/music/settings/values-v21/strings.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Translation Exception -->
+    <string name="revanced_category_ryd">Return YouTube Dislike</string>
+    <string name="revanced_category_sb">SponsorBlock</string>
+
     <string name="revanced_extended_settings_title">ReVanced Extended</string>
 
     <string name="revanced_hide_account_menu_filter_strings_summary">@string/revanced_custom_filter_strings_summary</string>
     <string name="revanced_hide_account_menu_filter_strings_title">@string/revanced_custom_filter_strings_title</string>
 
     <string name="revanced_ryd_attribution_title">ReturnYouTubeDislike.com</string>
-    <string name="revanced_ryd_enabled_title">@string/revanced_ryd_settings_title</string>
-    <string name="revanced_ryd_settings_title">Return YouTube Dislike</string>
+    <string name="revanced_ryd_enabled_title">@string/revanced_category_ryd</string>
 
-    <string name="revanced_sponsorblock_settings_title">SponsorBlock</string>
     <string name="revanced_sb_about_api">sponsor.ajay.app</string>
 </resources>
diff --git a/src/main/resources/music/sponsorblock/xml/sponsorblock_prefs.xml b/src/main/resources/music/sponsorblock/xml/sponsorblock_prefs.xml
deleted file mode 100644
index dab6789bb..000000000
--- a/src/main/resources/music/sponsorblock/xml/sponsorblock_prefs.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
-  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto">
-    <com.google.android.apps.youtube.music.ui.preference.SwitchCompatPreference android:title="@string/revanced_sb_enabled" android:key="sb_enabled" android:summary="@string/revanced_sb_enabled_sum" android:defaultValue="true" />
-    <com.google.android.apps.youtube.music.ui.preference.SwitchCompatPreference android:title="@string/revanced_sb_toast_on_skip" android:key="sb_toast_on_skip" android:summary="@string/revanced_sb_toast_on_skip_sum" android:dependency="sb_enabled" android:defaultValue="true" />
-    <com.google.android.apps.youtube.music.ui.preference.SwitchCompatPreference android:title="@string/revanced_sb_toast_on_connection_error" android:key="sb_toast_on_connection_error" android:summary="@string/revanced_sb_toast_on_connection_error_sum" android:dependency="sb_enabled" android:defaultValue="false" />
-    <Preference android:title="@string/revanced_sb_api_url" android:key="sb_api_url" android:summary="@string/revanced_sb_api_url_sum" android:dependency="sb_enabled">
-        <intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_api_url" android:targetClass="com.google.android.gms.common.api.GoogleApiActivity" />
-    </Preference>
-    <com.google.android.apps.youtube.music.ui.preference.PreferenceCategoryCompat android:title="@string/revanced_sb_diff_segments" android:key="segments">
-        <Preference android:title="@string/revanced_sb_segments_sponsor" android:key="sb_segments_sponsor" android:summary="@string/revanced_sb_segments_sponsor_sum">
-            <intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_sponsor" android:targetClass="com.google.android.gms.common.api.GoogleApiActivity" />
-        </Preference>
-        <Preference android:title="@string/revanced_sb_segments_selfpromo" android:key="sb_segments_selfpromo" android:summary="@string/revanced_sb_segments_selfpromo_sum">
-            <intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_selfpromo" android:targetClass="com.google.android.gms.common.api.GoogleApiActivity" />
-        </Preference>
-        <Preference android:title="@string/revanced_sb_segments_interaction" android:key="sb_segments_interaction" android:summary="@string/revanced_sb_segments_interaction_sum">
-            <intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_interaction" android:targetClass="com.google.android.gms.common.api.GoogleApiActivity" />
-        </Preference>
-        <Preference android:title="@string/revanced_sb_segments_intro" android:key="sb_segments_intro" android:summary="@string/revanced_sb_segments_intro_sum">
-            <intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_intro" android:targetClass="com.google.android.gms.common.api.GoogleApiActivity" />
-        </Preference>
-        <Preference android:title="@string/revanced_sb_segments_outro" android:key="sb_segments_outro" android:summary="@string/revanced_sb_segments_outro_sum">
-            <intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_outro" android:targetClass="com.google.android.gms.common.api.GoogleApiActivity" />
-        </Preference>
-        <Preference android:title="@string/revanced_sb_segments_preview" android:key="sb_segments_preview" android:summary="@string/revanced_sb_segments_preview_sum">
-            <intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_preview" android:targetClass="com.google.android.gms.common.api.GoogleApiActivity" />
-        </Preference>
-        <Preference android:title="@string/revanced_sb_segments_filler" android:key="sb_segments_filler" android:summary="@string/revanced_sb_segments_filler_sum">
-            <intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_filler" android:targetClass="com.google.android.gms.common.api.GoogleApiActivity" />
-        </Preference>
-        <Preference android:title="@string/revanced_sb_segments_nomusic" android:key="sb_segments_music_offtopic" android:summary="@string/revanced_sb_segments_nomusic_sum">
-            <intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_music_offtopic" android:targetClass="com.google.android.gms.common.api.GoogleApiActivity" />
-        </Preference>
-    </com.google.android.apps.youtube.music.ui.preference.PreferenceCategoryCompat>
-    <com.google.android.apps.youtube.music.ui.preference.PreferenceCategoryCompat android:title="@string/revanced_sb_about" android:key="about">
-        <Preference android:title="@string/revanced_sb_about_api" android:key="sb_about_api" android:summary="@string/revanced_sb_about_api_sum">
-            <intent android:action="android.intent.action.VIEW" android:data="https://sponsor.ajay.app" />
-        </Preference>
-    </com.google.android.apps.youtube.music.ui.preference.PreferenceCategoryCompat>
-</PreferenceScreen>
\ No newline at end of file