refactor(youtube): renamed some patches description

src/main/kotlin/app/revanced/patches/music/misc/sharebuttonhook/patch/ShareButtonHookPatch.kt

@@ -28,7 +28,7 @@ import app.revanced.util.integrations.Constants.MUSIC_MISC_PATH
 
 @Patch
 @Name("share-button-hook")
-@Description("Replace share button with external download button or sleep timer dialog.")
+@Description("Replace share button with external download button.")
 @DependsOn(
     [
         SettingsPatch::class,

src/main/kotlin/app/revanced/patches/youtube/ads/general/bytecode/patch/GeneralAdsBytecodePatch.kt

@@ -12,7 +12,6 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.AdAttribution
-import app.revanced.util.bytecode.BytecodeHelper.updatePatchStatus
 import app.revanced.util.bytecode.getWideLiteralIndex
 import app.revanced.util.bytecode.isWideLiteralExists
 import org.jf.dexlib2.iface.instruction.formats.Instruction35c
@@ -48,8 +47,6 @@ class GeneralAdsBytecodePatch : BytecodePatch() {
             }
         }
 
-        context.updatePatchStatus("GeneralAds")
-
         return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/patch/OldQualityLayoutPatch.kt

@@ -53,6 +53,7 @@ class OldQualityLayoutPatch : BytecodePatch(
         SettingsPatch.addPreference(
             arrayOf(
                 "PREFERENCE: FLYOUT_PANEL_SETTINGS",
+                "SETTINGS: PLAYER_FLYOUT_PANEL_HEADER",
                 "SETTINGS: ENABLE_OLD_QUALITY_LAYOUT"
             )
         )

src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/player/patch/PlayerFlyoutPanelPatch.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.flyoutpanel.general.patch
+package app.revanced.patches.youtube.flyoutpanel.player.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -15,8 +15,8 @@ import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.PATCHES_PATH
 
 @Patch
-@Name("hide-flyout-panel")
+@Name("hide-player-flyout-panel")
-@Description("Adds options to hide player settings flyout panel.")
+@Description("Hides player flyout panel components.")
 @DependsOn(
     [
         LithoFilterPatch::class,
@@ -25,9 +25,9 @@ import app.revanced.util.integrations.Constants.PATCHES_PATH
 )
 @YouTubeCompatibility
 @Version("0.0.1")
-class FlyoutPanelPatch : ResourcePatch {
+class PlayerFlyoutPanelPatch : ResourcePatch {
     override fun execute(context: ResourceContext): PatchResult {
-        LithoFilterPatch.addFilter("$PATCHES_PATH/ads/FlyoutPanelsFilter;")
+        LithoFilterPatch.addFilter("$PATCHES_PATH/ads/PlayerFlyoutPanelsFilter;")
 
         /**
          * Add settings
@@ -35,11 +35,12 @@ class FlyoutPanelPatch : ResourcePatch {
         SettingsPatch.addPreference(
             arrayOf(
                 "PREFERENCE: FLYOUT_PANEL_SETTINGS",
-                "SETTINGS: FLYOUT_PANEL_COMPONENT"
+                "SETTINGS: PLAYER_FLYOUT_PANEL_HEADER",
+                "SETTINGS: HIDE_PLAYER_FLYOUT_PANEL"
             )
         )
 
-        SettingsPatch.updatePatchStatus("hide-flyout-panel")
+        SettingsPatch.updatePatchStatus("hide-player-flyout-panel")
 
         return PatchResultSuccess()
     }

src/main/kotlin/app/revanced/patches/youtube/general/layout/patch/LayoutComponentsPatch.kt

@@ -3,15 +3,16 @@ package app.revanced.patches.youtube.general.layout.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.litho.patch.LithoFilterPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
+import app.revanced.util.bytecode.BytecodeHelper.updatePatchStatus
 import app.revanced.util.integrations.Constants.PATCHES_PATH
 
 @Patch
@@ -25,8 +26,8 @@ import app.revanced.util.integrations.Constants.PATCHES_PATH
 )
 @YouTubeCompatibility
 @Version("0.0.1")
-class LayoutComponentsPatch : ResourcePatch {
+class LayoutComponentsPatch : BytecodePatch() {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         LithoFilterPatch.addFilter("$PATCHES_PATH/ads/CommunityPostFilter;")
         LithoFilterPatch.addFilter("$PATCHES_PATH/ads/LayoutComponentsFilter;")
 
@@ -45,6 +46,8 @@ class LayoutComponentsPatch : ResourcePatch {
 
         SettingsPatch.updatePatchStatus("hide-layout-components")
 
+        context.updatePatchStatus("LayoutComponent")
+
         return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/youtube/general/tabletminiplayer/patch/TabletMiniPlayerPatch.kt

@@ -29,7 +29,7 @@ import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch
-@Name("enable-tablet-miniplayer")
+@Name("enable-tablet-mini-player")
 @Description("Enables the tablet mini player layout.")
 @DependsOn(
     [
@@ -85,7 +85,7 @@ class TabletMiniPlayerPatch : BytecodePatch(
             )
         )
 
-        SettingsPatch.updatePatchStatus("enable-tablet-miniplayer")
+        SettingsPatch.updatePatchStatus("enable-tablet-mini-player")
 
         return PatchResultSuccess()
     }

src/main/kotlin/app/revanced/patches/youtube/general/widesearchbar/patch/WideSearchbarPatch.kt

@@ -1,101 +0,0 @@
-package app.revanced.patches.youtube.general.widesearchbar.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.youtube.general.widesearchbar.fingerprints.SetActionBarRingoFingerprint
-import app.revanced.patches.youtube.utils.fingerprints.SetToolBarPaddingFingerprint
-import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
-import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
-import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
-import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch.Companion.contexts
-import app.revanced.util.integrations.Constants.GENERAL
-
-@Patch
-@Name("enable-wide-searchbar")
-@Description("Replaces the search icon with a wide search bar. This will hide the YouTube logo when active.")
-@DependsOn(
-    [
-        SettingsPatch::class,
-        SharedResourceIdPatch::class
-    ]
-)
-@YouTubeCompatibility
-@Version("0.0.1")
-class WideSearchbarPatch : BytecodePatch(
-    listOf(
-        SetActionBarRingoFingerprint,
-        SetToolBarPaddingFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-
-        arrayOf(
-            SetActionBarRingoFingerprint,
-            SetToolBarPaddingFingerprint
-        ).forEach {
-            it.injectHook(context)
-        }
-
-        /**
-         * Set Wide SearchBar Start Margin
-         */
-        contexts.xmlEditor[TARGET_RESOURCE_PATH].use { editor ->
-            val document = editor.file
-
-            with(document.getElementsByTagName("RelativeLayout").item(0)) {
-                if (attributes.getNamedItem(FLAG) != null) return@with
-
-                document.createAttribute(FLAG)
-                    .apply { value = "8.0dip" }
-                    .let(attributes::setNamedItem)
-            }
-        }
-
-        /**
-         * Add settings
-         */
-        SettingsPatch.addPreference(
-            arrayOf(
-                "PREFERENCE: GENERAL_SETTINGS",
-                "SETTINGS: ENABLE_WIDE_SEARCHBAR"
-            )
-        )
-
-        SettingsPatch.updatePatchStatus("enable-wide-searchbar")
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val FLAG = "android:paddingStart"
-        const val TARGET_RESOURCE_PATH = "res/layout/action_bar_ringo_background.xml"
-
-        fun MethodFingerprint.injectHook(context: BytecodeContext) {
-            result?.let {
-                (context
-                    .toMethodWalker(it.method)
-                    .nextMethod(it.scanResult.patternScanResult!!.endIndex, true)
-                    .getMethod() as MutableMethod).apply {
-                    addInstructions(
-                        implementation!!.instructions.size - 1, """
-                            invoke-static {}, $GENERAL->enableWideSearchbar()Z
-                            move-result p0
-                            """
-                    )
-                }
-            } ?: throw toErrorResult()
-        }
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/fingerprints/ShortsPaidPromotionFingerprint.kt

@@ -4,6 +4,6 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.ReelPlayerBadge
 import app.revanced.util.bytecode.isWideLiteralExists
 
-object ShortsPaidContentFingerprint : MethodFingerprint(
+object ShortsPaidPromotionFingerprint : MethodFingerprint(
     customFingerprint = { methodDef, _ -> methodDef.isWideLiteralExists(ReelPlayerBadge) }
 )

src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsComponentPatch.kt

@@ -32,7 +32,7 @@ import app.revanced.util.integrations.Constants.PATCHES_PATH
         ShortsInfoPanelPatch::class,
         ShortsLikeButtonPatch::class,
         ShortsNavigationBarPatch::class,
-        ShortsPaidContentBannerPatch::class,
+        ShortsPaidPromotionBannerPatch::class,
         ShortsRemixButtonPatch::class,
         ShortsShareButtonPatch::class,
         ShortsSubscriptionsButtonPatch::class,

src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsPaidPromotionBannerPatch.kt

@@ -10,7 +10,7 @@ import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.youtube.shorts.shortscomponent.fingerprints.ShortsPaidContentFingerprint
+import app.revanced.patches.youtube.shorts.shortscomponent.fingerprints.ShortsPaidPromotionFingerprint
 import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.ReelPlayerBadge
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.ReelPlayerBadge2
@@ -18,14 +18,14 @@ import app.revanced.util.bytecode.getWideLiteralIndex
 import app.revanced.util.integrations.Constants.SHORTS
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
-@Name("hide-shorts-paid-content")
+@Name("hide-shorts-paid-promotion")
 @YouTubeCompatibility
 @Version("0.0.1")
-class ShortsPaidContentBannerPatch : BytecodePatch(
+class ShortsPaidPromotionBannerPatch : BytecodePatch(
-    listOf(ShortsPaidContentFingerprint)
+    listOf(ShortsPaidPromotionFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
-        ShortsPaidContentFingerprint.result?.let {
+        ShortsPaidPromotionFingerprint.result?.let {
             it.mutableMethod.apply {
                 val primaryIndex = getWideLiteralIndex(ReelPlayerBadge) + 3
                 val secondaryIndex = getWideLiteralIndex(ReelPlayerBadge2) + 3
@@ -38,7 +38,7 @@ class ShortsPaidContentBannerPatch : BytecodePatch(
                     insertHook(primaryIndex)
                 }
             }
-        } ?: return ShortsPaidContentFingerprint.toErrorResult()
+        } ?: return ShortsPaidPromotionFingerprint.toErrorResult()
 
         return PatchResultSuccess()
     }
@@ -49,7 +49,7 @@ class ShortsPaidContentBannerPatch : BytecodePatch(
 
             addInstructions(
                 insertIndex + 1, """
-                    invoke-static {v$insertRegister}, $SHORTS->hideShortsPlayerPaidContent(Landroid/view/ViewStub;)Landroid/view/ViewStub;
+                    invoke-static {v$insertRegister}, $SHORTS->hideShortsPlayerPaidPromotionBanner(Landroid/view/ViewStub;)Landroid/view/ViewStub;
                     move-result-object v$insertRegister
                     """
             )

src/main/kotlin/app/revanced/patches/youtube/swipe/swipecontrols/bytecode/fingerprints/WatchWhileActivityFingerprint.kt

@@ -7,5 +7,5 @@ import org.jf.dexlib2.AccessFlags
 object WatchWhileActivityFingerprint : MethodFingerprint(
     accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
     parameters = emptyList(),
-    customFingerprint = { methodDef, _ -> methodDef.definingClass.endsWith("WatchWhileActivity;") && methodDef.name == "<init>" }
+    customFingerprint = { methodDef, _ -> methodDef.definingClass.endsWith("WatchWhileActivity;") }
 )

src/main/kotlin/app/revanced/patches/youtube/utils/litho/patch/LithoFilterPatch.kt

@@ -39,7 +39,7 @@ class LithoFilterPatch : BytecodePatch(
 
         ByteBufferFingerprint.result?.mutableMethod?.addInstruction(
             0,
-            "sput-object p0, $ADS_PATH/ByteBufferFilterPatch;->bytebuffer:Ljava/nio/ByteBuffer;"
+            "sput-object p0, $ADS_PATH/LowLevelFilter;->byteBuffer:Ljava/nio/ByteBuffer;"
         ) ?: return ByteBufferFingerprint.toErrorResult()
 
         generalHook("$ADS_PATH/LithoFilterPatch;->filters")

src/main/resources/youtube/settings/host/values/strings.xml

@@ -137,9 +137,9 @@
     <string name="revanced_enable_time_stamp_speed_title">Enable time stamp speed</string>
     <string name="revanced_enable_vp9_codec_summary">Spoof device information to enable vp9 codec</string>
     <string name="revanced_enable_vp9_codec_title">Enable vp9 codec</string>
-    <string name="revanced_enable_wide_searchbar_summary_off">Wide search bar is disabled</string>
+    <string name="revanced_enable_wide_search_bar_summary_off">Wide search bar is disabled</string>
-    <string name="revanced_enable_wide_searchbar_summary_on">Wide search bar is enabled</string>
+    <string name="revanced_enable_wide_search_bar_summary_on">Wide search bar is enabled</string>
-    <string name="revanced_enable_wide_searchbar_title">Enable wide search bar</string>
+    <string name="revanced_enable_wide_search_bar_title">Enable wide search bar</string>
     <string name="revanced_experimental_flag">Experimental Flags</string>
     <string name="revanced_export_settings_summary">Save your ReVanced settings to file</string>
     <string name="revanced_export_settings_title">Export settings</string>
@@ -294,6 +294,9 @@
     <string name="revanced_hide_gray_description_summary_off">Gray description is shown</string>
     <string name="revanced_hide_gray_description_summary_on">Gray description is hidden</string>
     <string name="revanced_hide_gray_description_title">Hide gray description</string>
+    <string name="revanced_hide_gray_separator_summary_off">Gray separators are shown</string>
+    <string name="revanced_hide_gray_separator_summary_on">Gray separators are hidden</string>
+    <string name="revanced_hide_gray_separator_title">Hide gray separator</string>
     <string name="revanced_hide_home_button_summary_off">Home button is shown</string>
     <string name="revanced_hide_home_button_summary_on">Home button is hidden</string>
     <string name="revanced_hide_home_button_title">Hide home button</string>
@@ -321,45 +324,9 @@
     <string name="revanced_hide_medical_panel_summary_off">Medical panels are shown</string>
     <string name="revanced_hide_medical_panel_summary_on">Medical panels are hidden</string>
     <string name="revanced_hide_medical_panel_title">Hide medical panels</string>
-    <string name="revanced_hide_menu_ambient_mode_summary_off">Ambient mode menu is shown</string>
+    <string name="revanced_hide_merchandise_shelf_summary_off">Merchandise shelves are shown</string>
-    <string name="revanced_hide_menu_ambient_mode_summary_on">Ambient mode menu is hidden</string>
+    <string name="revanced_hide_merchandise_shelf_summary_on">Merchandise shelves are hidden</string>
-    <string name="revanced_hide_menu_ambient_mode_title">Hide ambient mode menu</string>
+    <string name="revanced_hide_merchandise_shelf_title">Hide merchandise shelf</string>
-    <string name="revanced_hide_menu_audio_track_summary_off">Audio track menu is shown</string>
-    <string name="revanced_hide_menu_audio_track_summary_on">Audio track menu is hidden</string>
-    <string name="revanced_hide_menu_audio_track_title">Hide audio track menu</string>
-    <string name="revanced_hide_menu_captions_summary_off">Captions menu is shown</string>
-    <string name="revanced_hide_menu_captions_summary_on">Captions menu is hidden</string>
-    <string name="revanced_hide_menu_captions_title">Hide captions menu</string>
-    <string name="revanced_hide_menu_help_summary_off">Help &amp; feedback menu is shown</string>
-    <string name="revanced_hide_menu_help_summary_on">Help &amp; feedback menu is hidden</string>
-    <string name="revanced_hide_menu_help_title">Hide help &amp; feedback menu</string>
-    <string name="revanced_hide_menu_listening_controls_summary_off">Listening controls menu is shown</string>
-    <string name="revanced_hide_menu_listening_controls_summary_on">Listening controls menu is hidden</string>
-    <string name="revanced_hide_menu_listening_controls_title">Hide listening controls menu</string>
-    <string name="revanced_hide_menu_listen_with_youtube_music_summary_off">Listen with YouTube Music menu is shown</string>
-    <string name="revanced_hide_menu_listen_with_youtube_music_summary_on">Listen with YouTube Music menu is hidden</string>
-    <string name="revanced_hide_menu_listen_with_youtube_music_title">Hide listen with YouTube Music menu</string>
-    <string name="revanced_hide_menu_loop_video_summary_off">Loop video menu is shown</string>
-    <string name="revanced_hide_menu_loop_video_summary_on">Loop video menu is hidden</string>
-    <string name="revanced_hide_menu_loop_video_title">Hide loop video menu</string>
-    <string name="revanced_hide_menu_more_info_summary_off">More information menu is shown</string>
-    <string name="revanced_hide_menu_more_info_summary_on">More information menu is hidden</string>
-    <string name="revanced_hide_menu_more_info_title">Hide more information menu</string>
-    <string name="revanced_hide_menu_report_summary_off">Report menu is shown</string>
-    <string name="revanced_hide_menu_report_summary_on">Report menu is hidden</string>
-    <string name="revanced_hide_menu_report_title">Hide report menu</string>
-    <string name="revanced_hide_menu_speed_summary_off">Playback speed menu is shown</string>
-    <string name="revanced_hide_menu_speed_summary_on">Playback speed menu is hidden</string>
-    <string name="revanced_hide_menu_speed_title">Hide playback speed menu</string>
-    <string name="revanced_hide_menu_stats_for_nerds_summary_off">Stats for nerds menu is shown</string>
-    <string name="revanced_hide_menu_stats_for_nerds_summary_on">Stats for nerds menu is hidden</string>
-    <string name="revanced_hide_menu_stats_for_nerds_title">Hide stats for nerds menu</string>
-    <string name="revanced_hide_menu_watch_in_vr_summary_off">Watch in VR menu is shown</string>
-    <string name="revanced_hide_menu_watch_in_vr_summary_on">Watch in VR menu is hidden</string>
-    <string name="revanced_hide_menu_watch_in_vr_title">Hide watch in VR menu</string>
-    <string name="revanced_hide_merchandise_summary_off">Merchandise banners are shown</string>
-    <string name="revanced_hide_merchandise_summary_on">Merchandise banners are hidden</string>
-    <string name="revanced_hide_merchandise_title">Hide merchandise banners</string>
     <string name="revanced_hide_mix_playlists_summary_off">Mix playlist is shown</string>
     <string name="revanced_hide_mix_playlists_summary_on">Mix playlist is hidden</string>
     <string name="revanced_hide_mix_playlists_title">Hide mix playlist</string>
@@ -372,12 +339,48 @@
     <string name="revanced_hide_official_header_summary_off">Official header is shown</string>
     <string name="revanced_hide_official_header_summary_on">Official header is hidden</string>
     <string name="revanced_hide_official_header_title">Hide official header</string>
-    <string name="revanced_hide_paid_content_summary_off">Paid promotion label is shown</string>
+    <string name="revanced_hide_paid_promotion_banner_summary_off">Paid promotion banner is shown</string>
-    <string name="revanced_hide_paid_content_summary_on">Paid promotion label is hidden</string>
+    <string name="revanced_hide_paid_promotion_banner_summary_on">Paid promotion banner is hidden</string>
-    <string name="revanced_hide_paid_content_title">Hide paid promotion</string>
+    <string name="revanced_hide_paid_promotion_banner_title">Hide paid promotion banner</string>
     <string name="revanced_hide_player_button_background_summary_off">Player button background is shown</string>
     <string name="revanced_hide_player_button_background_summary_on">Player button background is hidden</string>
     <string name="revanced_hide_player_button_background_title">Hide player button background</string>
+    <string name="revanced_hide_player_flyout_panel_ambient_mode_summary_off">Ambient mode menu is shown</string>
+    <string name="revanced_hide_player_flyout_panel_ambient_mode_summary_on">Ambient mode menu is hidden</string>
+    <string name="revanced_hide_player_flyout_panel_ambient_mode_title">Hide ambient mode menu</string>
+    <string name="revanced_hide_player_flyout_panel_audio_track_summary_off">Audio track menu is shown</string>
+    <string name="revanced_hide_player_flyout_panel_audio_track_summary_on">Audio track menu is hidden</string>
+    <string name="revanced_hide_player_flyout_panel_audio_track_title">Hide audio track menu</string>
+    <string name="revanced_hide_player_flyout_panel_captions_summary_off">Captions menu is shown</string>
+    <string name="revanced_hide_player_flyout_panel_captions_summary_on">Captions menu is hidden</string>
+    <string name="revanced_hide_player_flyout_panel_captions_title">Hide captions menu</string>
+    <string name="revanced_hide_player_flyout_panel_help_summary_off">Help &amp; feedback menu is shown</string>
+    <string name="revanced_hide_player_flyout_panel_help_summary_on">Help &amp; feedback menu is hidden</string>
+    <string name="revanced_hide_player_flyout_panel_help_title">Hide help &amp; feedback menu</string>
+    <string name="revanced_hide_player_flyout_panel_listening_controls_summary_off">Listening controls menu is shown</string>
+    <string name="revanced_hide_player_flyout_panel_listening_controls_summary_on">Listening controls menu is hidden</string>
+    <string name="revanced_hide_player_flyout_panel_listening_controls_title">Hide listening controls menu</string>
+    <string name="revanced_hide_player_flyout_panel_listen_with_youtube_music_summary_off">Listen with YouTube Music menu is shown</string>
+    <string name="revanced_hide_player_flyout_panel_listen_with_youtube_music_summary_on">Listen with YouTube Music menu is hidden</string>
+    <string name="revanced_hide_player_flyout_panel_listen_with_youtube_music_title">Hide listen with YouTube Music menu</string>
+    <string name="revanced_hide_player_flyout_panel_loop_video_summary_off">Loop video menu is shown</string>
+    <string name="revanced_hide_player_flyout_panel_loop_video_summary_on">Loop video menu is hidden</string>
+    <string name="revanced_hide_player_flyout_panel_loop_video_title">Hide loop video menu</string>
+    <string name="revanced_hide_player_flyout_panel_more_info_summary_off">More information menu is shown</string>
+    <string name="revanced_hide_player_flyout_panel_more_info_summary_on">More information menu is hidden</string>
+    <string name="revanced_hide_player_flyout_panel_more_info_title">Hide more information menu</string>
+    <string name="revanced_hide_player_flyout_panel_report_summary_off">Report menu is shown</string>
+    <string name="revanced_hide_player_flyout_panel_report_summary_on">Report menu is hidden</string>
+    <string name="revanced_hide_player_flyout_panel_report_title">Hide report menu</string>
+    <string name="revanced_hide_player_flyout_panel_speed_summary_off">Playback speed menu is shown</string>
+    <string name="revanced_hide_player_flyout_panel_speed_summary_on">Playback speed menu is hidden</string>
+    <string name="revanced_hide_player_flyout_panel_speed_title">Hide playback speed menu</string>
+    <string name="revanced_hide_player_flyout_panel_stats_for_nerds_summary_off">Stats for nerds menu is shown</string>
+    <string name="revanced_hide_player_flyout_panel_stats_for_nerds_summary_on">Stats for nerds menu is hidden</string>
+    <string name="revanced_hide_player_flyout_panel_stats_for_nerds_title">Hide stats for nerds menu</string>
+    <string name="revanced_hide_player_flyout_panel_watch_in_vr_summary_off">Watch in VR menu is shown</string>
+    <string name="revanced_hide_player_flyout_panel_watch_in_vr_summary_on">Watch in VR menu is hidden</string>
+    <string name="revanced_hide_player_flyout_panel_watch_in_vr_title">Hide watch in VR menu</string>
     <string name="revanced_hide_player_overlay_filter_summary_off">Player overlay filter is shown</string>
     <string name="revanced_hide_player_overlay_filter_summary_on">Player overlay filter is hidden</string>
     <string name="revanced_hide_player_overlay_filter_title">Hide player overlay filter</string>
@@ -411,12 +414,9 @@
     <string name="revanced_hide_seek_message_summary_off">Seek message is shown</string>
     <string name="revanced_hide_seek_message_summary_on">Seek message is hidden</string>
     <string name="revanced_hide_seek_message_title">Hide seek message</string>
-    <string name="revanced_hide_self_sponsor_summary_off">Self sponsored cards are shown</string>
+    <string name="revanced_hide_self_sponsor_cards_summary_off">Self sponsored cards are shown</string>
-    <string name="revanced_hide_self_sponsor_summary_on">Self sponsored cards are hidden</string>
+    <string name="revanced_hide_self_sponsor_cards_summary_on">Self sponsored cards are hidden</string>
-    <string name="revanced_hide_self_sponsor_title">Hide self sponsored cards</string>
+    <string name="revanced_hide_self_sponsor_cards_title">Hide self sponsored cards</string>
-    <string name="revanced_hide_separator_summary_off">Gray separators are shown</string>
-    <string name="revanced_hide_separator_summary_on">Gray separators are hidden</string>
-    <string name="revanced_hide_separator_title">Hide gray separator</string>
     <string name="revanced_hide_shorts_button_summary_off">Shorts button is shown</string>
     <string name="revanced_hide_shorts_button_summary_on">Shorts button is hidden</string>
     <string name="revanced_hide_shorts_button_title">Hide shorts button</string>
@@ -449,8 +449,14 @@
     <string name="revanced_hide_suggested_actions_summary_off">Suggested actions shown</string>
     <string name="revanced_hide_suggested_actions_summary_on">Suggested actions hidden</string>
     <string name="revanced_hide_suggested_actions_title">Hide suggested actions</string>
-    <string name="revanced_hide_suggestions_shelf_summary_off">Following shelves are shown: Breaking news, Explore more channels, Shopping</string>
+    <string name="revanced_hide_suggestions_shelf_summary_off">"Following shelves are shown
-    <string name="revanced_hide_suggestions_shelf_summary_on">Following shelves are hidden: Breaking news, Explore more channels, Shopping</string>
+- Breaking news
+- Explore more channels
+- Shopping"</string>
+    <string name="revanced_hide_suggestions_shelf_summary_on">"Following shelves are hidden
+- Breaking news
+- Explore more channels
+- Shopping"</string>
     <string name="revanced_hide_suggestions_shelf_title">Hide suggestions shelf</string>
     <string name="revanced_hide_ticket_shelf_summary_off">Ticket shelves are shown</string>
     <string name="revanced_hide_ticket_shelf_summary_on">Ticket shelves are hidden</string>
@@ -467,9 +473,9 @@
     <string name="revanced_hide_view_products_summary_off">View products banner is shown</string>
     <string name="revanced_hide_view_products_summary_on">View products banner is hidden</string>
     <string name="revanced_hide_view_products_title">Hide view products banner</string>
-    <string name="revanced_hide_web_search_panel_summary_off">Web search panels are shown</string>
+    <string name="revanced_hide_web_search_results_summary_off">Web search results are shown</string>
-    <string name="revanced_hide_web_search_panel_summary_on">Web search panels are hidden</string>
+    <string name="revanced_hide_web_search_results_summary_on">Web search results are hidden</string>
-    <string name="revanced_hide_web_search_panel_title">Hide web search panels</string>
+    <string name="revanced_hide_web_search_results_title">Hide web search results</string>
     <string name="revanced_hide_youtube_music_button_summary_off">YouTube Music button is shown</string>
     <string name="revanced_hide_youtube_music_button_summary_on">YouTube Music button is hidden</string>
     <string name="revanced_hide_youtube_music_button_title">Hide youtube music button</string>
@@ -483,7 +489,6 @@
     <string name="revanced_open_library_startup_title">Open library on app startup</string>
     <string name="revanced_others">Others</string>
     <string name="revanced_overlay_button">Overlay button</string>
-    <string name="revanced_overlay_button_always_repeat_notice">Tap and hold to toggle pause after repeat states</string>
     <string name="revanced_overlay_button_always_repeat_summary">"Tap to toggle always repeat states
 Tap and hold to toggle pause after repeat states"</string>
     <string name="revanced_overlay_button_always_repeat_title">Show always repeat button</string>
@@ -498,7 +503,7 @@ Tap and hold to copy video timestamp"</string>
     <string name="revanced_overlay_button_speed_dialog_reset">Video speed reseted (1.0x)</string>
     <string name="revanced_overlay_button_speed_dialog_summary">"Tap to open speed dialog
 Tap and hold to set video speed to 1.0x"</string>
-    <string name="revanced_overlay_button_speed_dialog_title">Show speed button</string>
+    <string name="revanced_overlay_button_speed_dialog_title">Show speed dialog button</string>
     <string name="revanced_override_premium_header_summary_off">Current Header: Default Header</string>
     <string name="revanced_override_premium_header_summary_on">Current Header: Premium Header</string>
     <string name="revanced_override_premium_header_title">Premium Header</string>

src/main/resources/youtube/settings/values-v21/strings.xml

@@ -48,9 +48,9 @@
     <string name="revanced_hide_shorts_player_like_button_summary_off">@string/revanced_hide_button_like_summary_off</string>
     <string name="revanced_hide_shorts_player_like_button_summary_on">@string/revanced_hide_button_like_summary_on</string>
     <string name="revanced_hide_shorts_player_like_button_title">@string/revanced_hide_button_like_title</string>
-    <string name="revanced_hide_shorts_player_paid_content_summary_off">@string/revanced_hide_paid_content_summary_off</string>
+    <string name="revanced_hide_shorts_player_paid_promotion_banner_summary_off">@string/revanced_hide_paid_promotion_banner_summary_off</string>
-    <string name="revanced_hide_shorts_player_paid_content_summary_on">@string/revanced_hide_paid_content_summary_on</string>
+    <string name="revanced_hide_shorts_player_paid_promotion_banner_summary_on">@string/revanced_hide_paid_promotion_banner_summary_on</string>
-    <string name="revanced_hide_shorts_player_paid_content_title">@string/revanced_hide_paid_content_title</string>
+    <string name="revanced_hide_shorts_player_paid_promotion_banner_title">@string/revanced_hide_paid_promotion_banner_title</string>
     <string name="revanced_hide_shorts_player_remix_button_summary_off">@string/revanced_hide_button_remix_summary_off</string>
     <string name="revanced_hide_shorts_player_remix_button_summary_on">@string/revanced_hide_button_remix_summary_on</string>
     <string name="revanced_hide_shorts_player_remix_button_title">@string/revanced_hide_button_remix_title</string>

src/main/resources/youtube/settings/xml/revanced_prefs.xml

@@ -9,11 +9,11 @@
         <!-- SETTINGS: HIDE_GENERAL_ADS
         <SwitchPreference android:title="@string/revanced_hide_general_ads_title" android:key="revanced_hide_general_ads" android:defaultValue="true" android:summaryOn="@string/revanced_hide_general_ads_summary_on" android:summaryOff="@string/revanced_hide_general_ads_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_image_shelf_title" android:key="revanced_hide_image_shelf" android:defaultValue="true" android:summaryOn="@string/revanced_hide_image_shelf_summary_on" android:summaryOff="@string/revanced_hide_image_shelf_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_merchandise_title" android:key="revanced_hide_merchandise" android:defaultValue="true" android:summaryOn="@string/revanced_hide_merchandise_summary_on" android:summaryOff="@string/revanced_hide_merchandise_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_merchandise_shelf_title" android:key="revanced_hide_merchandise_shelf" android:defaultValue="true" android:summaryOn="@string/revanced_hide_merchandise_shelf_summary_on" android:summaryOff="@string/revanced_hide_merchandise_shelf_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_paid_content_title" android:key="revanced_hide_paid_content" android:defaultValue="true" android:summaryOn="@string/revanced_hide_paid_content_summary_on" android:summaryOff="@string/revanced_hide_paid_content_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_paid_promotion_banner_title" android:key="revanced_hide_paid_promotion_banner" android:defaultValue="true" android:summaryOn="@string/revanced_hide_paid_promotion_banner_summary_on" android:summaryOff="@string/revanced_hide_paid_promotion_banner_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_self_sponsor_title" android:key="revanced_hide_self_sponsor" android:defaultValue="true" android:summaryOn="@string/revanced_hide_self_sponsor_summary_on" android:summaryOff="@string/revanced_hide_self_sponsor_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_self_sponsor_cards_title" android:key="revanced_hide_self_sponsor_cards" android:defaultValue="true" android:summaryOn="@string/revanced_hide_self_sponsor_cards_summary_on" android:summaryOff="@string/revanced_hide_self_sponsor_cards_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_view_products_title" android:key="revanced_hide_view_products" android:defaultValue="true" android:summaryOn="@string/revanced_hide_view_products_summary_on" android:summaryOff="@string/revanced_hide_view_products_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_web_search_panel_title" android:key="revanced_hide_web_search_panel" android:defaultValue="true" android:summaryOn="@string/revanced_hide_web_search_panel_summary_on" android:summaryOff="@string/revanced_hide_web_search_panel_summary_off" />SETTINGS: HIDE_GENERAL_ADS -->
+        <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_VIDEO_ADS
         <SwitchPreference android:title="@string/revanced_hide_video_ads_title" android:key="revanced_hide_video_ads" android:defaultValue="true" android:summaryOn="@string/revanced_hide_video_ads_summary_on" android:summaryOff="@string/revanced_hide_video_ads_summary_off" />SETTINGS: HIDE_VIDEO_ADS -->
@@ -58,26 +58,27 @@
 
 
     <!-- PREFERENCE: FLYOUT_PANEL_SETTINGS
-    <PreferenceScreen android:title="@string/revanced_flyout_menu" android:key="flyout_menu">
+    <PreferenceScreen android:title="@string/revanced_flyout_menu" android:key="flyout_menu">PREFERENCE: FLYOUT_PANEL_SETTINGS -->
-        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_flyout_menu" />PREFERENCE: FLYOUT_PANEL_SETTINGS -->
+
+        <!-- SETTINGS: PLAYER_FLYOUT_PANEL_HEADER
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_player_flyout_panel_title" />SETTINGS: PLAYER_FLYOUT_PANEL_HEADER -->
 
         <!-- SETTINGS: ENABLE_OLD_QUALITY_LAYOUT
         <SwitchPreference android:title="@string/revanced_enable_old_quality_layout_title" android:key="revanced_enable_old_quality_layout" android:defaultValue="true" android:summaryOn="@string/revanced_enable_old_quality_layout_summary_on" android:summaryOff="@string/revanced_enable_old_quality_layout_summary_off" />SETTINGS: ENABLE_OLD_QUALITY_LAYOUT -->
 
-        <!-- SETTINGS: FLYOUT_PANEL_COMPONENT
+        <!-- SETTINGS: HIDE_PLAYER_FLYOUT_PANEL
-        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_player_flyout_panel_title" />
+        <SwitchPreference android:title="@string/revanced_hide_player_flyout_panel_ambient_mode_title" android:key="revanced_hide_player_flyout_panel_ambient_mode" android:defaultValue="false" android:summaryOn="@string/revanced_hide_player_flyout_panel_ambient_mode_summary_on" android:summaryOff="@string/revanced_hide_player_flyout_panel_ambient_mode_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_menu_ambient_mode_title" android:key="revanced_hide_menu_ambient_mode" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_ambient_mode_summary_on" android:summaryOff="@string/revanced_hide_menu_ambient_mode_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_player_flyout_panel_audio_track_title" android:key="revanced_hide_player_flyout_panel_audio_track" android:defaultValue="false" android:summaryOn="@string/revanced_hide_player_flyout_panel_audio_track_summary_on" android:summaryOff="@string/revanced_hide_player_flyout_panel_audio_track_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_menu_audio_track_title" android:key="revanced_hide_menu_audio_track" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_audio_track_summary_on" android:summaryOff="@string/revanced_hide_menu_audio_track_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_player_flyout_panel_captions_title" android:key="revanced_hide_player_flyout_panel_captions" android:defaultValue="false" android:summaryOn="@string/revanced_hide_player_flyout_panel_captions_summary_on" android:summaryOff="@string/revanced_hide_player_flyout_panel_captions_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_menu_captions_title" android:key="revanced_hide_menu_captions" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_captions_summary_on" android:summaryOff="@string/revanced_hide_menu_captions_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_player_flyout_panel_help_title" android:key="revanced_hide_player_flyout_panel_help" android:defaultValue="false" android:summaryOn="@string/revanced_hide_player_flyout_panel_help_summary_on" android:summaryOff="@string/revanced_hide_player_flyout_panel_help_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_menu_help_title" android:key="revanced_hide_menu_help" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_help_summary_on" android:summaryOff="@string/revanced_hide_menu_help_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_player_flyout_panel_listening_controls_title" android:key="revanced_hide_player_flyout_panel_listening_controls" android:defaultValue="false" android:summaryOn="@string/revanced_hide_player_flyout_panel_listening_controls_summary_on" android:summaryOff="@string/revanced_hide_player_flyout_panel_listening_controls_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_menu_listening_controls_title" android:key="revanced_hide_menu_listening_controls" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_listening_controls_summary_on" android:summaryOff="@string/revanced_hide_menu_listening_controls_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_player_flyout_panel_listen_with_youtube_music_title" android:key="revanced_hide_player_flyout_panel_listen_with_youtube_music" android:defaultValue="false" android:summaryOn="@string/revanced_hide_player_flyout_panel_listen_with_youtube_music_summary_on" android:summaryOff="@string/revanced_hide_player_flyout_panel_listen_with_youtube_music_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_menu_listen_with_youtube_music_title" android:key="revanced_hide_menu_listen_with_youtube_music" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_listen_with_youtube_music_summary_on" android:summaryOff="@string/revanced_hide_menu_listen_with_youtube_music_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_player_flyout_panel_loop_video_title" android:key="revanced_hide_player_flyout_panel_loop_video" android:defaultValue="false" android:summaryOn="@string/revanced_hide_player_flyout_panel_loop_video_summary_on" android:summaryOff="@string/revanced_hide_player_flyout_panel_loop_video_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_menu_loop_video_title" android:key="revanced_hide_menu_loop_video" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_loop_video_summary_on" android:summaryOff="@string/revanced_hide_menu_loop_video_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_player_flyout_panel_more_info_title" android:key="revanced_hide_player_flyout_panel_more_info" android:defaultValue="false" android:summaryOn="@string/revanced_hide_player_flyout_panel_more_info_summary_on" android:summaryOff="@string/revanced_hide_player_flyout_panel_more_info_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_menu_more_info_title" android:key="revanced_hide_menu_more_info" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_more_info_summary_on" android:summaryOff="@string/revanced_hide_menu_more_info_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_player_flyout_panel_report_title" android:key="revanced_hide_player_flyout_panel_report" android:defaultValue="false" android:summaryOn="@string/revanced_hide_player_flyout_panel_report_summary_on" android:summaryOff="@string/revanced_hide_player_flyout_panel_report_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_menu_report_title" android:key="revanced_hide_menu_report" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_report_summary_on" android:summaryOff="@string/revanced_hide_menu_report_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_player_flyout_panel_speed_title" android:key="revanced_hide_player_flyout_panel_speed" android:defaultValue="false" android:summaryOn="@string/revanced_hide_player_flyout_panel_speed_summary_on" android:summaryOff="@string/revanced_hide_player_flyout_panel_speed_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_menu_speed_title" android:key="revanced_hide_menu_speed" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_speed_summary_on" android:summaryOff="@string/revanced_hide_menu_speed_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_player_flyout_panel_stats_for_nerds_title" android:key="revanced_hide_player_flyout_panel_stats_for_nerds" android:defaultValue="false" android:summaryOn="@string/revanced_hide_player_flyout_panel_stats_for_nerds_summary_on" android:summaryOff="@string/revanced_hide_player_flyout_panel_stats_for_nerds_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_menu_stats_for_nerds_title" android:key="revanced_hide_menu_stats_for_nerds" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_stats_for_nerds_summary_on" android:summaryOff="@string/revanced_hide_menu_stats_for_nerds_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_player_flyout_panel_watch_in_vr_title" android:key="revanced_hide_player_flyout_panel_watch_in_vr" android:defaultValue="false" android:summaryOn="@string/revanced_hide_player_flyout_panel_watch_in_vr_summary_on" android:summaryOff="@string/revanced_hide_player_flyout_panel_watch_in_vr_summary_off" />SETTINGS: HIDE_PLAYER_FLYOUT_PANEL -->
-        <SwitchPreference android:title="@string/revanced_hide_menu_watch_in_vr_title" android:key="revanced_hide_menu_watch_in_vr" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_watch_in_vr_summary_on" android:summaryOff="@string/revanced_hide_menu_watch_in_vr_summary_off" />SETTINGS: FLYOUT_PANEL_COMPONENT -->
 
     <!-- PREFERENCE: FLYOUT_PANEL_SETTINGS
     </PreferenceScreen>PREFERENCE: FLYOUT_PANEL_SETTINGS -->
@@ -130,8 +131,8 @@
         <!-- SETTINGS: ENABLE_TABLET_MINI_PLAYER
         <SwitchPreference android:title="@string/revanced_enable_tablet_mini_player_title" android:key="revanced_enable_tablet_mini_player" android:defaultValue="false" android:summaryOn="@string/revanced_enable_tablet_mini_player_summary_on" android:summaryOff="@string/revanced_enable_tablet_mini_player_summary_off" />SETTINGS: ENABLE_TABLET_MINI_PLAYER -->
 
-        <!-- SETTINGS: ENABLE_WIDE_SEARCHBAR
+        <!-- SETTINGS: ENABLE_WIDE_SEARCH_BAR
-        <SwitchPreference android:title="@string/revanced_enable_wide_searchbar_title" android:key="revanced_enable_wide_searchbar" android:defaultValue="false" android:summaryOn="@string/revanced_enable_wide_searchbar_summary_on" android:summaryOff="@string/revanced_enable_wide_searchbar_summary_off" />SETTINGS: ENABLE_WIDE_SEARCHBAR -->
+        <SwitchPreference android:title="@string/revanced_enable_wide_search_bar_title" android:key="revanced_enable_wide_search_bar" android:defaultValue="false" android:summaryOn="@string/revanced_enable_wide_search_bar_summary_on" android:summaryOff="@string/revanced_enable_wide_search_bar_summary_off" />SETTINGS: ENABLE_WIDE_SEARCH_BAR -->
 
         <!-- SETTINGS: HIDE_ACCOUNT_MENU
         <SwitchPreference android:title="@string/revanced_hide_account_menu_title" android:key="revanced_hide_account_menu" android:defaultValue="false" android:summaryOn="@string/revanced_hide_account_menu_summary_on" android:summaryOff="@string/revanced_hide_account_menu_summary_off" />
@@ -181,14 +182,14 @@
         <app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_custom_filter_strings_title" android:key="revanced_custom_filter_strings" android:summary="@string/revanced_custom_filter_strings_summary" android:defaultValue="" android:inputType="textMultiLine" />
         <SwitchPreference android:title="@string/revanced_hide_album_card_title" android:key="revanced_hide_album_card" android:defaultValue="true" android:summaryOn="@string/revanced_hide_album_card_summary_on" android:summaryOff="@string/revanced_hide_album_card_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_channel_member_shelf_title" android:key="revanced_hide_channel_member_shelf" android:defaultValue="true" android:summaryOn="@string/revanced_hide_channel_member_shelf_summary_on" android:summaryOff="@string/revanced_hide_channel_member_shelf_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_chapters_title" android:key="revanced_hide_chapters_summary" android:defaultValue="true" android:summaryOn="@string/revanced_hide_chapters_summary_on" android:summaryOff="@string/revanced_hide_chapters_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_chapters_title" android:key="revanced_hide_chapters" android:defaultValue="true" android:summaryOn="@string/revanced_hide_chapters_summary_on" android:summaryOff="@string/revanced_hide_chapters_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_community_posts_home_title" android:key="revanced_hide_community_posts_home" android:defaultValue="true" android:summaryOn="@string/revanced_hide_community_posts_home_summary_on" android:summaryOff="@string/revanced_hide_community_posts_home_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_community_posts_subscriptions_title" android:key="revanced_hide_community_posts_subscriptions" android:defaultValue="false" android:summaryOn="@string/revanced_hide_community_posts_subscriptions_summary_on" android:summaryOff="@string/revanced_hide_community_posts_subscriptions_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_expandable_chip_title" android:key="revanced_hide_expandable_chip" android:defaultValue="false" android:summaryOn="@string/revanced_hide_expandable_chip_summary_on" android:summaryOff="@string/revanced_hide_expandable_chip_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_feed_survey_title" android:key="revanced_hide_feed_survey" android:defaultValue="true" android:summaryOn="@string/revanced_hide_feed_survey_summary_on" android:summaryOff="@string/revanced_hide_feed_survey_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_gray_description_title" android:key="revanced_hide_gray_description" android:defaultValue="true" android:summaryOn="@string/revanced_hide_gray_description_summary_on" android:summaryOff="@string/revanced_hide_gray_description_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_gray_separator_title" android:key="revanced_hide_gray_separator" android:defaultValue="true" android:summaryOn="@string/revanced_hide_gray_separator_summary_on" android:summaryOff="@string/revanced_hide_gray_separator_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_join_button_title" android:key="revanced_hide_join_button" android:defaultValue="true" android:summaryOn="@string/revanced_hide_join_button_summary_on" android:summaryOff="@string/revanced_hide_join_button_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_separator_title" android:key="revanced_hide_separator" android:defaultValue="true" android:summaryOn="@string/revanced_hide_separator_summary_on" android:summaryOff="@string/revanced_hide_separator_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_info_panel_title" android:key="revanced_hide_info_panel" android:defaultValue="true" android:summaryOn="@string/revanced_hide_info_panel_summary_on" android:summaryOff="@string/revanced_hide_info_panel_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_latest_posts_title" android:key="revanced_hide_latest_posts" android:defaultValue="true" android:summaryOn="@string/revanced_hide_latest_posts_summary_on" android:summaryOff="@string/revanced_hide_latest_posts_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_medical_panel_title" android:key="revanced_hide_medical_panel" android:defaultValue="true" android:summaryOn="@string/revanced_hide_medical_panel_summary_on" android:summaryOff="@string/revanced_hide_medical_panel_summary_off" />
@@ -276,7 +277,7 @@
 
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_flyout_menu" />
             <Preference android:title="enable-old-quality-layout" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
-            <Preference android:title="hide-flyout-panel" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
+            <Preference android:title="hide-player-flyout-panel" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_fullscreen" />
             <Preference android:title="disable-haptic-feedback" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
@@ -291,8 +292,8 @@
 
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_general" />
             <Preference android:title="disable-auto-captions" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
-            <Preference android:title="enable-tablet-miniplayer" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
+            <Preference android:title="enable-tablet-mini-player" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
-            <Preference android:title="enable-wide-searchbar" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
+            <Preference android:title="enable-wide-search-bar" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="header-switch" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-account-menu" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-auto-player-popup-panels" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
@@ -542,7 +543,7 @@
         <SwitchPreference android:title="@string/revanced_hide_shorts_player_info_panel_title" android:key="revanced_hide_shorts_player_info_panel" android:defaultValue="true" android:summaryOn="@string/revanced_hide_shorts_player_info_panel_summary_on" android:summaryOff="@string/revanced_hide_shorts_player_info_panel_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_shorts_player_join_button_title" android:key="revanced_hide_shorts_player_join_button" android:defaultValue="true" android:summaryOn="@string/revanced_hide_shorts_player_join_button_summary_on" android:summaryOff="@string/revanced_hide_shorts_player_join_button_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_shorts_player_like_button_title" android:key="revanced_hide_shorts_player_like_button" android:defaultValue="false" android:summaryOn="@string/revanced_hide_shorts_player_like_button_summary_on" android:summaryOff="@string/revanced_hide_shorts_player_like_button_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_shorts_player_paid_content_title" android:key="revanced_hide_shorts_player_paid_content" android:defaultValue="true" android:summaryOn="@string/revanced_hide_shorts_player_paid_content_summary_on" android:summaryOff="@string/revanced_hide_shorts_player_paid_content_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_shorts_player_paid_promotion_banner_title" android:key="revanced_hide_shorts_player_paid_promotion_banner" android:defaultValue="true" android:summaryOn="@string/revanced_hide_shorts_player_paid_promotion_banner_summary_on" android:summaryOff="@string/revanced_hide_shorts_player_paid_promotion_banner_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_shorts_player_remix_button_title" android:key="revanced_hide_shorts_player_remix_button" android:defaultValue="true" android:summaryOn="@string/revanced_hide_shorts_player_remix_button_summary_on" android:summaryOff="@string/revanced_hide_shorts_player_remix_button_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_shorts_player_share_button_title" android:key="revanced_hide_shorts_player_share_button" android:defaultValue="false" android:summaryOn="@string/revanced_hide_shorts_player_share_button_summary_on" android:summaryOff="@string/revanced_hide_shorts_player_share_button_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_shorts_player_subscriptions_button_title" android:key="revanced_hide_shorts_player_subscriptions_button" android:defaultValue="true" android:summaryOn="@string/revanced_hide_shorts_player_subscriptions_button_summary_on" android:summaryOff="@string/revanced_hide_shorts_player_subscriptions_button_summary_off" />