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

# [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 ([daf125a](daf125a863))

CHANGELOG.md

@@ -1,3 +1,88 @@
+# [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)
+
+
+### Bug Fixes
+
+* Fix builds ([d7b8149](https://github.com/ReVanced/revanced-patches/commit/d7b8149b0a8dad4e2c201b2f514d298bc6b97f54))
+* **YouTube - ReturnYouTubeDislike:** Fix dislikes not showing on Shorts ([#3133](https://github.com/ReVanced/revanced-patches/issues/3133)) ([0e8a286](https://github.com/ReVanced/revanced-patches/commit/0e8a2868e8e4328a6f02fa31537abc5e5ed220eb))
+* **YouTube - Spoof app version:** Recommend clearing the app data after turning off spoofing ([#3134](https://github.com/ReVanced/revanced-patches/issues/3134)) ([166bf5b](https://github.com/ReVanced/revanced-patches/commit/166bf5b1aec5f8868b3895f7e24d2abc9037a7de))
+
+
+### Features
+
+* **CieID:** Add `bypass root check` patch ([#3011](https://github.com/ReVanced/revanced-patches/issues/3011)) ([20cfa8a](https://github.com/ReVanced/revanced-patches/commit/20cfa8a5cdebc7e81128c820a2aa01415a068320))
+* Do not support reading options from a properties file ([3d1c0c1](https://github.com/ReVanced/revanced-patches/commit/3d1c0c1a958271c358755220b97b9dd92eb81d54))
+* Improve option descriptions and titles ([9f86daa](https://github.com/ReVanced/revanced-patches/commit/9f86daa82271591bcaa9144d300a4810458fdd28))
+
+# [2.194.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v2.194.0-dev.2...v2.194.0-dev.3) (2023-10-12)
+
+
+### Bug Fixes
+
+* Fix builds ([d7b8149](https://github.com/ReVanced/revanced-patches/commit/d7b8149b0a8dad4e2c201b2f514d298bc6b97f54))
+
+
+### Features
+
+* **CieID:** Add `bypass root check` patch ([#3011](https://github.com/ReVanced/revanced-patches/issues/3011)) ([20cfa8a](https://github.com/ReVanced/revanced-patches/commit/20cfa8a5cdebc7e81128c820a2aa01415a068320))
+
+# [2.194.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v2.194.0-dev.1...v2.194.0-dev.2) (2023-10-12)
+
+
+### Bug Fixes
+
+* **YouTube - ReturnYouTubeDislike:** Fix dislikes not showing on Shorts ([#3133](https://github.com/ReVanced/revanced-patches/issues/3133)) ([0e8a286](https://github.com/ReVanced/revanced-patches/commit/0e8a2868e8e4328a6f02fa31537abc5e5ed220eb))
+
+# [2.194.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.193.1-dev.2...v2.194.0-dev.1) (2023-10-12)
+
+
+### Features
+
+* Do not support reading options from a properties file ([3d1c0c1](https://github.com/ReVanced/revanced-patches/commit/3d1c0c1a958271c358755220b97b9dd92eb81d54))
+* Improve option descriptions and titles ([9f86daa](https://github.com/ReVanced/revanced-patches/commit/9f86daa82271591bcaa9144d300a4810458fdd28))
+
+## [2.193.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v2.193.1-dev.1...v2.193.1-dev.2) (2023-10-11)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof app version:** Recommend clearing the app data after turning off spoofing ([#3134](https://github.com/ReVanced/revanced-patches/issues/3134)) ([166bf5b](https://github.com/ReVanced/revanced-patches/commit/166bf5b1aec5f8868b3895f7e24d2abc9037a7de))
+
+## [2.193.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.193.0...v2.193.1-dev.1) (2023-10-09)
+
+# [2.193.0](https://github.com/ReVanced/revanced-patches/compare/v2.192.0...v2.193.0) (2023-10-08)
+
+
+### Bug Fixes
+
+* **Boost for Reddit - Spoof client:** Set user-agent for OAuth requests to fix login ([2223951](https://github.com/ReVanced/revanced-patches/commit/2223951fa16011d735ef4c4cda11eba13403f62d))
+* Consolidate patches ([#3098](https://github.com/ReVanced/revanced-patches/issues/3098)) ([02f767d](https://github.com/ReVanced/revanced-patches/commit/02f767df3cd1b2d0155e7360d2b26fa5d1cfcace))
+* **Infinity for Reddit - Spoof client:** Set user-agent for OAuth requests to fix login ([a710f05](https://github.com/ReVanced/revanced-patches/commit/a710f05bb46156e66ca56aa4731e1028f459c414))
+* **Sync for Reddit - Spoof client:** Set user-agent for OAuth requests to fix login ([a48c4a7](https://github.com/ReVanced/revanced-patches/commit/a48c4a7cc1dbb3ecfce2e345240bca8142740b77))
+* **YouTube:** Sort settings alphabetically despite punctuation ([#3097](https://github.com/ReVanced/revanced-patches/issues/3097)) ([46e3c97](https://github.com/ReVanced/revanced-patches/commit/46e3c97d24e282e4d7d444603af4fb475ae03315))
+
+
+### Features
+
+* **YouTube - Hide shorts components:** Hide subscribe button when paused separately from subscribe button ([52d07ec](https://github.com/ReVanced/revanced-patches/commit/52d07ecd39b1c37cfbfbfa699ccbef849600d9f8))
+* **YouTube - Return YouTube Dislike:** Support version `18.37.36` ([#3061](https://github.com/ReVanced/revanced-patches/issues/3061)) ([fe11db7](https://github.com/ReVanced/revanced-patches/commit/fe11db70eafb481db87231d3db22eafbaa479871))
+* **YouTube:** Add `Disable fine scrubbing gesture` patch ([6c9baf2](https://github.com/ReVanced/revanced-patches/commit/6c9baf22614b1be4870be684915445f7a138cf31))
+* **YouTube:** Bump compatibility to `18.38.44` ([#3071](https://github.com/ReVanced/revanced-patches/issues/3071)) ([a73868c](https://github.com/ReVanced/revanced-patches/commit/a73868cb270295c871a9f1e4d543f728d6152146))
+
 # [2.193.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v2.193.0-dev.6...v2.193.0-dev.7) (2023-10-08)
 
 

build.gradle.kts

@@ -9,13 +9,7 @@ repositories {
     mavenCentral()
     mavenLocal()
     google()
-    maven {
-        url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
-        credentials {
-            username = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
-            password = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")
-        }
-    }
+    maven { url = uri("https://jitpack.io") }
     // Required for FlexVer-Java
     maven {
         url = uri("https://repo.sleeping.town")

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 2.193.0-dev.7
+version = 2.195.0-dev.1

gradle/libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
-revanced-patcher = "16.0.1"
-revanced-patch-annotation-processor = "16.0.1"
+revanced-patcher = "17.0.0"
+revanced-patch-annotation-processor = "17.0.0"
 ksp = "1.9.0-1.0.11"
 smali = "3.0.3"
 guava = "32.1.2-jre"
 gson = "2.10.1"
 
 [libraries]
-revanced-patcher = { module = "app.revanced:revanced-patcher", version.ref = "revanced-patcher" }
-revanced-patch-annotation-processor = { module = "app.revanced:revanced-patch-annotation-processor", version.ref = "revanced-patch-annotation-processor" }
+revanced-patcher = { module = "app.revanced.revanced-patcher:revanced-patcher", version.ref = "revanced-patcher" }
+revanced-patch-annotation-processor = { module = "app.revanced.revanced-patcher:revanced-patch-annotation-processor", version.ref = "revanced-patch-annotation-processor" }
 smali = { module = "com.android.tools.smali:smali", version.ref = "smali" }
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }

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
 
 
 /**

src/main/kotlin/app/revanced/patches/cieid/restrictions/root/BypassRootChecksPatch.kt

@@ -0,0 +1,24 @@
+package app.revanced.patches.cieid.restrictions.root
+
+import app.revanced.extensions.exception
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.cieid.restrictions.root.fingerprints.CheckRootFingerprint
+
+@Patch(
+    name = "Bypass root checks",
+    description = "Removes the restriction to use the app with root permissions or on a custom ROM.",
+    compatiblePackages = [CompatiblePackage("it.ipzs.cieid")]
+)
+@Suppress("unused")
+object BypassRootChecksPatch : BytecodePatch(
+    setOf(CheckRootFingerprint)
+) {
+    override fun execute(context: BytecodeContext) {
+        CheckRootFingerprint.result?.mutableMethod?.addInstruction(1, "return-void")
+            ?: throw CheckRootFingerprint.exception
+    }
+}

src/main/kotlin/app/revanced/patches/cieid/restrictions/root/fingerprints/CheckRootFingerprint.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.cieid.restrictions.root.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object CheckRootFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef, _ ->
+        methodDef.definingClass == "Lit/ipzs/cieid/BaseActivity;" && methodDef.name == "onResume"
+    }
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/AbstractSpoofClientPatch.kt

@@ -1,19 +1,14 @@
 package app.revanced.patches.reddit.customclients
 
-import android.os.Environment
 import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchException
-import app.revanced.patcher.patch.options.PatchOptionException
 import app.revanced.patcher.patch.options.types.StringPatchOption.Companion.stringPatchOption
-import java.io.File
-import java.util.*
 
 abstract class AbstractSpoofClientPatch(
-    private val redirectUri: String,
+    redirectUri: String,
     private val clientIdFingerprints: List<MethodFingerprint>,
     private val userAgentFingerprints: List<MethodFingerprint>? = null,
     private val miscellaneousFingerprints: List<MethodFingerprint>? = null
@@ -34,59 +29,6 @@ abstract class AbstractSpoofClientPatch(
     )
 
     override fun execute(context: BytecodeContext) {
-        val requiredOptions = options.values.filter { it.required }
-
-        val isAndroidButRequiredOptionsUnset = try {
-            Class.forName("android.os.Environment")
-
-            requiredOptions.any { it.value == null }
-        } catch (_: ClassNotFoundException) {
-            false
-        }
-
-        if (isAndroidButRequiredOptionsUnset) {
-            val properties = Properties()
-
-            val propertiesFile = File(
-                Environment.getExternalStorageDirectory(),
-                "revanced_client_spoof_${redirectUri.hashCode()}.properties"
-            )
-            if (propertiesFile.exists()) {
-                properties.load(propertiesFile.inputStream())
-
-                // Set options from properties file.
-                properties.forEach { (name, value) ->
-                    try {
-                        options[name.toString()] = value.toString().trim()
-                    } catch (_: PatchOptionException.PatchOptionNotFoundException) {
-                        // Ignore unknown options.
-                    }
-                }
-            } else {
-                options.keys.forEach { properties.setProperty(it, "") }
-
-                properties.store(
-                    propertiesFile.outputStream(),
-                    "Options for the ReVanced \"Client Spoof\" patch. Required options: " +
-                            requiredOptions.joinToString { it.key }
-                )
-            }
-
-            requiredOptions.filter { it.value == null }.let { requiredUnsetOptions ->
-                if (requiredUnsetOptions.isEmpty()) return@let
-
-                val error = """
-                    In order to use this patch, you need to provide the following options:
-                    ${requiredUnsetOptions.joinToString("\n") { "${it.key}: ${it.description}" }}
-
-                    A properties file has been created at ${propertiesFile.absolutePath}.
-                    Please fill in the required options before using this patch.
-                """.trimIndent()
-
-                throw PatchException(error)
-            }
-        }
-
         fun List<MethodFingerprint>?.executePatch(
             patch: List<MethodFingerprintResult>.(BytecodeContext) -> Unit
         ) = this?.map { it.result ?: throw it.exception }?.patch(context)

src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt

@@ -12,7 +12,7 @@ import java.nio.file.Files
 
 @Patch(
     name = "Custom branding",
-    description = "Changes the YouTube launcher icon and name to your choice (defaults to ReVanced).",
+    description = "Changes the app icon and name to your choice (defaults to YouTube ReVanced and the ReVanced logo).",
     compatiblePackages = [
         CompatiblePackage("com.google.android.youtube")
     ],
@@ -20,19 +20,42 @@ import java.nio.file.Files
 )
 @Suppress("unused")
 object CustomBrandingPatch : ResourcePatch() {
+    private val iconResourceFileNames = arrayOf(
+        "adaptiveproduct_youtube_background_color_108",
+        "adaptiveproduct_youtube_foreground_color_108",
+        "ic_launcher",
+        "ic_launcher_round"
+    ).map { "$it.png" }.toTypedArray()
+
+    private val mipmapDirectories = arrayOf(
+        "xxxhdpi",
+        "xxhdpi",
+        "xhdpi",
+        "hdpi",
+        "mdpi"
+    ).map { "mipmap-$it" }
+
     private var appName by stringPatchOption(
         key = "appName",
         default = "YouTube ReVanced",
-        title = "Application Name",
-        description = "The name of the application it will show on your home screen.",
+        title = "App name",
+        description = "The name of the app.",
         required = true
     )
 
     private var iconPath by stringPatchOption(
         key = "iconPath",
         default = null,
-        title = "App Icon Path",
-        description = "A path containing mipmap resource folders with icons."
+        title = "App icon path",
+        description =  """
+            The path to a folder containing the following folders:
+            
+            ${mipmapDirectories.joinToString("\n") { "- $it" }}
+            
+            Each of these folders has to have the following files:
+            
+            ${iconResourceFileNames.joinToString("\n") { "- $it" }}
+        """.trimIndent()
     )
 
     override fun execute(context: ResourceContext) {
@@ -55,24 +78,14 @@ object CustomBrandingPatch : ResourcePatch() {
             } ?: resourceGroups.forEach { context.copyResources("branding", it) }
         }
 
-        val iconResourceFileNames = arrayOf(
-            "adaptiveproduct_youtube_background_color_108",
-            "adaptiveproduct_youtube_foreground_color_108",
-            "ic_launcher",
-            "ic_launcher_round"
-        ).map { "$it.png" }.toTypedArray()
-
         fun createGroup(directory: String) = ResourceUtils.ResourceGroup(
             directory, *iconResourceFileNames
         )
 
-        // change the app icon
-        arrayOf("xxxhdpi", "xxhdpi", "xhdpi", "hdpi", "mdpi")
-            .map { "mipmap-$it" }
-            .map(::createGroup)
-            .let(::copyResources)
+        // Change the app icon.
+        mipmapDirectories.map(::createGroup).let(::copyResources)
 
-        // change the name of the app
+        // Change the app name.
         val manifest = context["AndroidManifest.xml"]
         manifest.writeText(
             manifest.readText()

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
     }
 }

src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/fingerprints/PlayerOverlayFingerprint.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")
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/fingerprints/ShowWatermarkFingerprint.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")
 )

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
-            """
-        )
-    }
-}

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
 

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)
     }
 )

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

@@ -184,6 +184,9 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
         // Filter that parses the video id from the UI
         LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
 
+        // Player response video id is needed to search for the video ids in Shorts litho components.
+        VideoIdPatch.hookPlayerResponseVideoId("$FILTER_CLASS_DESCRIPTOR->newPlayerResponseVideoId(Ljava/lang/String;)V")
+
         // endregion
 
         // region Hook old UI layout dislikes, for the older app spoofs used with spoof-app-version.

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,

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)
     }
 )

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

@@ -51,7 +51,7 @@ object SpoofAppVersionPatch : BytecodePatch(
                 StringResource("revanced_spoof_app_version_user_dialog_message",
                 "App version will be spoofed to an older version of YouTube."
                         + "\\n\\nThis will change the appearance and features of the app, but unknown side effects may occur."
-                        + "\\n\\nIf later turned off, the old UI may remain until the app data is cleared.")
+                        + "\\n\\nIf later turned off, it is recommended to clear the app data to prevent UI bugs.")
             ),
             ListPreference(
                 "revanced_spoof_app_version_target",
@@ -62,19 +62,21 @@ object SpoofAppVersionPatch : BytecodePatch(
                 ArrayResource(
                     "revanced_spoof_app_version_target_entries",
                     listOf(
-                        StringResource("revanced_spoof_app_version_target_entry_1", "18.20.39 - Restore wide video speed & quality menu"),
-                        StringResource("revanced_spoof_app_version_target_entry_2", "17.08.35 - Restore old UI layout"),
-                        StringResource("revanced_spoof_app_version_target_entry_3", "16.08.35 - Restore explore tab"),
-                        StringResource("revanced_spoof_app_version_target_entry_4", "16.01.35 - Restore old Shorts player"),
+                        StringResource("revanced_spoof_app_version_target_entry_1", "18.33.40 - Restore RYD Shorts incognito mode"),
+                        StringResource("revanced_spoof_app_version_target_entry_2", "18.20.39 - Restore wide video speed & quality menu"),
+                        StringResource("revanced_spoof_app_version_target_entry_3", "17.08.35 - Restore old UI layout"),
+                        StringResource("revanced_spoof_app_version_target_entry_4", "16.08.35 - Restore explore tab"),
+                        StringResource("revanced_spoof_app_version_target_entry_5", "16.01.35 - Restore old Shorts player"),
                     )
                 ),
                 ArrayResource(
                     "revanced_spoof_app_version_target_entry_values",
                     listOf(
-                        StringResource("revanced_spoof_app_version_target_entry_value_1", "18.20.39"),
-                        StringResource("revanced_spoof_app_version_target_entry_value_2", "17.08.35"),
-                        StringResource("revanced_spoof_app_version_target_entry_value_3", "16.08.35"),
-                        StringResource("revanced_spoof_app_version_target_entry_value_4", "16.01.35"),
+                        StringResource("revanced_spoof_app_version_target_entry_value_1", "18.33.40"),
+                        StringResource("revanced_spoof_app_version_target_entry_value_2", "18.20.39"),
+                        StringResource("revanced_spoof_app_version_target_entry_value_3", "17.08.35"),
+                        StringResource("revanced_spoof_app_version_target_entry_value_4", "16.08.35"),
+                        StringResource("revanced_spoof_app_version_target_entry_value_5", "16.01.35"),
                     )
                 )
             )

src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemeBytecodePatch.kt

@@ -1,40 +1,94 @@
 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",
         default = "@android:color/black",
-        title = "Background color for the dark theme",
+        title = "Dark theme background color",
         description = "The background color of the dark theme. Can be a hex color or a resource reference.",
     )
 
     internal val lightThemeBackgroundColor by stringPatchOption(
         key = "lightThemeBackgroundColor",
         default = "@android:color/white",
-        title = "Background color for the light theme",
+        title = "Light theme background color",
         description = "The background color of the light theme. Can be a hex color or a resource reference.",
     )
 
     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")
     }
 }

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 }
+)

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)
     }
 )

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())
     }
 )

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

@@ -14,8 +14,9 @@
     <string name="revanced_ryd_enable_summary_off">Dislikes are not shown</string>
 
     <string name="revanced_ryd_shorts_title">Show dislikes on Shorts</string>
-    <string name="revanced_ryd_shorts_summary_on">Dislikes shown on Shorts</string>
+    <string name="revanced_ryd_shorts_summary_on">Dislikes shown on Shorts %s</string>
     <string name="revanced_ryd_shorts_summary_off">Dislikes hidden on Shorts</string>
+    <string name="revanced_ryd_shorts_summary_disclaimer">Limitation: Dislikes may not appear in incognito mode</string>
 
     <string name="revanced_ryd_dislike_percentage_title">Dislikes as percentage</string>
     <string name="revanced_ryd_dislike_percentage_summary_on">Dislikes shown as percentage</string>