chore(release): 2.201.1 [skip ci]

## [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 ([15702c9](15702c92b3))
* **YouTube - Hide layout components:** Clarify custom filter usage ([45e55b4](45e55b48e5))

CHANGELOG.md

@@ -1,3 +1,58 @@
+## [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))
+
+
+### 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))
+
+## [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 ([1eb12cc](https://github.com/ReVanced/revanced-patches/commit/1eb12cc40ac5c25410dac9857ff4a9585c25f5cc))
+
 # [2.200.0](https://github.com/ReVanced/revanced-patches/compare/v2.199.0...v2.200.0) (2023-11-22)
 
 

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 2.200.0
+version = 2.201.1

src/main/kotlin/app/revanced/patches/spotify/navbar/PremiumNavbarTabPatch.kt

@@ -1,51 +1,32 @@
 package app.revanced.patches.spotify.navbar
 
+import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
-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
+import app.revanced.patches.spotify.navbar.fingerprints.AddNavBarItemFingerprint
 
 @Patch(
     name = "Hide premium navbar",
     description = "Removes the premium tab from the navbar.",
-    dependencies = [ResourceMappingPatch::class],
+    dependencies = [PremiumNavbarTabResourcePatch::class],
     compatiblePackages = [CompatiblePackage("com.spotify.music")]
 )
 @Suppress("unused")
-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
-        }
-    }
-}
+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
+}

src/main/kotlin/app/revanced/patches/spotify/navbar/PremiumNavbarTabResourcePatch.kt

@@ -0,0 +1,22 @@
+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
+    }
+}

src/main/kotlin/app/revanced/patches/spotify/navbar/fingerprints/AddNavBarItemFingerprint.kt

@@ -0,0 +1,12 @@
+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 },
+)

src/main/kotlin/app/revanced/patches/spotify/navbar/fingerprints/AddPremiumNavbarTabFingerprint.kt

@@ -1,7 +0,0 @@
-package app.revanced.patches.spotify.navbar.fingerprints
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-
-object AddPremiumNavbarTabFingerprint : MethodFingerprint(
-    parameters = listOf("L", "L", "L", "L", "L", "L")
-)

src/main/kotlin/app/revanced/patches/spotify/navbar/fingerprints/AddPremiumNavbarTabParentFingerprint.kt

@@ -1,7 +0,0 @@
-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")
-)

src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsResourcePatch.kt

@@ -55,6 +55,12 @@ object HideAdsResourcePatch : ResourcePatch() {
                 StringResource("revanced_hide_products_banner_summary_on", "Banner is hidden"),
                 StringResource("revanced_hide_products_banner_summary_off", "Banner is shown")
             ),
+            SwitchPreference(
+                "revanced_hide_shopping_links",
+                StringResource("revanced_hide_shopping_links_title", "Hide shopping links in video description"),
+                StringResource("revanced_hide_shopping_links_summary_on", "Shopping links are hidden"),
+                StringResource("revanced_hide_shopping_links_summary_off", "Shopping links are shown")
+            ),
             SwitchPreference(
                 "revanced_hide_web_search_results",
                 StringResource("revanced_hide_web_search_results_title", "Hide web search results"),

src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt

@@ -74,6 +74,12 @@ object HideLayoutComponentsPatch : BytecodePatch(
                 StringResource("revanced_hide_channel_watermark_title_summary_on", "Watermark is hidden"),
                 StringResource("revanced_hide_channel_watermark_title_summary_off", "Watermark is shown")
             ),
+            SwitchPreference(
+                "revanced_hide_for_you_shelf",
+                StringResource("revanced_hide_for_you_shelf_title", "Hide \\\'For you\\\' shelf in channel page"),
+                StringResource("revanced_hide_for_you_shelf_summary_on", "Shelf is hidden"),
+                StringResource("revanced_hide_for_you_shelf_summary_off", "Shelf is shown")
+            ),
             SwitchPreference(
                 "revanced_hide_notify_me_button",
                 StringResource("revanced_hide_notify_me_button_title", "Hide \\\'Notify me\\\' button"),
@@ -400,7 +406,7 @@ object HideLayoutComponentsPatch : BytecodePatch(
                         StringResource("revanced_custom_filter_strings_title", "Custom filter"),
                         StringResource(
                             "revanced_custom_filter_strings_summary",
-                            "List of components to filter separated by new line"
+                            "List of component path builder strings to filter separated by new line"
                         ),
                         inputType = InputType.TEXT_MULTI_LINE
                     )

src/main/kotlin/app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch.kt

@@ -2,8 +2,11 @@ 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
@@ -13,6 +16,8 @@ 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",
@@ -37,18 +42,28 @@ object EnableTabletLayoutPatch : BytecodePatch(
 
         GetFormFactorFingerprint.result?.let {
             it.mutableMethod.apply {
-                val returnLargeFormFactorIndex = it.scanResult.patternScanResult!!.endIndex - 4
+                val returnCurrentFormFactorIndex = getInstructions().lastIndex - 2
 
+                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(
-                    0,
+                    insertIndex,
                     """
-                          invoke-static {}, Lapp/revanced/integrations/patches/EnableTabletLayoutPatch;->enableTabletLayout()Z
-                          move-result v0
+                          invoke-static { }, Lapp/revanced/integrations/patches/EnableTabletLayoutPatch;->enableTabletLayout()Z
+                          move-result v0 # Free register
                           if-nez v0, :is_large_form_factor
                     """,
                     ExternalLabel(
                         "is_large_form_factor",
-                        getInstruction(returnLargeFormFactorIndex)
+                        returnIsLargeFormFactorLabel
                     )
                 )
             }