chore(release): 2.186.0-dev.3 [skip ci]

# [2.186.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v2.186.0-dev.2...v2.186.0-dev.3) (2023-07-20)

### Bug Fixes

* **Tiktok - Settings:** get instruction registers dynamically ([#2676](https://github.com/ReVanced/revanced-patches/issues/2676)) ([b3ff7ef](b3ff7efdb2))

CHANGELOG.md

@@ -1,3 +1,47 @@
+# [2.186.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v2.186.0-dev.2...v2.186.0-dev.3) (2023-07-20)
+
+
+### Bug Fixes
+
+* **Tiktok - Settings:** get instruction registers dynamically ([#2676](https://github.com/ReVanced/revanced-patches/issues/2676)) ([b34e45b](https://github.com/ReVanced/revanced-patches/commit/b34e45b6dafad8e9d567ad65f58a182b8cc04676))
+
+# [2.186.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v2.186.0-dev.1...v2.186.0-dev.2) (2023-07-20)
+
+
+### Bug Fixes
+
+* **YouTube - Theme:** apply custom seekbar color to shorts ([#2670](https://github.com/ReVanced/revanced-patches/issues/2670)) ([1f6fe3d](https://github.com/ReVanced/revanced-patches/commit/1f6fe3da4284fd768057ef068c7ddf88d3a11049))
+
+
+### Features
+
+* **Youtube - Theme:** add a switch to enable/disable custom seekbar color ([#2663](https://github.com/ReVanced/revanced-patches/issues/2663)) ([5c39985](https://github.com/ReVanced/revanced-patches/commit/5c39985888cdfe3acfdd8811ff9b6f80e243704e))
+
+# [2.186.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.185.0...v2.186.0-dev.1) (2023-07-20)
+
+
+### Features
+
+* **Twitter:** remove `Hide view stats` patch ([f0d3800](https://github.com/ReVanced/revanced-patches/commit/f0d38001b34db63f212209afb91eebf59dad2b24))
+
+# [2.185.0](https://github.com/ReVanced/revanced-patches/compare/v2.184.0...v2.185.0) (2023-07-20)
+
+
+### Bug Fixes
+
+* allocate for more than eight `LithoFilter` array items ([#2643](https://github.com/ReVanced/revanced-patches/issues/2643)) ([fc8660b](https://github.com/ReVanced/revanced-patches/commit/fc8660b740bec2747e5f82b7321027bb8a51e0cf))
+* **Sync for Reddit - Disable ads:** fix compatibility with latest version ([1456577](https://github.com/ReVanced/revanced-patches/commit/1456577f11c4a7e49d6c1ba0103b919dc487f4cf))
+* **Tiktok - Settings:** bump compatibility ([#2656](https://github.com/ReVanced/revanced-patches/issues/2656)) ([6641356](https://github.com/ReVanced/revanced-patches/commit/6641356d41813a20c77faac67c37ea517690d25b))
+* **TikTok - Show seekbar:** fix seekbar not always showing ([#2660](https://github.com/ReVanced/revanced-patches/issues/2660)) ([f2742f1](https://github.com/ReVanced/revanced-patches/commit/f2742f1ba117809971a10780823fca99c19a4f34))
+* **Trakt - Unlock pro:** constraint to last known working version ([#2662](https://github.com/ReVanced/revanced-patches/issues/2662)) ([324bbde](https://github.com/ReVanced/revanced-patches/commit/324bbde92a851e855c11f266e92fa14c39d88160))
+* **YouTube - Spoof client:** show video time and chapters while using seekbar ([#2607](https://github.com/ReVanced/revanced-patches/issues/2607)) ([9546d12](https://github.com/ReVanced/revanced-patches/commit/9546d126430870d1abd8f43bb687b31b9fcb6fb5))
+* **youtube/sponsorblock:** fix some segments skipping slightly too late ([#2634](https://github.com/ReVanced/revanced-patches/issues/2634)) ([3175431](https://github.com/ReVanced/revanced-patches/commit/31754311870324b1e245b12965d7486878e9eba4))
+
+
+### Features
+
+* **youtube:** rename `video-speed` to `playback-speed` ([#2642](https://github.com/ReVanced/revanced-patches/issues/2642)) ([77e8639](https://github.com/ReVanced/revanced-patches/commit/77e8639b71048f2795f8f32fe18d052b335e3ce4))
+
 # [2.185.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v2.185.0-dev.6...v2.185.0-dev.7) (2023-07-19)
 
 

gradle.properties

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

src/main/kotlin/app/revanced/patches/tiktok/misc/settings/patch/SettingsPatch.kt

@@ -18,7 +18,8 @@ import app.revanced.patches.tiktok.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.tiktok.misc.settings.annotations.SettingsCompatibility
 import app.revanced.patches.tiktok.misc.settings.fingerprints.*
 import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
+import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
+import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 
 @Patch
 @DependsOn([IntegrationsPatch::class])
@@ -45,7 +46,9 @@ class SettingsPatch : BytecodePatch(
         AddSettingsEntryFingerprint.result?.apply {
             scanResult.patternScanResult?.startIndex?.let {
                 val settingsEntries = mutableMethod.getInstruction(it + 3)
-                val addEntry = mutableMethod.getInstruction(it + 5)
+                val addEntry = mutableMethod.getInstruction<BuilderInstruction35c>(it + 5)
+                val register1 = addEntry.registerC
+                val register2 = addEntry.registerD
                 // Add the settings entry created to the settings fragment
                 mutableMethod.addInstructions(
                     it + 6,
@@ -58,10 +61,10 @@ class SettingsPatch : BytecodePatch(
                 mutableMethod.addInstructions(
                     it + 6,
                     """
-                        const-string v1, "$settingsButtonClass"
-                        const-string v2, "$settingsButtonInfoClass"
-                        invoke-static {v1, v2}, $CREATE_SETTINGS_ENTRY_METHOD_DESCRIPTOR
-                        move-result-object v1
+                        const-string v$register1, "$settingsButtonClass"
+                        const-string v$register2, "$settingsButtonInfoClass"
+                        invoke-static {v$register1, v$register2}, $CREATE_SETTINGS_ENTRY_METHOD_DESCRIPTOR
+                        move-result-object v$register2
                     """
                 )
             }
@@ -73,14 +76,15 @@ class SettingsPatch : BytecodePatch(
                 it.opcode == Opcode.INVOKE_SUPER
             } + 1
 
-            val thisRegister = getInstruction<FiveRegisterInstruction>(initializeSettingsIndex - 1).registerC
+            val thisRegister = getInstruction<Instruction35c>(initializeSettingsIndex - 1).registerC
+            val usableRegister = implementation!!.registerCount - parameters.size - 2
 
             addInstructionsWithLabels(
                 initializeSettingsIndex,
                 """
                     invoke-static {v$thisRegister}, $INITIALIZE_SETTINGS_METHOD_DESCRIPTOR
-                    move-result v0
-                    if-eqz v0, :notrevanced
+                    move-result v$usableRegister
+                    if-eqz v$usableRegister, :notrevanced
                     return-void
                 """,
                 ExternalLabel("notrevanced", getInstruction(initializeSettingsIndex))

src/main/kotlin/app/revanced/patches/twitter/layout/hideviews/annotations/HideViewsCompatibility.kt

@@ -1,12 +0,0 @@
-package app.revanced.patches.twitter.layout.hideviews.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.twitter.android", arrayOf("9.69.1-release.0", "9.71.0-release.0")
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideViewsCompatibility

src/main/kotlin/app/revanced/patches/twitter/layout/hideviews/fingerprints/InlineActionTypesFingerprint.kt

@@ -1,15 +0,0 @@
-package app.revanced.patches.twitter.layout.hideviews.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object InlineActionTypesFingerprint : MethodFingerprint(
-    returnType = "Ljava/util/List",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    strings = listOf(
-        "getCurrentMemoizing()",
-        "android_animated_reply_icon_enabled",
-        "reply_voting_android_position_before_favorite_enabled"
-    )
-)

src/main/kotlin/app/revanced/patches/twitter/layout/hideviews/fingerprints/TweetStatsContainerConstructorFingerprint.kt

@@ -1,22 +0,0 @@
-package app.revanced.patches.twitter.layout.hideviews.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 TweetStatsContainerConstructorFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    parameters = listOf("L"),
-    opcodes = listOf(
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.CONST_4,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.INVOKE_VIRTUAL
-    )
-)

src/main/kotlin/app/revanced/patches/twitter/layout/hideviews/fingerprints/TweetStatsContainerWrapperConstructorFingerprint.kt

@@ -1,22 +0,0 @@
-package app.revanced.patches.twitter.layout.hideviews.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 TweetStatsContainerWrapperConstructorFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    parameters = listOf("L"),
-    opcodes = listOf(
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IPUT_OBJECT
-    )
-)

src/main/kotlin/app/revanced/patches/twitter/layout/hideviews/fingerprints/TweetStatsViewDelegateBinderFingerprint.kt

@@ -1,26 +0,0 @@
-package app.revanced.patches.twitter.layout.hideviews.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 TweetStatsViewDelegateBinderFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    opcodes = listOf(
-        Opcode.NEW_INSTANCE,
-        Opcode.CONST_16,
-        Opcode.INVOKE_DIRECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.CONST_16,
-        Opcode.INVOKE_DIRECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.RETURN_OBJECT
-    )
-)

src/main/kotlin/app/revanced/patches/twitter/layout/hideviews/patch/HideViewsBytecodePatch.kt

@@ -1,114 +0,0 @@
-package app.revanced.patches.twitter.layout.hideviews.patch
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.twitter.layout.hideviews.fingerprints.InlineActionTypesFingerprint
-import app.revanced.patches.twitter.layout.hideviews.fingerprints.TweetStatsContainerConstructorFingerprint
-import app.revanced.patches.twitter.layout.hideviews.fingerprints.TweetStatsContainerWrapperConstructorFingerprint
-import app.revanced.patches.twitter.layout.hideviews.fingerprints.TweetStatsViewDelegateBinderFingerprint
-import org.jf.dexlib2.Opcode
-
-class HideViewsBytecodePatch : BytecodePatch(
-    listOf(
-        InlineActionTypesFingerprint,
-        TweetStatsContainerWrapperConstructorFingerprint,
-        TweetStatsContainerConstructorFingerprint,
-        TweetStatsViewDelegateBinderFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        removeViewsFromTimeline(context)
-        removeTweetStatViewInitializer(context)
-        removeTweetStatViewWrapperInitializer(context)
-        removeViewDelegateBinderSubscription()
-        return PatchResultSuccess()
-    }
-
-    private fun removeViewsFromTimeline(context: BytecodeContext) {
-        val addViewsToActionBarMethodFingerprint = object : MethodFingerprint(
-            opcodes = listOf(
-                Opcode.INVOKE_STATIC,
-                Opcode.MOVE_RESULT,
-                Opcode.IF_EQZ,
-                Opcode.SGET_OBJECT,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.IF_EQZ,
-            )
-        ) {}
-        transformMethodAtPattern(
-            context,
-            InlineActionTypesFingerprint,
-            addViewsToActionBarMethodFingerprint
-        ) { patternScanResult, method ->
-            method.removeInstruction(patternScanResult.endIndex - 1)
-        }
-    }
-
-    private fun removeTweetStatViewInitializer(context: BytecodeContext) {
-        val returnFingerprint = object : MethodFingerprint(
-            opcodes = listOf(Opcode.RETURN_VOID)
-        ) {}
-        transformMethodAtPattern(
-            context,
-            TweetStatsContainerConstructorFingerprint,
-            returnFingerprint
-        ) { patternScanResult, method ->
-            method.removeInstructions(patternScanResult.endIndex - 3, 3)
-        }
-    }
-
-    private fun removeTweetStatViewWrapperInitializer(context: BytecodeContext) {
-        val wrapperReturnFingerprint = object : MethodFingerprint(
-            opcodes = listOf(
-                Opcode.IGET_OBJECT,
-                Opcode.INVOKE_STATIC,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.IPUT_OBJECT,
-                Opcode.RETURN_VOID,
-            )
-        ) {}
-        transformMethodAtPattern(
-            context,
-            TweetStatsContainerWrapperConstructorFingerprint,
-            wrapperReturnFingerprint
-        ) { patternScanResult, method ->
-            method.removeInstructions(patternScanResult.startIndex - 4, 4)
-        }
-    }
-
-    private fun removeViewDelegateBinderSubscription() {
-        transformMethod(TweetStatsViewDelegateBinderFingerprint) { result, method ->
-            method.removeInstructions(result.scanResult.patternScanResult!!.startIndex - 4, 10)
-        }
-    }
-
-    private fun transformMethodAtPattern(
-        context: BytecodeContext, methodFingerprint: MethodFingerprint,
-        patternFingerprint: MethodFingerprint, transformer: TransformerAtPattern
-    ) {
-        transformMethod(methodFingerprint) { result, method ->
-            val patternResult = patternFingerprint.also {
-                it.resolve(context, method, result.classDef)
-            }.result!!
-            transformer(patternResult.scanResult.patternScanResult!!, method)
-        }
-    }
-
-    private fun transformMethod(methodFingerprint: MethodFingerprint, transformer: Transformer) {
-        val result = methodFingerprint.result!!
-        val method = result.mutableMethod
-        transformer(result, method)
-    }
-}
-
-private typealias Transformer = (MethodFingerprintResult, MutableMethod) -> Unit
-
-private typealias TransformerAtPattern = (MethodFingerprintResult.MethodFingerprintScanResult.PatternScanResult, MutableMethod) -> Unit

src/main/kotlin/app/revanced/patches/twitter/layout/hideviews/patch/HideViewsResourcePatch.kt

@@ -1,34 +0,0 @@
-package app.revanced.patches.twitter.layout.hideviews.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.*
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.twitter.layout.hideviews.annotations.HideViewsCompatibility
-import org.w3c.dom.Element
-
-@Patch
-@DependsOn([HideViewsBytecodePatch::class])
-@Name("Hide views stats")
-@Description("Hides the view stats under tweets.")
-@HideViewsCompatibility
-@Version("0.0.1")
-class HideViewsResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        arrayOf(
-            "res/layout/condensed_tweet_stats.xml",
-            "res/layout/focal_tweet_stats.xml"
-        ).forEach { file ->
-            context.xmlEditor[file].use { editor ->
-                val tags = editor.file.getElementsByTagName("com.twitter.ui.tweet.TweetStatView")
-                List(tags.length) { tags.item(it) as Element }
-                    .filter { it.getAttribute("android:id").contains("views_stat") }
-                    .forEach { it.parentNode.removeChild(it) }
-            }
-        }
-        return PatchResultSuccess()
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/bytecode/fingerprints/PlayerSeekbarColorFingerprint.kt

@@ -6,7 +6,7 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.layout.seekbar.resource.SeekbarColorResourcePatch
 import org.jf.dexlib2.AccessFlags
 
-object CreateDarkThemeSeekbarFingerprint : MethodFingerprint(
+object PlayerSeekbarColorFingerprint : MethodFingerprint(
     accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
     customFingerprint = { method, _ ->
         method.containsConstantInstructionValue(SeekbarColorResourcePatch.inlineTimeBarColorizedBarPlayedColorDarkId)

src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/bytecode/fingerprints/ShortsSeekbarColorFingerprint.kt

@@ -0,0 +1,11 @@
+package app.revanced.patches.youtube.layout.seekbar.bytecode.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patches.youtube.layout.seekbar.resource.SeekbarColorResourcePatch
+import app.revanced.util.patch.LiteralValueFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object ShortsSeekbarColorFingerprint : LiteralValueFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    literal = SeekbarColorResourcePatch.reelTimeBarPlayedColorId,
+)

src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/bytecode/patch/SeekbarColorBytecodePatch.kt

@@ -14,8 +14,9 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.youtube.layout.seekbar.annotations.SeekbarColorCompatibility
-import app.revanced.patches.youtube.layout.seekbar.bytecode.fingerprints.CreateDarkThemeSeekbarFingerprint
+import app.revanced.patches.youtube.layout.seekbar.bytecode.fingerprints.PlayerSeekbarColorFingerprint
 import app.revanced.patches.youtube.layout.seekbar.bytecode.fingerprints.SetSeekbarClickedColorFingerprint
+import app.revanced.patches.youtube.layout.seekbar.bytecode.fingerprints.ShortsSeekbarColorFingerprint
 import app.revanced.patches.youtube.layout.seekbar.resource.SeekbarColorResourcePatch
 import app.revanced.patches.youtube.layout.theme.bytecode.patch.LithoColorHookPatch
 import app.revanced.patches.youtube.layout.theme.bytecode.patch.LithoColorHookPatch.Companion.lithoColorOverrideHook
@@ -28,30 +29,29 @@ import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
 @SeekbarColorCompatibility
 @Version("0.0.1")
 class SeekbarColorBytecodePatch : BytecodePatch(
-    listOf(CreateDarkThemeSeekbarFingerprint, SetSeekbarClickedColorFingerprint)
+    listOf(PlayerSeekbarColorFingerprint, ShortsSeekbarColorFingerprint, SetSeekbarClickedColorFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
-        CreateDarkThemeSeekbarFingerprint.result?.mutableMethod?.apply {
-            var registerIndex = indexOfFirstConstantInstructionValue(SeekbarColorResourcePatch.inlineTimeBarColorizedBarPlayedColorDarkId) + 2
-            var colorRegister = (getInstruction(registerIndex) as OneRegisterInstruction).registerA
+        fun MutableMethod.addColorChangeInstructions(resourceId: Long) {
+            var registerIndex = indexOfFirstConstantInstructionValue(resourceId) + 2
+            var colorRegister = getInstruction<OneRegisterInstruction>(registerIndex).registerA
             addInstructions(
                 registerIndex + 1,
                 """
-                    invoke-static { v$colorRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getVideoPlayerSeekbarColor(I)I
-                    move-result v$colorRegister
-                """
+                        invoke-static { v$colorRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getVideoPlayerSeekbarColor(I)I
+                        move-result v$colorRegister
+                    """
             )
-            
-            registerIndex = indexOfFirstConstantInstructionValue(SeekbarColorResourcePatch.inlineTimeBarPlayedNotHighlightedColorId) + 2
-            colorRegister = (getInstruction(registerIndex) as OneRegisterInstruction).registerA
-            addInstructions(
-                registerIndex + 1,
-                """
-                    invoke-static { v$colorRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getVideoPlayerSeekbarColor(I)I
-                    move-result v$colorRegister
-                """
-            )
-        } ?: return CreateDarkThemeSeekbarFingerprint.toErrorResult()
+        }
+
+        PlayerSeekbarColorFingerprint.result?.mutableMethod?.apply {
+            addColorChangeInstructions(SeekbarColorResourcePatch.inlineTimeBarColorizedBarPlayedColorDarkId)
+            addColorChangeInstructions(SeekbarColorResourcePatch.inlineTimeBarPlayedNotHighlightedColorId)
+        } ?: return PlayerSeekbarColorFingerprint.toErrorResult()
+
+        ShortsSeekbarColorFingerprint.result?.mutableMethod?.apply {
+            addColorChangeInstructions(SeekbarColorResourcePatch.reelTimeBarPlayedColorId)
+        } ?: return ShortsSeekbarColorFingerprint.toErrorResult()
 
         SetSeekbarClickedColorFingerprint.result?.let { result ->
             result.mutableMethod.let {
@@ -62,7 +62,7 @@ class SeekbarColorBytecodePatch : BytecodePatch(
                     .getMethod() as MutableMethod
 
                 method.apply {
-                    val colorRegister = (method.getInstruction(0) as TwoRegisterInstruction).registerA
+                    val colorRegister = getInstruction<TwoRegisterInstruction>(0).registerA
                     addInstructions(
                         0,
                         """

src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/resource/SeekbarColorResourcePatch.kt

@@ -9,17 +9,20 @@ import org.w3c.dom.Element
 
 @DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
 class SeekbarColorResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        // Edit theme colors via bytecode.
-        // For that the resource id is used in a bytecode patch to change the color.
 
-        val seekbarErrorMessage = "Could not find seekbar resource"
-        inlineTimeBarColorizedBarPlayedColorDarkId = ResourceMappingPatch.resourceMappings
-            .find { it.name == "inline_time_bar_colorized_bar_played_color_dark" }?.id
-            ?: return PatchResultError(seekbarErrorMessage)
-        inlineTimeBarPlayedNotHighlightedColorId = ResourceMappingPatch.resourceMappings
-            .find { it.name == "inline_time_bar_played_not_highlighted_color" }?.id
-            ?: return PatchResultError(seekbarErrorMessage)
+    override fun execute(context: ResourceContext): PatchResult {
+        fun findColorResource(resourceName: String): Long {
+            return ResourceMappingPatch.resourceMappings
+                .find { it.type == "color" && it.name == resourceName }?.id
+            ?: throw PatchResultError("Could not find color resource: $resourceName")
+        }
+
+        reelTimeBarPlayedColorId =
+            findColorResource("reel_time_bar_played_color")
+        inlineTimeBarColorizedBarPlayedColorDarkId =
+            findColorResource("inline_time_bar_colorized_bar_played_color_dark")
+        inlineTimeBarPlayedNotHighlightedColorId =
+            findColorResource("inline_time_bar_played_not_highlighted_color")
 
         // Edit the resume playback drawable and replace the progress bar with a custom drawable
         context.xmlEditor["res/drawable/resume_playback_progressbar_drawable.xml"].use { editor ->
@@ -39,6 +42,7 @@ class SeekbarColorResourcePatch : ResourcePatch {
     }
 
     companion object {
+        internal var reelTimeBarPlayedColorId = -1L
         internal var inlineTimeBarColorizedBarPlayedColorDarkId = -1L
         internal var inlineTimeBarPlayedNotHighlightedColorId = -1L
     }

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

@@ -9,6 +9,7 @@ import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
 import app.revanced.patches.shared.settings.preference.impl.InputType
 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.seekbar.resource.SeekbarPreferencesPatch
 import app.revanced.patches.youtube.layout.theme.bytecode.patch.ThemeBytecodePatch.Companion.darkThemeBackgroundColor
@@ -20,10 +21,16 @@ import org.w3c.dom.Element
 class ThemeResourcePatch : ResourcePatch {
     override fun execute(context: ResourceContext): PatchResult {
         SeekbarPreferencesPatch.addPreferences(
+            SwitchPreference(
+                "revanced_seekbar_custom_color",
+                StringResource("revanced_seekbar_custom_color_title", "Enable custom seekbar color"),
+                StringResource("revanced_seekbar_custom_color_summary_on", "Custom seekbar color is shown"),
+                StringResource("revanced_seekbar_custom_color_summary_off", "Original seekbar color is shown")
+            ),
             TextPreference(
-                "revanced_seekbar_color",
-                StringResource("revanced_seekbar_color_title", "Seekbar color"),
-                StringResource("revanced_seekbar_color_summary", "The color of the seekbar"),
+                "revanced_seekbar_custom_color_value",
+                StringResource("revanced_seekbar_custom_color_value_title", "Custom seekbar color"),
+                StringResource("revanced_seekbar_custom_color_value_summary", "The color of the seekbar"),
                 InputType.TEXT_CAP_CHARACTERS
             )
         )