chore: Merge branch dev to main (#3140)

2024-11-10 09:07:46 +01:00 · 2023-10-20 03:22:27 +02:00 · 2023-10-20 03:22:27 +02:00 · 0b31857a56
commit 0b31857a56
parent 894b5c0ebd 33806a391e
22 changed files with 368 additions and 128 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,45 @@
+# [2.195.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v2.195.0-dev.4...v2.195.0-dev.5) (2023-10-20)
+
+
+### Features
+
+* **YouTube:** Add `Announcements` patch ([#3166](https://github.com/ReVanced/revanced-patches/issues/3166)) ([f977983](https://github.com/ReVanced/revanced-patches/commit/f97798391ffc3477f781d43817664d31cfcd209a))
+
+# [2.195.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v2.195.0-dev.3...v2.195.0-dev.4) (2023-10-19)
+
+
+### Bug Fixes
+
+* **Reddit - Sanitize sharing links:** Restore compatibility with newer versions of the app ([1671d8d](https://github.com/ReVanced/revanced-patches/commit/1671d8d826a08273fae5ccffc4a4ebfef9648fe2))
+
+# [2.195.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v2.195.0-dev.2...v2.195.0-dev.3) (2023-10-19)
+
+
+### Features
+
+* **YouTube:** Add `Spoof device dimensions` patch ([c8d409e](https://github.com/ReVanced/revanced-patches/commit/c8d409e1dbda6ac45fef01912ce7afad1022b4b7))
+
+# [2.195.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v2.195.0-dev.1...v2.195.0-dev.2) (2023-10-14)
+
+
+### Bug Fixes
+
+* Indent option description correctly ([d4a9ea1](https://github.com/ReVanced/revanced-patches/commit/d4a9ea1f6c7ab9d25fd60695cce0965c7b5269a4))
+
+# [2.195.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.194.1-dev.1...v2.195.0-dev.1) (2023-10-13)
+
+
+### Features
+
+* **YouTube - Theme:** Disable gradient loading screen ([90d5877](https://github.com/ReVanced/revanced-patches/commit/90d5877950095b7abacdca979bc7ad709192eee2))
+
+## [2.194.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.194.0...v2.194.1-dev.1) (2023-10-13)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Hide new channel watermark component ([cbfd569](https://github.com/ReVanced/revanced-patches/commit/cbfd5691d31ed144eac1d23de918ab5a6a905dfa))
+
 # [2.194.0](https://github.com/ReVanced/revanced-patches/compare/v2.193.0...v2.194.0) (2023-10-12)


--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -1,6 +1,9 @@
+import org.gradle.kotlin.dsl.support.listFilesOrdered
+
 plugins {
    kotlin("jvm") version "1.8.20"
    alias(libs.plugins.ksp)
+    `maven-publish`
 }

 group = "app.revanced"
@ -27,6 +30,7 @@ dependencies {
    implementation(libs.guava)
    // Used in JsonGenerator.
    implementation(libs.gson)
+
    // A dependency to the Android library unfortunately fails the build, which is why this is required.
    compileOnly(project("dummy"))

@ -40,40 +44,74 @@ kotlin {
 tasks {
    register<DefaultTask>("generateBundle") {
        description = "Generate dex files from build and bundle them in the jar file"
+
        dependsOn(build)

        doLast {
-            val androidHome = System.getenv("ANDROID_HOME") ?: throw GradleException("ANDROID_HOME not found")
-            val d8 = "${androidHome}/build-tools/33.0.1/d8"
-            val input = configurations.archives.get().allArtifacts.files.files.first().absolutePath
-            val work = layout.buildDirectory.dir("libs").get().asFile
+            val d8 = File(System.getenv("ANDROID_HOME")).resolve("build-tools")
+                .listFilesOrdered().last().resolve("d8").absolutePath
+
+            val artifacts = configurations.archives.get().allArtifacts.files.files.first().absolutePath
+            val workingDirectory = layout.buildDirectory.dir("libs").get().asFile

            exec {
-                workingDir = work
-                commandLine = listOf(d8, input)
+                workingDir = workingDirectory
+                commandLine = listOf(d8, artifacts)
            }

            exec {
-                workingDir = work
-                commandLine = listOf("zip", "-u", input, "classes.dex")
+                workingDir = workingDirectory
+                commandLine = listOf("zip", "-u", artifacts, "classes.dex")
            }
        }
    }

    register<JavaExec>("generateMeta") {
        description = "Generate metadata for this bundle"
+
        dependsOn(build)

        classpath = sourceSets["main"].runtimeClasspath
        mainClass.set("app.revanced.meta.PatchesFileGenerator")
    }

-    // Dummy task to fix the Gradle semantic-release plugin.
-    // Remove this if you forked it to support building only.
-    // Tracking issue: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
-    register<DefaultTask>("publish") {
-        group = "publish"
-        description = "Dummy task"
-        dependsOn(named("generateBundle"), named("generateMeta"))
+    // Required to run tasks because Gradle semantic-release plugin runs the publish task.
+    // Tracking: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
+    named("publish") {
+        dependsOn("generateBundle")
+        dependsOn("generateMeta")
+    }
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("revanced-patches-publication") {
+            from(components["java"])
+
+            pom {
+                name = "ReVanced Patches"
+                description = "Patches for ReVanced."
+                url = "https://revanced.app"
+
+                licenses {
+                    license {
+                        name = "GNU General Public License v3.0"
+                        url = "https://www.gnu.org/licenses/gpl-3.0.en.html"
+                    }
+                }
+                developers {
+                    developer {
+                        id = "ReVanced"
+                        name = "ReVanced"
+                        email = "contact@revanced.app"
+                    }
+                }
+                scm {
+                    connection = "scm:git:git://github.com/revanced/revanced-patches.git"
+                    developerConnection = "scm:git:git@github.com:revanced/revanced-patches.git"
+                    url = "https://github.com/revanced/revanced-patches"
+                }
+            }
+        }
    }
 }
--- a/gradle.properties
+++ b/gradle.properties
@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 2.194.0
+version = 2.195.0-dev.5
--- a/patches.json
+++ b/patches.json
--- a/src/main/kotlin/app/revanced/extensions/Extensions.kt
+++ b/src/main/kotlin/app/revanced/extensions/Extensions.kt
@ -7,7 +7,6 @@ import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.shared.mapping.misc.ResourceMappingPatch
-import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.Method
 import com.android.tools.smali.dexlib2.iface.instruction.WideLiteralInstruction
 import com.android.tools.smali.dexlib2.util.MethodUtil
@ -58,38 +57,38 @@ fun MutableMethod.injectHideViewCall(
 )

 /**
- * Find the index of the first constant instruction with the id of the given resource name.
+ * Find the index of the first instruction with the id of the given resource name.
 *
 * @param resourceName the name of the resource to find the id for.
- * @return the index of the first constant instruction with the id of the given resource name, or -1 if not found.
+ * @return the index of the first instruction with the id of the given resource name, or -1 if not found.
 */
 fun Method.findIndexForIdResource(resourceName: String): Int {
    fun getIdResourceId(resourceName: String) = ResourceMappingPatch.resourceMappings.single {
        it.type == "id" && it.name == resourceName
    }.id

-    return indexOfFirstConstantInstructionValue(getIdResourceId(resourceName))
+    return indexOfFirstWideLiteralInstructionValue(getIdResourceId(resourceName))
 }

 /**
- * Find the index of the first constant instruction with the given value.
+ * Find the index of the first wide literal instruction with the given value.
 *
- * @return the first constant instruction with the value, or -1 if not found.
+ * @return the first literal instruction with the value, or -1 if not found.
 */
-fun Method.indexOfFirstConstantInstructionValue(constantValue: Long) = implementation?.let {
+fun Method.indexOfFirstWideLiteralInstructionValue(literal: Long) = implementation?.let {
    it.instructions.indexOfFirst { instruction ->
-        instruction.opcode == Opcode.CONST && (instruction as WideLiteralInstruction).wideLiteral == constantValue
+        (instruction as? WideLiteralInstruction)?.wideLiteral == literal
    }
 } ?: -1


 /**
- * Check if the method contains a constant with the given value.
+ * Check if the method contains a literal with the given value.
 *
- * @return if the method contains a constant with the given value.
+ * @return if the method contains a literal with the given value.
 */
-fun Method.containsConstantInstructionValue(constantValue: Long) =
-    indexOfFirstConstantInstructionValue(constantValue) >= 0
+fun Method.containsWideLiteralInstructionValue(literal: Long) =
+    indexOfFirstWideLiteralInstructionValue(literal) >= 0


 /**
--- a/src/main/kotlin/app/revanced/patches/reddit/misc/tracking/url/fingerprints/ShareLinkFormatterFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/misc/tracking/url/fingerprints/ShareLinkFormatterFingerprint.kt
@ -3,7 +3,7 @@ package app.revanced.patches.reddit.misc.tracking.url.fingerprints
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

 object ShareLinkFormatterFingerprint : MethodFingerprint(
-    returnType = "Ljava/lang/String;",
-    parameters = listOf("Ljava/lang/String;", "Ljava/util/Map;"),
-    strings = listOf("uri.getQueryParameters(name)", "uri.queryParameterNames", "newUriBuilder.build().toString()"),
+    customFingerprint = { methodDef, classDef ->
+        methodDef.definingClass.startsWith("Lcom/reddit/sharing/") && classDef.sourceFile == "UrlUtil.kt"
+    }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt
@ -55,7 +55,10 @@ object CustomBrandingPatch : ResourcePatch() {
            Each of these folders has to have the following files:

            ${iconResourceFileNames.joinToString("\n") { "- $it" }}
-        """.trimIndent()
+        """
+            .split("\n")
+            .joinToString("\n") { it.trimIndent() } // Remove the leading whitespace from each line.
+            .trimIndent(), // Remove the leading newline.
    )

    override fun execute(context: ResourceContext) {
--- 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
@ -2,9 +2,12 @@ package app.revanced.patches.youtube.layout.hide.general

 import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 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.removeInstruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
@ -14,6 +17,8 @@ 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.youtube.layout.hide.general.fingerprints.ParseElementFromBufferFingerprint
+import app.revanced.patches.youtube.layout.hide.general.fingerprints.PlayerOverlayFingerprint
+import app.revanced.patches.youtube.layout.hide.general.fingerprints.ShowWatermarkFingerprint
 import app.revanced.patches.youtube.misc.litho.filter.LithoFilterPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch.PreferenceScreen
@ -39,7 +44,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 )
@Suppress("unused")
 object HideLayoutComponentsPatch : BytecodePatch(
-    setOf(ParseElementFromBufferFingerprint)
+    setOf(ParseElementFromBufferFingerprint, PlayerOverlayFingerprint)
 ) {
    private const val FILTER_CLASS_DESCRIPTOR =
        "Lapp/revanced/integrations/patches/components/LayoutComponentsFilter;"
@ -58,7 +63,15 @@ object HideLayoutComponentsPatch : BytecodePatch(
                StringResource("revanced_hide_join_membership_button_summary_on", "Button is hidden"),
                StringResource("revanced_hide_join_membership_button_summary_off", "Button is shown")
            ),
-
+            SwitchPreference(
+                "revanced_hide_channel_watermark_title",
+                StringResource(
+                    "revanced_hide_channel_watermark_title",
+                    "Hide channel watermark in video player"
+                ),
+                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_notify_me_button",
                StringResource("revanced_hide_notify_me_button_title", "Hide \\\'Notify me\\\' button"),
@ -316,5 +329,24 @@ object HideLayoutComponentsPatch : BytecodePatch(
        } ?: throw ParseElementFromBufferFingerprint.exception

        // endregion
+
+        // region Watermark (legacy code for old versions of YouTube)
+
+        ShowWatermarkFingerprint.also {
+            it.resolve(context, PlayerOverlayFingerprint.result?.classDef ?: throw PlayerOverlayFingerprint.exception)
+        }.result?.mutableMethod?.apply {
+            val index = implementation!!.instructions.size - 5
+
+            removeInstruction(index)
+            addInstructions(
+                index,
+                """
+                    invoke-static {}, $FILTER_CLASS_DESCRIPTOR->showWatermark()Z
+                    move-result p2
+                """
+            )
+        } ?: throw ShowWatermarkFingerprint.exception
+
+        // endregion
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/watermark/fingerprints/HideWatermarkParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/watermark/fingerprints/HideWatermarkParentFingerprint.kt
@ -1,9 +1,9 @@
-package app.revanced.patches.youtube.layout.hide.watermark.fingerprints
+package app.revanced.patches.youtube.layout.hide.general.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

-object HideWatermarkParentFingerprint : MethodFingerprint (
+object PlayerOverlayFingerprint : MethodFingerprint (
    "L", AccessFlags.PUBLIC or AccessFlags.FINAL, strings = listOf("player_overlay_in_video_programming")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/watermark/fingerprints/HideWatermarkFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/watermark/fingerprints/HideWatermarkFingerprint.kt
@ -1,9 +1,9 @@
-package app.revanced.patches.youtube.layout.hide.watermark.fingerprints
+package app.revanced.patches.youtube.layout.hide.general.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

-object HideWatermarkFingerprint : MethodFingerprint (
+object ShowWatermarkFingerprint : MethodFingerprint (
    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/watermark/HideWatermarkPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/watermark/HideWatermarkPatch.kt
@ -1,68 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.watermark
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchException
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.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.hide.watermark.fingerprints.HideWatermarkFingerprint
-import app.revanced.patches.youtube.layout.hide.watermark.fingerprints.HideWatermarkParentFingerprint
-import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.SettingsPatch
-
-@Patch(
-    name = "Hide watermark",
-    description = "Hides creator's watermarks on videos.",
-    dependencies = [IntegrationsPatch::class, SettingsPatch::class],
-    compatiblePackages = [
-        CompatiblePackage(
-            "com.google.android.youtube",
-            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
-                "18.32.39",
-                "18.37.36",
-                "18.38.44"
-            ]
-        )
-    ]
-)
-@Suppress("unused")
-object HideWatermarkPatch : BytecodePatch(
-    setOf(HideWatermarkParentFingerprint)
-) {
-    override fun execute(context: BytecodeContext) {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_video_watermark",
-                StringResource("revanced_hide_video_watermark_title", "Hide creator watermark on videos"),
-                StringResource("revanced_hide_video_watermark_summary_on", "Watermark is hidden"),
-                StringResource("revanced_hide_video_watermark_summary_off", "Watermark is shown")
-            )
-        )
-
-        HideWatermarkFingerprint.resolve(context, HideWatermarkParentFingerprint.result!!.classDef)
-        val result = HideWatermarkFingerprint.result
-            ?: throw PatchException("Required parent method could not be found.")
-
-        val method = result.mutableMethod
-        val line = method.implementation!!.instructions.size - 5
-
-        method.removeInstruction(line)
-        method.addInstructions(
-            line,
-            """
-                invoke-static {}, Lapp/revanced/integrations/patches/BrandingWaterMarkPatch;->isBrandingWatermarkShown()Z
-                move-result p2
-            """
-        )
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/overlay/CustomPlayerOverlayOpacityPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/overlay/CustomPlayerOverlayOpacityPatch.kt
@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.player.overlay

 import app.revanced.extensions.exception
-import app.revanced.extensions.indexOfFirstConstantInstructionValue
+import app.revanced.extensions.indexOfFirstWideLiteralInstructionValue
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
@ -27,7 +27,7 @@ object CustomPlayerOverlayOpacityPatch : BytecodePatch(setOf(CreatePlayerOvervie
        CreatePlayerOverviewFingerprint.result?.let { result ->
            result.mutableMethod.apply {
                val viewRegisterIndex =
-                    indexOfFirstConstantInstructionValue(CustomPlayerOverlayOpacityResourcePatch.scrimOverlayId) + 3
+                    indexOfFirstWideLiteralInstructionValue(CustomPlayerOverlayOpacityResourcePatch.scrimOverlayId) + 3
                val viewRegister =
                    getInstruction<OneRegisterInstruction>(viewRegisterIndex).registerA

--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/overlay/fingerprints/CreatePlayerOverviewFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/overlay/fingerprints/CreatePlayerOverviewFingerprint.kt
@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.layout.player.overlay.fingerprints

-import app.revanced.extensions.containsConstantInstructionValue
+import app.revanced.extensions.containsWideLiteralInstructionValue
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.layout.player.overlay.CustomPlayerOverlayOpacityResourcePatch
@ -17,6 +17,6 @@ object CreatePlayerOverviewFingerprint : MethodFingerprint(
        Opcode.CHECK_CAST
    ),
    customFingerprint = { methodDef, _ ->
-        methodDef.containsConstantInstructionValue(CustomPlayerOverlayOpacityResourcePatch.scrimOverlayId)
+        methodDef.containsWideLiteralInstructionValue(CustomPlayerOverlayOpacityResourcePatch.scrimOverlayId)
    }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/SeekbarColorBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/SeekbarColorBytecodePatch.kt
@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.layout.seekbar

 import app.revanced.extensions.exception
-import app.revanced.extensions.indexOfFirstConstantInstructionValue
+import app.revanced.extensions.indexOfFirstWideLiteralInstructionValue
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
@ -30,7 +30,7 @@ object SeekbarColorBytecodePatch : BytecodePatch(

    override fun execute(context: BytecodeContext) {
        fun MutableMethod.addColorChangeInstructions(resourceId: Long) {
-            val registerIndex = indexOfFirstConstantInstructionValue(resourceId) + 2
+            val registerIndex = indexOfFirstWideLiteralInstructionValue(resourceId) + 2
            val colorRegister = getInstruction<OneRegisterInstruction>(registerIndex).registerA
            addInstructions(
                registerIndex + 1,
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/fingerprints/PlayerSeekbarColorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/fingerprints/PlayerSeekbarColorFingerprint.kt
@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.layout.seekbar.fingerprints

-import app.revanced.extensions.containsConstantInstructionValue
+import app.revanced.extensions.containsWideLiteralInstructionValue
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.layout.seekbar.SeekbarColorResourcePatch
@ -9,7 +9,7 @@ import com.android.tools.smali.dexlib2.AccessFlags
 object PlayerSeekbarColorFingerprint : MethodFingerprint(
    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
    customFingerprint = { method, _ ->
-        method.containsConstantInstructionValue(SeekbarColorResourcePatch.inlineTimeBarColorizedBarPlayedColorDarkId)
-                && method.containsConstantInstructionValue(SeekbarColorResourcePatch.inlineTimeBarPlayedNotHighlightedColorId)
+        method.containsWideLiteralInstructionValue(SeekbarColorResourcePatch.inlineTimeBarColorizedBarPlayedColorDarkId)
+                && method.containsWideLiteralInstructionValue(SeekbarColorResourcePatch.inlineTimeBarPlayedNotHighlightedColorId)
    }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemeBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemeBytecodePatch.kt
@ -1,24 +1,50 @@
 package app.revanced.patches.youtube.layout.theme

+import app.revanced.extensions.exception
+import app.revanced.extensions.indexOfFirstWideLiteralInstructionValue
 import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.patch.options.types.StringPatchOption.Companion.stringPatchOption
+import app.revanced.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.layout.seekbar.SeekbarColorBytecodePatch
+import app.revanced.patches.youtube.layout.theme.fingerprints.UseGradientLoadingScreenFingerprint
+import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.SettingsPatch
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction

@Patch(
    name = "Theme",
    description = "Applies a custom theme.",
-    dependencies = [LithoColorHookPatch::class, SeekbarColorBytecodePatch::class, ThemeResourcePatch::class],
+    dependencies = [
+        LithoColorHookPatch::class,
+        SeekbarColorBytecodePatch::class,
+        ThemeResourcePatch::class,
+        IntegrationsPatch::class,
+        SettingsPatch::class
+    ],
    compatiblePackages = [
-        CompatiblePackage("com.google.android.youtube")
+        CompatiblePackage(
+            "com.google.android.youtube",
+            [
+                "18.37.36",
+                "18.38.44"
+            ]
+        )
    ]
 )
@Suppress("unused")
-object ThemeBytecodePatch : BytecodePatch() {
+object ThemeBytecodePatch : BytecodePatch(
+    setOf(UseGradientLoadingScreenFingerprint)
+) {
    private const val INTEGRATIONS_CLASS_DESCRIPTOR =
-        "Lapp/revanced/integrations/patches/theme/ThemeLithoComponentsPatch;"
+        "Lapp/revanced/integrations/patches/theme/ThemePatch;"
+
+    internal const val GRADIENT_LOADING_SCREEN_AB_CONSTANT = 45412406L

    internal val darkThemeBackgroundColor by stringPatchOption(
        key = "darkThemeBackgroundColor",
@ -35,6 +61,34 @@ object ThemeBytecodePatch : BytecodePatch() {
    )

    override fun execute(context: BytecodeContext) {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_gradient_loading_screen",
+                StringResource("revanced_gradient_loading_screen_title", "Enable gradient loading screen"),
+                StringResource(
+                    "revanced_gradient_loading_screen_summary_on",
+                    "Loading screen will have a gradient background"
+                ),
+                StringResource(
+                    "revanced_gradient_loading_screen_summary_off",
+                    "Loading screen will have a solid background"
+                ),
+            )
+        )
+
+        UseGradientLoadingScreenFingerprint.result?.mutableMethod?.apply {
+            val isEnabledIndex = indexOfFirstWideLiteralInstructionValue(GRADIENT_LOADING_SCREEN_AB_CONSTANT) + 3
+            val isEnabledRegister = getInstruction<OneRegisterInstruction>(isEnabledIndex - 1).registerA
+
+            addInstructions(
+                isEnabledIndex,
+                """
+                    invoke-static { }, $INTEGRATIONS_CLASS_DESCRIPTOR->gradientLoadingScreenEnabled()Z
+                    move-result v$isEnabledRegister
+                """
+            )
+        } ?: throw UseGradientLoadingScreenFingerprint.exception
+
        LithoColorHookPatch.lithoColorOverrideHook(INTEGRATIONS_CLASS_DESCRIPTOR, "getValue")
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/fingerprints/UseGradientLoadingScreenFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/fingerprints/UseGradientLoadingScreenFingerprint.kt
@ -0,0 +1,8 @@
+package app.revanced.patches.youtube.layout.theme.fingerprints
+
+import app.revanced.patches.youtube.layout.theme.ThemeBytecodePatch.GRADIENT_LOADING_SCREEN_AB_CONSTANT
+import app.revanced.util.patch.LiteralValueFingerprint
+
+object UseGradientLoadingScreenFingerprint : LiteralValueFingerprint(
+    literalSupplier = { GRADIENT_LOADING_SCREEN_AB_CONSTANT }
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch.kt
@ -0,0 +1,61 @@
+package app.revanced.patches.youtube.misc.announcements
+
+import app.revanced.extensions.exception
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstructions
+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.fingerprints.WatchWhileActivityFingerprint
+import app.revanced.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.misc.settings.SettingsPatch
+import com.android.tools.smali.dexlib2.Opcode
+
+@Patch(
+    name = "Announcements",
+    description = "Shows announcements on startup.",
+    compatiblePackages = [CompatiblePackage("com.google.android.youtube")],
+    dependencies = [SettingsPatch::class]
+)
+@Suppress("unused")
+object AnnouncementsPatch : BytecodePatch(
+    setOf(WatchWhileActivityFingerprint)
+) {
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR =
+        "Lapp/revanced/integrations/patches/announcements/AnnouncementsPatch;"
+
+    override fun execute(context: BytecodeContext) {
+        val onCreateMethod = WatchWhileActivityFingerprint.result?.let {
+            it.mutableClass.methods.find { method -> method.name == "onCreate" }
+        } ?: throw WatchWhileActivityFingerprint.exception
+
+        val superCallIndex = onCreateMethod.getInstructions().indexOfFirst { it.opcode == Opcode.INVOKE_SUPER_RANGE }
+
+        onCreateMethod.addInstructions(
+            superCallIndex + 1,
+            "invoke-static { v1 }, $INTEGRATIONS_CLASS_DESCRIPTOR->showAnnouncement(Landroid/app/Activity;)V"
+        )
+
+        SettingsPatch.PreferenceScreen.MISC.addPreferences(
+            SwitchPreference(
+                "revanced_announcements",
+                StringResource(
+                    "revanced_announcements_title",
+                    "Show announcements"
+                ),
+                StringResource(
+                    "revanced_announcements_summary_on",
+                    "Announcements are shown on startup."
+                ), StringResource(
+                    "revanced_announcements_summary_off",
+                    "Announcements are not shown on startup."
+                ), StringResource(
+                    "revanced_announcements_enabled_summary",
+                    "Show announcements on startup."
+                ),
+            )
+        )
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt
@ -0,0 +1,63 @@
+package app.revanced.patches.youtube.misc.dimensions.spoof
+
+import app.revanced.extensions.exception
+import app.revanced.patcher.data.BytecodeContext
+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.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.misc.dimensions.spoof.fingerprints.DeviceDimensionsModelToStringFingerprint
+import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.SettingsPatch
+
+@Patch(
+    name = "Spoof device dimensions",
+    description = "Spoofs the device dimensions in order to unlock higher video qualities " +
+            "that may not be available on your device.",
+    dependencies = [IntegrationsPatch::class, SettingsPatch::class],
+    compatiblePackages = [
+        CompatiblePackage(
+            "com.google.android.youtube",
+            [
+                "18.38.44"
+            ]
+        )
+    ]
+)
+object SpoofDeviceDimensionsPatch : BytecodePatch(
+    setOf(DeviceDimensionsModelToStringFingerprint)
+) {
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR =
+        "Lapp/revanced/integrations/patches/spoof/SpoofDeviceDimensionsPatch;"
+
+    override fun execute(context: BytecodeContext) {
+        SettingsPatch.PreferenceScreen.MISC.addPreferences(
+            SwitchPreference(
+                "revanced_spoof_device_dimensions",
+                StringResource("revanced_spoof_device_dimensions_title", "Spoof device dimensions"),
+                StringResource("revanced_spoof_device_dimensions_summary_on", "Device dimensions spoofed"),
+                StringResource("revanced_spoof_device_dimensions_summary_off", "Device dimensions not spoofed"),
+            )
+        )
+
+        DeviceDimensionsModelToStringFingerprint.result
+            ?.mutableClass?.methods?.find { method -> method.name == "<init>" }
+            // Override the parameters containing the dimensions.
+            ?.addInstructions(
+                1, // Add after super call.
+                mapOf(
+                    1 to "MinHeightOrWidth", // p1 = min height
+                    2 to "MaxHeightOrWidth", // p2 = max height
+                    3 to "MinHeightOrWidth", // p3 = min width
+                    4 to "MaxHeightOrWidth"  // p4 = max width
+                ).map { (parameter, method) ->
+                    """
+                        invoke-static { p$parameter }, $INTEGRATIONS_CLASS_DESCRIPTOR->get$method(I)I
+                        move-result p$parameter
+                    """
+                }.joinToString("\n") { it }
+            ) ?: throw DeviceDimensionsModelToStringFingerprint.exception
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/fingerprints/DeviceDimensionsModelToStringFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/fingerprints/DeviceDimensionsModelToStringFingerprint.kt
@ -0,0 +1,8 @@
+package app.revanced.patches.youtube.misc.dimensions.spoof.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object DeviceDimensionsModelToStringFingerprint : MethodFingerprint(
+    returnType = "L",
+    strings = listOf("minh.", ";maxh.")
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/PlayerResponseModelImplFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/PlayerResponseModelImplFingerprint.kt
@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.misc.fix.playback.fingerprints

-import app.revanced.extensions.containsConstantInstructionValue
+import app.revanced.extensions.containsWideLiteralInstructionValue
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
@ -18,6 +18,6 @@ object PlayerResponseModelImplFingerprint : MethodFingerprint(
    customFingerprint = handler@{ methodDef, _ ->
        if (!methodDef.definingClass.endsWith("/PlayerResponseModelImpl;")) return@handler false

-        methodDef.containsConstantInstructionValue(55735497)
+        methodDef.containsWideLiteralInstructionValue(55735497)
    }
 )
--- a/src/main/kotlin/app/revanced/util/patch/LiteralValueFingerprint.kt
+++ b/src/main/kotlin/app/revanced/util/patch/LiteralValueFingerprint.kt
@ -1,6 +1,6 @@
 package app.revanced.util.patch

-import app.revanced.extensions.containsConstantInstructionValue
+import app.revanced.extensions.containsWideLiteralInstructionValue
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

@ -19,6 +19,6 @@ abstract class LiteralValueFingerprint(
    opcodes = opcodes,
    strings = strings,
    customFingerprint = { methodDef, _ ->
-        methodDef.containsConstantInstructionValue(literalSupplier())
+        methodDef.containsWideLiteralInstructionValue(literalSupplier())
    }
 )