refactor: ReVanced settings UI (remove summary and PreferenceScreen segmentation)

2025-06-12 13:17:46 +02:00 · 2023-03-06 12:11:35 +09:00
parent 2d7506e871
commit 6aefd9bd87
31 changed files with 153 additions and 195 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
@ -98,8 +98,7 @@ class GeneralAdsPatch : ResourcePatch {
                "SETTINGS: HIDE_VIEW_PRODUCT",
                "SETTINGS: DOUBLE_BACK_TIMEOUT",

-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: BOTTOM_PLAYER",
+                "PREFERENCE: BOTTOM_PLAYER_LAYOUT_SETTINGS",
                "SETTINGS: COMMENT_COMPONENT_PARENT"
            )
        )
--- 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,8 +32,7 @@ class ButtonContainerPatch : ResourcePatch {
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: BOTTOM_PLAYER",
+                "PREFERENCE: BOTTOM_PLAYER_LAYOUT_SETTINGS",
                "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,8 +32,7 @@ class CommentComponentPatch : ResourcePatch {
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: BOTTOM_PLAYER",
+                "PREFERENCE: BOTTOM_PLAYER_LAYOUT_SETTINGS",
                "SETTINGS: COMMENT_COMPONENT_PARENT",
                "SETTINGS: COMMENT_COMPONENTS"
            )
--- 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,8 +32,7 @@ class FlyoutPanelPatch : ResourcePatch {
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: FLYOUT_PANEL",
+                "PREFERENCE: FLYOUT_PANEL_LAYOUT_SETTINGS",
                "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
@ -70,8 +70,7 @@ class OldQualityLayoutPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: FLYOUT_PANEL",
+                "PREFERENCE: FLYOUT_PANEL_LAYOUT_SETTINGS",
                "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,8 +85,7 @@ class HideEndscreenOverlayPatch : BytecodePatch() {
             */
            SettingsPatch.addPreference(
                arrayOf(
-                    "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                    "PREFERENCE_HEADER: FULLSCREEN",
+                    "PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS",
                    "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,8 +61,7 @@ class HideFilmstripOverlayPatch : BytecodePatch(
                     */
                    SettingsPatch.addPreference(
                        arrayOf(
-                            "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                            "PREFERENCE_HEADER: FULLSCREEN",
+                            "PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS",
                            "SETTINGS: HIDE_FILMSTRIP_OVERLAY"
                        )
                    )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/fullscreenbuttoncontainer/resource/patch/HideFullscreenButtonContainerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/fullscreenbuttoncontainer/resource/patch/HideFullscreenButtonContainerPatch.kt
@ -33,8 +33,7 @@ class HideFullscreenButtonContainerPatch : ResourcePatch {
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: FULLSCREEN",
+                "PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS",
                "SETTINGS: HIDE_FULLSCREEN_BUTTON_CONTAINER"
            )
        )
--- 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
@ -88,8 +88,7 @@ class HideFullscreenPanelsPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: FULLSCREEN",
+                "PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS",
                "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,8 +56,7 @@ class HapticFeedBackPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: FULLSCREEN",
+                "PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS",
                "SETTINGS: DISABLE_HAPTIC_FEEDBACK"
            )
        )
--- 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
@ -81,8 +81,7 @@ class HideAutoplayButtonPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: PLAYER",
+                "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                "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,8 +50,7 @@ class HideCaptionsButtonBytecodePatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: PLAYER",
+                "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                "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,8 +43,7 @@ class HideCastButtonPatch : BytecodePatch() {
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: PLAYER",
+                "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                "SETTINGS: HIDE_CAST_BUTTON"
            )
        )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/collapsebutton/patch/HideCollapseButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/collapsebutton/patch/HideCollapseButtonPatch.kt
@ -32,8 +32,7 @@ class HideCollapseButtonPatch : ResourcePatch {
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: PLAYER",
+                "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                "SETTINGS: HIDE_COLLAPSE_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,8 +60,7 @@ class HideEndscreenCardsPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: PLAYER",
+                "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                "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,8 +45,7 @@ class HideInfocardsPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: PLAYER",
+                "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                "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,8 +32,7 @@ class HideLiveChatButtonPatch : ResourcePatch {
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: PLAYER",
+                "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                "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,8 +32,7 @@ class HideNextPrevButtonPatch : ResourcePatch {
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: PLAYER",
+                "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                "SETTINGS: HIDE_NEXT_BUTTON",
                "SETTINGS: HIDE_PREV_BUTTON"
            )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt
@ -44,8 +44,7 @@ class HidePlayerButtonBackgroundPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: PLAYER",
+                "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                "SETTINGS: HIDE_PLAYER_BUTTON_BACKGROUND"
            )
        )
--- 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,8 +92,7 @@ class PlayerOverlayFilterPatch : BytecodePatch() {
             */
            SettingsPatch.addPreference(
                arrayOf(
-                    "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                    "PREFERENCE_HEADER: PLAYER",
+                    "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                    "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,8 +77,7 @@ class SuggestedActionsPatch : BytecodePatch() {
             */
            SettingsPatch.addPreference(
                arrayOf(
-                    "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                    "PREFERENCE_HEADER: PLAYER",
+                    "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                    "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,8 +56,7 @@ class HideChannelWatermarkBytecodePatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: PLAYER",
+                "PREFERENCE: PLAYER_LAYOUT_SETTINGS",
                "SETTINGS: HIDE_CHANNEL_WATERMARK"
            )
        )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbar/patch/HideSeekbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbar/patch/HideSeekbarPatch.kt
@ -47,8 +47,7 @@ class HideSeekbarPatch : BytecodePatch() {
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: SEEKBAR",
+                "PREFERENCE: SEEKBAR_LAYOUT_SETTINGS",
                "SETTINGS: HIDE_SEEKBAR"
            )
        )
--- 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,8 +82,7 @@ class SeekbarColorPatch : BytecodePatch() {
             */
            SettingsPatch.addPreference(
                arrayOf(
-                    "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                    "PREFERENCE_HEADER: SEEKBAR",
+                    "PREFERENCE: SEEKBAR_LAYOUT_SETTINGS",
                    "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,8 +92,7 @@ class SeekbarTappingPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: SEEKBAR",
+                "PREFERENCE: SEEKBAR_LAYOUT_SETTINGS",
                "SETTINGS: ENABLE_SEEKBAR_TAPPING"
            )
        )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timestamps/patch/HideTimeStampPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timestamps/patch/HideTimeStampPatch.kt
@ -53,8 +53,7 @@ class HideTimeStampPatch : BytecodePatch(
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE: OTHER_LAYOUT_SETTINGS",
-                "PREFERENCE_HEADER: SEEKBAR",
+                "PREFERENCE: SEEKBAR_LAYOUT_SETTINGS",
                "SETTINGS: HIDE_TIME_STAMP"
            )
        )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/resource/patch/MicroGPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/resource/patch/MicroGPatch.kt
@ -43,9 +43,7 @@ class MicroGPatch : ResourcePatch {
         */
        SettingsPatch.addPreference(
            arrayOf(
-                "PREFERENCE_CATEGORY: MICROG_SETTINGS",
-                "PREFERENCE: MICROG_SETTINGS",
-                "SETTINGS: MICROG_SETTINGS"
+                "PREFERENCE: MICROG_SETTINGS"
            )
        )
        SettingsPatch.updatePatchStatus("microg-support")
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
@ -13,6 +13,7 @@ import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.shared.annotation.YouTubeCompatibility
 import app.revanced.patches.youtube.misc.playercontrols.patch.PlayerControlsPatch
+import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
 import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourcdIdPatch
 import app.revanced.patches.youtube.misc.sponsorblock.bytecode.fingerprints.*
 import app.revanced.patches.youtube.misc.timebar.patch.HookTimebarPatch
@ -32,6 +33,7 @@ import org.jf.dexlib2.iface.reference.MethodReference
    [
        MainstreamVideoIdPatch::class,
        PlayerControlsPatch::class,
+        PlayerTypeHookPatch::class,
        SharedResourcdIdPatch::class
    ]
 )