From c3118199a9287b7199e9ce4fabced430c1835219 Mon Sep 17 00:00:00 2001
From: inotia00 <ars258000@gmail.com>
Date: Thu, 9 Feb 2023 10:16:02 +0900
Subject: [PATCH] refactor(youtube/general-ads): move settings to correct
 preference screens

---
 .../general/resource/patch/GeneralAdsPatch.kt | 16 ++++++
 .../youtube/settings/xml/revanced_prefs.xml   | 54 ++++++++++---------
 2 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/src/main/kotlin/app/revanced/patches/youtube/ads/general/resource/patch/GeneralAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ads/general/resource/patch/GeneralAdsPatch.kt
index dee9553fd..0ff1fd5bc 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/ads/general/resource/patch/GeneralAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ads/general/resource/patch/GeneralAdsPatch.kt
@@ -95,6 +95,22 @@ class GeneralAdsPatch : ResourcePatch {
             "SETTINGS: HIDE_GENERAL_ADS"
         )
 
+        ResourceHelper.addSettings2(
+            context,
+            "PREFERENCE_CATEGORY: REVANCED_SETTINGS",
+            "PREFERENCE: LAYOUT_SETTINGS",
+            "PREFERENCE_HEADER: GENERAL",
+            "SETTINGS: HIDE_GENERAL_LAYOUT_ADS"
+        )
+
+        ResourceHelper.addSettings2(
+            context,
+            "PREFERENCE_CATEGORY: REVANCED_SETTINGS",
+            "PREFERENCE: LAYOUT_SETTINGS",
+            "PREFERENCE_HEADER: PLAYER",
+            "SETTINGS: HIDE_VIEW_PRODUCT"
+        )
+
         ResourceHelper.patchSuccess(
             context,
             "hide-general-ads"
diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index ebd39f51f..a40d8fefe 100644
--- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -22,33 +22,8 @@
         <!-- SETTINGS: HIDE_GENERAL_ADS
         <SwitchPreference android:title="@string/revanced_adremover_general_ads_title" android:key="revanced_adremover_general_ads" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_general_ads_summary_on" android:summaryOff="@string/revanced_adremover_general_ads_summary_off" />
         <SwitchPreference android:title="@string/revanced_adremover_button_ads_title" android:key="revanced_adremover_button_ads" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_button_ads_summary_on" android:summaryOff="@string/revanced_adremover_button_ads_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_merchandise_title" android:key="revanced_adremover_merchandise" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_merchandise_summary_on" android:summaryOff="@string/revanced_adremover_merchandise_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_browse_store_button_title" android:key="revanced_adremover_browse_store_button" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_browse_store_button_summary_on" android:summaryOff="@string/revanced_adremover_browse_store_button_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_community_posts_title" android:key="revanced_adremover_community_posts" android:defaultValue="false" android:summaryOn="@string/revanced_adremover_community_posts_summary_on" android:summaryOff="@string/revanced_adremover_community_posts_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_compact_banner_title" android:key="revanced_adremover_compact_banner" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_compact_banner_summary_on" android:summaryOff="@string/revanced_adremover_compact_banner_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_movie_shelf_title" android:key="revanced_adremover_movie_shelf" android:defaultValue="false" android:summaryOn="@string/revanced_adremover_movie_shelf_summary_on" android:summaryOff="@string/revanced_adremover_movie_shelf_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_in_feed_survey_title" android:key="revanced_adremover_feed_survey" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_in_feed_survey_summary_on" android:summaryOff="@string/revanced_adremover_in_feed_survey_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_image_shelf_title" android:key="revanced_adremover_image_shelf" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_image_shelf_summary_on" android:summaryOff="@string/revanced_adremover_image_shelf_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_community_guidelines_title" android:key="revanced_adremover_community_guidelines" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_community_guidelines_summary_on" android:summaryOff="@string/revanced_adremover_community_guidelines_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_subscribers_community_guidelines_title" android:key="revanced_adremover_subscribers_community_guidelines" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_subscribers_community_guidelines_summary_on" android:summaryOff="@string/revanced_adremover_subscribers_community_guidelines_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_emergency_box_title" android:key="revanced_adremover_emergency_box" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_emergency_box_summary_on" android:summaryOff="@string/revanced_adremover_emergency_box_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_info_panel_title" android:key="revanced_adremover_info_panel" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_info_panel_summary_on" android:summaryOff="@string/revanced_adremover_info_panel_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_medical_panel_title" android:key="revanced_adremover_medical_panel" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_medical_panel_summary_on" android:summaryOff="@string/revanced_adremover_medical_panel_summary_off" />
         <SwitchPreference android:title="@string/revanced_adremover_paid_content_title" android:key="revanced_adremover_paid_content" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_paid_content_summary_on" android:summaryOff="@string/revanced_adremover_paid_content_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_suggestions_title" android:key="revanced_adremover_suggestions" android:defaultValue="false" android:summaryOn="@string/revanced_adremover_suggestions_summary_on" android:summaryOff="@string/revanced_adremover_suggestions_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_latest_posts_title" android:key="revanced_adremover_latest_posts" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_latest_posts_summary_on" android:summaryOff="@string/revanced_adremover_latest_posts_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_channel_guidelines_title" android:key="revanced_adremover_channel_guidelines" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_channel_guidelines_summary_on" android:summaryOff="@string/revanced_adremover_channel_guidelines_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_channel_member_shelf_title" android:key="revanced_adremover_channel_member_shelf" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_channel_member_shelf_summary_on" android:summaryOff="@string/revanced_adremover_channel_member_shelf_summary_off" />
         <SwitchPreference android:title="@string/revanced_adremover_self_sponsor_title" android:key="revanced_adremover_self_sponsor" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_self_sponsor_summary_on" android:summaryOff="@string/revanced_adremover_self_sponsor_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_channelbar_join_button_title" android:key="revanced_adremover_channelbar_join_button" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_channelbar_join_button_summary_on" android:summaryOff="@string/revanced_adremover_channelbar_join_button_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_chapter_teaser_title" android:key="revanced_adremover_chapter_teaser" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_chapter_teaser_summary_on" android:summaryOff="@string/revanced_adremover_chapter_teaser_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_separator_title" android:key="revanced_adremover_separator" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_separator_summary_on" android:summaryOff="@string/revanced_adremover_separator_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_official_card_in_search_title" android:key="revanced_adremover_official_card_in_search" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_official_card_in_search_summary_on" android:summaryOff="@string/revanced_adremover_official_card_in_search_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_album_card_in_search_title" android:key="revanced_adremover_album_card_in_search" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_album_card_in_search_summary_on" android:summaryOff="@string/revanced_adremover_album_card_in_search_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_breaking_news_shelf_title" android:key="revanced_adremover_breaking_news_shelf" android:defaultValue="false" android:summaryOn="@string/revanced_adremover_breaking_news_shelf_summary_on" android:summaryOff="@string/revanced_adremover_breaking_news_shelf_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_web_search_panel_title" android:key="revanced_adremover_web_search_panel" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_web_search_panel_summary_on" android:summaryOff="@string/revanced_adremover_web_search_panel_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_view_products_title" android:key="revanced_adremover_view_products" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_view_products_summary_on" android:summaryOff="@string/revanced_adremover_view_products_summary_off" />
-        <SwitchPreference android:title="@string/revanced_adremover_timed_reactions_title" android:key="revanced_adremover_timed_reactions" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_timed_reactions_summary_on" android:summaryOff="@string/revanced_adremover_timed_reactions_summary_off" />
         <PreferenceScreen android:title="@string/revanced_adremover_custom_filter_title" android:key="revanced_adremover_custom_filter" android:summary="@string/revanced_adremover_custom_filter_summary" >
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_adremover_custom_filter_title" />
             <SwitchPreference android:title="@string/revanced_adremover_user_filter_title" android:key="revanced_adremover_user_filter" android:defaultValue="false" android:summaryOn="@string/revanced_adremover_user_filter_summary_on" android:summaryOff="@string/revanced_adremover_user_filter_summary_off" />
@@ -144,6 +119,32 @@
         <!-- SETTINGS: HIDE_SNACKBAR
         <SwitchPreference android:title="@string/revanced_hide_snackbar_title" android:key="revanced_hide_snackbar" android:defaultValue="false" android:summaryOn="@string/revanced_hide_snackbar_summary_on" android:summaryOff="@string/revanced_hide_snackbar_summary_off" />SETTINGS: HIDE_SNACKBAR -->
 
+        <!-- SETTINGS: HIDE_GENERAL_LAYOUT_ADS
+        <SwitchPreference android:title="@string/revanced_adremover_merchandise_title" android:key="revanced_adremover_merchandise" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_merchandise_summary_on" android:summaryOff="@string/revanced_adremover_merchandise_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_browse_store_button_title" android:key="revanced_adremover_browse_store_button" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_browse_store_button_summary_on" android:summaryOff="@string/revanced_adremover_browse_store_button_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_community_posts_title" android:key="revanced_adremover_community_posts" android:defaultValue="false" android:summaryOn="@string/revanced_adremover_community_posts_summary_on" android:summaryOff="@string/revanced_adremover_community_posts_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_compact_banner_title" android:key="revanced_adremover_compact_banner" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_compact_banner_summary_on" android:summaryOff="@string/revanced_adremover_compact_banner_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_movie_shelf_title" android:key="revanced_adremover_movie_shelf" android:defaultValue="false" android:summaryOn="@string/revanced_adremover_movie_shelf_summary_on" android:summaryOff="@string/revanced_adremover_movie_shelf_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_in_feed_survey_title" android:key="revanced_adremover_feed_survey" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_in_feed_survey_summary_on" android:summaryOff="@string/revanced_adremover_in_feed_survey_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_image_shelf_title" android:key="revanced_adremover_image_shelf" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_image_shelf_summary_on" android:summaryOff="@string/revanced_adremover_image_shelf_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_community_guidelines_title" android:key="revanced_adremover_community_guidelines" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_community_guidelines_summary_on" android:summaryOff="@string/revanced_adremover_community_guidelines_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_subscribers_community_guidelines_title" android:key="revanced_adremover_subscribers_community_guidelines" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_subscribers_community_guidelines_summary_on" android:summaryOff="@string/revanced_adremover_subscribers_community_guidelines_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_emergency_box_title" android:key="revanced_adremover_emergency_box" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_emergency_box_summary_on" android:summaryOff="@string/revanced_adremover_emergency_box_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_info_panel_title" android:key="revanced_adremover_info_panel" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_info_panel_summary_on" android:summaryOff="@string/revanced_adremover_info_panel_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_medical_panel_title" android:key="revanced_adremover_medical_panel" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_medical_panel_summary_on" android:summaryOff="@string/revanced_adremover_medical_panel_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_suggestions_title" android:key="revanced_adremover_suggestions" android:defaultValue="false" android:summaryOn="@string/revanced_adremover_suggestions_summary_on" android:summaryOff="@string/revanced_adremover_suggestions_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_latest_posts_title" android:key="revanced_adremover_latest_posts" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_latest_posts_summary_on" android:summaryOff="@string/revanced_adremover_latest_posts_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_channel_guidelines_title" android:key="revanced_adremover_channel_guidelines" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_channel_guidelines_summary_on" android:summaryOff="@string/revanced_adremover_channel_guidelines_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_channel_member_shelf_title" android:key="revanced_adremover_channel_member_shelf" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_channel_member_shelf_summary_on" android:summaryOff="@string/revanced_adremover_channel_member_shelf_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_channelbar_join_button_title" android:key="revanced_adremover_channelbar_join_button" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_channelbar_join_button_summary_on" android:summaryOff="@string/revanced_adremover_channelbar_join_button_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_chapter_teaser_title" android:key="revanced_adremover_chapter_teaser" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_chapter_teaser_summary_on" android:summaryOff="@string/revanced_adremover_chapter_teaser_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_separator_title" android:key="revanced_adremover_separator" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_separator_summary_on" android:summaryOff="@string/revanced_adremover_separator_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_official_card_in_search_title" android:key="revanced_adremover_official_card_in_search" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_official_card_in_search_summary_on" android:summaryOff="@string/revanced_adremover_official_card_in_search_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_album_card_in_search_title" android:key="revanced_adremover_album_card_in_search" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_album_card_in_search_summary_on" android:summaryOff="@string/revanced_adremover_album_card_in_search_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_breaking_news_shelf_title" android:key="revanced_adremover_breaking_news_shelf" android:defaultValue="false" android:summaryOn="@string/revanced_adremover_breaking_news_shelf_summary_on" android:summaryOff="@string/revanced_adremover_breaking_news_shelf_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_web_search_panel_title" android:key="revanced_adremover_web_search_panel" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_web_search_panel_summary_on" android:summaryOff="@string/revanced_adremover_web_search_panel_summary_off" />
+        <SwitchPreference android:title="@string/revanced_adremover_timed_reactions_title" android:key="revanced_adremover_timed_reactions" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_timed_reactions_summary_on" android:summaryOff="@string/revanced_adremover_timed_reactions_summary_off" />SETTINGS: HIDE_GENERAL_LAYOUT_ADS -->
+
         <!-- SETTINGS: HEADER_SWITCH
         <SwitchPreference android:title="@string/revanced_override_premium_header_title" android:key="revanced_override_premium_header" android:defaultValue="false" android:summaryOn="@string/revanced_override_premium_header_summary_on" android:summaryOff="@string/revanced_override_premium_header_summary_off" />SETTINGS: HEADER_SWITCH -->
 
@@ -180,6 +181,9 @@
         <!-- SETTINGS: HIDE_SUGGESTED_ACTION
         <SwitchPreference android:title="@string/revanced_hide_suggested_actions_title" android:key="revanced_hide_suggested_actions" android:defaultValue="true" android:summaryOn="@string/revanced_hide_suggested_actions_summary_on" android:summaryOff="@string/revanced_hide_suggested_actions_summary_off" />SETTINGS: HIDE_SUGGESTED_ACTION -->
 
+        <!-- SETTINGS: HIDE_VIEW_PRODUCT
+        <SwitchPreference android:title="@string/revanced_adremover_view_products_title" android:key="revanced_adremover_view_products" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_view_products_summary_on" android:summaryOff="@string/revanced_adremover_view_products_summary_off" />SETTINGS: HIDE_VIEW_PRODUCT -->
+
         <!-- SETTINGS: HIDE_PALYER_OVERLAY_FILTER
         <SwitchPreference android:title="@string/revanced_hide_player_overlay_filter_title" android:key="revanced_hide_player_overlay_filter" android:defaultValue="false" android:summaryOn="@string/revanced_hide_player_overlay_filter_summary_on" android:summaryOff="@string/revanced_hide_player_overlay_filter_summary_off" />SETTINGS: HIDE_PALYER_OVERLAY_FILTER -->