feat: settings patch framework (#266)

src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/AutoNavInformerFingerprint.kt

@@ -14,10 +14,9 @@ import org.jf.dexlib2.Opcode
 @MatchingMethod(
     "LWillAutonavInformer;", "k"
 )
-@FuzzyPatternScanMethod(2)
 @AutoplayButtonCompatibility
 @Version("0.0.1")
-object AutonavInformerFingerprint : MethodFingerprint(
+object AutoNavInformerFingerprint : MethodFingerprint(
     "Z",
     AccessFlags.PUBLIC or AccessFlags.FINAL,
     null,
@@ -31,4 +30,4 @@ object AutonavInformerFingerprint : MethodFingerprint(
     ),
     null,
     { it.definingClass.endsWith("WillAutonavInformer;") }
-)
+)

src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/LayoutConstructorFingerprint.kt

@@ -2,31 +2,19 @@ package app.revanced.patches.youtube.layout.autoplaybutton.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.layout.autoplaybutton.annotations.AutoplayButtonCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
 
 @Name("layout-constructor-fingerprint")
 @MatchingMethod(
     "LYouTubeControlsOverlay;", "F"
 )
-@FuzzyPatternScanMethod(2)
 @AutoplayButtonCompatibility
 @Version("0.0.1")
 object LayoutConstructorFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    null,
-    listOf(
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_VIRTUAL,
-    ),
-    listOf("1.0x")
-)
+    null, null, null, null, listOf("1.0x"),
+    { methodDef ->
+        methodDef.definingClass.endsWith("YouTubeControlsOverlay;")
+    }
+)

src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/HideAutoplayButton.kt

@@ -1,88 +0,0 @@
-package app.revanced.patches.youtube.layout.autoplaybutton.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.removeInstruction
-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.patch.impl.BytecodePatch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.youtube.layout.autoplaybutton.annotations.AutoplayButtonCompatibility
-import app.revanced.patches.youtube.layout.autoplaybutton.fingerprints.AutonavInformerFingerprint
-import app.revanced.patches.youtube.layout.autoplaybutton.fingerprints.LayoutConstructorFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
-import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
-
-@Patch
-@DependsOn([ResourceIdMappingProviderResourcePatch::class, IntegrationsPatch::class])
-@Name("hide-autoplay-button")
-@Description("Hides the autoplay button in the video player.")
-@AutoplayButtonCompatibility
-@Version("0.0.1")
-class HideAutoplayButton : BytecodePatch(
-    listOf(
-        LayoutConstructorFingerprint, AutonavInformerFingerprint
-    )
-) {
-    override fun execute(data: BytecodeData): PatchResult {
-        val layoutGenMethod = LayoutConstructorFingerprint.result!!.mutableMethod
-
-        val autonavToggle =
-            ResourceIdMappingProviderResourcePatch.resourceMappings.single { it.type == "id" && it.name == "autonav_toggle" }
-        val autonavPreviewStub =
-            ResourceIdMappingProviderResourcePatch.resourceMappings.single { it.type == "id" && it.name == "autonav_preview_stub" }
-
-        val instructions = layoutGenMethod.implementation!!.instructions
-
-        val autonavToggleConstIndex =
-            instructions.indexOfFirst { (it as? WideLiteralInstruction)?.wideLiteral == autonavToggle.id } + 4
-        val autonavPreviewStubConstIndex =
-            instructions.indexOfFirst { (it as? WideLiteralInstruction)?.wideLiteral == autonavPreviewStub.id } + 4
-
-        injectIfBranch(layoutGenMethod, autonavToggleConstIndex)
-        injectIfBranch(layoutGenMethod, autonavPreviewStubConstIndex)
-
-        val autonavInformerMethod = AutonavInformerFingerprint.result!!.mutableMethod
-
-        //force disable autoplay since it's hard to do without the button
-        autonavInformerMethod.addInstructions(
-            0, """
-            invoke-static {}, Lapp/revanced/integrations/patches/HideAutoplayButtonPatch;->isButtonShown()Z
-            move-result v0
-            if-nez v0, :hidden
-            const/4 v0, 0x0
-            return v0
-            :hidden
-            nop
-        """
-        )
-
-        return PatchResultSuccess()
-    }
-
-    private fun injectIfBranch(method: MutableMethod, index: Int) {
-        val instructions = method.implementation!!.instructions
-        val insn = (instructions.get(index) as? Instruction35c)!!
-        val methodToCall = insn.reference.toString()
-
-        //remove the invoke-virtual because we want to put it in an if-statement
-        method.removeInstruction(index)
-        method.addInstructions(
-            index, """
-            invoke-static {}, Lapp/revanced/integrations/patches/HideAutoplayButtonPatch;->isButtonShown()Z
-            move-result v11
-            if-eqz v11, :hidebutton
-            invoke-virtual {v${insn.registerC}, v${insn.registerD}, v${insn.registerE}}, $methodToCall
-            :hidebutton
-            nop
-        """
-        )
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/HideAutoplayButtonPatch.kt

@@ -0,0 +1,92 @@
+package app.revanced.patches.youtube.layout.autoplaybutton.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+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.patch.impl.BytecodePatch
+import app.revanced.patcher.util.smali.ExternalLabel
+import app.revanced.patches.youtube.layout.autoplaybutton.annotations.AutoplayButtonCompatibility
+import app.revanced.patches.youtube.layout.autoplaybutton.fingerprints.AutoNavInformerFingerprint
+import app.revanced.patches.youtube.layout.autoplaybutton.fingerprints.LayoutConstructorFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
+import org.jf.dexlib2.iface.instruction.Instruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+import org.jf.dexlib2.iface.reference.MethodReference
+
+@Patch
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class, ResourceIdMappingProviderResourcePatch::class])
+@Name("hide-autoplay-button")
+@Description("Hides the autoplay button in the video player.")
+@AutoplayButtonCompatibility
+@Version("0.0.1")
+class HideAutoplayButtonPatch : BytecodePatch(
+    listOf(
+        LayoutConstructorFingerprint, AutoNavInformerFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_autoplay_button_enabled",
+                StringResource("revanced_autoplay_button_enabled_title", "Show autoplay button"),
+                false,
+                StringResource("revanced_autoplay_button_summary_on", "Autoplay button is shown"),
+                StringResource("revanced_autoplay_button_summary_off", "Autoplay button is hidden")
+            )
+        )
+
+        val autoNavInformerMethod = AutoNavInformerFingerprint.result!!.mutableMethod
+
+        val layoutGenMethodResult = LayoutConstructorFingerprint.result!!
+        val layoutGenMethod = layoutGenMethodResult.mutableMethod
+        val layoutGenMethodInstructions = layoutGenMethod.implementation!!.instructions
+
+        // resolve the offsets such as ...
+        val autoNavPreviewStubId = ResourceIdMappingProviderResourcePatch.resourceMappings.single {
+            it.name == "autonav_preview_stub"
+        }.id
+        // where to insert the branch instructions and ...
+        val insertIndex = layoutGenMethodInstructions.indexOfFirst {
+            (it as? WideLiteralInstruction)?.wideLiteral == autoNavPreviewStubId
+        }
+        // where to branch away
+        val branchIndex = layoutGenMethodInstructions.subList(insertIndex + 1, layoutGenMethodInstructions.size - 1).indexOfFirst {
+            ((it as? ReferenceInstruction)?.reference as? MethodReference)?.name == "addOnLayoutChangeListener"
+        } + 2
+
+        val jumpInstruction = layoutGenMethodInstructions[insertIndex + branchIndex] as Instruction
+        layoutGenMethod.addInstructions(
+            insertIndex, """
+                invoke-static {}, Lapp/revanced/integrations/patches/HideAutoplayButtonPatch;->isButtonShown()Z
+                move-result v11
+                if-eqz v11, :hidden
+            """, listOf(ExternalLabel("hidden", jumpInstruction))
+        )
+
+        //force disable autoplay since it's hard to do without the button
+        autoNavInformerMethod.addInstructions(
+            0, """
+            invoke-static {}, Lapp/revanced/integrations/patches/HideAutoplayButtonPatch;->isButtonShown()Z
+            move-result v0
+            if-nez v0, :hidden
+            const/4 v0, 0x0
+            return v0
+            :hidden
+            nop
+        """
+        )
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/castbutton/patch/HideCastButtonPatch.kt

@@ -12,15 +12,28 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.youtube.layout.castbutton.annotations.CastButtonCompatibility
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
 
 @Patch
-@DependsOn([IntegrationsPatch::class])
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
 @Name("hide-cast-button")
 @Description("Hides the cast button in the video player.")
 @CastButtonCompatibility
 @Version("0.0.1")
 class HideCastButtonPatch : BytecodePatch() {
     override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_cast_button_enabled",
+                StringResource("revanced_cast_button_enabled_title", "Show cast button"),
+                false,
+                StringResource("revanced_cast_button_summary_on", "Cast button is shown"),
+                StringResource("revanced_cast_button_summary_off", "Cast button is hidden")
+            )
+        )
+
         data.classes.forEach { classDef ->
             classDef.methods.forEach { method ->
                 if (classDef.type.endsWith("MediaRouteButton;") && method.name == "setVisibility") {

src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/patch/CreateButtonRemoverPatch.kt

@@ -15,6 +15,9 @@ import app.revanced.patches.youtube.layout.createbutton.annotations.CreateButton
 import app.revanced.patches.youtube.layout.createbutton.fingerprints.CreateButtonFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
@@ -22,7 +25,7 @@ import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
 import org.jf.dexlib2.iface.reference.MethodReference
 
 @Patch
-@DependsOn([IntegrationsPatch::class, ResourceIdMappingProviderResourcePatch::class])
+@DependsOn([IntegrationsPatch::class, ResourceIdMappingProviderResourcePatch::class, SettingsPatch::class])
 @Name("disable-create-button")
 @Description("Hides the create button in the navigation bar.")
 @CreateButtonCompatibility
@@ -33,6 +36,16 @@ class CreateButtonRemoverPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_create_button_enabled",
+                StringResource("revanced_create_button_enabled_title", "Show create button"),
+                false,
+                StringResource("revanced_create_button_summary_on", "Create button is shown."),
+                StringResource("revanced_create_button_summary_off", "Create button is hidden.")
+            )
+        )
+
         val result = CreateButtonFingerprint.result!!
 
         // Get the required register which holds the view object we need to pass to the method hideCreateButton

src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/patch/FullscreenPanelsRemoverPatch.kt

@@ -17,10 +17,13 @@ import app.revanced.patches.youtube.layout.fullscreenpanels.annotations.Fullscre
 import app.revanced.patches.youtube.layout.fullscreenpanels.fingerprints.FullscreenViewAdderFingerprint
 import app.revanced.patches.youtube.layout.fullscreenpanels.fingerprints.FullscreenViewAdderParentFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
 
 @Patch
 @Name("disable-fullscreen-panels")
-@DependsOn([IntegrationsPatch::class])
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
 @Description("Disables video description and comments panel in fullscreen view.")
 @FullscreenPanelsCompatibility
 @Version("0.0.1")
@@ -30,6 +33,16 @@ class FullscreenPanelsRemoverPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_fullscreen_panels_enabled",
+                StringResource("revanced_fullscreen_panels_enabled_title", "Show fullscreen panels"),
+                false,
+                StringResource("revanced_fullscreen_panels_summary_on", "Fullscreen panels are shown"),
+                StringResource("revanced_fullscreen_panels_summary_off", "Fullscreen panels are hidden")
+            )
+        )
+
         val parentResult = FullscreenViewAdderParentFingerprint.result!!
         FullscreenViewAdderFingerprint.resolve(data, parentResult.method, parentResult.classDef)
         val result = FullscreenViewAdderParentFingerprint.result

src/main/kotlin/app/revanced/patches/youtube/layout/minimizedplayback/annotations/MinimizedPlaybackCompatibility.kt

@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.layout.minimizedplayback.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35")
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class MinimizedPlaybackCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/minimizedplayback/fingerprints/MinimizedPlaybackKidsFingerprint.kt

@@ -1,34 +0,0 @@
-package app.revanced.patches.youtube.layout.minimizedplayback.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("minimized-playback-kids-fingerprint")
-@MatchingMethod(
-    "LMinimizedPlaybackPolicyController;", "k"
-)
-@MinimizedPlaybackCompatibility
-@Version("0.0.1")
-object MinimizedPlaybackKidsFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf("I", "L", "L"),
-    listOf(
-        Opcode.IF_EQZ,
-        Opcode.SGET_OBJECT,
-        Opcode.IF_NE,
-        Opcode.CONST_4,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.IF_EQZ,
-        Opcode.IGET,
-        Opcode.INVOKE_STATIC
-    ),
-    null,
-    { it.definingClass.endsWith("MinimizedPlaybackPolicyController;") }
-)

src/main/kotlin/app/revanced/patches/youtube/layout/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt

@@ -1,51 +0,0 @@
-package app.revanced.patches.youtube.layout.minimizedplayback.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patches.youtube.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("minimized-playback-manager-fingerprint")
-@MatchingMethod(
-    "Lyuf", "n"
-)
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@MinimizedPlaybackCompatibility
-@Version("0.0.1")
-object MinimizedPlaybackManagerFingerprint : MethodFingerprint(
-    "Z",
-    AccessFlags.PUBLIC or AccessFlags.STATIC,
-    listOf("L"),
-    listOf(
-        Opcode.CONST_4,
-        Opcode.IF_EQZ,
-        Opcode.IGET,
-        Opcode.AND_INT_LIT16,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.IGET,
-        Opcode.CONST,
-        Opcode.IF_NE,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.IGET,
-        Opcode.IF_NE,
-        Opcode.IGET_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.GOTO,
-        Opcode.SGET_OBJECT,
-        Opcode.GOTO,
-        Opcode.CONST_4,
-        Opcode.IF_EQZ,
-        Opcode.IGET_BOOLEAN,
-        Opcode.IF_EQZ
-    )
-)

src/main/kotlin/app/revanced/patches/youtube/layout/minimizedplayback/fingerprints/MinimizedPlaybackSettingsFingerprint.kt

@@ -1,36 +0,0 @@
-package app.revanced.patches.youtube.layout.minimizedplayback.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
-
-@Name("minimized-playback-manager-fingerprint")
-@MatchingMethod(
-    "Ladj", "w"
-)
-@FuzzyPatternScanMethod(2)
-@MinimizedPlaybackCompatibility
-@Version("0.0.1")
-object MinimizedPlaybackSettingsFingerprint : MethodFingerprint(
-    "L",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    null,
-    listOf(
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.IF_NEZ,
-        Opcode.GOTO,
-        Opcode.IGET_OBJECT,
-        Opcode.CHECK_CAST
-    ),
-)

src/main/kotlin/app/revanced/patches/youtube/layout/minimizedplayback/patch/MinimizedPlaybackPatch.kt

@@ -1,75 +0,0 @@
-package app.revanced.patches.youtube.layout.minimizedplayback.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.data.impl.toMethodWalker
-import app.revanced.patcher.extensions.addInstructions
-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.patch.impl.BytecodePatch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.youtube.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
-import app.revanced.patches.youtube.layout.minimizedplayback.fingerprints.MinimizedPlaybackKidsFingerprint
-import app.revanced.patches.youtube.layout.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
-import app.revanced.patches.youtube.layout.minimizedplayback.fingerprints.MinimizedPlaybackSettingsFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.MethodReference
-
-
-@Patch
-@Name("minimized-playback")
-@Description("Enables minimized and background playback.")
-@DependsOn([IntegrationsPatch::class])
-@MinimizedPlaybackCompatibility
-@Version("0.0.1")
-class MinimizedPlaybackPatch : BytecodePatch(
-    listOf(
-        MinimizedPlaybackKidsFingerprint, MinimizedPlaybackManagerFingerprint, MinimizedPlaybackSettingsFingerprint
-    )
-) {
-    override fun execute(data: BytecodeData): PatchResult {
-        // Instead of removing all instructions like Vanced,
-        // we return the method at the beginning instead
-        MinimizedPlaybackManagerFingerprint.result!!.mutableMethod.addInstructions(
-            0, """
-                invoke-static {}, Lapp/revanced/integrations/patches/MinimizedPlaybackPatch;->isMinimizedPlaybackEnabled()Z
-                move-result v0
-                return v0
-                """
-        )
-
-        val method = MinimizedPlaybackSettingsFingerprint.result!!.mutableMethod
-        val booleanCalls = method.implementation!!.instructions.withIndex()
-            .filter { ((it.value as? ReferenceInstruction)?.reference as? MethodReference)?.returnType == "Z" }
-
-        val settingsBooleanIndex = booleanCalls.elementAt(1).index
-        val settingsBooleanMethod =
-            data.toMethodWalker(method).nextMethod(settingsBooleanIndex, true).getMethod() as MutableMethod
-
-        settingsBooleanMethod.addInstructions(
-            0, """
-                invoke-static {}, Lapp/revanced/integrations/patches/MinimizedPlaybackPatch;->isMinimizedPlaybackEnabled()Z
-                move-result v0
-                return v0
-                """
-        )
-
-        MinimizedPlaybackKidsFingerprint.result!!.mutableMethod.addInstructions(
-            0, """
-                invoke-static {}, Lapp/revanced/integrations/patches/MinimizedPlaybackPatch;->isMinimizedPlaybackEnabled()Z
-                move-result v0
-                if-eqz v0, :enable
-                return-void
-                :enable
-                nop
-                """
-        )
-
-        return PatchResultSuccess()
-    }
-}

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

@@ -13,10 +13,13 @@ import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.youtube.layout.oldqualitylayout.annotations.OldQualityLayoutCompatibility
 import app.revanced.patches.youtube.layout.oldqualitylayout.fingerprints.QualityMenuViewInflateFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
 import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
 
 @Patch
-@DependsOn([IntegrationsPatch::class])
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
 @Name("old-quality-layout")
 @Description("Enables the original quality flyout menu.")
 @OldQualityLayoutCompatibility
@@ -25,6 +28,16 @@ class OldQualityLayoutPatch : BytecodePatch(
     listOf(QualityMenuViewInflateFingerprint)
 ) {
     override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_use_old_style_quality_settings",
+                StringResource("revanced_old_style_quality_settings_enabled_title", "Use old quality layout"),
+                true,
+                StringResource("revanced_old_style_quality_settings_summary_on", "Old quality settings are shown"),
+                StringResource("revanced_old_style_quality_settings_summary_off", "New quality settings are shown")
+            )
+        )
+
         val inflateFingerprintResult = QualityMenuViewInflateFingerprint.result!!
         val method = inflateFingerprintResult.mutableMethod
         val instructions = method.implementation!!.instructions

src/main/kotlin/app/revanced/patches/youtube/layout/reels/patch/HideReelsPatch.kt

@@ -7,13 +7,18 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility
 import app.revanced.patches.youtube.layout.reels.fingerprints.HideReelsFingerprint
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
 
 //@Patch TODO: this is currently in the general-bytecode-ads patch due to the integrations having a preference for including reels or not. Move it here.
 @Name("hide-reels")
 @Description("Hides reels on the home page.")
+@DependsOn([SettingsPatch::class])
 @HideReelsCompatibility
 @Version("0.0.1")
 class HideReelsPatch : BytecodePatch(
@@ -22,6 +27,16 @@ class HideReelsPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_reel_button_enabled",
+                StringResource("revanced_reel_button_enabled_title", "Show reels button"),
+                false,
+                StringResource("revanced_reel_button_summary_on", "Reels button is shown"),
+                StringResource("revanced_reel_button_summary_off", "Reels button is hidden")
+            )
+        )
+
         val result = HideReelsFingerprint.result!!
 
         // HideReel will hide the reel view before it is being used,

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt

@@ -12,15 +12,16 @@ import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.youtube.layout.returnyoutubedislike.annotations.ReturnYouTubeDislikeCompatibility
-import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.TextComponentSpecParentFingerprint
 import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.DislikeFingerprint
 import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.LikeFingerprint
 import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.RemoveLikeFingerprint
+import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.TextComponentSpecParentFingerprint
+import app.revanced.patches.youtube.layout.returnyoutubedislike.resource.patch.ReturnYouTubeDislikeResourcePatch
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.videoid.patch.VideoIdPatch
 
 @Patch
-@DependsOn([IntegrationsPatch::class, VideoIdPatch::class])
+@DependsOn([IntegrationsPatch::class, VideoIdPatch::class, ReturnYouTubeDislikeResourcePatch::class])
 @Name("return-youtube-dislike")
 @Description("Shows the dislike count of videos using the Return YouTube Dislike API.")
 @ReturnYouTubeDislikeCompatibility
@@ -57,9 +58,9 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
 
         val parentResult = TextComponentSpecParentFingerprint.result!!
         val createComponentMethod = parentResult.mutableClass.methods.find { method ->
-                method.parameters.size >= 19 && method.parameterTypes.takeLast(4)
-                    .all { param -> param == "Ljava/util/concurrent/atomic/AtomicReference;" }
-            }
+            method.parameters.size >= 19 && method.parameterTypes.takeLast(4)
+                .all { param -> param == "Ljava/util/concurrent/atomic/AtomicReference;" }
+        }
             ?: return PatchResultError("TextComponentSpec.createComponent not found")
 
         val conversionContextParam = 5

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/resource/patch/ReturnYouTubeDislikeResourcePatch.kt

@@ -0,0 +1,47 @@
+package app.revanced.patches.youtube.layout.returnyoutubedislike.resource.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.impl.ResourcePatch
+import app.revanced.patches.youtube.layout.returnyoutubedislike.annotations.ReturnYouTubeDislikeCompatibility
+import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.Preference
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.util.resources.ResourceUtils.iterateXmlNodeChildren
+
+@DependsOn([FixLocaleConfigErrorPatch::class, SettingsPatch::class])
+@Name("return-youtube-dislike-resource-patch")
+@Description("Adds the preferences for Return YouTube Dislike.")
+@ReturnYouTubeDislikeCompatibility
+@Version("0.0.1")
+class ReturnYouTubeDislikeResourcePatch : ResourcePatch() {
+    override fun execute(data: ResourceData): PatchResult {
+        val youtubePackage = "com.google.android.youtube"
+        SettingsPatch.addPreference(
+            Preference(
+                StringResource("revanced_ryd_settings_title", "Return YouTube Dislike"),
+                Preference.Intent(
+                    youtubePackage,
+                    "ryd_settings",
+                    "com.google.android.libraries.social.licenses.LicenseActivity"
+                ),
+                StringResource("revanced_ryd_settings_summary", "Settings for Return YouTube Dislike"),
+            )
+        )
+        // merge strings
+        data.iterateXmlNodeChildren("returnyoutubedislike/host/values/strings.xml", "resources") {
+            // TODO: figure out why this is needed
+            if (!it.hasAttributes()) return@iterateXmlNodeChildren
+            val attributes = it.attributes
+            SettingsPatch.addString(attributes.getNamedItem("name")!!.nodeValue!!, it.textContent!!)
+        }
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/patch/ShortsButtonRemoverPatch.kt

@@ -14,11 +14,14 @@ import app.revanced.patches.youtube.layout.shorts.button.annotations.ShortsButto
 import app.revanced.patches.youtube.layout.shorts.button.fingerprints.PivotBarButtonTabEnumFingerprint
 import app.revanced.patches.youtube.layout.shorts.button.fingerprints.PivotBarButtonsViewFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.Opcode
 
 @Patch
-@DependsOn([IntegrationsPatch::class])
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
 @Name("hide-shorts-button")
 @Description("Hides the shorts button on the navigation bar.")
 @ShortsButtonCompatibility
@@ -29,6 +32,16 @@ class ShortsButtonRemoverPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_shorts_button_enabled",
+                StringResource("revanced_shorts_button_enabled_title", "Show shorts button"),
+                false,
+                StringResource("revanced_shorts_button_summary_on", "Shorts button is shown"),
+                StringResource("revanced_shorts_button_summary_off", "Shorts button is hidden")
+            )
+        )
+
         val tabEnumResult = PivotBarButtonTabEnumFingerprint.result!!
         val tabEnumImplementation = tabEnumResult.mutableMethod.implementation!!
         val scanResultEndIndex = tabEnumResult.patternScanResult!!.endIndex

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/resource/patch/SponsorBlockResourcePatch.kt

@@ -9,96 +9,112 @@ import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.impl.ResourcePatch
 import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
 import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.Preference
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.util.resources.ResourceUtils
+import app.revanced.util.resources.ResourceUtils.copyResources
 import app.revanced.util.resources.ResourceUtils.copyXmlNode
-import java.nio.file.Files
+import app.revanced.util.resources.ResourceUtils.iterateXmlNodeChildren
 
 @Name("sponsorblock-resource-patch")
 @SponsorBlockCompatibility
-@DependsOn([FixLocaleConfigErrorPatch::class])
+@DependsOn([FixLocaleConfigErrorPatch::class, SettingsPatch::class])
 @Version("0.0.1")
 class SponsorBlockResourcePatch : ResourcePatch() {
     override fun execute(data: ResourceData): PatchResult {
+        val youtubePackage = "com.google.android.youtube"
+        SettingsPatch.addPreference(
+            Preference(
+                StringResource("sb_settings", "SponsorBlock"),
+                Preference.Intent(
+                    youtubePackage,
+                    "sponsorblock_settings",
+                    "com.google.android.libraries.social.licenses.LicenseActivity"
+                ),
+                StringResource("revanced_sponsorblock_settings_summary", "SponsorBlock related settings"),
+            )
+        )
         val classLoader = this.javaClass.classLoader
 
         /*
          merge SponsorBlock strings to main strings
          */
-        val stringsResourcePath = "values/strings.xml"
-        val stringsResourceInputStream = classLoader.getResourceAsStream("sponsorblock/$stringsResourcePath")!!
+        data.iterateXmlNodeChildren("sponsorblock/host/values/strings.xml", "resources") {
+            // TODO: figure out why this is needed
+            if (!it.hasAttributes()) return@iterateXmlNodeChildren
 
-        // copy nodes from the resources node to the real resource node
-        "resources".copyXmlNode(
-            data.xmlEditor[stringsResourceInputStream],
-            data.xmlEditor["res/$stringsResourcePath"]
-        ).close() // close afterwards
+            val attributes = it.attributes
+            val key = attributes.getNamedItem("name")!!.nodeValue!!
+            val value = it.textContent!!
+
+            // all strings of SponsorBlock which have this attribute have the attribute value false,
+            // hence a null check suffices
+            val formatted = attributes.getNamedItem("formatted") == null
+
+            SettingsPatch.addString(key, value, formatted)
+        }
 
         /*
          merge SponsorBlock drawables to main drawables
          */
-        val drawables = "drawable" to arrayOf(
-            "ic_sb_adjust",
-            "ic_sb_compare",
-            "ic_sb_edit",
-            "ic_sb_logo",
-            "ic_sb_publish",
-            "ic_sb_voting"
-        )
 
-        val layouts = "layout" to arrayOf(
-            "inline_sponsor_overlay", "new_segment", "skip_sponsor_button"
-        )
-
-        // collect resources
-        val xmlResources = arrayOf(drawables, layouts)
-
-        // write resources
-        xmlResources.forEach { (path, resourceNames) ->
-            resourceNames.forEach { name ->
-                val relativePath = "$path/$name.xml"
-
-                Files.copy(
-                    classLoader.getResourceAsStream("sponsorblock/$relativePath")!!,
-                    data["res"].resolve(relativePath).toPath()
-                )
-            }
+        arrayOf(
+            ResourceUtils.ResourceGroup(
+                "layout",
+                "inline_sponsor_overlay.xml",
+                "new_segment.xml",
+                "skip_sponsor_button.xml"
+            ),
+            ResourceUtils.ResourceGroup(
+                // required resource for back button, because when the base APK is used, this resource will not exist
+                "drawable",
+                "ic_sb_adjust.xml",
+                "ic_sb_compare.xml",
+                "ic_sb_edit.xml",
+                "ic_sb_logo.xml",
+                "ic_sb_publish.xml",
+                "ic_sb_voting.xml"
+            ),
+            ResourceUtils.ResourceGroup(
+                // required resource for back button, because when the base APK is used, this resource will not exist
+                "drawable-xxxhdpi", "quantum_ic_skip_next_white_24.png"
+            )
+        ).forEach { resourceGroup ->
+            data.copyResources("sponsorblock", resourceGroup)
         }
 
         /*
         merge xml nodes from the host to their real xml files
          */
 
-        // collect all host resources
-        val hostingXmlResources = mapOf("layout" to arrayOf("youtube_controls_layout"))
-
         // copy nodes from host resources to their real xml files
-        hostingXmlResources.forEach { (path, resources) ->
-            resources.forEach { resource ->
-                val hostingResourceStream = classLoader.getResourceAsStream("sponsorblock/host/$path/$resource.xml")!!
+        val hostingResourceStream =
+            classLoader.getResourceAsStream("sponsorblock/host/layout/youtube_controls_layout.xml")!!
 
-                val targetXmlEditor = data.xmlEditor["res/$path/$resource.xml"]
-                "RelativeLayout".copyXmlNode(
-                    data.xmlEditor[hostingResourceStream],
-                    targetXmlEditor
-                ).also {
-                    val children = targetXmlEditor.file.getElementsByTagName("RelativeLayout").item(0).childNodes
+        val targetXmlEditor = data.xmlEditor["res/layout/youtube_controls_layout.xml"]
+        "RelativeLayout".copyXmlNode(
+            data.xmlEditor[hostingResourceStream],
+            targetXmlEditor
+        ).also {
+            val children = targetXmlEditor.file.getElementsByTagName("RelativeLayout").item(0).childNodes
 
-                    // Replace the startOf with the voting button view so that the button does not overlap
-                    for (i in 1 until children.length) {
-                        val view = children.item(i)
+            // Replace the startOf with the voting button view so that the button does not overlap
+            for (i in 1 until children.length) {
+                val view = children.item(i)
 
-                        // Replace the attribute for a specific node only
-                        if (!(view.hasAttributes() && view.attributes.getNamedItem("android:id").nodeValue.endsWith("live_chat_overlay_button"))) continue
+                // Replace the attribute for a specific node only
+                if (!(view.hasAttributes() && view.attributes.getNamedItem("android:id").nodeValue.endsWith("live_chat_overlay_button"))) continue
 
-                        // voting button id from the voting button view from the youtube_controls_layout.xml host file
-                        val votingButtonId = "@+id/voting_button"
+                // voting button id from the voting button view from the youtube_controls_layout.xml host file
+                val votingButtonId = "@+id/voting_button"
 
-                        view.attributes.getNamedItem("android:layout_toStartOf").nodeValue = votingButtonId
+                view.attributes.getNamedItem("android:layout_toStartOf").nodeValue = votingButtonId
 
-                        break
-                    }
-                }.close() // close afterwards
+                break
             }
-        }
+        }.close() // close afterwards
+
         return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/youtube/layout/watermark/patch/HideWatermarkPatch.kt

@@ -17,9 +17,12 @@ import app.revanced.patches.youtube.layout.watermark.annotations.HideWatermarkCo
 import app.revanced.patches.youtube.layout.watermark.fingerprints.HideWatermarkParentFingerprint
 import app.revanced.patches.youtube.layout.watermark.fingerprints.HideWatermarkFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
 
 @Patch
-@DependsOn([IntegrationsPatch::class])
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
 @Name("hide-watermark")
 @Description("Hides creator's watermarks on videos.")
 @HideWatermarkCompatibility
@@ -30,6 +33,16 @@ class HideWatermarkPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_branding_watermark_enabled",
+                StringResource("revanced_branding_watermark_enabled_title", "Show branding watermark"),
+                false,
+                StringResource("revanced_branding_watermark_summary_on", "Branding watermark is shown"),
+                StringResource("revanced_branding_watermark_summary_off", "Branding watermark is hidden")
+            )
+        )
+
         HideWatermarkFingerprint.resolve(data, HideWatermarkParentFingerprint.result!!.classDef)
         val result = HideWatermarkFingerprint.result
             ?: return PatchResultError("Required parent method could not be found.")

src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarTwoParentFingerprint.kt

@@ -3,10 +3,8 @@ package app.revanced.patches.youtube.layout.widesearchbar.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.layout.widesearchbar.annotations.WideSearchbarCompatibility
 import org.jf.dexlib2.AccessFlags
 
@@ -14,7 +12,6 @@ import org.jf.dexlib2.AccessFlags
 @MatchingMethod(
     "Lkrf;", "i"
 )
-@FuzzyPatternScanMethod(3)
 @WideSearchbarCompatibility
 @Version("0.0.1")
 

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

@@ -19,9 +19,12 @@ import app.revanced.patches.youtube.layout.widesearchbar.fingerprints.WideSearch
 import app.revanced.patches.youtube.layout.widesearchbar.fingerprints.WideSearchbarTwoFingerprint
 import app.revanced.patches.youtube.layout.widesearchbar.fingerprints.WideSearchbarTwoParentFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
 
 @Patch
-@DependsOn([IntegrationsPatch::class])
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
 @Name("enable-wide-searchbar")
 @Description("Replaces the search icon with a wide search bar. This will hide the YouTube logo when active.")
 @WideSearchbarCompatibility
@@ -32,6 +35,16 @@ class WideSearchbarPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_wide_searchbar_enabled",
+                StringResource("revanced_wide_searchbar_enabled_title", "Enable wide search bar"),
+                false,
+                StringResource("revanced_wide_searchbar_summary_on", "Wide search bar is enabled"),
+                StringResource("revanced_wide_searchbar_summary_off", "Wide search bar is disabled")
+            )
+        )
+
         WideSearchbarOneFingerprint.resolve(data, WideSearchbarOneParentFingerprint.result!!.classDef)
         WideSearchbarTwoFingerprint.resolve(data, WideSearchbarTwoParentFingerprint.result!!.classDef)