chore(release): 2.162.0-dev.2 [skip ci]

# [2.162.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.162.0-dev.1...v2.162.0-dev.2) (2023-02-11)

### Bug Fixes

* **youtube/general-ads:** use better description for switch ([95be457](95be457590))

CHANGELOG.md

@@ -1,3 +1,97 @@
+# [2.162.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.162.0-dev.1...v2.162.0-dev.2) (2023-02-11)
+
+
+### Bug Fixes
+
+* **youtube/general-ads:** use better description for switch ([d33f959](https://github.com/revanced/revanced-patches/commit/d33f9597529d63014dd42fc6fe1e84b76831e0f3))
+
+# [2.162.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.161.1...v2.162.0-dev.1) (2023-02-11)
+
+
+### Features
+
+* **yuka:** `unlock-premium` patch ([#1608](https://github.com/revanced/revanced-patches/issues/1608)) ([71e1594](https://github.com/revanced/revanced-patches/commit/71e15945c1b4019eaa2ff214b4efbfc6b1a67376))
+
+## [2.161.1](https://github.com/revanced/revanced-patches/compare/v2.161.0...v2.161.1) (2023-02-11)
+
+
+### Bug Fixes
+
+* **youtube/minimized-playback:** disable when playing shorts ([cd48030](https://github.com/revanced/revanced-patches/commit/cd48030cada3666d0159ad25711c20045a8a70c7))
+
+## [2.161.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.161.0...v2.161.1-dev.1) (2023-02-11)
+
+
+### Bug Fixes
+
+* **youtube/minimized-playback:** disable when playing shorts ([cd48030](https://github.com/revanced/revanced-patches/commit/cd48030cada3666d0159ad25711c20045a8a70c7))
+
+# [2.161.0](https://github.com/revanced/revanced-patches/compare/v2.160.0...v2.161.0) (2023-02-10)
+
+
+### Bug Fixes
+
+* **instagram/hide-timeline-ads:** fix compatibility with newer versions ([3d4646a](https://github.com/revanced/revanced-patches/commit/3d4646ae7efe13f9f7e47cf5ba7613aac4d04d66))
+
+
+### Features
+
+* **youtube/general-ads:** hide pill to view products ([7b1bc1a](https://github.com/revanced/revanced-patches/commit/7b1bc1ad50f2b38277b0c19aad735ea65f8333d3))
+
+# [2.161.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.161.0-dev.1...v2.161.0-dev.2) (2023-02-10)
+
+
+### Bug Fixes
+
+* **instagram/hide-timeline-ads:** fix compatibility with newer versions ([3d4646a](https://github.com/revanced/revanced-patches/commit/3d4646ae7efe13f9f7e47cf5ba7613aac4d04d66))
+
+# [2.161.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.160.0...v2.161.0-dev.1) (2023-02-10)
+
+
+### Features
+
+* **youtube/general-ads:** hide pill to view products ([7b1bc1a](https://github.com/revanced/revanced-patches/commit/7b1bc1ad50f2b38277b0c19aad735ea65f8333d3))
+
+# [2.160.0](https://github.com/revanced/revanced-patches/compare/v2.159.0...v2.160.0) (2023-02-10)
+
+
+### Features
+
+* **instagram:** `hide-timeline-ads` patch ([61668e6](https://github.com/revanced/revanced-patches/commit/61668e67083b74a08f8015308f4afe548e16a9ad))
+* **reddit:** `hide-subreddit-banner` patch ([13a1381](https://github.com/revanced/revanced-patches/commit/13a138122875b30e82df68a680e413f6ad7ba382))
+* **reddit:** bump patches compatibility to `v2023.05.0` ([0a72fa1](https://github.com/revanced/revanced-patches/commit/0a72fa10bf009192157e04e0788daf5462324a0e))
+
+# [2.160.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.160.0-dev.1...v2.160.0-dev.2) (2023-02-10)
+
+
+### Features
+
+* **reddit:** `hide-subreddit-banner` patch ([13a1381](https://github.com/revanced/revanced-patches/commit/13a138122875b30e82df68a680e413f6ad7ba382))
+* **reddit:** bump patches compatibility to `v2023.05.0` ([0a72fa1](https://github.com/revanced/revanced-patches/commit/0a72fa10bf009192157e04e0788daf5462324a0e))
+
+# [2.160.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.159.0...v2.160.0-dev.1) (2023-02-10)
+
+
+### Features
+
+* **instagram:** `hide-timeline-ads` patch ([61668e6](https://github.com/revanced/revanced-patches/commit/61668e67083b74a08f8015308f4afe548e16a9ad))
+
+# [2.159.0](https://github.com/revanced/revanced-patches/compare/v2.158.0...v2.159.0) (2023-02-03)
+
+
+### Bug Fixes
+
+* **youtube/custom-branding:** correct scaling, margin and images ([#1580](https://github.com/revanced/revanced-patches/issues/1580)) ([491c413](https://github.com/revanced/revanced-patches/commit/491c4138f0185664a9c5d3db9ebdf026ff4594e8))
+
+
+### Features
+
+* `spoof-wifi-connection` patch ([#1527](https://github.com/revanced/revanced-patches/issues/1527)) ([adce206](https://github.com/revanced/revanced-patches/commit/adce206d66e1f7017328fe68a5818d424f70e588))
+* **music:** bump patches compatibility to v5.41.50 ([#1551](https://github.com/revanced/revanced-patches/issues/1551)) ([0b1024a](https://github.com/revanced/revanced-patches/commit/0b1024ab754a3e2ce798a54cccda6f41f97069a5))
+* **netguard:** `remove-broadcasts-restriction` patch ([#1581](https://github.com/revanced/revanced-patches/issues/1581)) ([73132e3](https://github.com/revanced/revanced-patches/commit/73132e37cf83f4c1f05cf6a184dfd8e454f7456e))
+* **spotify-lite:** enable on-demand patch ([9f0de4f](https://github.com/revanced/revanced-patches/commit/9f0de4f5678e9f57baaf6ec788821641d75defdc))
+* **youtube:** `hide-player-buttons` patch ([3469d37](https://github.com/revanced/revanced-patches/commit/3469d37bcedfd2dfbe46231b17cd098b591810c1))
+
 # [2.159.0-dev.4](https://github.com/revanced/revanced-patches/compare/v2.159.0-dev.3...v2.159.0-dev.4) (2023-02-03)
 
 

README.md

@@ -151,7 +151,8 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | 2022.43.0 |
+| `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | 2023.05.0 |
+| `hide-subreddit-banner` | Hides banner ads from comments on subreddits. | 2023.05.0 |
 | `premium-icon-reddit` | Unlocks premium Reddit app icons. | all |
 </details>
 
@@ -197,6 +198,14 @@ The official Patch bundle provided by ReVanced and the community.
 | `enable-on-demand` | Enables listening to songs on-demand, allowing to play any song from playlists, albums or artists without limitations. This does not remove ads. | all |
 </details>
 
+### [📦 `com.instagram.android`](https://play.google.com/store/apps/details?id=com.instagram.android)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `hide-timeline-ads` | Removes ads from the timeline. | all |
+</details>
+
 ### [📦 `org.citra.citra_emu`](https://play.google.com/store/apps/details?id=org.citra.citra_emu)
 <details>
 
@@ -245,6 +254,14 @@ The official Patch bundle provided by ReVanced and the community.
 | `remove-broadcasts-restriction` | Enables starting/stopping NetGuard via broadcasts. | all |
 </details>
 
+### [📦 `io.yuka.android`](https://play.google.com/store/apps/details?id=io.yuka.android)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-premium` | Unlocks premium features. | all |
+</details>
+
 ### [📦 `com.teslacoilsw.launcher`](https://play.google.com/store/apps/details?id=com.teslacoilsw.launcher)
 <details>
 

build.gradle.kts

@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation("app.revanced:revanced-patcher:6.4.2")
+    implementation("app.revanced:revanced-patcher:6.4.3")
     implementation("app.revanced:multidexlib2:2.5.3-a3836654")
     // Required for meta
     implementation("com.google.code.gson:gson:2.10.1")

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.159.0-dev.4
+version = 2.162.0-dev.2

src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/MediaFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.instagram.patches.ads.timeline.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object MediaFingerprint : MethodFingerprint(
+    strings = listOf("force_overlay", "Media#updateFields", "live_reels_metadata")
+)

src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ShowAdFingerprint.kt

@@ -0,0 +1,26 @@
+package app.revanced.patches.instagram.patches.ads.timeline.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 ShowAdFingerprint : MethodFingerprint(
+    "Z",
+    AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.FINAL,
+    listOf("L", "L", "Z", "Z"),
+    opcodes = listOf(
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_NEZ,
+        Opcode.RETURN,
+        Opcode.CONST_4,
+        Opcode.GOTO,
+        Opcode.CONST_4,
+        Opcode.GOTO,
+        Opcode.CONST_4,
+        Opcode.GOTO,
+        Opcode.CONST_4,
+        Opcode.RETURN,
+    ),
+)

src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/GenericMediaAdFingerprint.kt

@@ -0,0 +1,18 @@
+package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
+
+import org.jf.dexlib2.Opcode
+
+object GenericMediaAdFingerprint : MediaAdFingerprint(
+    opcodes = listOf(
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CONST_4,
+        Opcode.IF_EQZ,
+        Opcode.CONST_4,
+        Opcode.RETURN,
+    )
+) {
+    override fun toString() = result!!.method.toString()
+}

src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/MediaAdFingerprint.kt

@@ -0,0 +1,23 @@
+package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.Method
+
+abstract class MediaAdFingerprint(
+    returnType: String? = "Z",
+    access: Int? = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters: Iterable<String>? = listOf(),
+    opcodes: Iterable<Opcode>?,
+    customFingerprint: ((methodDef: Method) -> Boolean)? = null
+) : MethodFingerprint(
+    returnType,
+    access,
+    parameters,
+    opcodes,
+    customFingerprint = customFingerprint
+) {
+    abstract override fun toString(): String
+}

src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/PaidPartnershipAdFingerprint.kt

@@ -0,0 +1,29 @@
+package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
+
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.reference.MethodReference
+
+object PaidPartnershipAdFingerprint : MediaAdFingerprint(
+    "V",
+    null,
+    listOf("L", "L"),
+    listOf(
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.IPUT_BOOLEAN,
+        Opcode.IPUT_BOOLEAN
+    ),
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("ClipsEditMetadataController;")
+    }
+) {
+    override fun toString() = result!!.let {
+        val adCheckIndex = it.scanResult.patternScanResult!!.startIndex
+        val adCheckInstruction = it.method.implementation!!.instructions.elementAt(adCheckIndex)
+
+        val adCheckMethod = (adCheckInstruction as ReferenceInstruction).reference as MethodReference
+
+        adCheckMethod.toString()
+    }
+}

src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/ShoppingAdFingerprint.kt

@@ -0,0 +1,21 @@
+package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
+
+import org.jf.dexlib2.Opcode
+
+object ShoppingAdFingerprint : MediaAdFingerprint(
+    opcodes = listOf(
+        Opcode.IF_EQZ,
+        Opcode.IGET_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.IF_EQZ,
+        Opcode.IGET_OBJECT,
+        Opcode.IF_EQZ,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.XOR_INT_LIT8,
+        Opcode.IF_EQZ,
+    )
+) {
+    override fun toString() = result!!.method.toString()
+}

src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/patch/HideTimelineAdsPatch.kt

@@ -0,0 +1,108 @@
+package app.revanced.patches.instagram.patches.ads.timeline.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.*
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.extensions.removeInstruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+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.smali.ExternalLabel
+import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.MediaFingerprint
+import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ShowAdFingerprint
+import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.GenericMediaAdFingerprint
+import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.MediaAdFingerprint
+import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.PaidPartnershipAdFingerprint
+import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.ShoppingAdFingerprint
+import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Patch
+@Name("hide-timeline-ads")
+@Description("Removes ads from the timeline.")
+@Compatibility([Package("com.instagram.android")])
+@Version("0.0.1")
+class HideTimelineAdsPatch : BytecodePatch(
+    listOf(
+        ShowAdFingerprint,
+        MediaFingerprint,
+        PaidPartnershipAdFingerprint // Unlike the other ads this one is resolved from all classes.
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        // region Resolve required methods to check for ads.
+
+        ShowAdFingerprint.result ?: return ShowAdFingerprint.toErrorResult()
+
+        PaidPartnershipAdFingerprint.result ?: return PaidPartnershipAdFingerprint.toErrorResult()
+
+        MediaFingerprint.result?.let {
+            GenericMediaAdFingerprint.resolve(context, it.classDef)
+            ShoppingAdFingerprint.resolve(context, it.classDef)
+
+            return@let
+        } ?: return MediaFingerprint.toErrorResult()
+
+        // endregion
+
+        ShowAdFingerprint.result!!.apply {
+            // region Create instructions.
+
+            val scanStart = scanResult.patternScanResult!!.startIndex
+            val jumpIndex = scanStart - 1
+
+            val mediaInstanceRegister = (mutableMethod.instruction(scanStart) as FiveRegisterInstruction).registerC
+            val freeRegister = (mutableMethod.instruction(jumpIndex) as OneRegisterInstruction).registerA
+
+            val returnFalseLabel = "an_ad"
+
+            val checkForAdInstructions =
+                listOf(GenericMediaAdFingerprint, PaidPartnershipAdFingerprint, ShoppingAdFingerprint)
+                    .map(MediaAdFingerprint::toString)
+                    .joinToString("\n") {
+                        """ 
+                            invoke-virtual {v$mediaInstanceRegister}, $it
+                            move-result v$freeRegister
+                            if-nez v$freeRegister, :$returnFalseLabel
+                        """.trimIndent()
+                    }.let { "$it\nconst/4 v0, 0x1\nreturn v0" }
+
+            // endregion
+
+            // region Patch.
+
+            val insertIndex = scanStart + 3
+
+            mutableMethod.addInstructions(
+                insertIndex,
+                checkForAdInstructions,
+                listOf(
+                    ExternalLabel(
+                        returnFalseLabel,
+                        mutableMethod.instruction(mutableMethod.implementation!!.instructions.size - 2 /* return false = ad */)
+                    )
+                )
+            )
+
+            // endregion
+
+            // region Jump to checks for ads from previous patch.
+
+            mutableMethod.apply {
+                addInstructions(
+                    jumpIndex + 1,
+                    "if-nez v$freeRegister, :start_check",
+                    listOf(ExternalLabel("start_check", instruction(insertIndex)))
+                )
+            }.removeInstruction(jumpIndex)
+
+            // endregion
+        }
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/reddit/ad/banner/annotations/HideBannerCompatibility.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.reddit.ad.banner.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.reddit.frontpage", arrayOf("2023.05.0")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class HideBannerCompatibility

src/main/kotlin/app/revanced/patches/reddit/ad/banner/patch/HideBannerPatch.kt

@@ -0,0 +1,48 @@
+package app.revanced.patches.reddit.ad.banner.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.reddit.ad.banner.annotations.HideBannerCompatibility
+
+@Patch
+@Name("hide-subreddit-banner")
+@Description("Hides banner ads from comments on subreddits.")
+@HideBannerCompatibility
+@Version("0.0.1")
+class HideBannerPatch : ResourcePatch {
+    override fun execute(context: ResourceContext): PatchResult {
+
+        context.xmlEditor[RESOURCE_FILE_PATH].use {
+            it.file.getElementsByTagName("merge").item(0).childNodes.apply {
+                val attributes = arrayOf("height", "width")
+
+                for (i in 1 until length) {
+                    val view = item(i)
+                    if (
+                        view.hasAttributes() &&
+                        view.attributes.getNamedItem("android:id").nodeValue.endsWith("ad_view_stub")
+                    ) {
+                        attributes.forEach { attribute ->
+                            view.attributes.getNamedItem("android:layout_$attribute").nodeValue = "0.0dip"
+                        }
+
+                        break
+                    }
+                }
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+
+    private companion object {
+        const val RESOURCE_FILE_PATH = "res/layout/merge_listheader_link_detail.xml"
+    }
+}
+

src/main/kotlin/app/revanced/patches/reddit/ad/general/annotations/GeneralAdsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.reddit.frontpage", arrayOf("2022.43.0")
+        "com.reddit.frontpage", arrayOf("2022.43.0", "2023.05.0")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -87,6 +87,13 @@ class GeneralAdsResourcePatch : ResourcePatch {
                 StringResource("revanced_adremover_compact_banner_enabled_summary_on", "Compact banners are hidden"),
                 StringResource("revanced_adremover_compact_banner_enabled_summary_off", "Compact banners are shown")
             ),
+            SwitchPreference(
+                "revanced_adremover_view_products",
+                StringResource("revanced_adremover_view_products_title", "Hide banner to view products"),
+                true,
+                StringResource("revanced_adremover_view_products_summary_on", "Banner is hidden"),
+                StringResource("revanced_adremover_view_products_summary_off", "Banner is shown")
+            ),
             SwitchPreference(
                 "revanced_adremover_movie",
                 StringResource("revanced_adremover_movie_enabled_title", "Hide movies section"),

src/main/kotlin/app/revanced/patches/youtube/misc/microg/shared/Constants.kt

@@ -1,9 +1,9 @@
 package app.revanced.patches.youtube.misc.microg.shared
 
-object Constants {
-    internal const val REVANCED_APP_NAME = "YouTube ReVanced"
-    internal const val REVANCED_PACKAGE_NAME = "app.revanced.android.youtube"
-    internal const val PACKAGE_NAME = "com.google.android.youtube"
-    internal const val SPOOFED_PACKAGE_NAME = PACKAGE_NAME
-    internal const val SPOOFED_PACKAGE_SIGNATURE = "24bb24c05e47e0aefa68a58a766179d9b613a600"
+internal object Constants {
+    const val REVANCED_APP_NAME = "YouTube ReVanced"
+    const val REVANCED_PACKAGE_NAME = "app.revanced.android.youtube"
+    const val PACKAGE_NAME = "com.google.android.youtube"
+    const val SPOOFED_PACKAGE_NAME = PACKAGE_NAME
+    const val SPOOFED_PACKAGE_SIGNATURE = "24bb24c05e47e0aefa68a58a766179d9b613a600"
 }

src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/KidsMinimizedPlaybackPolicyControllerFingerprint.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-object MinimizedPlaybackKidsFingerprint : MethodFingerprint(
+object KidsMinimizedPlaybackPolicyControllerFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PUBLIC or AccessFlags.FINAL,
     listOf("I", "L", "L"),

src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/PipControllerFingerprint.kt

@@ -0,0 +1,16 @@
+package app.revanced.patches.youtube.misc.minimizedplayback.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 PipControllerFingerprint : MethodFingerprint(
+    returnType = "L",
+    access = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf("L"),
+    opcodes = listOf(
+        Opcode.IGET_BOOLEAN
+    ),
+    customFingerprint = { it.definingClass.endsWith("DefaultPipController;") }
+)

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

@@ -1,38 +1,46 @@
 package app.revanced.patches.youtube.misc.minimizedplayback.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.data.toMethodWalker
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.instruction
 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.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.minimizedplayback.annotations.MinimizedPlaybackCompatibility
-import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackKidsFingerprint
-import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
-import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackSettingsFingerprint
-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.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.minimizedplayback.annotations.MinimizedPlaybackCompatibility
+import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.KidsMinimizedPlaybackPolicyControllerFingerprint
+import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
+import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackSettingsFingerprint
+import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.PipControllerFingerprint
+import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
 import org.jf.dexlib2.iface.reference.MethodReference
 
 
 @Patch
 @Name("minimized-playback")
 @Description("Enables minimized and background playback.")
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
+@DependsOn([IntegrationsPatch::class, PlayerTypeHookPatch::class, SettingsPatch::class])
 @MinimizedPlaybackCompatibility
 @Version("0.0.1")
 class MinimizedPlaybackPatch : BytecodePatch(
     listOf(
-        MinimizedPlaybackKidsFingerprint, MinimizedPlaybackManagerFingerprint, MinimizedPlaybackSettingsFingerprint
+        KidsMinimizedPlaybackPolicyControllerFingerprint,
+        MinimizedPlaybackManagerFingerprint,
+        MinimizedPlaybackSettingsFingerprint,
+        PipControllerFingerprint
     )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
@@ -46,15 +54,15 @@ class MinimizedPlaybackPatch : BytecodePatch(
             )
         )
 
-        // 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
+        MinimizedPlaybackManagerFingerprint.result?.apply {
+            mutableMethod.addInstructions(
+                0, """
+                invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->isMinimizedPlaybackEnabled()Z
                 move-result v0
                 return v0
                 """
-        )
+            )
+        } ?: return MinimizedPlaybackManagerFingerprint.toErrorResult()
 
         val method = MinimizedPlaybackSettingsFingerprint.result!!.mutableMethod
         val booleanCalls = method.implementation!!.instructions.withIndex()
@@ -66,23 +74,42 @@ class MinimizedPlaybackPatch : BytecodePatch(
 
         settingsBooleanMethod.addInstructions(
             0, """
-                invoke-static {}, Lapp/revanced/integrations/patches/MinimizedPlaybackPatch;->isMinimizedPlaybackEnabled()Z
+                invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->isMinimizedPlaybackEnabled()Z
                 move-result v0
                 return v0
                 """
         )
 
-        MinimizedPlaybackKidsFingerprint.result!!.mutableMethod.addInstructions(
-            0, """
-                invoke-static {}, Lapp/revanced/integrations/patches/MinimizedPlaybackPatch;->isMinimizedPlaybackEnabled()Z
+        KidsMinimizedPlaybackPolicyControllerFingerprint.result?.apply {
+            mutableMethod.addInstructions(
+                0, """
+                invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->isMinimizedPlaybackEnabled()Z
                 move-result v0
                 if-eqz v0, :enable
                 return-void
                 :enable
                 nop
                 """
-        )
+            )
+        } ?: return KidsMinimizedPlaybackPolicyControllerFingerprint.toErrorResult()
 
+        PipControllerFingerprint.result?.apply {
+            val insertIndex = scanResult.patternScanResult!!.endIndex + 1
+            val pipEnabledRegister = (mutableMethod.instruction(insertIndex - 1) as TwoRegisterInstruction).registerA
+
+            mutableMethod.addInstructions(
+                insertIndex,
+                """
+                    invoke-static {v$pipEnabledRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->isNotPlayingShorts(Z)Z
+                    move-result v$pipEnabledRegister
+                """
+            )
+
+        } ?: return PipControllerFingerprint.toErrorResult()
         return PatchResultSuccess()
     }
+
+    private companion object {
+        const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/MinimizedPlaybackPatch;"
+    }
 }

src/main/kotlin/app/revanced/patches/yuka/misc/unlockpremium/annotations/UnlockPremiumCompatibility.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.yuka.misc.unlockpremium.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("io.yuka.android")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class UnlockPremiumCompatibility

src/main/kotlin/app/revanced/patches/yuka/misc/unlockpremium/fingerprints/IsPremiumFingerprint.kt

@@ -0,0 +1,15 @@
+package app.revanced.patches.yuka.misc.unlockpremium.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 IsPremiumFingerprint : MethodFingerprint(
+    returnType = "Z",
+    access = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    opcodes = listOf(
+        Opcode.IGET_BOOLEAN,
+        Opcode.RETURN,
+    )
+)

src/main/kotlin/app/revanced/patches/yuka/misc/unlockpremium/fingerprints/YukaUserConstructorFingerprint.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.yuka.misc.unlockpremium.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object YukaUserConstructorFingerprint : MethodFingerprint(
+    returnType = "V",
+    access = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    strings = listOf(
+        "premiumProvider"
+    )
+)

src/main/kotlin/app/revanced/patches/yuka/misc/unlockpremium/patch/UnlockPremiunPatch.kt

@@ -0,0 +1,41 @@
+package app.revanced.patches.yuka.misc.unlockpremium.patch
+
+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.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+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.patches.yuka.misc.unlockpremium.annotations.UnlockPremiumCompatibility
+import app.revanced.patches.yuka.misc.unlockpremium.fingerprints.IsPremiumFingerprint
+import app.revanced.patches.yuka.misc.unlockpremium.fingerprints.YukaUserConstructorFingerprint
+
+@Patch
+@Name("unlock-premium")
+@Description("Unlocks premium features.")
+@UnlockPremiumCompatibility
+@Version("0.0.1")
+class UnlockPremiunPatch : BytecodePatch(
+    listOf(
+        YukaUserConstructorFingerprint
+    )
+) {
+
+    override fun execute(context: BytecodeContext): PatchResult {
+        IsPremiumFingerprint.resolve(context,YukaUserConstructorFingerprint.result!!.classDef)
+        val method = IsPremiumFingerprint.result!!.mutableMethod
+        method.addInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """
+        )
+        return PatchResultSuccess()
+    }
+
+}