From bbe504e616ed7f62b804c2204096742c07e9db74 Mon Sep 17 00:00:00 2001
From: ILoveOpenSourceApplications
<117499019+ILoveOpenSourceApplications@users.noreply.github.com>
Date: Tue, 1 Jul 2025 01:42:01 +0530
Subject: [PATCH] refactor(YouTube): Match YouTube naming and sort strings
(#5309)
---
.../youtube/patches/components/AdsFilter.java | 33 +++++++-----
.../extension/youtube/settings/Settings.java | 8 +--
.../youtube/ad/general/HideAdsPatch.kt | 10 ++--
.../hide/general/HideLayoutComponentsPatch.kt | 2 +-
.../resources/addresources/values/strings.xml | 53 ++++++++++---------
5 files changed, 56 insertions(+), 50 deletions(-)
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/AdsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/AdsFilter.java
index 51903793c..6cd179391 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/AdsFilter.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/AdsFilter.java
@@ -107,21 +107,24 @@ public final class AdsFilter extends Filter {
);
final var viewProducts = new StringFilterGroup(
- Settings.HIDE_PRODUCTS_BANNER,
+ Settings.HIDE_VIEW_PRODUCTS_BANNER,
"product_item",
"products_in_video",
- "shopping_overlay.eml", // Video player overlay shopping links.
- "shopping_carousel.eml" // Channel profile shopping shelf.
+ "shopping_overlay.eml" // Video player overlay shopping links.
);
shoppingLinks = new StringFilterGroup(
- Settings.HIDE_SHOPPING_LINKS,
- "expandable_list",
+ Settings.HIDE_TAGGED_PRODUCTS,
+ "expandable_list"
+ );
+
+ final var storeProductsShelf = new StringFilterGroup(
+ Settings.HIDE_CREATOR_STORE_SHELVES,
"shopping_description_shelf.eml"
);
playerShoppingShelf = new StringFilterGroup(
- Settings.HIDE_PLAYER_STORE_SHELF,
+ Settings.HIDE_CREATOR_STORE_SHELVES,
"horizontal_shelf.eml"
);
@@ -148,7 +151,8 @@ public final class AdsFilter extends Filter {
final var merchandise = new StringFilterGroup(
Settings.HIDE_MERCHANDISE_BANNERS,
- "product_carousel"
+ "product_carousel",
+ "shopping_carousel.eml" // Channel profile shopping shelf.
);
final var selfSponsor = new StringFilterGroup(
@@ -157,16 +161,17 @@ public final class AdsFilter extends Filter {
);
addPathCallbacks(
+ channelProfile,
+ fullscreenAd,
generalAds,
merchandise,
- viewProducts,
- selfSponsor,
- fullscreenAd,
- channelProfile,
- webLinkPanel,
- shoppingLinks,
+ movieAds,
playerShoppingShelf,
- movieAds
+ selfSponsor,
+ shoppingLinks,
+ storeProductsShelf,
+ viewProducts,
+ webLinkPanel
);
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java
index f0eecb5c9..ecdf17fbc 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java
@@ -74,6 +74,7 @@ public class Settings extends BaseSettings {
public static final BooleanSetting FORCE_ORIGINAL_AUDIO = new BooleanSetting("revanced_force_original_audio", FALSE, new ForceOriginalAudioAvailability());
// Ads
+ public static final BooleanSetting HIDE_CREATOR_STORE_SHELVES = new BooleanSetting("revanced_hide_creator_store_shelves", TRUE);
public static final BooleanSetting HIDE_END_SCREEN_STORE_BANNER = new BooleanSetting("revanced_hide_end_screen_store_banner", TRUE, true);
public static final BooleanSetting HIDE_FULLSCREEN_ADS = new BooleanSetting("revanced_hide_fullscreen_ads", TRUE);
public static final BooleanSetting HIDE_GENERAL_ADS = new BooleanSetting("revanced_hide_general_ads", TRUE);
@@ -81,11 +82,10 @@ public class Settings extends BaseSettings {
public static final BooleanSetting HIDE_HIDE_LATEST_POSTS = new BooleanSetting("revanced_hide_latest_posts_ads", TRUE);
public static final BooleanSetting HIDE_MERCHANDISE_BANNERS = new BooleanSetting("revanced_hide_merchandise_banners", TRUE);
public static final BooleanSetting HIDE_PAID_PROMOTION_LABEL = new BooleanSetting("revanced_hide_paid_promotion_label", TRUE);
- public static final BooleanSetting HIDE_PLAYER_STORE_SHELF = new BooleanSetting("revanced_hide_player_store_shelf", TRUE);
- public static final BooleanSetting HIDE_PRODUCTS_BANNER = new BooleanSetting("revanced_hide_products_banner", TRUE);
public static final BooleanSetting HIDE_SELF_SPONSOR = new BooleanSetting("revanced_hide_self_sponsor_ads", TRUE);
- public static final BooleanSetting HIDE_SHOPPING_LINKS = new BooleanSetting("revanced_hide_shopping_links", TRUE);
+ public static final BooleanSetting HIDE_TAGGED_PRODUCTS = new BooleanSetting("revanced_hide_tagged_products", TRUE);
public static final BooleanSetting HIDE_VIDEO_ADS = new BooleanSetting("revanced_hide_video_ads", TRUE, true);
+ public static final BooleanSetting HIDE_VIEW_PRODUCTS_BANNER = new BooleanSetting("revanced_hide_view_products_banner", TRUE);
public static final BooleanSetting HIDE_VISIT_STORE_BUTTON = new BooleanSetting("revanced_hide_visit_store_button", TRUE);
public static final BooleanSetting HIDE_WEB_SEARCH_RESULTS = new BooleanSetting("revanced_hide_web_search_results", TRUE);
@@ -187,10 +187,10 @@ public class Settings extends BaseSettings {
public static final BooleanSetting HIDE_COMMENTS_AI_SUMMARY = new BooleanSetting("revanced_hide_comments_ai_summary", FALSE);
public static final BooleanSetting HIDE_COMMENTS_BY_MEMBERS_HEADER = new BooleanSetting("revanced_hide_comments_by_members_header", FALSE);
public static final BooleanSetting HIDE_COMMENTS_CREATE_A_SHORT_BUTTON = new BooleanSetting("revanced_hide_comments_create_a_short_button", TRUE);
- public static final BooleanSetting HIDE_COMMENTS_TIMESTAMP_BUTTON = new BooleanSetting("revanced_hide_comments_timestamp_button", FALSE);
public static final BooleanSetting HIDE_COMMENTS_PREVIEW_COMMENT = new BooleanSetting("revanced_hide_comments_preview_comment", FALSE);
public static final BooleanSetting HIDE_COMMENTS_SECTION = new BooleanSetting("revanced_hide_comments_section", FALSE);
public static final BooleanSetting HIDE_COMMENTS_THANKS_BUTTON = new BooleanSetting("revanced_hide_comments_thanks_button", TRUE);
+ public static final BooleanSetting HIDE_COMMENTS_TIMESTAMP_BUTTON = new BooleanSetting("revanced_hide_comments_timestamp_button", FALSE);
// Description
public static final BooleanSetting HIDE_AI_GENERATED_VIDEO_SUMMARY_SECTION = new BooleanSetting("revanced_hide_ai_generated_video_summary_section", FALSE);
public static final BooleanSetting HIDE_ASK_SECTION = new BooleanSetting("revanced_hide_ask_section", FALSE);
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt
index be632ff76..4e1b8b38e 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt
@@ -43,17 +43,17 @@ private val hideAdsResourcePatch = resourcePatch {
addResources("youtube", "ad.general.hideAdsResourcePatch")
PreferenceScreen.ADS.addPreferences(
- SwitchPreference("revanced_hide_general_ads"),
+ SwitchPreference("revanced_hide_creator_store_shelves"),
SwitchPreference("revanced_hide_end_screen_store_banner"),
SwitchPreference("revanced_hide_fullscreen_ads"),
+ SwitchPreference("revanced_hide_general_ads"),
+ SwitchPreference("revanced_hide_merchandise_banners"),
SwitchPreference("revanced_hide_paid_promotion_label"),
- SwitchPreference("revanced_hide_player_store_shelf"),
SwitchPreference("revanced_hide_self_sponsor_ads"),
- SwitchPreference("revanced_hide_products_banner"),
- SwitchPreference("revanced_hide_shopping_links"),
+ SwitchPreference("revanced_hide_tagged_products"),
+ SwitchPreference("revanced_hide_view_products_banner"),
SwitchPreference("revanced_hide_visit_store_button"),
SwitchPreference("revanced_hide_web_search_results"),
- SwitchPreference("revanced_hide_merchandise_banners"),
)
addLithoFilter("Lapp/revanced/extension/youtube/patches/components/AdsFilter;")
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
index 34925d565..189619214 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
@@ -160,9 +160,9 @@ val hideLayoutComponentsPatch = bytecodePatch(
SwitchPreference("revanced_hide_comments_by_members_header"),
SwitchPreference("revanced_hide_comments_section"),
SwitchPreference("revanced_hide_comments_create_a_short_button"),
- SwitchPreference("revanced_hide_comments_timestamp_button"),
SwitchPreference("revanced_hide_comments_preview_comment"),
SwitchPreference("revanced_hide_comments_thanks_button"),
+ SwitchPreference("revanced_hide_comments_timestamp_button"),
),
sorting = PreferenceScreenPreference.Sorting.UNSORTED,
),
diff --git a/patches/src/main/resources/addresources/values/strings.xml b/patches/src/main/resources/addresources/values/strings.xml
index bec6c8537..d8c18f4b1 100644
--- a/patches/src/main/resources/addresources/values/strings.xml
+++ b/patches/src/main/resources/addresources/values/strings.xml
@@ -363,7 +363,7 @@ You will not be notified of any unexpected events."
Hide AI Chat summary
Chat summary is hidden
Chat summary is shown
- Hide AI Comments summary
+ Hide AI comments summary
Comments summary is hidden
Comments summary is shown
Hide \'Comments by members\' header
@@ -375,15 +375,15 @@ You will not be notified of any unexpected events."
Hide \'Create a Short\' button
Create a Short button is hidden
Create a Short button is shown
- Hide timestamp button
- Timestamp button is hidden
- Timestamp button is shown
Hide preview comment
Preview comment is hidden
Preview comment is shown
Hide Thanks button
Thanks button is hidden
Thanks button is shown
+ Hide timestamp button
+ Timestamp button is hidden
+ Timestamp button is shown
Hide YouTube Doodles
@@ -439,32 +439,38 @@ Limitations
Keyword will hide all videos: %s
- Hide general ads
- General ads are hidden
- General ads are shown
+ Hide creator store shelves
+ Store shelves below the player and in video description are hidden
+ Store shelves below the player and in video description are shown
+ Hide end screen store banner
+ Store banner is hidden
+ Store banner is shown
Hide fullscreen ads
"Fullscreen ads are hidden
This feature is only available for older devices"
Fullscreen ads are shown
+
+ Hide fullscreen ads only works with older devices
+ Hide general ads
+ General ads are hidden
+ General ads are shown
+ Hide merchandise banners
+ Merchandise banners are hidden
+ Merchandise banners are shown
Hide paid promotion label
Paid promotion label is hidden
Paid promotion label is shown
+
+ Hide \'View products\' banner
+ Banner in video overlay is hidden
+ Banner in video overlay is shown
Hide self sponsored cards
Self sponsored cards are hidden
Self sponsored cards are shown
- Hide \'View products\' banner
- Banner is hidden
- Banner is shown
- Hide end screen store banner
- Store banner is hidden
- Store banner is shown
- Hide player shopping shelf
- Shopping shelf is hidden
- Shopping shelf is shown
- Hide shopping links
- Shopping links in video description are hidden
- Shopping links in video description are shown
+ Hide tagged products
+ Tagged products in video description are hidden
+ Tagged products in video description are shown
Hide \'Visit store\' button
Button in channel page is hidden
@@ -472,11 +478,6 @@ This feature is only available for older devices"
Hide web search results
Web search results are hidden
Web search results are shown
- Hide merchandise banners
- Merchandise banners are hidden
- Merchandise banners are shown
-
- Hide fullscreen ads only works with older devices
Hide YouTube Premium promotions
@@ -888,10 +889,10 @@ To show the Audio track menu, change \'Spoof video streams\' to iOS TV"
Hide sound metadata label
Metadata label is hidden
Metadata label is shown
- Hide full video link label
+ Hide video link label
Video link label is hidden
Video link label is shown
- Hide sound button
+ Hide Sound button
Sound button is hidden
Sound button is shown
Hide navigation bar