chore(release): 2.154.0-dev.1 [skip ci]

# [2.154.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.153.0...v2.154.0-dev.1) (2023-01-10)

### Bug Fixes

* **youtube/hide-info-cards:** allow toggling visibility of info-cards ([#1464](https://github.com/revanced/revanced-patches/issues/1464)) ([3789a20](3789a205cb))

### Features

* `remove-screenshot-restriction` patch ([#1455](https://github.com/revanced/revanced-patches/issues/1455)) ([efe814f](efe814f2e1))
* **music:** update patches compatibility to v5.38.53 ([#1453](https://github.com/revanced/revanced-patches/issues/1453)) ([e13db69](e13db6934f))
* **youtube/return-youtube-dislike:** style for minimum width ([#1454](https://github.com/revanced/revanced-patches/issues/1454)) ([e4cc17e](e4cc17e6ef))
* **youtube:** `spoof-app-version` patch ([#1449](https://github.com/revanced/revanced-patches/issues/1449)) ([b57eee8](b57eee8582))

.github/workflows/release.yml

@@ -40,7 +40,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew generateMeta clean --no-daemon
       - name: Setup semantic-release
-        run: npm install semantic-release @saithodev/semantic-release-backmerge @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D
+        run: npm install semantic-release@19.0.5 @saithodev/semantic-release-backmerge @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin@1.7.4 -D
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,3 +1,53 @@
+# [2.154.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.153.0...v2.154.0-dev.1) (2023-01-10)
+
+
+### Bug Fixes
+
+* **youtube/hide-info-cards:** allow toggling visibility of info-cards ([#1464](https://github.com/revanced/revanced-patches/issues/1464)) ([e6dcb55](https://github.com/revanced/revanced-patches/commit/e6dcb55382441f03c4b1322ccd652a22db104254))
+
+
+### Features
+
+* `remove-screenshot-restriction` patch ([#1455](https://github.com/revanced/revanced-patches/issues/1455)) ([a16ab79](https://github.com/revanced/revanced-patches/commit/a16ab7969d98b1e05ac896a4b9aa834cdac8734e))
+* **music:** update patches compatibility to v5.38.53 ([#1453](https://github.com/revanced/revanced-patches/issues/1453)) ([c7d116a](https://github.com/revanced/revanced-patches/commit/c7d116afd7293924760e7b6c1de0ba5d6cbd00a0))
+* **youtube/return-youtube-dislike:** style for minimum width ([#1454](https://github.com/revanced/revanced-patches/issues/1454)) ([fd782aa](https://github.com/revanced/revanced-patches/commit/fd782aa0a37edf2344425c80afafb2c87851bc1a))
+* **youtube:** `spoof-app-version` patch ([#1449](https://github.com/revanced/revanced-patches/issues/1449)) ([bd4d3b5](https://github.com/revanced/revanced-patches/commit/bd4d3b5706f26e398292df952ca8aec6c7dd1d6a))
+
+# [2.153.0](https://github.com/revanced/revanced-patches/compare/v2.152.0...v2.153.0) (2023-01-07)
+
+
+### Bug Fixes
+
+* **youtube/general-ads:** move settings to correct preference screens ([cde45fc](https://github.com/revanced/revanced-patches/commit/cde45fca769eddea64072f13f836d46560a4a89a))
+
+
+### Features
+
+* **youtube/remember-video-quality:** simplify settings switch state description ([9bd42ec](https://github.com/revanced/revanced-patches/commit/9bd42ec1a1b54b103cd2550211515acdaf90e9de))
+* **youtube:** `remember-playback-rate` patch ([177e908](https://github.com/revanced/revanced-patches/commit/177e908dba260f184a2835b73b834563ca9c29fd))
+
+# [2.153.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.152.1-dev.1...v2.153.0-dev.1) (2023-01-07)
+
+
+### Features
+
+* **youtube/remember-video-quality:** simplify settings switch state description ([9bd42ec](https://github.com/revanced/revanced-patches/commit/9bd42ec1a1b54b103cd2550211515acdaf90e9de))
+* **youtube:** `remember-playback-rate` patch ([177e908](https://github.com/revanced/revanced-patches/commit/177e908dba260f184a2835b73b834563ca9c29fd))
+
+## [2.152.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.152.0...v2.152.1-dev.1) (2023-01-07)
+
+
+### Bug Fixes
+
+* **youtube/general-ads:** move settings to correct preference screens ([cde45fc](https://github.com/revanced/revanced-patches/commit/cde45fca769eddea64072f13f836d46560a4a89a))
+
+# [2.152.0](https://github.com/revanced/revanced-patches/compare/v2.151.0...v2.152.0) (2023-01-04)
+
+
+### Features
+
+* **youtube/copy-video-url:** match icon style with native icon ([#1419](https://github.com/revanced/revanced-patches/issues/1419)) ([e89e54c](https://github.com/revanced/revanced-patches/commit/e89e54c316a2d99195d2b79e9176d34f6de0113c))
+
 # [2.152.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.151.0...v2.152.0-dev.1) (2023-01-02)
 
 

README.md

@@ -48,12 +48,14 @@ The official Patch bundle provided by ReVanced and the community.
 | `old-quality-layout` | Enables the original video quality flyout in the video player settings | 17.49.37 |
 | `open-links-directly` | Bypasses URL redirects and opens links directly inside YouTube app. | 17.49.37 |
 | `premium-heading` | Shows premium branding on the home screen. | all |
+| `remember-playback-rate` | Adds the ability to remember the playback rate you chose in the video playback rate flyout. | 17.49.37 |
 | `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.49.37 |
 | `remove-player-button-background` | Removes the background from the video player buttons. | 17.49.37 |
 | `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.49.37 |
 | `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.49.37 |
 | `settings` | Adds settings for ReVanced to YouTube. | all |
 | `sponsorblock` | Integrate SponsorBlock. | 17.49.37 |
+| `spoof-app-version` | Tricks YouTube into thinking, you are running an older version of the app. One of the side effects also includes restoring the old UI. | 17.49.37 |
 | `swipe-controls` | Adds volume and brightness swipe controls. | 17.49.37 |
 | `tablet-mini-player` | Enables the tablet mini player layout. | 17.49.37 |
 | `theme` | Applies a custom theme. | all |
@@ -65,16 +67,16 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `background-play` | Enables playing music in the background. | 5.36.51 |
-| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.36.51 |
-| `compact-header` | Hides the music category bar at the top of the homepage. | 5.36.51 |
-| `exclusive-audio-playback` | Enables the option to play music without video. | 5.36.51 |
-| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.36.51 |
-| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.36.51 |
-| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.36.51 |
-| `music-video-ads` | Removes ads in the music player. | 5.36.51 |
-| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.36.51 |
-| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.36.51 |
+| `background-play` | Enables playing music in the background. | 5.38.53 |
+| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.38.53 |
+| `compact-header` | Hides the music category bar at the top of the homepage. | 5.38.53 |
+| `exclusive-audio-playback` | Enables the option to play music without video. | 5.38.53 |
+| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.38.53 |
+| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.38.53 |
+| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.38.53 |
+| `music-video-ads` | Removes ads in the music player. | 5.38.53 |
+| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.38.53 |
+| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.38.53 |
 </details>
 
 ### [📦 `com.ss.android.ugc.trill`](https://play.google.com/store/apps/details?id=com.ss.android.ugc.trill)

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.152.0-dev.1
+version = 2.154.0-dev.1

src/main/kotlin/app/revanced/patches/all/screenshot/removerestriction/patch/RemoveScreenshotRestrictionPatch.kt

@@ -0,0 +1,106 @@
+package app.revanced.patches.all.screenshot.removerestriction.patch
+
+import app.revanced.extensions.findMutableMethodOf
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.formats.Instruction35c
+import org.jf.dexlib2.iface.reference.MethodReference
+
+@Patch(false)
+@Name("remove-screenshot-restriction")
+@Description("Removes the restriction of making screenshots.")
+@Version("0.0.1")
+class RemoveScreenshotRestrictionPatch : BytecodePatch() {
+
+    private companion object {
+        const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch;"
+    }
+
+    // Information about method calls we want to replace
+    private enum class MethodCall(
+        val definedClassName: String,
+        val methodName: String,
+        val replacementMethodDefinition: String
+    ) {
+        SetFlags(
+            "Landroid/view/Window;",
+            "setFlags",
+            "setFlags(Landroid/view/Window;II)V",
+        );
+
+        fun replaceInstruction(method: MutableMethod, instruction: Instruction35c, instructionIndex: Int) {
+            when (this) {
+                SetFlags -> {
+                    method.replaceInstruction(
+                        instructionIndex,
+                        "invoke-static { v${instruction.registerC}, v${instruction.registerD}, v${instruction.registerE} }, ${INTEGRATIONS_CLASS_DESCRIPTOR}->${replacementMethodDefinition}"
+                    )
+                }
+            }
+        }
+
+        companion object {
+            fun fromMethodReference(methodReference: MethodReference) = values().firstOrNull { search ->
+                search.definedClassName == methodReference.definingClass && search.methodName == methodReference.name
+            }
+        }
+    }
+
+    override fun execute(context: BytecodeContext): PatchResult {
+        // Find all instructions where one of the methods is called
+        buildMap {
+            context.classes.forEach { classDef ->
+                if (classDef.type == INTEGRATIONS_CLASS_DESCRIPTOR) {
+                    // avoid infinite recursion
+                    return@forEach
+                }
+
+                classDef.methods.let { methods ->
+                    buildMap methodList@{
+                        methods.forEach methods@{ method ->
+                            with(method.implementation?.instructions ?: return@methods) {
+                                ArrayDeque<Triple<MethodCall, Instruction35c, Int>>().also { patchIndices ->
+                                    this.forEachIndexed { index, instruction ->
+                                        if (instruction.opcode != Opcode.INVOKE_VIRTUAL) return@forEachIndexed
+
+                                        val invokeInstruction = instruction as Instruction35c
+                                        val methodRef = invokeInstruction.reference as MethodReference
+                                        val methodCall = MethodCall.fromMethodReference(methodRef) ?: return@forEachIndexed
+
+                                        patchIndices.add(Triple(methodCall, invokeInstruction, index))
+                                    }
+                                }.also { if (it.isEmpty()) return@methods }.let { patches ->
+                                    put(method, patches)
+                                }
+                            }
+                        }
+                    }
+                }.also { if (it.isEmpty()) return@forEach }.let { methodPatches ->
+                    put(classDef, methodPatches)
+                }
+            }
+        }.forEach { (classDef, methods) ->
+            // And finally replace the instructions...
+            with(context.proxy(classDef).mutableClass) {
+                methods.forEach { (method, patches) ->
+                    val mutableMethod = findMutableMethodOf(method)
+                    while (!patches.isEmpty()) {
+                        val (methodType, instruction, instructionIndex) = patches.removeLast()
+                        methodType.replaceInstruction(mutableMethod, instruction, instructionIndex)
+                    }
+                }
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/music/ad/video/annotations/MusicVideoAdsCompatibility.kt

@@ -21,7 +21,8 @@ import app.revanced.patcher.annotation.Package
             "5.29.52",
             "5.31.50",
             "5.34.51",
-            "5.36.51"
+            "5.36.51",
+            "5.38.53"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/music/audio/codecs/annotations/CodecsUnlockCompatibility.kt

@@ -21,7 +21,8 @@ import app.revanced.patcher.annotation.Package
             "5.29.52",
             "5.31.50",
             "5.34.51",
-            "5.36.51"
+            "5.36.51",
+            "5.38.53"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/CodecsLockFingerprint.kt

@@ -22,7 +22,7 @@ object CodecsLockFingerprint : MethodFingerprint(
         Opcode.INVOKE_STATIC,
         Opcode.MOVE_RESULT_OBJECT,
         Opcode.INVOKE_INTERFACE,
-        Opcode.INVOKE_DIRECT,
+        Opcode.INVOKE_VIRTUAL,
         Opcode.RETURN_OBJECT
     ),
     strings = listOf("eac3_supported")

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/annotations/ExclusiveAudioCompatibility.kt

@@ -21,7 +21,8 @@ import app.revanced.patcher.annotation.Package
             "5.29.52",
             "5.31.50",
             "5.34.51",
-            "5.36.51"
+            "5.36.51",
+            "5.38.53"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/music/layout/compactheader/annotations/CompactHeaderCompatibility.kt

@@ -20,7 +20,8 @@ import app.revanced.patcher.annotation.Package
             "5.29.52",
             "5.31.50",
             "5.34.51",
-            "5.36.51"
+            "5.36.51",
+            "5.38.53"
         )
     )]
 )

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

@@ -21,7 +21,8 @@ import app.revanced.patcher.annotation.Package
             "5.29.52",
             "5.31.50",
             "5.34.51",
-            "5.36.51"
+            "5.36.51",
+            "5.38.53"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/music/layout/premium/annotations/HideGetPremiumCompatibility.kt

@@ -21,7 +21,8 @@ import app.revanced.patcher.annotation.Package
             "5.29.52",
             "5.31.50",
             "5.34.51",
-            "5.36.51"
+            "5.36.51",
+            "5.38.53"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/annotations/RemoveTasteBuilderCompatibility.kt

@@ -23,7 +23,8 @@ import app.revanced.patcher.annotation.Package
             "5.29.52",
             "5.31.50",
             "5.34.51",
-            "5.36.51"
+            "5.36.51",
+            "5.38.53"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/annotations/RemoveUpgradeButtonCompatibility.kt

@@ -21,7 +21,8 @@ import app.revanced.patcher.annotation.Package
             "5.29.52",
             "5.31.50",
             "5.34.51",
-            "5.36.51"
+            "5.36.51",
+            "5.38.53"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/music/misc/microg/annotations/MusicMicroGPatchCompatibility.kt

@@ -21,7 +21,8 @@ import app.revanced.patcher.annotation.Package
             "5.29.52",
             "5.31.50",
             "5.34.51",
-            "5.36.51"
+            "5.36.51",
+            "5.38.53"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/annotations/BackgroundPlayCompatibility.kt

@@ -21,7 +21,8 @@ import app.revanced.patcher.annotation.Package
             "5.29.52",
             "5.31.50",
             "5.34.51",
-            "5.36.51"
+            "5.36.51",
+            "5.38.53"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/ad/general/resource/patch/GeneralAdsResourcePatch.kt

@@ -7,22 +7,21 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.InputType
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.shared.settings.preference.impl.TextPreference
+import app.revanced.patches.shared.settings.preference.impl.*
 import app.revanced.patches.youtube.ad.general.annotation.GeneralAdsCompatibility
 import app.revanced.patches.youtube.misc.litho.filter.patch.LithoFilterPatch
 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.bytecode.patch.SettingsPatch.PreferenceScreen
 
-@DependsOn(dependencies = [
-    FixLocaleConfigErrorPatch::class,
-    LithoFilterPatch::class,
-    SettingsPatch::class,
-    ResourceMappingPatch::class
-])
+@DependsOn(
+    dependencies = [
+        FixLocaleConfigErrorPatch::class,
+        LithoFilterPatch::class,
+        SettingsPatch::class,
+        ResourceMappingPatch::class
+    ]
+)
 @GeneralAdsCompatibility
 @Version("0.0.1")
 class GeneralAdsResourcePatch : ResourcePatch {
@@ -32,20 +31,42 @@ class GeneralAdsResourcePatch : ResourcePatch {
     }
 
     override fun execute(context: ResourceContext): PatchResult {
-        PreferenceScreen.ADS.addPreferences(
+        PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
-                "revanced_adremover_ad_removal",
-                StringResource("revanced_adremover_ad_removal_enabled_title", "Hide general ads"),
+                "revanced_adremover_separator",
+                StringResource("revanced_adremover_separator_title", "Hide gray separator"),
                 true,
-                StringResource("revanced_adremover_ad_removal_enabled_summary_on", "General ads are hidden"),
-                StringResource("revanced_adremover_ad_removal_enabled_summary_off", "General ads are shown")
+                StringResource("revanced_adremover_separator_summary_on", "Gray separators are hidden"),
+                StringResource("revanced_adremover_separator_summary_off", "Gray separators are shown")
             ),
             SwitchPreference(
-                "revanced_adremover_buttoned",
-                StringResource("revanced_adremover_buttoned_enabled_title", "Hide buttoned ad"),
+                "revanced_adremover_hide_channel_guidelines",
+                StringResource("revanced_adremover_hide_channel_guidelines_enabled_title", "Hide channel guidelines"),
                 true,
-                StringResource("revanced_adremover_buttoned_enabled_summary_on", "Buttoned ads are hidden"),
-                StringResource("revanced_adremover_buttoned_enabled_summary_off", "Buttoned ads are shown")
+                StringResource(
+                    "revanced_adremover_hide_channel_guidelines_enabled_summary_on",
+                    "Channel guidelines are hidden"
+                ),
+                StringResource(
+                    "revanced_adremover_hide_channel_guidelines_enabled_summary_off",
+                    "Channel guidelines are shown"
+                )
+            ),
+            SwitchPreference(
+                "revanced_adremover_chapter_teaser",
+                StringResource(
+                    "revanced_adremover_chapter_teaser_enabled_title",
+                    "Hide chapter teaser under videos"
+                ),
+                true,
+                StringResource(
+                    "revanced_adremover_chapter_teaser_enabled_summary_on",
+                    "Chapter teasers are hidden"
+                ),
+                StringResource(
+                    "revanced_adremover_chapter_teaser_enabled_summary_off",
+                    "Chapter teasers are shown"
+                )
             ),
             SwitchPreference(
                 "revanced_adremover_merchandise",
@@ -104,17 +125,32 @@ class GeneralAdsResourcePatch : ResourcePatch {
             ),
             SwitchPreference(
                 "revanced_adremover_subscribers_community_guidelines_removal",
-                StringResource("revanced_adremover_subscribers_community_guidelines_enabled_title", "Hide subscribers community guidelines"),
+                StringResource(
+                    "revanced_adremover_subscribers_community_guidelines_enabled_title",
+                    "Hide subscribers community guidelines"
+                ),
                 true,
-                StringResource("revanced_adremover_subscribers_community_guidelines_enabled_summary_on", "Subscribers community guidelines are hidden"),
-                StringResource("revanced_adremover_subscribers_community_guidelines_enabled_summary_off", "Subscribers community guidelines are shown")
+                StringResource(
+                    "revanced_adremover_subscribers_community_guidelines_enabled_summary_on",
+                    "Subscribers community guidelines are hidden"
+                ),
+                StringResource(
+                    "revanced_adremover_subscribers_community_guidelines_enabled_summary_off",
+                    "Subscribers community guidelines are shown"
+                )
             ),
             SwitchPreference(
                 "revanced_adremover_channel_member_shelf_removal",
                 StringResource("revanced_adremover_channel_member_shelf_enabled_title", "Hide channel member shelf"),
                 true,
-                StringResource("revanced_adremover_channel_member_shelf_enabled_summary_on", "Channel member shelf is hidden"),
-                StringResource("revanced_adremover_channel_member_shelf_enabled_summary_off", "Channel member shelf is shown")
+                StringResource(
+                    "revanced_adremover_channel_member_shelf_enabled_summary_on",
+                    "Channel member shelf is hidden"
+                ),
+                StringResource(
+                    "revanced_adremover_channel_member_shelf_enabled_summary_off",
+                    "Channel member shelf is shown"
+                )
             ),
             SwitchPreference(
                 "revanced_adremover_emergency_box_removal",
@@ -137,6 +173,23 @@ class GeneralAdsResourcePatch : ResourcePatch {
                 StringResource("revanced_adremover_medical_panel_enabled_summary_on", "Medical panels are hidden"),
                 StringResource("revanced_adremover_medical_panel_enabled_summary_off", "Medical panels are shown")
             ),
+        )
+
+        PreferenceScreen.ADS.addPreferences(
+            SwitchPreference(
+                "revanced_adremover_ad_removal",
+                StringResource("revanced_adremover_ad_removal_enabled_title", "Hide general ads"),
+                true,
+                StringResource("revanced_adremover_ad_removal_enabled_summary_on", "General ads are hidden"),
+                StringResource("revanced_adremover_ad_removal_enabled_summary_off", "General ads are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_buttoned",
+                StringResource("revanced_adremover_buttoned_enabled_title", "Hide buttoned ad"),
+                true,
+                StringResource("revanced_adremover_buttoned_enabled_summary_on", "Buttoned ads are hidden"),
+                StringResource("revanced_adremover_buttoned_enabled_summary_off", "Buttoned ads are shown")
+            ),
             SwitchPreference(
                 "revanced_adremover_paid_content",
                 StringResource("revanced_adremover_paid_content_enabled_title", "Hide paid content"),
@@ -158,19 +211,6 @@ class GeneralAdsResourcePatch : ResourcePatch {
                 StringResource("revanced_adremover_hide_latest_posts_enabled_summary_on", "Latest posts are hidden"),
                 StringResource("revanced_adremover_hide_latest_posts_enabled_summary_off", "Latest posts are shown")
             ),
-            SwitchPreference(
-                "revanced_adremover_hide_channel_guidelines",
-                StringResource("revanced_adremover_hide_channel_guidelines_enabled_title", "Hide channel guidelines"),
-                true,
-                StringResource(
-                    "revanced_adremover_hide_channel_guidelines_enabled_summary_on",
-                    "Channel guidelines are hidden"
-                ),
-                StringResource(
-                    "revanced_adremover_hide_channel_guidelines_enabled_summary_off",
-                    "Channel guidelines are shown"
-                )
-            ),
             SwitchPreference(
                 "revanced_adremover_self_sponsor",
                 StringResource("revanced_adremover_self_sponsor_enabled_title", "Hide self sponsored cards"),
@@ -178,30 +218,7 @@ class GeneralAdsResourcePatch : ResourcePatch {
                 StringResource("revanced_adremover_self_sponsor_enabled_summary_on", "Self sponsored cards are hidden"),
                 StringResource("revanced_adremover_self_sponsor_enabled_summary_off", "Self sponsored cards are shown")
             ),
-            SwitchPreference(
-                "revanced_adremover_separator",
-                StringResource("revanced_adremover_separator_title", "Hide gray separator"),
-                true,
-                StringResource("revanced_adremover_separator_summary_on", "Gray separators are hidden"),
-                StringResource("revanced_adremover_separator_summary_off", "Gray separators are shown")
-            ),
-            SwitchPreference(
-                "revanced_adremover_chapter_teaser",
-                StringResource(
-                    "revanced_adremover_chapter_teaser_enabled_title",
-                    "Hide chapter teaser under videos"
-                ),
-                true,
-                StringResource(
-                    "revanced_adremover_chapter_teaser_enabled_summary_on",
-                    "Chapter teasers are hidden"
-                ),
-                StringResource(
-                    "revanced_adremover_chapter_teaser_enabled_summary_off",
-                    "Chapter teasers are shown"
-                )
-            ),
-            app.revanced.patches.shared.settings.preference.impl.PreferenceScreen(
+            PreferenceScreen(
                 "revanced_adremover_custom",
                 StringResource("revanced_adremover_custom_title", "Custom filter"),
                 listOf(
@@ -221,7 +238,7 @@ class GeneralAdsResourcePatch : ResourcePatch {
                             "Custom filter is disabled"
                         )
                     ),
-                    // TODO: This should be a ListPreference, which does not exist yet
+                    // TODO: This should be a dynamic ListPreference, which does not exist yet
                     TextPreference(
                         "revanced_adremover_custom_strings",
                         StringResource("revanced_adremover_custom_strings_title", "Custom filter"),

src/main/kotlin/app/revanced/patches/youtube/layout/hideinfocards/patch/HideInfocardsPatch.kt

@@ -45,7 +45,7 @@ class HideInfocardsPatch : BytecodePatch(
                                 "Landroid/view/View;->setVisibility(I)V")
             }
 
-            replaceInstruction(
+            addInstructions(
                 invokeInstructionIndex,
                 "invoke-static {v${(instruction(invokeInstructionIndex) as? BuilderInstruction35c)?.registerC}}," +
                         " Lapp/revanced/integrations/patches/HideInfocardsPatch;->hideInfocardsIncognito(Landroid/view/View;)V"

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

@@ -59,7 +59,9 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
 
             val conversionContextParam = 5
             val textRefParam = createComponentMethod.parameters.size - 2
-            val insertIndex = scanResult.stringsScanResult!!.matches.first().index - 2
+            // insert index must be 0, otherwise UI does not updated correctly in some situations
+            // such as switching from full screen or when using previous/next overlay buttons.
+            val insertIndex = 0
 
             createComponentMethod.addInstructions(
                 insertIndex,

src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/annotations/SpoofAppVersionCompatibility.kt

@@ -0,0 +1,14 @@
+package app.revanced.patches.youtube.layout.spoofappversion.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.49.37")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class SpoofAppVersionCompatibility
+

src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/bytecode/fingerprints/SpoofAppVersionFingerprint.kt

@@ -0,0 +1,19 @@
+package app.revanced.patches.youtube.layout.spoofappversion.bytecode.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+object SpoofAppVersionFingerprint : MethodFingerprint(
+    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"), listOf(
+        Opcode.IGET_OBJECT,
+        Opcode.GOTO,
+        Opcode.CONST_STRING,
+    ),
+
+    // Instead of applying a bytecode patch, it might be possible to only rely on code from the integrations and
+    // manually set the desired version string as this keyed value in the SharedPreferences.
+    // But, this bytecode patch is simple and it works.
+    strings = listOf("pref_override_build_version_name")
+)

src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/bytecode/patch/SpoofAppVersionPatch.kt

@@ -0,0 +1,64 @@
+package app.revanced.patches.youtube.layout.spoofappversion.bytecode.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.layout.spoofappversion.annotations.SpoofAppVersionCompatibility
+import app.revanced.patches.youtube.layout.spoofappversion.bytecode.fingerprints.SpoofAppVersionFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Patch
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
+@Name("spoof-app-version")
+@Description("Tricks YouTube into thinking, you are running an older version of the app. One of the side effects also includes restoring the old UI.")
+@SpoofAppVersionCompatibility
+@Version("0.0.1")
+class SpoofAppVersionPatch : BytecodePatch(
+    listOf(
+        SpoofAppVersionFingerprint
+    )
+) {
+    companion object {
+        const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/SpoofAppVersionPatch"
+    }
+
+    override fun execute(context: BytecodeContext): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_spoof_app_version",
+                StringResource("revanced_spoof_app_version_title", "Spoof app version"),
+                false,
+                StringResource("revanced_spoof_app_version_summary_on", "Version spoofed to 17.30.34. If switched off, the old UI layout may remain until logging out or clearing app data"),
+                StringResource("revanced_spoof_app_version_summary_off", "Version not spoofed")
+            )
+        )
+
+        SpoofAppVersionFingerprint.result?.apply {
+            val insertIndex = scanResult.patternScanResult!!.startIndex + 1
+            val buildOverrideNameRegister =
+                (mutableMethod.implementation!!.instructions[insertIndex - 1] as OneRegisterInstruction).registerA
+
+            mutableMethod.addInstructions(
+                insertIndex,
+                """
+                        invoke-static {v$buildOverrideNameRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR;->getYouTubeVersionOverride(Ljava/lang/String;)Ljava/lang/String;
+                        move-result-object v$buildOverrideNameRegister
+                         """
+            )
+        } ?: return SpoofAppVersionFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/misc/video/quality/patch/RememberVideoQualityPatch.kt

@@ -12,14 +12,14 @@ 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.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 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.video.quality.annotations.RememberVideoQualityCompatibility
 import app.revanced.patches.youtube.misc.video.quality.fingerprints.VideoQualityReferenceFingerprint
 import app.revanced.patches.youtube.misc.video.quality.fingerprints.VideoQualitySetterFingerprint
 import app.revanced.patches.youtube.misc.video.quality.fingerprints.VideoUserQualityChangeFingerprint
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
 import org.jf.dexlib2.iface.reference.FieldReference
@@ -47,7 +47,7 @@ class RememberVideoQualityPatch : BytecodePatch(
                 ),
                 StringResource(
                     "revanced_remember_video_quality_last_selected_summary_off",
-                    "Quality changes only apply to the current video and are reverted back to the last remembered quality for future playbacks"
+                    "Quality changes only apply to the current video"
                 )
             )
         )

src/main/kotlin/app/revanced/patches/youtube/misc/video/speed/remember/annotation/RememberPlaybackRateCompatibility.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.misc.video.speed.remember.annotation
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.49.37")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class RememberPlaybackRateCompatibility

src/main/kotlin/app/revanced/patches/youtube/misc/video/speed/remember/fingerprint/ChangePlaybackRateFragmentStateFingerprint.kt

@@ -0,0 +1,8 @@
+package app.revanced.patches.youtube.misc.video.speed.remember.fingerprint
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object ChangePlaybackRateFragmentStateFingerprint : MethodFingerprint(
+    "V",
+    strings = listOf("PLAYBACK_RATE_MENU_BOTTOM_SHEET_FRAGMENT")
+)

src/main/kotlin/app/revanced/patches/youtube/misc/video/speed/remember/fingerprint/InitializePlaybackRateValuesFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.youtube.misc.video.speed.remember.fingerprint
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object InitializePlaybackRateValuesFingerprint : MethodFingerprint(
+    parameters = listOf("[L", "I")
+)

src/main/kotlin/app/revanced/patches/youtube/misc/video/speed/remember/fingerprint/OnPlaybackRateItemClickFingerprint.kt

@@ -0,0 +1,12 @@
+package app.revanced.patches.youtube.misc.video.speed.remember.fingerprint
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.Opcode
+
+object OnPlaybackRateItemClickFingerprint : MethodFingerprint(
+    customFingerprint = { it.name == "onItemClick" },
+    opcodes = listOf(
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL
+    )
+)

src/main/kotlin/app/revanced/patches/youtube/misc/video/speed/remember/patch/RememberPlaybackRatePatch.kt

@@ -0,0 +1,137 @@
+package app.revanced.patches.youtube.misc.video.speed.remember.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.patch.*
+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.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+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.video.speed.remember.annotation.RememberPlaybackRateCompatibility
+import app.revanced.patches.youtube.misc.video.speed.remember.fingerprint.ChangePlaybackRateFragmentStateFingerprint
+import app.revanced.patches.youtube.misc.video.speed.remember.fingerprint.InitializePlaybackRateValuesFingerprint
+import app.revanced.patches.youtube.misc.video.speed.remember.fingerprint.OnPlaybackRateItemClickFingerprint
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+
+@Patch
+@Name("remember-playback-rate")
+@Description("Adds the ability to remember the playback rate you chose in the video playback rate flyout.")
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
+@RememberPlaybackRateCompatibility
+@Version("0.0.1")
+class RememberPlaybackRatePatch : BytecodePatch(
+    listOf(ChangePlaybackRateFragmentStateFingerprint)
+) {
+    private companion object {
+        const val INTEGRATIONS_CLASS_DESCRIPTOR =
+            "Lapp/revanced/integrations/patches/playback/speed/RememberPlaybackRatePatch;"
+
+        fun MethodFingerprint.getReference(offsetFromPatternScanResultStartIndex: Int = 0) = this.result!!.let {
+            val referenceInstruction = it.mutableMethod
+                .instruction(it.scanResult.patternScanResult!!.startIndex + offsetFromPatternScanResultStartIndex) as ReferenceInstruction
+            referenceInstruction.reference.toString()
+        }
+
+        fun BytecodeContext.resolveFingerprints() {
+            ChangePlaybackRateFragmentStateFingerprint.result?.also {
+                fun MethodFingerprint.resolve() = resolve(this@resolveFingerprints, it.classDef)
+
+                OnPlaybackRateItemClickFingerprint.resolve()
+                InitializePlaybackRateValuesFingerprint.resolve()
+
+            } ?: throw ChangePlaybackRateFragmentStateFingerprint.toErrorResult()
+        }
+    }
+
+    override fun execute(context: BytecodeContext): PatchResult {
+        SettingsPatch.PreferenceScreen.MISC.addPreferences(
+            SwitchPreference(
+                "revanced_remember_playback_rate_last_selected",
+                StringResource("revanced_remember_playback_rate_last_selected_title", "Remember playback rate changes"),
+                true,
+                StringResource(
+                    "revanced_remember_playback_rate_last_selected_summary_on",
+                    "Playback rate changes apply to all videos"
+                ),
+                StringResource(
+                    "revanced_remember_playback_rate_last_selected_summary_off",
+                    "Playback rate changes only apply to the current video"
+                )
+            )
+        )
+
+        context.resolveFingerprints()
+
+        // Set the remembered playback rate.
+        InitializePlaybackRateValuesFingerprint.result!!.apply {
+            // Infer everything necessary for setPlaybackRate()
+
+            val playbackHandlerWrapperFieldReference =
+                (object : MethodFingerprint(opcodes = listOf(Opcode.IF_EQZ)) {}).apply {
+                    OnPlaybackRateItemClickFingerprint.result!!.apply {
+                        resolve(
+                            context,
+                            method,
+                            classDef
+                        )
+                    }
+                }.getReference(-1)
+            val playbackHandlerWrapperImplementorClassReference = OnPlaybackRateItemClickFingerprint
+                .getReference(-1)
+            val playbackHandlerFieldReference = OnPlaybackRateItemClickFingerprint
+                .getReference()
+            val setPlaybackRateMethodReference = OnPlaybackRateItemClickFingerprint
+                .getReference(1)
+
+            mutableMethod.addInstructions(
+                0,
+                """
+                    invoke-static { }, $INTEGRATIONS_CLASS_DESCRIPTOR->getRememberedPlaybackRate()F
+                    move-result v0
+                    
+                    # check if the playback rate is below 0 (when a playback rate was never remembered)
+                    
+                    const/4 v1, 0x0
+                    cmpg-float v1, v0, v1
+                    if-lez v1, :do_not_override
+
+                    # invoke setPlaybackRate
+                    
+                    iget-object v1, p0, $playbackHandlerWrapperFieldReference 
+                    check-cast v1, $playbackHandlerWrapperImplementorClassReference
+                    iget-object v2, v1, $playbackHandlerFieldReference
+                    invoke-virtual {v2, v0}, $setPlaybackRateMethodReference
+                """.trimIndent(),
+                listOf(ExternalLabel("do_not_override", mutableMethod.instruction(0)))
+            )
+        }
+
+        // Remember the selected playback rate.
+        OnPlaybackRateItemClickFingerprint.result!!.apply {
+            val setPlaybackRateIndex = scanResult.patternScanResult!!.endIndex
+            val selectedPlaybackRateRegister =
+                (mutableMethod.instruction(setPlaybackRateIndex) as FiveRegisterInstruction).registerD
+
+            mutableMethod.addInstruction(
+                setPlaybackRateIndex,
+                "invoke-static { v$selectedPlaybackRateRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->rememberPlaybackRate(F)V"
+            )
+        }
+
+
+        return PatchResultSuccess()
+    }
+}

src/main/resources/returnyoutubedislike/host/values/strings.xml

@@ -3,7 +3,6 @@
 
     <string name="revanced_ryd_failure_connection_timeout">Dislikes temporarily not available (API timed out)</string>
     <string name="revanced_ryd_failure_client_rate_limit_requested">Dislikes not available (client API limit reached)</string>
-
     <string name="revanced_ryd_failure_register_user">ReturnYouTubeDislike failed to register as new user</string>
     <string name="revanced_ryd_failure_confirm_user">ReturnYouTubeDislike failed to confirm new user</string>
     <string name="revanced_ryd_failure_send_vote_failed">ReturnYouTubeDislike failed to send vote</string>
@@ -17,6 +16,10 @@
     <string name="revanced_ryd_dislike_percentage_summary_on">Dislikes shown as percentage</string>
     <string name="revanced_ryd_dislike_percentage_summary_off">Dislikes shown as number</string>
 
+    <string name="revanced_ryd_compact_layout_title">Compact like button</string>
+    <string name="revanced_ryd_compact_layout_summary_on">Like button styled for minimum width</string>
+    <string name="revanced_ryd_compact_layout_summary_off">Like button styled for best appearance</string>
+
     <string name="revanced_ryd_attribution_title">ReturnYouTubeDislike.com</string>
     <string name="revanced_ryd_attribution_summary">Dislike data is provided by the Return YouTube Dislike API.  Tap here to learn more.</string>