From e5d259e3eb1c4f165027145bd4098cc31716516b Mon Sep 17 00:00:00 2001
From: inotia00 <108592928+inotia00@users.noreply.github.com>
Date: Sat, 2 Dec 2023 12:14:53 +0900
Subject: [PATCH] feat(YouTube/Hide general ads): add `Close interstitial ads`
 settings

---
 .../revanced/patches/youtube/ads/general/GeneralAdsPatch.kt   | 1 +
 src/main/resources/youtube/settings/values-v21/strings.xml    | 4 ++++
 src/main/resources/youtube/settings/xml/revanced_prefs.xml    | 4 +++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/app/revanced/patches/youtube/ads/general/GeneralAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ads/general/GeneralAdsPatch.kt
index 5417ecc2b..f4bbb628b 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/ads/general/GeneralAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ads/general/GeneralAdsPatch.kt
@@ -78,6 +78,7 @@ object GeneralAdsPatch : ResourcePatch() {
 
     override fun execute(context: ResourceContext) {
         LithoFilterPatch.addFilter("$COMPONENTS_PATH/AdsFilter;")
+        LithoFilterPatch.addFilter("$COMPONENTS_PATH/InterstitialBannerFilter;")
 
         context.forEach {
 
diff --git a/src/main/resources/youtube/settings/values-v21/strings.xml b/src/main/resources/youtube/settings/values-v21/strings.xml
index d058a64a0..a422fe81d 100644
--- a/src/main/resources/youtube/settings/values-v21/strings.xml
+++ b/src/main/resources/youtube/settings/values-v21/strings.xml
@@ -5,6 +5,10 @@
     <string name="pref_app_language_dialog_message_no_lang_name">This will change the language used in the app including buttons, text and dialogs, but will not change the language of ReVanced Extended settings.</string>
     <string name="pref_app_language_system_default">System default</string>
 
+    <string name="revanced_close_interstitial_ads_summary">"If Interstitial ads are detected, press the back button automatically to close it.
+Since it hasn't been tested, it most likely won't work."</string>
+    <string name="revanced_close_interstitial_ads_title">Close interstitial ads</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>
diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index 31c549efe..3ccfea6db 100644
--- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -21,7 +21,9 @@
         <SwitchPreference android:title="@string/revanced_hide_web_search_results_title" android:key="revanced_hide_web_search_results" android:defaultValue="true" android:summaryOn="@string/revanced_hide_web_search_results_summary_on" android:summaryOff="@string/revanced_hide_web_search_results_summary_off" />SETTINGS: HIDE_GENERAL_ADS -->
 
         <!-- SETTINGS: HIDE_GENERAL_ADS
-        <SwitchPreference android:title="@string/revanced_hide_get_premium_title" android:key="revanced_hide_get_premium" android:defaultValue="true" android:summaryOn="@string/revanced_hide_get_premium_summary_on" android:summaryOff="@string/revanced_hide_get_premium_summary_off" />SETTINGS: HIDE_GENERAL_ADS -->
+        <SwitchPreference android:title="@string/revanced_hide_get_premium_title" android:key="revanced_hide_get_premium" android:defaultValue="true" android:summaryOn="@string/revanced_hide_get_premium_summary_on" android:summaryOff="@string/revanced_hide_get_premium_summary_off" />
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_experimental_flag" />
+        <SwitchPreference android:title="@string/revanced_close_interstitial_ads_title" android:key="revanced_close_interstitial_ads" android:defaultValue="false" android:summary="@string/revanced_close_interstitial_ads_summary" />SETTINGS: HIDE_GENERAL_ADS -->
 
     <!-- PREFERENCE: ADS_SETTINGS
     </PreferenceScreen>PREFERENCE: ADS_SETTINGS -->