chore: merge branch dev to main (#2674)

.github/workflows/release.yml

@@ -30,13 +30,12 @@ jobs:
             ${{ runner.home }}/.gradle/caches
             ${{ runner.home }}/.gradle/wrapper
             .gradle
-            build
             node_modules
           key: ${{ runner.os }}-gradle-npm-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'package-lock.json') }}
       - name: Build with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew generateMeta clean --no-daemon
+        run: ./gradlew generateMeta
       - name: Setup semantic-release
         run: npm install
       - name: Release

CHANGELOG.md

@@ -1,3 +1,43 @@
+# [2.186.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v2.186.0-dev.4...v2.186.0-dev.5) (2023-07-20)
+
+
+### Bug Fixes
+
+* **YouTube - Theme:** allow setting no background color ([8a4e77a](https://github.com/ReVanced/revanced-patches/commit/8a4e77a290a61a1caf93eb8bccaf728c84a3ef53))
+
+# [2.186.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v2.186.0-dev.3...v2.186.0-dev.4) (2023-07-20)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof app version:** update target app version description ([#2666](https://github.com/ReVanced/revanced-patches/issues/2666)) ([307442e](https://github.com/ReVanced/revanced-patches/commit/307442e654ff5486656319d91e4a5f5fb2b92651))
+
+# [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)
 
 

gradle.properties

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

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 v$register1, "$settingsButtonClass"
-                        const-string v2, "$settingsButtonInfoClass"
+                        const-string v$register2, "$settingsButtonInfoClass"
-                        invoke-static {v1, v2}, $CREATE_SETTINGS_ENTRY_METHOD_DESCRIPTOR
+                        invoke-static {v$register1, v$register2}, $CREATE_SETTINGS_ENTRY_METHOD_DESCRIPTOR
-                        move-result-object v1
+                        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
+                    move-result v$usableRegister
-                    if-eqz v0, :notrevanced
+                    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,12 +29,12 @@ 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 {
+        fun MutableMethod.addColorChangeInstructions(resourceId: Long) {
-            var registerIndex = indexOfFirstConstantInstructionValue(SeekbarColorResourcePatch.inlineTimeBarColorizedBarPlayedColorDarkId) + 2
+            var registerIndex = indexOfFirstConstantInstructionValue(resourceId) + 2
-            var colorRegister = (getInstruction(registerIndex) as OneRegisterInstruction).registerA
+            var colorRegister = getInstruction<OneRegisterInstruction>(registerIndex).registerA
             addInstructions(
                 registerIndex + 1,
                 """
@@ -41,17 +42,16 @@ class SeekbarColorBytecodePatch : BytecodePatch(
                         move-result v$colorRegister
                     """
             )
+        }
 
-            registerIndex = indexOfFirstConstantInstructionValue(SeekbarColorResourcePatch.inlineTimeBarPlayedNotHighlightedColorId) + 2
+        PlayerSeekbarColorFingerprint.result?.mutableMethod?.apply {
-            colorRegister = (getInstruction(registerIndex) as OneRegisterInstruction).registerA
+            addColorChangeInstructions(SeekbarColorResourcePatch.inlineTimeBarColorizedBarPlayedColorDarkId)
-            addInstructions(
+            addColorChangeInstructions(SeekbarColorResourcePatch.inlineTimeBarPlayedNotHighlightedColorId)
-                registerIndex + 1,
+        } ?: return PlayerSeekbarColorFingerprint.toErrorResult()
-                """
+
-                    invoke-static { v$colorRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getVideoPlayerSeekbarColor(I)I
+        ShortsSeekbarColorFingerprint.result?.mutableMethod?.apply {
-                    move-result v$colorRegister
+            addColorChangeInstructions(SeekbarColorResourcePatch.reelTimeBarPlayedColorId)
-                """
+        } ?: return ShortsSeekbarColorFingerprint.toErrorResult()
-            )
-        } ?: return CreateDarkThemeSeekbarFingerprint.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"
+    override fun execute(context: ResourceContext): PatchResult {
-        inlineTimeBarColorizedBarPlayedColorDarkId = ResourceMappingPatch.resourceMappings
+        fun findColorResource(resourceName: String): Long {
-            .find { it.name == "inline_time_bar_colorized_bar_played_color_dark" }?.id
+            return ResourceMappingPatch.resourceMappings
-            ?: return PatchResultError(seekbarErrorMessage)
+                .find { it.type == "color" && it.name == resourceName }?.id
-        inlineTimeBarPlayedNotHighlightedColorId = ResourceMappingPatch.resourceMappings
+            ?: throw PatchResultError("Could not find color resource: $resourceName")
-            .find { it.name == "inline_time_bar_played_not_highlighted_color" }?.id
+        }
-            ?: return PatchResultError(seekbarErrorMessage)
+
+        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/spoofappversion/bytecode/patch/SpoofAppVersionPatch.kt

@@ -42,7 +42,7 @@ class 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 you log out or clear the app data.")
+                        + "\\n\\nIf later turned off, the old UI may remain until the app data is cleared.")
             ),
             ListPreference(
                 "revanced_spoof_app_version_target",
@@ -54,7 +54,7 @@ class SpoofAppVersionPatch : BytecodePatch(
                     "revanced_spoof_app_version_target_entries",
                     listOf(
                         StringResource("revanced_spoof_app_version_target_entry_1", "17.30.35 - Restore old UI layout"),
-                        StringResource("revanced_spoof_app_version_target_entry_2", "17.01.35 - Enable sorting videos by oldest"),
+                        StringResource("revanced_spoof_app_version_target_entry_2", "17.01.35 - Restore old watch history"),
                         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"),
                     )

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",
+                "revanced_seekbar_custom_color_value",
-                StringResource("revanced_seekbar_color_title", "Seekbar color"),
+                StringResource("revanced_seekbar_custom_color_value_title", "Custom seekbar color"),
-                StringResource("revanced_seekbar_color_summary", "The color of the seekbar"),
+                StringResource("revanced_seekbar_custom_color_value_summary", "The color of the seekbar"),
                 InputType.TEXT_CAP_CHARACTERS
             )
         )
@@ -38,8 +45,8 @@ class ThemeResourcePatch : ResourcePatch {
 
                 node.textContent = when (node.getAttribute("name")) {
                     "yt_black0", "yt_black1", "yt_black1_opacity95", "yt_black1_opacity98", "yt_black2", "yt_black3",
-                    "yt_black4", "yt_status_bar_background_dark", "material_grey_850" -> darkThemeBackgroundColor
+                    "yt_black4", "yt_status_bar_background_dark", "material_grey_850"
-                        ?: continue
+                    -> darkThemeBackgroundColor ?: continue
 
                     "yt_white1", "yt_white1_opacity95", "yt_white1_opacity98",
                     "yt_white2", "yt_white3", "yt_white4",
@@ -51,10 +58,13 @@ class ThemeResourcePatch : ResourcePatch {
         }
 
         // Add a dynamic background color to the colors.xml file.
-        addResourceColor(context, "res/values/colors.xml",
+        lightThemeBackgroundColor?.let {
-            SPLASH_BACKGROUND_COLOR, lightThemeBackgroundColor!!)
+            addColorResource(context, "res/values/colors.xml", SPLASH_BACKGROUND_COLOR, it)
-        addResourceColor(context, "res/values-night/colors.xml",
+        }
-            SPLASH_BACKGROUND_COLOR, darkThemeBackgroundColor!!)
+
+        darkThemeBackgroundColor?.let {
+            addColorResource(context, "res/values-night/colors.xml", SPLASH_BACKGROUND_COLOR, it)
+        }
 
         // Edit splash screen files and change the background color.
         val splashScreenResourceFiles = listOf(
@@ -80,7 +90,7 @@ class ThemeResourcePatch : ResourcePatch {
         return PatchResultSuccess()
     }
 
-    private fun addResourceColor(
+    private fun addColorResource(
         context: ResourceContext,
         resourceFile: String,
         colorName: String,