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

# [2.201.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.200.1-dev.1...v2.201.0-dev.1) (2023-11-23) ### Features * **YouTube - Hide ads:** Hide shopping links in video description ([5d3f62f](5d3f62fc67)) * **YouTube - Hide layout components:** Hide "For You" shelf in channel page ([273fe59](273fe59f0c))
feat(YouTube - Hide ads): Hide shopping links in video description
2025-12-09 10:53:55 +01:00 · 2023-11-23 00:20:29 +00:00 · 2023-11-23 01:18:31 +01:00 · 2023-11-23 01:18:31 +01:00 · 2023-11-23 00:01:35 +00:00 · 2023-11-23 00:59:32 +01:00
11 changed files with 71 additions and 143 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,57 +1,10 @@
-## [2.201.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.201.1...v2.201.2-dev.1) (2023-11-29)
-
-
-### Bug Fixes
-
-* **YouTube - Restore old seekbar thumbnails:** Move setting into 'Seekbar' submenu ([#3344](https://github.com/ReVanced/revanced-patches/issues/3344)) ([880091a](https://github.com/ReVanced/revanced-patches/commit/880091a96d1a628520732367c96c4c11fb93b72d))
-
-## [2.201.1](https://github.com/ReVanced/revanced-patches/compare/v2.201.0...v2.201.1) (2023-11-27)
-
-
-### Bug Fixes
-
-* **Spotify - Hide premium navbar:** Support latest version ([b87005d](https://github.com/ReVanced/revanced-patches/commit/b87005de0c40293f85d3997f43b353a87a925156))
-* **YouTube - Hide layout components:** Clarify custom filter usage ([cc16db5](https://github.com/ReVanced/revanced-patches/commit/cc16db56d1c9925852265fcebb459d9620cd1b92))
-
-## [2.201.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v2.201.1-dev.1...v2.201.1-dev.2) (2023-11-23)
-
-
-### Bug Fixes
-
-* **Spotify - Hide premium navbar:** Support latest version ([b87005d](https://github.com/ReVanced/revanced-patches/commit/b87005de0c40293f85d3997f43b353a87a925156))
-
-## [2.201.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.201.0...v2.201.1-dev.1) (2023-11-23)
-
-
-### Bug Fixes
-
-* **YouTube - Hide layout components:** Clarify custom filter usage ([cc16db5](https://github.com/ReVanced/revanced-patches/commit/cc16db56d1c9925852265fcebb459d9620cd1b92))
-
-# [2.201.0](https://github.com/ReVanced/revanced-patches/compare/v2.200.0...v2.201.0) (2023-11-23)
-
-
-### Bug Fixes
-
-* **YouTube - Enable tablet layout:** Respect the original device layout ([b2c5bab](https://github.com/ReVanced/revanced-patches/commit/b2c5babf3fd9ad73daa06e03f4830a9dd7199d0c))
+# [2.201.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.200.1-dev.1...v2.201.0-dev.1) (2023-11-23)


 ### Features

-* **YouTube - Hide ads:** Hide shopping links in video description ([0c875a1](https://github.com/ReVanced/revanced-patches/commit/0c875a106308ae9747ae998d75b84db1c336762b))
-* **YouTube - Hide layout components:** Hide "For You" shelf in channel page ([2bc7485](https://github.com/ReVanced/revanced-patches/commit/2bc7485cda5c5e17d65419faca983567a030f9aa))
-
-# [2.201.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.200.0...v2.201.0-dev.1) (2023-11-23)
-
-
-### Bug Fixes
-
-* **YouTube - Enable tablet layout:** Respect the original device layout ([b2c5bab](https://github.com/ReVanced/revanced-patches/commit/b2c5babf3fd9ad73daa06e03f4830a9dd7199d0c))
-
-
-### Features
-
-* **YouTube - Hide ads:** Hide shopping links in video description ([0c875a1](https://github.com/ReVanced/revanced-patches/commit/0c875a106308ae9747ae998d75b84db1c336762b))
-* **YouTube - Hide layout components:** Hide "For You" shelf in channel page ([2bc7485](https://github.com/ReVanced/revanced-patches/commit/2bc7485cda5c5e17d65419faca983567a030f9aa))
+* **YouTube - Hide ads:** Hide shopping links in video description ([50e0f77](https://github.com/ReVanced/revanced-patches/commit/50e0f775875d8b91612dafdb2ce2e0196f913a98))
+* **YouTube - Hide layout components:** Hide "For You" shelf in channel page ([207f02f](https://github.com/ReVanced/revanced-patches/commit/207f02faf956fe77be50b8ca9846a60b15ef4e25))

 ## [2.200.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.200.0...v2.200.1-dev.1) (2023-11-23)

--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,6 +12,13 @@ repositories {
    mavenLocal()
    google()
    maven { url = uri("https://jitpack.io") }
+    // Required for FlexVer-Java
+    maven {
+        url = uri("https://repo.sleeping.town")
+        content {
+            includeGroup("com.unascribed")
+        }
+    }
 }

 dependencies {
@@ -30,22 +37,6 @@ kotlin {
    jvmToolchain(11)
 }

-tasks.withType(Jar::class) {
-    exclude("app/revanced/meta")
-
-    manifest {
-        attributes["Name"] = "ReVanced Patches"
-        attributes["Description"] = "Patches for ReVanced."
-        attributes["Version"] = version
-        attributes["Timestamp"] = System.currentTimeMillis().toString()
-        attributes["Source"] = "git@github.com:revanced/revanced-patches.git"
-        attributes["Author"] = "ReVanced"
-        attributes["Contact"] = "contact@revanced.app"
-        attributes["Origin"] = "https://revanced.app"
-        attributes["License"] = "GNU General Public License v3.0"
-    }
-}
-
 tasks {
    register<DefaultTask>("generateBundle") {
        description = "Generate dex files from build and bundle them in the jar file"
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 2.201.2-dev.1
+version = 2.201.0-dev.1
--- a/src/main/kotlin/app/revanced/patches/spotify/navbar/PremiumNavbarTabPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/navbar/PremiumNavbarTabPatch.kt
@@ -1,32 +1,51 @@
 package app.revanced.patches.spotify.navbar

-import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.spotify.navbar.fingerprints.AddNavBarItemFingerprint
+import app.revanced.patches.shared.mapping.misc.ResourceMappingPatch
+import app.revanced.patches.spotify.navbar.fingerprints.AddPremiumNavbarTabFingerprint
+import app.revanced.patches.spotify.navbar.fingerprints.AddPremiumNavbarTabParentFingerprint
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.WideLiteralInstruction

@Patch(
    name = "Hide premium navbar",
    description = "Removes the premium tab from the navbar.",
-    dependencies = [PremiumNavbarTabResourcePatch::class],
+    dependencies = [ResourceMappingPatch::class],
    compatiblePackages = [CompatiblePackage("com.spotify.music")]
 )
@Suppress("unused")
-object PremiumNavbarTabPatch : BytecodePatch(
-    setOf(AddNavBarItemFingerprint)
-) {
-    // If the navigation bar item is the premium tab, do not add it.
-    override fun execute(context: BytecodeContext) = AddNavBarItemFingerprint.result?.mutableMethod?.addInstructions(
-        0,
-        """
-            const v1, ${PremiumNavbarTabResourcePatch.premiumTabId}
-            if-ne p5, v1, :continue
-            return-void
-            :continue
-            nop
-        """
-    ) ?: throw AddNavBarItemFingerprint.exception
+object PremiumNavbarTabPatch : BytecodePatch(setOf(AddPremiumNavbarTabParentFingerprint)) {
+    override fun execute(context: BytecodeContext) {
+        val parentResult = AddPremiumNavbarTabParentFingerprint.result!!
+        AddPremiumNavbarTabFingerprint.resolve(context, parentResult.classDef)
+
+        val result = AddPremiumNavbarTabFingerprint.result!!
+
+        val method = result.mutableMethod
+        val methodInstructions = method.implementation!!.instructions
+        val lastInstructionIdx = methodInstructions.size - 1
+
+        val premiumTabId =
+            ResourceMappingPatch.resourceMappings.single { it.type == "id" && it.name == "premium_tab" }.id
+
+        var removeAmount = 2
+        // 2nd const remove method
+        for ((i, instruction) in methodInstructions.asReversed().withIndex()) {
+            if (instruction.opcode.ordinal != Opcode.CONST.ordinal) continue
+            if ((instruction as WideLiteralInstruction).wideLiteral != premiumTabId) continue
+
+            val findThreshold = 10
+            val constIndex = lastInstructionIdx - i
+            val invokeInstruction = methodInstructions.subList(constIndex, constIndex + findThreshold).first {
+                it.opcode.ordinal == Opcode.INVOKE_VIRTUAL_RANGE.ordinal
+            }
+            method.removeInstruction(methodInstructions.indexOf(invokeInstruction))
+
+            if (--removeAmount == 0) break
+        }
+    }
 }
--- a/src/main/kotlin/app/revanced/patches/spotify/navbar/PremiumNavbarTabResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/navbar/PremiumNavbarTabResourcePatch.kt
@@ -1,22 +0,0 @@
-package app.revanced.patches.spotify.navbar
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.shared.mapping.misc.ResourceMappingPatch
-
-@Patch(dependencies = [ResourceMappingPatch::class])
-object PremiumNavbarTabResourcePatch : ResourcePatch() {
-    internal var showBottomNavigationItemsTextId = -1L
-    internal var premiumTabId = -1L
-
-    override fun execute(context: ResourceContext) {
-        premiumTabId = ResourceMappingPatch.resourceMappings.single {
-            it.type == "id" && it.name == "premium_tab"
-        }.id
-
-        showBottomNavigationItemsTextId = ResourceMappingPatch.resourceMappings.single {
-            it.type == "bool" && it.name == "show_bottom_navigation_items_text"
-        }.id
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/spotify/navbar/fingerprints/AddNavBarItemFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/navbar/fingerprints/AddNavBarItemFingerprint.kt
@@ -1,12 +0,0 @@
-package app.revanced.patches.spotify.navbar.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.spotify.navbar.PremiumNavbarTabResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-
-object AddNavBarItemFingerprint : LiteralValueFingerprint(
-     returnType = "V",
-     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-     literalSupplier = { PremiumNavbarTabResourcePatch.showBottomNavigationItemsTextId },
-)
--- a/src/main/kotlin/app/revanced/patches/spotify/navbar/fingerprints/AddPremiumNavbarTabFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/navbar/fingerprints/AddPremiumNavbarTabFingerprint.kt
@@ -0,0 +1,7 @@
+package app.revanced.patches.spotify.navbar.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+object AddPremiumNavbarTabFingerprint : MethodFingerprint(
+    parameters = listOf("L", "L", "L", "L", "L", "L")
+)
--- a/src/main/kotlin/app/revanced/patches/spotify/navbar/fingerprints/AddPremiumNavbarTabParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/navbar/fingerprints/AddPremiumNavbarTabParentFingerprint.kt
@@ -0,0 +1,7 @@
+package app.revanced.patches.spotify.navbar.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+object AddPremiumNavbarTabParentFingerprint : MethodFingerprint(
+     strings = listOf("com.samsung.android.samsungaccount.action.REQUEST_AUTHCODE")
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
@@ -406,7 +406,7 @@ object HideLayoutComponentsPatch : BytecodePatch(
                        StringResource("revanced_custom_filter_strings_title", "Custom filter"),
                        StringResource(
                            "revanced_custom_filter_strings_summary",
-                            "List of component path builder strings to filter separated by new line"
+                            "List of components to filter separated by new line"
                        ),
                        inputType = InputType.TEXT_MULTI_LINE
                    )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/RestoreOldSeekbarThumbnailsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/RestoreOldSeekbarThumbnailsPatch.kt
@@ -16,7 +16,7 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
@Patch(
    name = "Restore old seekbar thumbnails",
    description = "Restores the old seekbar thumbnails that appear above the seekbar instead of fullscreen thumbnails.",
-    dependencies = [IntegrationsPatch::class, SeekbarPreferencesPatch::class],
+    dependencies = [IntegrationsPatch::class, SettingsPatch::class],
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
@@ -37,7 +37,7 @@ object RestoreOldSeekbarThumbnailsPatch : BytecodePatch(
        "Lapp/revanced/integrations/patches/RestoreOldSeekbarThumbnailsPatch;"

    override fun execute(context: BytecodeContext) {
-        SeekbarPreferencesPatch.addPreferences(
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
            SwitchPreference(
                "revanced_restore_old_seekbar_thumbnails",
                StringResource(
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch.kt
@@ -2,11 +2,8 @@ package app.revanced.patches.youtube.layout.tablet

 import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
@@ -16,8 +13,6 @@ import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.layout.tablet.fingerprints.GetFormFactorFingerprint
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction10x

@Patch(
    name = "Enable tablet layout",
@@ -42,28 +37,18 @@ object EnableTabletLayoutPatch : BytecodePatch(

        GetFormFactorFingerprint.result?.let {
            it.mutableMethod.apply {
-                val returnCurrentFormFactorIndex = getInstructions().lastIndex - 2
+                val returnLargeFormFactorIndex = it.scanResult.patternScanResult!!.endIndex - 4

-                val returnIsLargeFormFactorLabel = getInstruction(returnCurrentFormFactorIndex - 2)
-                val returnFormFactorIndex = getInstruction(returnCurrentFormFactorIndex)
-
-                val insertIndex = returnCurrentFormFactorIndex + 1
-
-                // Replace the labeled instruction with a nop and add the preserved instructions back
-                replaceInstruction(returnCurrentFormFactorIndex, BuilderInstruction10x(Opcode.NOP))
-                addInstruction(insertIndex, returnFormFactorIndex)
-
-                // Because the labeled instruction is now a nop, we can add our own instructions right after it
                addInstructionsWithLabels(
-                    insertIndex,
+                    0,
                    """
-                          invoke-static { }, Lapp/revanced/integrations/patches/EnableTabletLayoutPatch;->enableTabletLayout()Z
-                          move-result v0 # Free register
+                          invoke-static { v0 }, Lapp/revanced/integrations/patches/EnableTabletLayoutPatch;->enableTabletLayout(Z)Z
+                          move-result v0
                          if-nez v0, :is_large_form_factor
                    """,
                    ExternalLabel(
                        "is_large_form_factor",
-                        returnIsLargeFormFactorLabel
+                        getInstruction(returnLargeFormFactorIndex)
                    )
                )
            }
Author	SHA1	Message	Date
semantic-release-bot	45f12d63ee	chore(release): 2.201.0-dev.1 [skip ci] # [2.201.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.200.1-dev.1...v2.201.0-dev.1) (2023-11-23) ### Features * YouTube - Hide ads: Hide shopping links in video description ([`5d3f62f`](`5d3f62fc67`)) * YouTube - Hide layout components: Hide "For You" shelf in channel page ([`273fe59`](`273fe59f0c`))	2023-11-23 00:20:29 +00:00
oSumAtrIX	5d3f62fc67	feat(YouTube - Hide ads): Hide shopping links in video description	2023-11-23 01:18:31 +01:00
oSumAtrIX	273fe59f0c	feat(YouTube - Hide layout components): Hide "For You" shelf in channel page	2023-11-23 01:18:31 +01:00
semantic-release-bot	1041238632	chore(release): 2.200.1-dev.1 [skip ci] ## [2.200.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.200.0...v2.200.1-dev.1) (2023-11-23) ### Bug Fixes * YouTube - Enable tablet layout: Respect the original device layout ([`e88d6a8`](`e88d6a8bba`))	2023-11-23 00:01:35 +00:00
oSumAtrIX	e88d6a8bba	fix(YouTube - Enable tablet layout): Respect the original device layout	2023-11-23 00:59:32 +01:00