refactor: split Layout settings into General layout settings and Other layout settings

2025-05-05 17:14:35 +02:00 · 2023-02-18 14:13:16 +09:00 · 2023-02-18 14:13:16 +09:00 · 9030abe616
commit 9030abe616
parent eaf6bd9bd8
37 changed files with 49 additions and 60 deletions
--- a/src/main/kotlin/app/revanced/patches/youtube/ads/general/resource/patch/GeneralAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ads/general/resource/patch/GeneralAdsPatch.kt
@ -92,11 +92,10 @@ class GeneralAdsPatch : ResourcePatch {
                "PREFERENCE: ADS_SETTINGS",
                "SETTINGS: HIDE_GENERAL_ADS",

-                "PREFERENCE: LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: GENERAL",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                "SETTINGS: HIDE_GENERAL_LAYOUT_ADS",

-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                "PREFERENCE_HEADER: PLAYER",
                "SETTINGS: HIDE_VIEW_PRODUCT"
            )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttomplayer/buttoncontainer/patch/ButtonContainerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttomplayer/buttoncontainer/patch/ButtonContainerPatch.kt
@ -32,7 +32,7 @@ class ButtonContainerPatch : ResourcePatch {
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                "PREFERENCE_HEADER: BOTTOM_PLAYER",
                "SETTINGS: BUTTON_CONTAINER"
            )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttomplayer/comment/patch/CommentComponentPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttomplayer/comment/patch/CommentComponentPatch.kt
@ -32,7 +32,7 @@ class CommentComponentPatch : ResourcePatch {
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                "PREFERENCE_HEADER: BOTTOM_PLAYER",
                "SETTINGS: COMMENT_COMPONENT"
            )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/flyoutpanel/flyoutpanel/patch/FlyoutPanelPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/flyoutpanel/flyoutpanel/patch/FlyoutPanelPatch.kt
@ -32,7 +32,7 @@ class FlyoutPanelPatch : ResourcePatch {
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                "PREFERENCE_HEADER: FLYOUT_PANEL",
                "SETTINGS: FLYOUT_PANEL_COMPONENT"
            )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/flyoutpanel/oldqualitylayout/patch/OldQualityLayoutPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/flyoutpanel/oldqualitylayout/patch/OldQualityLayoutPatch.kt
@ -45,7 +45,7 @@ class OldQualityLayoutPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                "PREFERENCE_HEADER: FLYOUT_PANEL",
                "SETTINGS: ENABLE_OLD_QUALITY_LAYOUT"
            )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/endscreenoverlay/patch/HideEndscreenOverlayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/endscreenoverlay/patch/HideEndscreenOverlayPatch.kt
@ -85,7 +85,7 @@ class HideEndscreenOverlayPatch : BytecodePatch() {
             */
            SettingsPatch.addPreference(
                arrayOf(
-                    "PREFERENCE: LAYOUT_SETTINGS",
+                    "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                    "PREFERENCE_HEADER: FULLSCREEN",
                    "SETTINGS: HIDE_ENDSCREEN_OVERLAY"
                )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/flimstripoverlay/patch/HideFilmstripOverlayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/flimstripoverlay/patch/HideFilmstripOverlayPatch.kt
@ -61,7 +61,7 @@ class HideFilmstripOverlayPatch : BytecodePatch(
                     */
                    SettingsPatch.addPreference(
                        arrayOf(
-                            "PREFERENCE: LAYOUT_SETTINGS",
+                            "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                            "PREFERENCE_HEADER: FULLSCREEN",
                            "SETTINGS: HIDE_FILMSTRIP_OVERLAY"
                        )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/fullscreenpanels/patch/HideFullscreenPanelsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/fullscreenpanels/patch/HideFullscreenPanelsPatch.kt
@ -62,7 +62,7 @@ class HideFullscreenPanelsPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                "PREFERENCE_HEADER: FULLSCREEN",
                "SETTINGS: HIDE_FULLSCREEN_PANELS"
            )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/hapticfeedback/patch/HapticFeedBackPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/hapticfeedback/patch/HapticFeedBackPatch.kt
@ -56,7 +56,7 @@ class HapticFeedBackPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                "PREFERENCE_HEADER: FULLSCREEN",
                "SETTINGS: DISABLE_HAPTIC_FEEDBACK"
            )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/autocaptions/patch/AutoCaptionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/autocaptions/patch/AutoCaptionsPatch.kt
@ -69,8 +69,7 @@ class AutoCaptionsPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: GENERAL",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                "SETTINGS: HIDE_AUTO_CAPTIONS"
            )
        )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/autopopuppanels/patch/PlayerPopupPanelsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/autopopuppanels/patch/PlayerPopupPanelsPatch.kt
@ -49,8 +49,7 @@ class PlayerPopupPanelsPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: GENERAL",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                "SETTINGS: HIDE_AUTO_PLAYER_POPUP_PANELS"
            )
        )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/crowdfundingbox/patch/CrowdfundingBoxPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/crowdfundingbox/patch/CrowdfundingBoxPatch.kt
@ -76,8 +76,7 @@ class CrowdfundingBoxPatch : BytecodePatch() {
             */
            SettingsPatch.addPreference(
                arrayOf(
-                    "PREFERENCE: LAYOUT_SETTINGS",
-                    "PREFERENCE_HEADER: GENERAL",
+                    "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                    "SETTINGS: HIDE_CROWDFUNDING_BOX"
                )
            )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/headerswitch/patch/HeaderSwitchPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/headerswitch/patch/HeaderSwitchPatch.kt
@ -80,8 +80,7 @@ class HeaderSwitchPatch : BytecodePatch() {
             */
            SettingsPatch.addPreference(
                arrayOf(
-                    "PREFERENCE: LAYOUT_SETTINGS",
-                    "PREFERENCE_HEADER: GENERAL",
+                    "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                    "SETTINGS: HEADER_SWITCH"
                )
            )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/patch/MixPlaylistsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/patch/MixPlaylistsPatch.kt
@ -56,8 +56,7 @@ class MixPlaylistsPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: GENERAL",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                "SETTINGS: HIDE_MIX_PLAYLISTS"
            )
        )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/personalinformation/patch/HideEmailAddressPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/personalinformation/patch/HideEmailAddressPatch.kt
@ -48,8 +48,7 @@ class HideEmailAddressPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: GENERAL",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                "SETTINGS: HIDE_EMAIL_ADDRESS"
            )
        )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/createbutton/patch/CreateButtonRemoverPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/createbutton/patch/CreateButtonRemoverPatch.kt
@ -73,8 +73,7 @@ class CreateButtonRemoverPatch : BytecodePatch(
                     */
                    SettingsPatch.addPreference(
                        arrayOf(
-                            "PREFERENCE: LAYOUT_SETTINGS",
-                            "PREFERENCE_HEADER: GENERAL",
+                            "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                            "SETTINGS: HIDE_CREATE_BUTTON"
                        )
                    )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/shortsbutton/patch/ShortsButtonRemoverPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/shortsbutton/patch/ShortsButtonRemoverPatch.kt
@ -77,8 +77,7 @@ class ShortsButtonRemoverPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: GENERAL",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                "SETTINGS: SHORTS_COMPONENT.PARENT",
                "SETTINGS: SHORTS_COMPONENT_PARENT.A",
                "SETTINGS: HIDE_SHORTS_BUTTON"
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/shortscomponent/patch/ShortsComponentPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/shortscomponent/patch/ShortsComponentPatch.kt
@ -111,8 +111,7 @@ class ShortsComponentPatch : BytecodePatch() {
             */
            SettingsPatch.addPreference(
                arrayOf(
-                    "PREFERENCE: LAYOUT_SETTINGS",
-                    "PREFERENCE_HEADER: GENERAL",
+                    "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                    "SETTINGS: SHORTS_COMPONENT.PARENT",
                    "SETTINGS: SHORTS_COMPONENT_PARENT.A",
                    "SETTINGS: SHORTS_COMPONENT_PARENT.B",
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/snackbar/patch/HideSnackbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/snackbar/patch/HideSnackbarPatch.kt
@ -47,8 +47,7 @@ class HideSnackbarPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: GENERAL",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                "SETTINGS: HIDE_SNACKBAR"
            )
        )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/startupshortsreset/patch/HideShortsOnStartupPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/startupshortsreset/patch/HideShortsOnStartupPatch.kt
@ -53,8 +53,7 @@ class HideShortsOnStartupPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: GENERAL",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                "SETTINGS: SHORTS_COMPONENT.PARENT",
                "SETTINGS: SHORTS_COMPONENT_PARENT.B",
                "SETTINGS: HIDE_STARTUP_SHORTS_PLAYER"
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/stories/patch/HideStoriesPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/stories/patch/HideStoriesPatch.kt
@ -79,8 +79,7 @@ class HideStoriesPatch : BytecodePatch() {
             */
            SettingsPatch.addPreference(
                arrayOf(
-                    "PREFERENCE: LAYOUT_SETTINGS",
-                    "PREFERENCE_HEADER: GENERAL",
+                    "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                    "SETTINGS: HIDE_STORIES_SHELF"
                )
            )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/patch/TabletMiniPlayerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/patch/TabletMiniPlayerPatch.kt
@ -65,8 +65,7 @@ class TabletMiniPlayerPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: GENERAL",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                "SETTINGS: ENABLE_TABLET_MINIPLAYER"
            )
        )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/patch/WideSearchbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/patch/WideSearchbarPatch.kt
@ -58,8 +58,7 @@ class WideSearchbarPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: GENERAL",
+                "PREFERENCE: GENERAL_LAYOUT_SETTINGS",
                "SETTINGS: ENABLE_WIDE_SEARCHBAR"
            )
        )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/autoplaybutton/patch/HideAutoplayButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/autoplaybutton/patch/HideAutoplayButtonPatch.kt
@ -72,7 +72,7 @@ class HideAutoplayButtonPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                "PREFERENCE_HEADER: PLAYER",
                "SETTINGS: HIDE_AUTOPLAY_BUTTON"
            )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/captionsbutton/patch/HideCaptionsButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/captionsbutton/patch/HideCaptionsButtonPatch.kt
@ -50,7 +50,7 @@ class HideCaptionsButtonBytecodePatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                "PREFERENCE_HEADER: PLAYER",
                "SETTINGS: HIDE_CAPTIONS_BUTTON"
            )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/castbutton/patch/HideCastButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/castbutton/patch/HideCastButtonPatch.kt
@ -43,7 +43,7 @@ class HideCastButtonPatch : BytecodePatch() {
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                "PREFERENCE_HEADER: PLAYER",
                "SETTINGS: HIDE_CAST_BUTTON"
            )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/endscreencards/patch/HideEndscreenCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/endscreencards/patch/HideEndscreenCardsPatch.kt
@ -60,7 +60,7 @@ class HideEndscreenCardsPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                "PREFERENCE_HEADER: PLAYER",
                "SETTINGS: HIDE_ENDSCREEN_CARDS"
            )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/infocards/patch/HideInfocardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/infocards/patch/HideInfocardsPatch.kt
@ -45,7 +45,7 @@ class HideInfocardsPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                "PREFERENCE_HEADER: PLAYER",
                "SETTINGS: HIDE_INFO_CARDS"
            )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/livechatbutton/patch/HideLiveChatButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/livechatbutton/patch/HideLiveChatButtonPatch.kt
@ -32,7 +32,7 @@ class HideLiveChatButtonPatch : ResourcePatch {
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                "PREFERENCE_HEADER: PLAYER",
                "SETTINGS: HIDE_LIVE_CHATS_BUTTON"
            )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/nextprevbutton/patch/HideNextPrevButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/nextprevbutton/patch/HideNextPrevButtonPatch.kt
@ -32,7 +32,7 @@ class HideNextPrevButtonPatch : ResourcePatch {
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                "PREFERENCE_HEADER: PLAYER",
                "SETTINGS: HIDE_NEXT_BUTTON",
                "SETTINGS: HIDE_PREV_BUTTON"
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/playeroverlayfilter/patch/PlayerOverlayFilterPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/playeroverlayfilter/patch/PlayerOverlayFilterPatch.kt
@ -92,7 +92,7 @@ class PlayerOverlayFilterPatch : BytecodePatch() {
             */
            SettingsPatch.addPreference(
                arrayOf(
-                    "PREFERENCE: LAYOUT_SETTINGS",
+                    "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                    "PREFERENCE_HEADER: PLAYER",
                    "SETTINGS: HIDE_PLAYER_OVERLAY_FILTER"
                )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/suggestactions/patch/SuggestedActionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/suggestactions/patch/SuggestedActionsPatch.kt
@ -77,7 +77,7 @@ class SuggestedActionsPatch : BytecodePatch() {
             */
            SettingsPatch.addPreference(
                arrayOf(
-                    "PREFERENCE: LAYOUT_SETTINGS",
+                    "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                    "PREFERENCE_HEADER: PLAYER",
                    "SETTINGS: HIDE_SUGGESTED_ACTION"
                )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/watermark/patch/HideChannelWatermarkPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/watermark/patch/HideChannelWatermarkPatch.kt
@ -56,7 +56,7 @@ class HideChannelWatermarkBytecodePatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                "PREFERENCE_HEADER: PLAYER",
                "SETTINGS: HIDE_CHANNEL_WATERMARK"
            )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbarcolor/patch/SeekbarColorPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbarcolor/patch/SeekbarColorPatch.kt
@ -82,7 +82,7 @@ class SeekbarColorPatch : BytecodePatch() {
             */
            SettingsPatch.addPreference(
                arrayOf(
-                    "PREFERENCE: LAYOUT_SETTINGS",
+                    "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                    "PREFERENCE_HEADER: SEEKBAR",
                    "SETTINGS: CUSTOM_SEEKBAR_COLOR"
                )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbartapping/patch/SeekbarTappingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbartapping/patch/SeekbarTappingPatch.kt
@ -92,7 +92,7 @@ class SeekbarTappingPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                "PREFERENCE_HEADER: SEEKBAR",
                "SETTINGS: ENABLE_SEEKBAR_TAPPING"
            )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timeandseekbar/patch/HideTimeAndSeekbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timeandseekbar/patch/HideTimeAndSeekbarPatch.kt
@ -65,7 +65,7 @@ class HideTimeAndSeekbarPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: LAYOUT_SETTINGS",
+                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
                "PREFERENCE_HEADER: SEEKBAR",
                "SETTINGS: HIDE_TIME_AND_SEEKBAR"
            )
--- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@ -76,11 +76,9 @@
    </PreferenceScreen>PREFERENCE: SWIPE_SETTINGS -->


-    <!-- PREFERENCE: LAYOUT_SETTINGS
-    <PreferenceScreen android:title="@string/revanced_layout_settings_title" android:key="layout" android:summary="@string/revanced_layout_settings_summary">PREFERENCE: LAYOUT_SETTINGS -->
-
-    <!-- PREFERENCE_HEADER: GENERAL
-        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_layout_settings_general" />PREFERENCE_HEADER: GENERAL -->
+    <!-- PREFERENCE: GENERAL_LAYOUT_SETTINGS
+    <PreferenceScreen android:title="@string/revanced_general_layout_settings_title" android:key="general_layout" android:summary="@string/revanced_general_layout_settings_summary">
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_general_layout_settings_title" />PREFERENCE: GENERAL_LAYOUT_SETTINGS -->

        <!-- SETTINGS: HIDE_STORIES_SHELF
        <SwitchPreference android:title="@string/revanced_hide_stories_shelf_title" android:key="revanced_hide_stories_shelf" android:defaultValue="true" android:summaryOn="@string/revanced_hide_stories_shelf_summary_on" android:summaryOff="@string/revanced_hide_stories_shelf_summary_off" />SETTINGS: HIDE_STORIES_SHELF -->
@ -169,6 +167,12 @@
        <!-- SETTINGS: HEADER_SWITCH
        <SwitchPreference android:title="@string/revanced_override_premium_header_title" android:key="revanced_override_premium_header" android:defaultValue="false" android:summaryOn="@string/revanced_override_premium_header_summary_on" android:summaryOff="@string/revanced_override_premium_header_summary_off" />SETTINGS: HEADER_SWITCH -->

+    <!-- PREFERENCE: GENERAL_LAYOUT_SETTINGS
+    </PreferenceScreen>PREFERENCE: GENERAL_LAYOUT_SETTINGS -->
+
+    <!-- PREFERENCE: OTHER_LAYOUT_SETTINGS
+    <PreferenceScreen android:title="@string/revanced_other_layout_settings_title" android:key="other_layout" android:summary="@string/revanced_other_layout_settings_summary">PREFERENCE: OTHER_LAYOUT_SETTINGS -->
+
    <!-- PREFERENCE_HEADER: PLAYER
        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_layout_settings_player" />PREFERENCE_HEADER: PLAYER -->

@ -290,8 +294,8 @@
    <!-- SETTINGS: HIDE_TIME_AND_SEEKBAR
        <SwitchPreference android:title="@string/revanced_hide_time_and_seekbar_title" android:key="revanced_hide_time_and_seekbar" android:defaultValue="false" android:summaryOn="@string/revanced_hide_time_and_seekbar_summary_on" android:summaryOff="@string/revanced_hide_time_and_seekbar_summary_off" />SETTINGS: HIDE_TIME_AND_SEEKBAR -->

-    <!-- PREFERENCE: LAYOUT_SETTINGS
-    </PreferenceScreen>PREFERENCE: LAYOUT_SETTINGS -->
+    <!-- PREFERENCE: OTHER_LAYOUT_SETTINGS
+    </PreferenceScreen>PREFERENCE: OTHER_LAYOUT_SETTINGS -->


    <!-- PREFERENCE: OVERLAY_BUTTONS
@ -353,7 +357,7 @@
            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_swipe_controls_title" />
            <Preference android:title="swipe-controls" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>

-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_layout_settings_general" />
+            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_general_layout_settings_title" />
            <Preference android:title="hide-stories" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
            <Preference android:title="hide-create-button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
            <Preference android:title="hide-shorts-button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>