refactor(settings): moved General/Shorts component setting to Shorts setting

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

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.general.shortscomponent.fingerprints
+package app.revanced.patches.youtube.layout.shorts.shortscomponent.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch

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

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.general.shortscomponent.fingerprints
+package app.revanced.patches.youtube.layout.shorts.shortscomponent.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch

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

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.general.shortscomponent.fingerprints
+package app.revanced.patches.youtube.layout.shorts.shortscomponent.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch

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

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.general.shortscomponent.fingerprints
+package app.revanced.patches.youtube.layout.shorts.shortscomponent.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch

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

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.general.shortscomponent.fingerprints
+package app.revanced.patches.youtube.layout.shorts.shortscomponent.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch

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

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.general.shortscomponent.fingerprints
+package app.revanced.patches.youtube.layout.shorts.shortscomponent.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.Opcode

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

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.general.shortscomponent.fingerprints
+package app.revanced.patches.youtube.layout.shorts.shortscomponent.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch

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

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.general.shortscomponent.patch
+package app.revanced.patches.youtube.layout.shorts.shortscomponent.patch
 
 import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Name
@@ -10,7 +10,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.youtube.layout.general.shortscomponent.fingerprints.ShortsCommentFingerprint
+import app.revanced.patches.youtube.layout.shorts.shortscomponent.fingerprints.ShortsCommentFingerprint
 import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch
 import app.revanced.util.integrations.Constants.GENERAL
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction

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

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.general.shortscomponent.patch
+package app.revanced.patches.youtube.layout.shorts.shortscomponent.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -46,12 +46,10 @@ class ShortsComponentPatch : BytecodePatch() {
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: GENERAL_SETTINGS",
+                "PREFERENCE: SHORTS_SETTINGS",
-                "SETTINGS: SHORTS_COMPONENT.PARENT",
+                "SETTINGS: HIDE_SHORTS_SHELF",
-                "SETTINGS: SHORTS_COMPONENT_PARENT.A",
+                "SETTINGS: SHORTS_PLAYER_PARENT",
-                "SETTINGS: SHORTS_COMPONENT_PARENT.B",
+                "SETTINGS: HIDE_SHORTS_COMPONENTS"
-                "SETTINGS: HIDE_SHORTS_COMPONENTS",
-                "SETTINGS: HIDE_SHORTS_SHELF"
             )
         )
 

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

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.general.shortscomponent.patch
+package app.revanced.patches.youtube.layout.shorts.shortscomponent.patch
 
 import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Name
@@ -10,9 +10,9 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.youtube.layout.general.shortscomponent.fingerprints.ShortsInfoPanelFingerprint
+import app.revanced.patches.youtube.layout.shorts.shortscomponent.fingerprints.ShortsInfoPanelFingerprint
 import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch
-import app.revanced.util.integrations.Constants.GENERAL
+import app.revanced.util.integrations.Constants.SHORTS
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
 
@@ -34,7 +34,7 @@ class ShortsInfoPanelPatch : BytecodePatch(
 
                 method.addInstructions(
                     insertIndex + 1, """
-                        invoke-static {v$insertRegister}, $GENERAL->hideShortsPlayerInfoPanel(Landroid/view/ViewGroup;)Landroid/view/ViewGroup;
+                        invoke-static {v$insertRegister}, $SHORTS->hideShortsPlayerInfoPanel(Landroid/view/ViewGroup;)Landroid/view/ViewGroup;
                         move-result-object v$insertRegister
                     """
                 )

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

@@ -1,10 +1,9 @@
-package app.revanced.patches.youtube.layout.general.shortscomponent.patch
+package app.revanced.patches.youtube.layout.shorts.shortscomponent.patch
 
 import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.instruction
 import app.revanced.patcher.patch.BytecodePatch
@@ -13,10 +12,9 @@ import app.revanced.patcher.patch.PatchResultSuccess
 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.layout.general.shortscomponent.fingerprints.ShortsPaidContentFingerprint
+import app.revanced.patches.youtube.layout.shorts.shortscomponent.fingerprints.ShortsPaidContentFingerprint
 import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch
-import app.revanced.util.integrations.Constants
+import app.revanced.util.integrations.Constants.SHORTS
-import app.revanced.util.integrations.Constants.GENERAL
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
 
@@ -55,7 +53,7 @@ class ShortsPaidContentBannerPatch : BytecodePatch(
             val insertRegister = (instruction(insertIndex) as OneRegisterInstruction).registerA
             addInstructions(
                 insertIndex + 1, """
-                    invoke-static {v$insertRegister}, $GENERAL->hideShortsPlayerPaidContent(Landroid/view/ViewStub;)Landroid/view/ViewStub;
+                    invoke-static {v$insertRegister}, $SHORTS->hideShortsPlayerPaidContent(Landroid/view/ViewStub;)Landroid/view/ViewStub;
                     move-result-object v$insertRegister
                 """
             )

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

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.general.shortscomponent.patch
+package app.revanced.patches.youtube.layout.shorts.shortscomponent.patch
 
 import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Name
@@ -10,9 +10,9 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.youtube.layout.general.shortscomponent.fingerprints.ShortsRemixFingerprint
+import app.revanced.patches.youtube.layout.shorts.shortscomponent.fingerprints.ShortsRemixFingerprint
 import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch
-import app.revanced.util.integrations.Constants.GENERAL
+import app.revanced.util.integrations.Constants.SHORTS
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
 
@@ -34,7 +34,7 @@ class ShortsRemixButtonPatch : BytecodePatch(
 
                 method.addInstruction(
                     insertIndex,
-                    "invoke-static {v$insertRegister}, $GENERAL->hideShortsPlayerRemixButton(Landroid/view/View;)V"
+                    "invoke-static {v$insertRegister}, $SHORTS->hideShortsPlayerRemixButton(Landroid/view/View;)V"
                 )
             }
         } ?: return ShortsRemixFingerprint.toErrorResult()

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

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.general.shortscomponent.patch
+package app.revanced.patches.youtube.layout.shorts.shortscomponent.patch
 
 import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Name
@@ -12,11 +12,11 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.youtube.layout.general.shortscomponent.fingerprints.ShortsSubscriptionsFingerprint
+import app.revanced.patches.youtube.layout.shorts.shortscomponent.fingerprints.ShortsSubscriptionsFingerprint
-import app.revanced.patches.youtube.layout.general.shortscomponent.fingerprints.ShortsSubscriptionsTabletFingerprint
+import app.revanced.patches.youtube.layout.shorts.shortscomponent.fingerprints.ShortsSubscriptionsTabletFingerprint
-import app.revanced.patches.youtube.layout.general.shortscomponent.fingerprints.ShortsSubscriptionsTabletParentFingerprint
+import app.revanced.patches.youtube.layout.shorts.shortscomponent.fingerprints.ShortsSubscriptionsTabletParentFingerprint
 import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch
-import app.revanced.util.integrations.Constants.GENERAL
+import app.revanced.util.integrations.Constants.SHORTS
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
@@ -45,7 +45,7 @@ class ShortsSubscriptionsButtonPatch : BytecodePatch(
 
                 method.addInstruction(
                     insertIndex + 1,
-                    "invoke-static {v$insertRegister}, $GENERAL->hideShortsPlayerSubscriptionsButton(Landroid/view/View;)V"
+                    "invoke-static {v$insertRegister}, $SHORTS->hideShortsPlayerSubscriptionsButton(Landroid/view/View;)V"
                 )
             }
         } ?: return ShortsSubscriptionsFingerprint.toErrorResult()
@@ -69,7 +69,7 @@ class ShortsSubscriptionsButtonPatch : BytecodePatch(
 
                         it.addInstructions(
                             insertIndex,"""
-                                invoke-static {v$register}, $GENERAL->hideShortsPlayerSubscriptionsButton(I)I
+                                invoke-static {v$register}, $SHORTS->hideShortsPlayerSubscriptionsButton(I)I
                                 move-result v$register
                                 """
                         )

src/main/kotlin/app/revanced/patches/youtube/layout/shorts/startupshortsreset/fingerprints/UserWasInShortsFingerprint.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.general.startupshortsreset.fingerprints
+package app.revanced.patches.youtube.layout.shorts.startupshortsreset.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

src/main/kotlin/app/revanced/patches/youtube/layout/shorts/startupshortsreset/patch/DisableShortsOnStartupPatch.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.general.startupshortsreset.patch
+package app.revanced.patches.youtube.layout.shorts.startupshortsreset.patch
 
 import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
@@ -14,18 +14,18 @@ import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.youtube.layout.general.startupshortsreset.fingerprints.UserWasInShortsFingerprint
+import app.revanced.patches.youtube.layout.shorts.startupshortsreset.fingerprints.UserWasInShortsFingerprint
 import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
-import app.revanced.util.integrations.Constants.GENERAL
+import app.revanced.util.integrations.Constants.SHORTS
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch
-@Name("hide-startup-shorts-player")
+@Name("disable-startup-shorts-player")
 @Description("Disables playing YouTube Shorts when launching YouTube.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
 @Version("0.0.1")
-class HideShortsOnStartupPatch : BytecodePatch(
+class DisableShortsOnStartupPatch : BytecodePatch(
     listOf(
         UserWasInShortsFingerprint
     )
@@ -39,7 +39,7 @@ class HideShortsOnStartupPatch : BytecodePatch(
                 val register = (instruction(insertIndex - 1) as OneRegisterInstruction).registerA + 2
                 addInstructions(
                     insertIndex, """
-                        invoke-static { }, $GENERAL->hideStartupShortsPlayer()Z
+                        invoke-static { }, $SHORTS->disableStartupShortsPlayer()Z
                         move-result v$register
                         if-eqz v$register, :show_startup_shorts_player
                         return-void
@@ -53,14 +53,13 @@ class HideShortsOnStartupPatch : BytecodePatch(
          */
         SettingsPatch.addPreference(
             arrayOf(
-                "PREFERENCE: GENERAL_SETTINGS",
+                "PREFERENCE: SHORTS_SETTINGS",
-                "SETTINGS: SHORTS_COMPONENT.PARENT",
+                "SETTINGS: SHORTS_PLAYER_PARENT",
-                "SETTINGS: SHORTS_COMPONENT_PARENT.B",
+                "SETTINGS: DISABLE_STARTUP_SHORTS_PLAYER"
-                "SETTINGS: HIDE_STARTUP_SHORTS_PLAYER"
             )
         )
 
-        SettingsPatch.updatePatchStatus("hide-startup-shorts-player")
+        SettingsPatch.updatePatchStatus("disable-startup-shorts-player")
 
         return PatchResultSuccess()
     }

src/main/kotlin/app/revanced/util/integrations/Constants.kt

@@ -15,6 +15,7 @@ internal object Constants {
     const val NAVIGATION = "$PATCHES_PATH/layout/NavigationPatch;"
     const val PLAYER = "$PATCHES_PATH/layout/PlayerPatch;"
     const val SEEKBAR = "$PATCHES_PATH/layout/SeekBarPatch;"
+    const val SHORTS = "$PATCHES_PATH/layout/ShortsPatch;"
 
     const val MISC_PATH = "$PATCHES_PATH/misc"
 

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

@@ -113,6 +113,9 @@ Is it ready to submit?"</string>
     <string name="revanced_disable_landscape_mode_summary_off">Landscape mode when entering fullscreen is enabled</string>
     <string name="revanced_disable_landscape_mode_summary_on">Landscape mode when entering fullscreen is disabled</string>
     <string name="revanced_disable_landscape_mode_title">Disable landscape mode</string>
+    <string name="revanced_disable_startup_shorts_player_summary_off">Shorts player is enabled at app startup</string>
+    <string name="revanced_disable_startup_shorts_player_summary_on">Shorts player is disabled at app startup</string>
+    <string name="revanced_disable_startup_shorts_player_title">Disable shorts player at app startup</string>
     <string name="revanced_disable_quic_protocol_summary">"Disable CronetEngine's QUIC protocol"</string>
     <string name="revanced_disable_quic_protocol_title">Disable QUIC protocol</string>
     <string name="revanced_double_back_timeout_summary">The amount of seconds the double press back to exit</string>
@@ -299,9 +302,6 @@ Please do not report any issues you encounter while using this feature."</string
     <string name="revanced_hide_comments_section_summary_off">Comment section is shown</string>
     <string name="revanced_hide_comments_section_summary_on">Comment section is hidden</string>
     <string name="revanced_hide_comments_section_title">Hide comments section</string>
-    <string name="revanced_hide_comments_thanks_button_summary_off">Thanks button is shown</string>
-    <string name="revanced_hide_comments_thanks_button_summary_on">Thanks button is hidden</string>
-    <string name="revanced_hide_comments_thanks_button_title">Hide thanks button</string>
     <string name="revanced_hide_community_posts_home_summary_off">Community posts in home feed are shown</string>
     <string name="revanced_hide_community_posts_home_summary_on">Community posts in home feed are hidden</string>
     <string name="revanced_hide_community_posts_home_title">Hide community posts in home feed</string>
@@ -433,33 +433,23 @@ Please do not report any issues you encounter while using this feature."</string
     <string name="revanced_hide_shorts_navigation_bar_summary_off">Navigation bar is shown</string>
     <string name="revanced_hide_shorts_navigation_bar_summary_on">Navigation bar is hidden</string>
     <string name="revanced_hide_shorts_navigation_bar_title">Hide navigation bar in shorts</string>
-    <string name="revanced_hide_shorts_player_comments_button_summary_off">Shorts player comments button is shown</string>
+    <string name="revanced_hide_shorts_player_comments_button_summary_off">Comments button is shown</string>
-    <string name="revanced_hide_shorts_player_comments_button_summary_on">Shorts player comments button is hidden</string>
+    <string name="revanced_hide_shorts_player_comments_button_summary_on">Comments button is hidden</string>
-    <string name="revanced_hide_shorts_player_comments_button_title">Hide shorts player comments button</string>
+    <string name="revanced_hide_shorts_player_comments_button_title">Hide comments button</string>
-    <string name="revanced_hide_shorts_player_component_title">Hide shorts player component</string>
+    <string name="revanced_hide_shorts_player_join_button_summary_off">Join button is shown</string>
-    <string name="revanced_hide_shorts_player_info_panel_title">Hide shorts player info panels</string>
+    <string name="revanced_hide_shorts_player_join_button_summary_on">Join button is hidden</string>
-    <string name="revanced_hide_shorts_player_join_button_summary_off">Shorts player join button is shown</string>
+    <string name="revanced_hide_shorts_player_join_button_title">Hide join button</string>
-    <string name="revanced_hide_shorts_player_join_button_summary_on">Shorts player join button is hidden</string>
+    <string name="revanced_hide_shorts_player_subscriptions_button_summary_off">Subscriptions button is shown</string>
-    <string name="revanced_hide_shorts_player_join_button_title">Hide shorts player join button</string>
+    <string name="revanced_hide_shorts_player_subscriptions_button_summary_on">Subscriptions button is hidden</string>
-    <string name="revanced_hide_shorts_player_paid_content_title">Hide shorts player paid promotion</string>
+    <string name="revanced_hide_shorts_player_subscriptions_button_title">Hide subscriptions button</string>
-    <string name="revanced_hide_shorts_player_remix_button_summary_off">Shorts player remix button is shown</string>
-    <string name="revanced_hide_shorts_player_remix_button_summary_on">Shorts player remix button is hidden</string>
-    <string name="revanced_hide_shorts_player_remix_button_title">Hide shorts player remix button</string>
-    <string name="revanced_hide_shorts_player_subscriptions_button_summary_off">Shorts player subscriptions button is shown</string>
-    <string name="revanced_hide_shorts_player_subscriptions_button_summary_on">Shorts player subscriptions button is hidden</string>
-    <string name="revanced_hide_shorts_player_subscriptions_button_title">Hide shorts player subscriptions button</string>
-    <string name="revanced_hide_shorts_player_thanks_button_summary_off">Shorts player thanks button is shown</string>
-    <string name="revanced_hide_shorts_player_thanks_button_summary_on">Shorts player thanks button is hidden</string>
-    <string name="revanced_hide_shorts_player_thanks_button_title">Hide shorts player thanks button</string>
     <string name="revanced_hide_shorts_shelf_summary_off">Shorts shelves are shown</string>
     <string name="revanced_hide_shorts_shelf_summary_on">Shorts shelves are hidden</string>
     <string name="revanced_hide_shorts_shelf_title">Hide shorts shelf</string>
+    <string name="revanced_shorts">Shorts</string>
+    <string name="revanced_shorts_player_title">Shorts player</string>
     <string name="revanced_hide_snackbar_summary_off">Snackbar is shown</string>
     <string name="revanced_hide_snackbar_summary_on">Snackbar is hidden</string>
     <string name="revanced_hide_snackbar_title">Hide snackbar</string>
-    <string name="revanced_hide_startup_shorts_player_summary_off">Shorts player is shown at app startup</string>
-    <string name="revanced_hide_startup_shorts_player_summary_on">Shorts player is hidden at app startup</string>
-    <string name="revanced_hide_startup_shorts_player_title">Hide shorts player at app startup</string>
     <string name="revanced_hide_stories_shelf_summary_off">Stories shelves are shown</string>
     <string name="revanced_hide_stories_shelf_summary_on">Stories shelves are hidden</string>
     <string name="revanced_hide_stories_shelf_title">Hide stories shelf</string>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Translation Exception Language Resources -->
+    <!-- Translation Exception -->
     <string name="about">@string/pref_about_category</string>
 
     <string name="revanced_account_menu_custom_filter_summary">@string/revanced_adremover_custom_filter_summary</string>
@@ -8,10 +8,24 @@
 
     <string name="revanced_backup_title">@string/settings_ie</string>
     <string name="revanced_extended_settings_title">ReVanced Extended</string>
+
+    <string name="revanced_hide_comments_thanks_button_summary_off">@string/revanced_hide_button_thanks_summary_off</string>
+    <string name="revanced_hide_comments_thanks_button_summary_on">@string/revanced_hide_button_thanks_summary_on</string>
+    <string name="revanced_hide_comments_thanks_button_title">@string/revanced_hide_button_thanks_title</string>
+
     <string name="revanced_hide_shorts_player_info_panel_summary_off">@string/revanced_hide_info_panel_summary_off</string>
     <string name="revanced_hide_shorts_player_info_panel_summary_on">@string/revanced_hide_info_panel_summary_on</string>
+    <string name="revanced_hide_shorts_player_info_panel_title">@string/revanced_hide_info_panel_title</string>
     <string name="revanced_hide_shorts_player_paid_content_summary_off">@string/revanced_adremover_paid_content_summary_off</string>
     <string name="revanced_hide_shorts_player_paid_content_summary_on">@string/revanced_adremover_paid_content_summary_on</string>
+    <string name="revanced_hide_shorts_player_paid_content_title">@string/revanced_adremover_paid_content_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>
+    <string name="revanced_hide_shorts_player_thanks_button_summary_off">@string/revanced_hide_button_thanks_summary_off</string>
+    <string name="revanced_hide_shorts_player_thanks_button_summary_on">@string/revanced_hide_button_thanks_summary_on</string>
+    <string name="revanced_hide_shorts_player_thanks_button_title">@string/revanced_hide_button_thanks_title</string>
+
     <string name="revanced_whitelisting_speed_button">@string/camera_speed_button_label</string>
 
     <string name="revanced_icons_blue">afn / blue</string>

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

@@ -44,6 +44,32 @@
     </PreferenceScreen>PREFERENCE: SWIPE_SETTINGS -->
 
 
+    <!-- PREFERENCE: SHORTS_SETTINGS
+    <PreferenceScreen android:title="@string/revanced_shorts" android:key="shorts">PREFERENCE: SHORTS_SETTINGS -->
+
+        <!-- SETTINGS: HIDE_SHORTS_SHELF
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_shorts" />
+        <SwitchPreference android:title="@string/revanced_hide_shorts_shelf_title" android:key="revanced_hide_shorts_shelf" android:defaultValue="true" android:summaryOn="@string/revanced_hide_shorts_shelf_summary_on" android:summaryOff="@string/revanced_hide_shorts_shelf_summary_off" />SETTINGS: HIDE_SHORTS_SHELF -->
+
+        <!-- SETTINGS: SHORTS_PLAYER_PARENT
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_shorts_player_title" />SETTINGS: SHORTS_PLAYER_PARENT -->
+
+        <!-- SETTINGS: DISABLE_STARTUP_SHORTS_PLAYER
+        <SwitchPreference android:title="@string/revanced_disable_startup_shorts_player_title" android:key="revanced_disable_startup_shorts_player" android:defaultValue="true" android:summaryOn="@string/revanced_disable_startup_shorts_player_summary_on" android:summaryOff="@string/revanced_disable_startup_shorts_player_summary_off" />SETTINGS: DISABLE_STARTUP_SHORTS_PLAYER -->
+
+        <!-- SETTINGS: HIDE_SHORTS_COMPONENTS
+        <SwitchPreference android:title="@string/revanced_hide_shorts_player_comments_button_title" android:key="revanced_hide_shorts_player_comments_button" android:defaultValue="false" android:summaryOn="@string/revanced_hide_shorts_player_comments_button_summary_on" android:summaryOff="@string/revanced_hide_shorts_player_comments_button_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_thanks_button_title" android:key="revanced_hide_shorts_player_thanks_button" android:defaultValue="true" android:summaryOn="@string/revanced_hide_shorts_player_thanks_button_summary_on" android:summaryOff="@string/revanced_hide_shorts_player_thanks_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" />
+        <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_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_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" />SETTINGS: HIDE_SHORTS_COMPONENTS -->
+
+    <!-- PREFERENCE: SHORTS_SETTINGS
+    </PreferenceScreen>PREFERENCE: SHORTS_SETTINGS -->
+
+
     <!-- PREFERENCE: GENERAL_SETTINGS
     <PreferenceScreen android:title="@string/revanced_general" android:key="general">
         <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_general" />PREFERENCE: GENERAL_SETTINGS -->
@@ -51,33 +77,6 @@
         <!-- 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 -->
 
-        <!-- SETTINGS: SHORTS_COMPONENT.PARENT
-        <PreferenceScreen android:title="@string/revanced_hide_shorts_component_title" android:key="revanced_hide_shorts_component" android:summary="@string/revanced_hide_shorts_component_summary">SETTINGS: SHORTS_COMPONENT.PARENT -->
-
-            <!-- SETTINGS: SHORTS_COMPONENT_PARENT.A
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_hide_shorts_component_title" />SETTINGS: SHORTS_COMPONENT_PARENT.A -->
-
-            <!-- SETTINGS: HIDE_SHORTS_SHELF
-            <SwitchPreference android:title="@string/revanced_hide_shorts_shelf_title" android:key="revanced_hide_shorts_shelf" android:defaultValue="true" android:summaryOn="@string/revanced_hide_shorts_shelf_summary_on" android:summaryOff="@string/revanced_hide_shorts_shelf_summary_off" />SETTINGS: HIDE_SHORTS_SHELF -->
-
-            <!-- SETTINGS: SHORTS_COMPONENT_PARENT.B
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_hide_shorts_player_component_title" />SETTINGS: SHORTS_COMPONENT_PARENT.B -->
-
-            <!-- SETTINGS: HIDE_STARTUP_SHORTS_PLAYER
-            <SwitchPreference android:title="@string/revanced_hide_startup_shorts_player_title" android:key="revanced_hide_startup_shorts_player" android:defaultValue="true" android:summaryOn="@string/revanced_hide_startup_shorts_player_summary_on" android:summaryOff="@string/revanced_hide_startup_shorts_player_summary_off" />SETTINGS: HIDE_STARTUP_SHORTS_PLAYER -->
-
-            <!-- SETTINGS: HIDE_SHORTS_COMPONENTS
-            <SwitchPreference android:title="@string/revanced_hide_shorts_player_comments_button_title" android:key="revanced_hide_shorts_player_comments_button" android:defaultValue="false" android:summaryOn="@string/revanced_hide_shorts_player_comments_button_summary_on" android:summaryOff="@string/revanced_hide_shorts_player_comments_button_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_thanks_button_title" android:key="revanced_hide_shorts_player_thanks_button" android:defaultValue="true" android:summaryOn="@string/revanced_hide_shorts_player_thanks_button_summary_on" android:summaryOff="@string/revanced_hide_shorts_player_thanks_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" />
-            <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_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_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" />SETTINGS: HIDE_SHORTS_COMPONENTS -->
-
-        <!-- SETTINGS: SHORTS_COMPONENT.PARENT
-        </PreferenceScreen>SETTINGS: SHORTS_COMPONENT.PARENT -->
-
         <!-- SETTINGS: ENABLE_WIDE_SEARCHBAR
         <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 -->
 
@@ -443,10 +442,12 @@
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_swipe_controls" />
             <Preference android:title="swipe-controls" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
+            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_shorts" />
+            <Preference android:title="hide-shorts-component" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
+            <Preference android:title="disable-startup-shorts-player" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
+
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_general" />
             <Preference android:title="hide-stories" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
-            <Preference android:title="hide-shorts-component" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
-            <Preference android:title="hide-startup-shorts-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-tablet-miniplayer" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-auto-captions" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>