From 83a3f4da0034411d048100c3702136b1c75ba314 Mon Sep 17 00:00:00 2001 From: ILoveOpenSourceApplications <117499019+ILoveOpenSourceApplications@users.noreply.github.com> Date: Sun, 6 Jul 2025 13:54:25 +0530 Subject: [PATCH] refactor: Standardize string formatting and apply alphabetical sorting (#5343) --- .../components/LayoutComponentsFilter.java | 51 ++- .../extension/youtube/settings/Settings.java | 29 +- .../patches/crunchyroll/ads/HideAdsPatch.kt | 2 +- .../hide/general/HideLayoutComponentsPatch.kt | 5 +- .../resources/addresources/values/strings.xml | 371 +++++++++--------- 5 files changed, 234 insertions(+), 224 deletions(-) diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java index 7bf8e0ecc..915479aa1 100644 --- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java @@ -167,7 +167,7 @@ public final class LayoutComponentsFilter extends Filter { ); expandableMetadata = new StringFilterGroup( - Settings.HIDE_EXPANDABLE_CHIP, + Settings.HIDE_EXPANDABLE_CARD, "inline_expander" ); @@ -233,8 +233,8 @@ public final class LayoutComponentsFilter extends Filter { "mixed_content_shelf" ); - final var searchResultRecommendationLabels = new StringFilterGroup( - Settings.HIDE_SEARCH_RESULT_RECOMMENDATION_LABELS, + final var videoRecommendationLabels = new StringFilterGroup( + Settings.HIDE_VIDEO_RECOMMENDATION_LABELS, "endorsement_header_footer.eml" ); @@ -268,36 +268,35 @@ public final class LayoutComponentsFilter extends Filter { ); addPathCallbacks( - expandableMetadata, - inFeedSurvey, - notifyMe, - compactChannelBar, - communityPosts, - paidPromotion, - searchResultRecommendationLabels, - latestPosts, + artistCard, + audioTrackButton, + channelLinksPreview, + channelMembersShelf, + channelProfile, channelWatermark, - playables, - quickActions, - relatedVideos, + chipBar, compactBanner, + compactChannelBar, compactChannelBarInner, - medicalPanel, - infoPanel, - singleItemInformationPanel, + communityPosts, emergencyBox, + expandableMetadata, + forYouShelf, + horizontalShelves, + imageShelf, + inFeedSurvey, + infoPanel, + latestPosts, + medicalPanel, + notifyMe, + paidPromotion, + playables, + relatedVideos, + singleItemInformationPanel, subscribersCommunityGuidelines, subscriptionsChipBar, - chipBar, - channelLinksPreview, - channelProfile, - audioTrackButton, - artistCard, timedReactions, - imageShelf, - channelMembersShelf, - forYouShelf, - horizontalShelves + videoRecommendationLabels ); } 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 ce4982f3e..52a8ebcd1 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 @@ -62,6 +62,7 @@ public class Settings extends BaseSettings { parentsAny(REMEMBER_VIDEO_QUALITY_LAST_SELECTED, REMEMBER_SHORTS_QUALITY_LAST_SELECTED)); public static final BooleanSetting ADVANCED_VIDEO_QUALITY_MENU = new BooleanSetting("revanced_advanced_video_quality_menu", TRUE); public static final BooleanSetting DISABLE_HDR_VIDEO = new BooleanSetting("revanced_disable_hdr_video", FALSE); + // Speed public static final FloatSetting SPEED_TAP_AND_HOLD = new FloatSetting("revanced_speed_tap_and_hold", 2.0f, true); public static final BooleanSetting REMEMBER_PLAYBACK_SPEED_LAST_SELECTED = new BooleanSetting("revanced_remember_playback_speed_last_selected", FALSE); @@ -71,6 +72,7 @@ public class Settings extends BaseSettings { public static final FloatSetting PLAYBACK_SPEED_DEFAULT = new FloatSetting("revanced_playback_speed_default", -2.0f); public static final StringSetting CUSTOM_PLAYBACK_SPEEDS = new StringSetting("revanced_custom_playback_speeds", "0.25\n0.5\n0.75\n1.0\n1.25\n1.5\n1.75\n2.0\n2.5\n3.0\n4.0\n5.0\n6.0\n7.0\n8.0", true); + // Audio public static final BooleanSetting FORCE_ORIGINAL_AUDIO = new BooleanSetting("revanced_force_original_audio", FALSE, new ForceOriginalAudioAvailability()); @@ -97,7 +99,7 @@ public class Settings extends BaseSettings { public static final BooleanSetting HIDE_COMPACT_BANNER = new BooleanSetting("revanced_hide_compact_banner", TRUE); public static final BooleanSetting HIDE_CROWDFUNDING_BOX = new BooleanSetting("revanced_hide_crowdfunding_box", FALSE, true); public static final BooleanSetting HIDE_DOODLES = new BooleanSetting("revanced_hide_doodles", FALSE, true, "revanced_hide_doodles_user_dialog_message"); - public static final BooleanSetting HIDE_EXPANDABLE_CHIP = new BooleanSetting("revanced_hide_expandable_chip", TRUE); + public static final BooleanSetting HIDE_EXPANDABLE_CARD = new BooleanSetting("revanced_hide_expandable_card", TRUE); public static final BooleanSetting HIDE_FEED_SURVEY = new BooleanSetting("revanced_hide_feed_survey", TRUE); public static final BooleanSetting HIDE_FILTER_BAR_FEED_IN_FEED = new BooleanSetting("revanced_hide_filter_bar_feed_in_feed", FALSE, true); public static final BooleanSetting HIDE_FILTER_BAR_FEED_IN_HISTORY = new BooleanSetting("revanced_hide_filter_bar_feed_in_history", FALSE); @@ -110,9 +112,10 @@ public class Settings extends BaseSettings { public static final BooleanSetting HIDE_MOVIES_SECTION = new BooleanSetting("revanced_hide_movies_section", TRUE); public static final BooleanSetting HIDE_NOTIFY_ME_BUTTON = new BooleanSetting("revanced_hide_notify_me_button", TRUE); public static final BooleanSetting HIDE_PLAYABLES = new BooleanSetting("revanced_hide_playables", TRUE); - public static final BooleanSetting HIDE_SEARCH_RESULT_RECOMMENDATION_LABELS = new BooleanSetting("revanced_hide_search_result_recommendation_labels", TRUE); public static final BooleanSetting HIDE_SHOW_MORE_BUTTON = new BooleanSetting("revanced_hide_show_more_button", TRUE, true); public static final BooleanSetting HIDE_TICKET_SHELF = new BooleanSetting("revanced_hide_ticket_shelf", FALSE); + public static final BooleanSetting HIDE_VIDEO_RECOMMENDATION_LABELS = new BooleanSetting("revanced_hide_video_recommendation_labels", TRUE); + // Alternative thumbnails public static final EnumSetting ALT_THUMBNAIL_HOME = new EnumSetting<>("revanced_alt_thumbnail_home", ThumbnailOption.ORIGINAL); public static final EnumSetting ALT_THUMBNAIL_SUBSCRIPTIONS = new EnumSetting<>("revanced_alt_thumbnail_subscription", ThumbnailOption.ORIGINAL); @@ -124,12 +127,14 @@ public class Settings extends BaseSettings { public static final BooleanSetting ALT_THUMBNAIL_DEARROW_CONNECTION_TOAST = new BooleanSetting("revanced_alt_thumbnail_dearrow_connection_toast", TRUE, new DeArrowAvailability()); public static final EnumSetting ALT_THUMBNAIL_STILLS_TIME = new EnumSetting<>("revanced_alt_thumbnail_stills_time", ThumbnailStillTime.MIDDLE, new StillImagesAvailability()); public static final BooleanSetting ALT_THUMBNAIL_STILLS_FAST = new BooleanSetting("revanced_alt_thumbnail_stills_fast", FALSE, new StillImagesAvailability()); + // Hide keyword content public static final BooleanSetting HIDE_KEYWORD_CONTENT_HOME = new BooleanSetting("revanced_hide_keyword_content_home", FALSE); public static final BooleanSetting HIDE_KEYWORD_CONTENT_SUBSCRIPTIONS = new BooleanSetting("revanced_hide_keyword_content_subscriptions", FALSE); public static final BooleanSetting HIDE_KEYWORD_CONTENT_SEARCH = new BooleanSetting("revanced_hide_keyword_content_search", FALSE); public static final StringSetting HIDE_KEYWORD_CONTENT_PHRASES = new StringSetting("revanced_hide_keyword_content_phrases", "", parentsAny(HIDE_KEYWORD_CONTENT_HOME, HIDE_KEYWORD_CONTENT_SUBSCRIPTIONS, HIDE_KEYWORD_CONTENT_SEARCH)); + // Channel page public static final BooleanSetting HIDE_FOR_YOU_SHELF = new BooleanSetting("revanced_hide_for_you_shelf", FALSE); public static final BooleanSetting HIDE_LINKS_PREVIEW = new BooleanSetting("revanced_hide_links_preview", TRUE); @@ -147,18 +152,18 @@ public class Settings extends BaseSettings { public static final BooleanSetting HIDE_AUTOPLAY_BUTTON = new BooleanSetting("revanced_hide_autoplay_button", TRUE, true); public static final BooleanSetting HIDE_CAPTIONS_BUTTON = new BooleanSetting("revanced_hide_captions_button", FALSE); public static final BooleanSetting HIDE_CAST_BUTTON = new BooleanSetting("revanced_hide_cast_button", TRUE, true); - public static final BooleanSetting HIDE_PLAYER_CONTROL_BUTTONS_BACKGROUND = new BooleanSetting("revanced_hide_player_control_buttons_background", FALSE, true); public static final BooleanSetting HIDE_CHANNEL_BAR = new BooleanSetting("revanced_hide_channel_bar", FALSE); public static final BooleanSetting HIDE_EMERGENCY_BOX = new BooleanSetting("revanced_hide_emergency_box", TRUE); public static final BooleanSetting HIDE_ENDSCREEN_CARDS = new BooleanSetting("revanced_hide_endscreen_cards", FALSE); public static final BooleanSetting HIDE_END_SCREEN_SUGGESTED_VIDEO = new BooleanSetting("revanced_end_screen_suggested_video", FALSE, true); - public static final BooleanSetting HIDE_RELATED_VIDEO_OVERLAY = new BooleanSetting("revanced_hide_related_video_overlay", FALSE, true); - public static final BooleanSetting HIDE_INFO_PANELS = new BooleanSetting("revanced_hide_info_panels", TRUE); public static final BooleanSetting HIDE_INFO_CARDS = new BooleanSetting("revanced_hide_info_cards", FALSE); + public static final BooleanSetting HIDE_INFO_PANELS = new BooleanSetting("revanced_hide_info_panels", TRUE); public static final BooleanSetting HIDE_JOIN_MEMBERSHIP_BUTTON = new BooleanSetting("revanced_hide_join_membership_button", TRUE); public static final BooleanSetting HIDE_MEDICAL_PANELS = new BooleanSetting("revanced_hide_medical_panels", TRUE); + public static final BooleanSetting HIDE_PLAYER_CONTROL_BUTTONS_BACKGROUND = new BooleanSetting("revanced_hide_player_control_buttons_background", FALSE, true); public static final BooleanSetting HIDE_PLAYER_PREVIOUS_NEXT_BUTTONS = new BooleanSetting("revanced_hide_player_previous_next_buttons", FALSE, true); public static final BooleanSetting HIDE_QUICK_ACTIONS = new BooleanSetting("revanced_hide_quick_actions", FALSE); + public static final BooleanSetting HIDE_RELATED_VIDEO_OVERLAY = new BooleanSetting("revanced_hide_related_video_overlay", FALSE, true); public static final BooleanSetting HIDE_RELATED_VIDEOS = new BooleanSetting("revanced_hide_related_videos", FALSE); public static final BooleanSetting HIDE_SUBSCRIBERS_COMMUNITY_GUIDELINES = new BooleanSetting("revanced_hide_subscribers_community_guidelines", TRUE); public static final BooleanSetting HIDE_TIMED_REACTIONS = new BooleanSetting("revanced_hide_timed_reactions", TRUE); @@ -167,6 +172,7 @@ public class Settings extends BaseSettings { public static final BooleanSetting PLAYBACK_SPEED_DIALOG_BUTTON = new BooleanSetting("revanced_playback_speed_dialog_button", FALSE); public static final IntegerSetting PLAYER_OVERLAY_OPACITY = new IntegerSetting("revanced_player_overlay_opacity", 100, true); public static final BooleanSetting PLAYER_POPUP_PANELS = new BooleanSetting("revanced_hide_player_popup_panels", FALSE); + // Miniplayer public static final EnumSetting MINIPLAYER_TYPE = new EnumSetting<>("revanced_miniplayer_type", MiniplayerType.DEFAULT, true); private static final Availability MINIPLAYER_ANY_MODERN = MINIPLAYER_TYPE.availability(MODERN_1, MODERN_2, MODERN_3, MODERN_4); @@ -179,22 +185,25 @@ public class Settings extends BaseSettings { public static final BooleanSetting MINIPLAYER_ROUNDED_CORNERS = new BooleanSetting("revanced_miniplayer_rounded_corners", TRUE, true, MINIPLAYER_ANY_MODERN); public static final IntegerSetting MINIPLAYER_WIDTH_DIP = new IntegerSetting("revanced_miniplayer_width_dip", 192, true, MINIPLAYER_ANY_MODERN); public static final IntegerSetting MINIPLAYER_OPACITY = new IntegerSetting("revanced_miniplayer_opacity", 100, true, MINIPLAYER_TYPE.availability(MODERN_1)); + // External downloader public static final BooleanSetting EXTERNAL_DOWNLOADER = new BooleanSetting("revanced_external_downloader", FALSE); public static final BooleanSetting EXTERNAL_DOWNLOADER_ACTION_BUTTON = new BooleanSetting("revanced_external_downloader_action_button", FALSE); public static final StringSetting EXTERNAL_DOWNLOADER_PACKAGE_NAME = new StringSetting("revanced_external_downloader_name", "org.schabi.newpipe" /* NewPipe */, parentsAny(EXTERNAL_DOWNLOADER, EXTERNAL_DOWNLOADER_ACTION_BUTTON)); + // Comments public static final BooleanSetting HIDE_COMMENTS_AI_CHAT_SUMMARY = new BooleanSetting("revanced_hide_comments_ai_chat_summary", FALSE); public static final BooleanSetting HIDE_COMMENTS_AI_SUMMARY = new BooleanSetting("revanced_hide_comments_ai_summary", FALSE); - public static final BooleanSetting HIDE_COMMENTS_CHANNEL_GUIDELINES = new BooleanSetting("revanced_hide_comments_channel_guidelines", TRUE); public static final BooleanSetting HIDE_COMMENTS_BY_MEMBERS_HEADER = new BooleanSetting("revanced_hide_comments_by_members_header", FALSE); + public static final BooleanSetting HIDE_COMMENTS_CHANNEL_GUIDELINES = new BooleanSetting("revanced_hide_comments_channel_guidelines", TRUE); public static final BooleanSetting HIDE_COMMENTS_COMMUNITY_GUIDELINES = new BooleanSetting("revanced_hide_comments_community_guidelines", TRUE); 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_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); @@ -205,6 +214,7 @@ public class Settings extends BaseSettings { public static final BooleanSetting HIDE_KEY_CONCEPTS_SECTION = new BooleanSetting("revanced_hide_key_concepts_section", FALSE); public static final BooleanSetting HIDE_PODCAST_SECTION = new BooleanSetting("revanced_hide_podcast_section", TRUE); public static final BooleanSetting HIDE_TRANSCRIPT_SECTION = new BooleanSetting("revanced_hide_transcript_section", TRUE); + // Action buttons public static final BooleanSetting DISABLE_LIKE_SUBSCRIBE_GLOW = new BooleanSetting("revanced_disable_like_subscribe_glow", FALSE); public static final BooleanSetting HIDE_ASK_BUTTON = new BooleanSetting("revanced_hide_ask_button", FALSE); @@ -217,6 +227,7 @@ public class Settings extends BaseSettings { public static final BooleanSetting HIDE_SHARE_BUTTON = new BooleanSetting("revanced_hide_share_button", FALSE); public static final BooleanSetting HIDE_STOP_ADS_BUTTON = new BooleanSetting("revanced_hide_stop_ads_button", TRUE); public static final BooleanSetting HIDE_THANKS_BUTTON = new BooleanSetting("revanced_hide_thanks_button", TRUE); + // Player flyout menu items public static final BooleanSetting HIDE_PLAYER_FLYOUT_ADDITIONAL_SETTINGS = new BooleanSetting("revanced_hide_player_flyout_additional_settings", FALSE); public static final BooleanSetting HIDE_PLAYER_FLYOUT_AMBIENT_MODE = new BooleanSetting("revanced_hide_player_flyout_ambient_mode", FALSE); @@ -250,9 +261,11 @@ public class Settings extends BaseSettings { public static final BooleanSetting CHANGE_START_PAGE_ALWAYS = new BooleanSetting("revanced_change_start_page_always", FALSE, true, new ChangeStartPageTypeAvailability()); public static final StringSetting SPOOF_APP_VERSION_TARGET = new StringSetting("revanced_spoof_app_version_target", "19.01.34", true, parent(SPOOF_APP_VERSION)); + // Custom filter public static final BooleanSetting CUSTOM_FILTER = new BooleanSetting("revanced_custom_filter", FALSE); public static final StringSetting CUSTOM_FILTER_STRINGS = new StringSetting("revanced_custom_filter_strings", "", true, parent(CUSTOM_FILTER)); + // Navigation buttons public static final BooleanSetting HIDE_HOME_BUTTON = new BooleanSetting("revanced_hide_home_button", FALSE, true); public static final BooleanSetting HIDE_CREATE_BUTTON = new BooleanSetting("revanced_hide_create_button", TRUE, true); @@ -288,12 +301,12 @@ public class Settings extends BaseSettings { public static final BooleanSetting HIDE_SHORTS_LOCATION_LABEL = new BooleanSetting("revanced_hide_shorts_location_label", FALSE); public static final BooleanSetting HIDE_SHORTS_NAVIGATION_BAR = new BooleanSetting("revanced_hide_shorts_navigation_bar", FALSE, true); public static final BooleanSetting HIDE_SHORTS_PAUSED_OVERLAY_BUTTONS = new BooleanSetting("revanced_hide_shorts_paused_overlay_buttons", FALSE); + public static final BooleanSetting HIDE_SHORTS_PREVIEW_COMMENT = new BooleanSetting("revanced_hide_shorts_preview_comment", TRUE); public static final BooleanSetting HIDE_SHORTS_REMIX_BUTTON = new BooleanSetting("revanced_hide_shorts_remix_button", TRUE); public static final BooleanSetting HIDE_SHORTS_SAVE_SOUND_BUTTON = new BooleanSetting("revanced_hide_shorts_save_sound_button", TRUE); public static final BooleanSetting HIDE_SHORTS_SEARCH = new BooleanSetting("revanced_hide_shorts_search", FALSE); public static final BooleanSetting HIDE_SHORTS_SEARCH_SUGGESTIONS = new BooleanSetting("revanced_hide_shorts_search_suggestions", TRUE); public static final BooleanSetting HIDE_SHORTS_SHARE_BUTTON = new BooleanSetting("revanced_hide_shorts_share_button", FALSE); - public static final BooleanSetting HIDE_SHORTS_PREVIEW_COMMENT = new BooleanSetting("revanced_hide_shorts_preview_comment", TRUE); public static final BooleanSetting HIDE_SHORTS_SHOP_BUTTON = new BooleanSetting("revanced_hide_shorts_shop_button", TRUE); public static final BooleanSetting HIDE_SHORTS_SOUND_BUTTON = new BooleanSetting("revanced_hide_shorts_sound_button", FALSE); public static final BooleanSetting HIDE_SHORTS_SOUND_METADATA_LABEL = new BooleanSetting("revanced_hide_shorts_sound_metadata_label", FALSE); @@ -323,7 +336,7 @@ public class Settings extends BaseSettings { public static final StringSetting SEEKBAR_CUSTOM_COLOR_PRIMARY = new StringSetting("revanced_seekbar_custom_color_primary", "#FF0033", true, parent(SEEKBAR_CUSTOM_COLOR)); public static final StringSetting SEEKBAR_CUSTOM_COLOR_ACCENT = new StringSetting("revanced_seekbar_custom_color_accent", "#FF2791", true, parent(SEEKBAR_CUSTOM_COLOR)); - // Misc + // Miscellaneous public static final BooleanSetting ANNOUNCEMENTS = new BooleanSetting("revanced_announcements", TRUE); public static final IntegerSetting ANNOUNCEMENT_LAST_ID = new IntegerSetting("revanced_announcement_last_id", -1, false, false); public static final BooleanSetting AUTO_REPEAT = new BooleanSetting("revanced_auto_repeat", FALSE); diff --git a/patches/src/main/kotlin/app/revanced/patches/crunchyroll/ads/HideAdsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/crunchyroll/ads/HideAdsPatch.kt index 5344175bc..bb354a568 100644 --- a/patches/src/main/kotlin/app/revanced/patches/crunchyroll/ads/HideAdsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/crunchyroll/ads/HideAdsPatch.kt @@ -14,7 +14,7 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference @Suppress("unused") val hideAdsPatch = bytecodePatch( - name = "Hide Ads" + name = "Hide ads" ) { compatibleWith("com.crunchyroll.crunchyroid") 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 a5fbf4643..e81d05a10 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 @@ -221,7 +221,7 @@ val hideLayoutComponentsPatch = bytecodePatch( SwitchPreference("revanced_hide_compact_banner"), SwitchPreference("revanced_hide_crowdfunding_box"), SwitchPreference("revanced_hide_chips_shelf"), - SwitchPreference("revanced_hide_expandable_chip"), + SwitchPreference("revanced_hide_expandable_card"), SwitchPreference("revanced_hide_feed_survey"), SwitchPreference("revanced_hide_floating_microphone_button"), SwitchPreference("revanced_hide_horizontal_shelves"), @@ -231,9 +231,9 @@ val hideLayoutComponentsPatch = bytecodePatch( SwitchPreference("revanced_hide_movies_section"), SwitchPreference("revanced_hide_notify_me_button"), SwitchPreference("revanced_hide_playables"), - SwitchPreference("revanced_hide_search_result_recommendation_labels"), SwitchPreference("revanced_hide_show_more_button"), SwitchPreference("revanced_hide_ticket_shelf"), + SwitchPreference("revanced_hide_video_recommendation_labels"), SwitchPreference("revanced_hide_doodles"), ) @@ -243,7 +243,6 @@ val hideLayoutComponentsPatch = bytecodePatch( sorting = PreferenceScreenPreference.Sorting.UNSORTED, preferences = setOf( SwitchPreference("revanced_custom_filter"), - // TODO: This should be a dynamic ListPreference, which does not exist yet TextPreference("revanced_custom_filter_strings", inputType = InputType.TEXT_MULTI_LINE), ), ), diff --git a/patches/src/main/resources/addresources/values/strings.xml b/patches/src/main/resources/addresources/values/strings.xml index 9f6b784dd..df020fead 100644 --- a/patches/src/main/resources/addresources/values/strings.xml +++ b/patches/src/main/resources/addresources/values/strings.xml @@ -204,91 +204,39 @@ You will not be notified of any unexpected events." Hide album cards Album cards are hidden Album cards are shown - Hide crowdfunding box - Crowdfunding box is hidden - Crowdfunding box is shown - Hide floating microphone button - Microphone button hidden - Microphone button shown - Hide channel watermark - Watermark is hidden - Watermark is shown - Hide horizontal shelves - "Shelves are hidden, such as: -• Breaking news -• Continue watching -• Explore more channels -• Most relevant -• Shopping -• Watch it again" - Shelves are shown - - Hide Join button - Button is hidden - Button is shown - - Hide \'Notify me\' button - Button is hidden - Button is shown - - Hide video recommendation labels - \'People also watched\' and \'You might also like\' labels are hidden - \'People also watched\' and \'You might also like\' labels are shown - - Hide \'Show more\' button - Button is hidden - Button is shown - Hide ticket shelf - Ticket shelf is hidden - Ticket shelf is shown - Hide timed reactions - Timed reactions are hidden - Timed reactions are shown + Hide artist cards + Artist cards are hidden + Artist cards are shown Hide chips shelf Chips shelf is hidden Chips shelf is shown - Hide expandable card - Expandable card under videos is hidden - Expandable card under videos is shown Hide community posts Community posts are hidden Community posts are shown Hide compact banners Compact banners are hidden Compact banners are shown - Hide movies section - Movies section is hidden - Movies section is shown + Hide crowdfunding box + Crowdfunding box is hidden + Crowdfunding box is shown + Hide expandable card + Expandable card under videos is hidden + Expandable card under videos is shown Hide feed surveys Feed surveys are hidden Feed surveys are shown - Hide subscribers guidelines - Subscribers community guidelines are hidden - Subscribers community guidelines are shown - Hide emergency boxes - Emergency boxes are hidden - Emergency boxes are shown - Hide info panels - Info panels are hidden - Info panels are shown - Hide medical panels - Medical panels are hidden - Medical panels are shown - Hide channel bar - Channel bar is hidden - Channel bar is shown - Hide Playables - Playables are hidden - Playables are shown - Hide quick actions - Quick actions in fullscreen are hidden - Quick actions in fullscreen are shown - Hide related videos - Related videos in quick actions are hidden - Related videos in quick actions are shown + Hide floating microphone button + Floating microphone button in search is hidden + Floating microphone button in search is shown + Hide horizontal shelves + "Horizontal shelves are hidden, such as: +• Breaking news +• Continue watching +• Explore more channels +• Most relevant +• Shopping +• Watch it again" + Horizontal shelves are shown Hide image shelf Image shelf in search results is hidden Image shelf in search results is shown @@ -298,9 +246,68 @@ You will not be notified of any unexpected events." Hide mix playlists Mix playlists are hidden Mix playlists are shown - Hide artist cards - Artist cards are hidden - Artist cards are shown + Hide movies section + Movies section is hidden + Movies section is shown + + Hide \'Notify me\' button + Notify me button is hidden + Notify me button is shown + Hide Playables + Playables are hidden + Playables are shown + + Hide \'Show more\' button + Show more button in search results is hidden + Show more button in search results is shown + Hide ticket shelf + Ticket shelf is hidden + Ticket shelf is shown + + Hide video recommendation labels + \'People also watched\' and \'You might also like\' labels in search results are hidden + \'People also watched\' and \'You might also like\' labels in search results are shown + + Hide YouTube Doodles + YouTube Doodles animation on the logo is hidden + YouTube Doodles animation on the logo is shown + "YouTube Doodles are shown a few days each year. + +If a Doodle is currently showing in your region and this hide setting is on, then the filter bar below the search bar will also be hidden." + Hide channel bar + Channel bar is hidden + Channel bar is shown + Hide channel watermark + Watermark is hidden + Watermark is shown + Hide emergency boxes + Emergency boxes are hidden + Emergency boxes are shown + Hide info panels + Info panels are hidden + Info panels are shown + + Hide Join button + Join button is hidden + Join button is shown + Hide medical panels + Medical panels are hidden + Medical panels are shown + Hide quick actions + Quick actions in fullscreen are hidden + Quick actions in fullscreen are shown + Hide related videos + Related videos in quick actions are hidden + Related videos in quick actions are shown + Hide subscribers guidelines + Subscribers community guidelines are hidden + Subscribers community guidelines are shown + Hide timed reactions + Timed reactions are hidden + Timed reactions are shown Hide \'AI-generated video summary\' Video summary section is hidden Video summary section is shown @@ -400,13 +407,6 @@ You will not be notified of any unexpected events." Timestamp button is hidden Timestamp button is shown - - Hide YouTube Doodles - Search bar Doodles are hidden - Search bar Doodles are shown - "YouTube Doodles are shown a few days each year. - -If a Doodle is currently showing in your region and this hide setting is on, then the filter bar below the search bar will also be hidden." Custom filter Hide components using custom filters Enable custom filter @@ -455,11 +455,11 @@ Limitations Hide creator store shelf - Store shelf under video player is hidden - Store shelf under video player is shown + Creator store shelf under video player is hidden + Creator store shelf under video player is shown Hide end screen store banner - Store banner is hidden - Store banner is shown + End screen store banner is hidden + End screen store banner is shown Hide fullscreen ads "Fullscreen ads are hidden @@ -480,12 +480,12 @@ This feature is only available for older devices" Self sponsored cards are hidden Self sponsored cards are shown Hide shopping links - Links in the video description are hidden - Links in the video description are shown + Shopping links in video description are hidden + Shopping links in video description are shown Hide \'View products\' banner - Banner in video overlay is hidden - Banner in video overlay is shown + View products banner in video overlay is hidden + View products banner in video overlay is shown Hide web search results Web search results are hidden Web search results are shown @@ -522,7 +522,7 @@ This feature is only available for older devices" Show external download button Download button in player is shown Download button in player is not shown - + Override Download action button Download button opens your external downloader Download button opens the native in-app downloader @@ -615,7 +615,7 @@ Adjust volume by swiping vertically on the right side of the screen" Stop ads button is hidden Stop ads button is shown + This button usually appears only on live streams. --> Hide Report Report button is hidden Report button is shown @@ -632,7 +632,7 @@ Adjust volume by swiping vertically on the right side of the screen" Thanks button is hidden Thanks button is shown + This button only shows up if the user ip is from specific region such as the USA or EU. --> Hide Ask Ask button is hidden Ask button is shown @@ -656,7 +656,7 @@ Adjust volume by swiping vertically on the right side of the screen" Hide Shorts Shorts button is hidden Shorts button is shown - + Hide Create Create button is hidden Create button is shown @@ -725,7 +725,7 @@ If changing this setting does not take effect, try switching to Incognito mode." Playback speed menu is hidden Playback speed menu is shown + This menu only appears for some videos. Translate the name normally if the menu cannot be found. --> Hide More info More info menu is hidden More info menu is shown @@ -737,7 +737,7 @@ If changing this setting does not take effect, try switching to Incognito mode." Hide Audio track Audio track menu is hidden Audio track menu is shown - + "Audio track menu is hidden To show the Audio track menu, change \'Spoof video streams\' to iOS TV" @@ -750,22 +750,22 @@ To show the Audio track menu, change \'Spoof video streams\' to iOS TV" Video quality menu footer is shown - Hide Previous & Next buttons - Buttons are hidden - Buttons are shown - Hide Cast button - Cast button is hidden - Cast button is shown - - Hide Captions button - Captions button is hidden - Captions button is shown Hide Autoplay button Autoplay button is hidden Autoplay button is shown + + Hide Captions button + Captions button is hidden + Captions button is shown + Hide Cast button + Cast button is hidden + Cast button is shown Hide player control buttons background Player control buttons background is hidden Player control buttons background is shown + Hide Previous & Next buttons + Buttons are hidden + Buttons are shown Hide end screen cards @@ -798,76 +798,75 @@ To show the Audio track menu, change \'Spoof video streams\' to iOS TV" Shorts player Hide or show components in the Shorts player - - Hide Shorts in home feed - Hidden in home feed and related videos - Shown in home feed and related videos - - Hide Shorts in subscription feed - Hidden in subscription feed - Shown in subscription feed + + Hide Shorts in Home feed + Hidden in Home feed and related videos + Shown in Home feed and related videos + + Hide Shorts in Subscriptions feed + Hidden in Subscriptions feed + Shown in Subscriptions feed Hide Shorts in search results Hidden in search results Shown in search results Hide Shorts in watch history Hidden in watch history Shown in watch history - - Hide Join button - Join button is hidden - Join button is shown - - Hide Subscribe button - Subscribe button is hidden - Subscribe button is shown - Hide paused overlay buttons - Paused overlay buttons are hidden - Paused overlay buttons are shown - Hide Shop button - Shop button is hidden - Shop button is shown Hide Buy Super Thanks button - Super Thanks button is hidden - Super Thanks button is shown - Hide tagged products - Tagged products are hidden - Tagged products are shown - Hide location label - Location label is hidden - Location label is shown - Hide preview comment - Preview comment is hidden - Preview comment is shown - Hide Save music button - Save music button is hidden - Save music button is shown - Hide Use this sound button - Use this sound button is hidden - Use this sound button is shown - Hide Use this template button - Use this template button is hidden - Use this template button is shown - Hide Upcoming button - Upcoming button is hidden - Upcoming button is shown + Buy Super Thanks button is hidden + Buy Super Thanks button is shown Hide Effect button Effect button is hidden Effect button is shown Hide Green screen button Green screen button is hidden Green screen button is shown - Hide New posts button - New posts button is shown - New posts button is hidden Hide Hashtag button Hashtag button is hidden Hashtag button is shown + + Hide Join button + Join button is hidden + Join button is shown + Hide location label + Location label is hidden + Location label is shown + Hide New posts button + New posts button is hidden + New posts button is shown + Hide paused overlay buttons + Paused overlay buttons are hidden + Paused overlay buttons are shown + Hide preview comment + Preview comment is hidden + Preview comment is shown + Hide Save music button + Save music button is hidden + Save music button is shown Hide search suggestions Search suggestions are hidden Search suggestions are shown + Hide Shop button + Shop button is hidden + Shop button is shown Hide stickers Stickers are hidden Stickers are shown + Hide Subscribe button + Subscribe button is hidden + Subscribe button is shown + Hide tagged products + Tagged products are hidden + Tagged products are shown + Hide Upcoming button + Upcoming button is hidden + Upcoming button is shown + Hide Use this sound button + Use this sound button is hidden + Use this sound button is shown + Hide Use this template button + Use this template button is hidden + Use this template button is shown Hide Like button fountain animation Like button fountain animation is hidden Like button fountain animation is shown @@ -880,14 +879,17 @@ To show the Audio track menu, change \'Spoof video streams\' to iOS TV" Hide Comments button Comments button is hidden Comments button is shown - - Hide Remix button - Remix button is hidden - Remix button is shown - + Hide Share button Share button is hidden Share button is shown + + Hide Remix button + Remix button is hidden + Remix button is shown + Hide Sound button + Sound button is hidden + Sound button is shown Hide info panel Info panel is hidden Info panel is shown @@ -895,17 +897,14 @@ To show the Audio track menu, change \'Spoof video streams\' to iOS TV" Channel bar is hidden Channel bar is shown Hide video title - Title is hidden - Title is shown + Video title is hidden + Video title is shown Hide sound metadata label - Metadata label is hidden - Metadata label is shown + Sound metadata label is hidden + Sound metadata label is shown Hide video link label Video link label is hidden Video link label is shown - Hide Sound button - Sound button is hidden - Sound button is shown Hide navigation bar Navigation bar is hidden Navigation bar is shown @@ -919,9 +918,9 @@ Settings → Playback → Autoplay next video" End screen suggested video is shown - Hide related video overlay in fullscreen - Related video overlay is hidden - Related video overlay is shown + Hide related videos overlay + Related videos overlay in fullscreen is hidden + Related videos overlay in fullscreen is shown Hide video timestamp @@ -971,7 +970,7 @@ Limitation: Dislikes may not appear in incognito mode" Dislikes as percentage Dislikes are shown as a percentage Dislikes are shown as a number - + Compact Like button Like button styled for minimum width Like button styled for best appearance @@ -1032,7 +1031,7 @@ This feature works best with a video quality of 720p or lower and when using a v Use square layout Buttons and controls are square Buttons and controls are rounded - + Use compact Skip button Skip button styled for minimum width Skip button styled for best appearance @@ -1176,7 +1175,7 @@ Already exists" Downvote Change category There are no segments to vote for - + %1$s to %2$s Choose the segment category Category is disabled in settings. Enable category to submit. @@ -1256,7 +1255,7 @@ This will change the appearance and features of the app, but unknown side effect If later turned off, it is recommended to clear the app data to prevent UI bugs." + This is because the 'General layout' menu uses alphabetic sorting, and it functionally works better if the spoof target selector appears below the 'Spoof app version' UI switch. --> Spoof app version target 19.35.36 - Restore old Shorts player icons 19.01.34 - Restore old navigation icons @@ -1398,13 +1397,13 @@ Swipe to expand or close" Enabling this can fix missing images that are blocked in some regions" - + Home tab - - Subscription tab - + + Subscriptions tab + You tab - Player playlists, recommendations + Player playlists & recommendations Search results Original thumbnails DeArrow & Original thumbnails @@ -1504,11 +1503,11 @@ Enabling this can unlock higher video qualities" Force original audio language Using original audio language Using default audio - + To use this feature, change \'Spoof video streams\' to iOS TV - + Auto Remember video quality changes Quality changes apply to all videos @@ -1622,7 +1621,7 @@ AVC has a maximum resolution of 1080p, Opus audio codec is not available, and vi Video ads are unblocked - message deleted + Message deleted Show deleted messages Do not show deleted messages Hide deleted messages behind a spoiler @@ -1634,7 +1633,7 @@ AVC has a maximum resolution of 1080p, Opus audio codec is not available, and vi Channel Points are not claimed automatically - + Enable Twitch debug mode Twitch debug mode is enabled (not recommended) Twitch debug mode is disabled @@ -1643,11 +1642,11 @@ AVC has a maximum resolution of 1080p, Opus audio codec is not available, and vi ReVanced Settings About About ReVanced - Ads - Ad blocking settings + Ad Blocking + Ad Blocking settings Chat Chat settings - Misc + Miscellaneous Miscellaneous settings General settings Other settings