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

# [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 ([82e3ebe](82e3ebeeff))

CHANGELOG.md

@@ -1,3 +1,24 @@
+# [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)
 
 

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 2.186.0-dev.2
+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 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/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

@@ -45,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
-                        ?: continue
+                    "yt_black4", "yt_status_bar_background_dark", "material_grey_850"
+                    -> darkThemeBackgroundColor ?: continue
 
                     "yt_white1", "yt_white1_opacity95", "yt_white1_opacity98",
                     "yt_white2", "yt_white3", "yt_white4",
@@ -58,10 +58,13 @@ class ThemeResourcePatch : ResourcePatch {
         }
 
         // Add a dynamic background color to the colors.xml file.
-        addResourceColor(context, "res/values/colors.xml",
-            SPLASH_BACKGROUND_COLOR, lightThemeBackgroundColor!!)
-        addResourceColor(context, "res/values-night/colors.xml",
-            SPLASH_BACKGROUND_COLOR, darkThemeBackgroundColor!!)
+        lightThemeBackgroundColor?.let {
+            addColorResource(context, "res/values/colors.xml", SPLASH_BACKGROUND_COLOR, it)
+        }
+
+        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(
@@ -87,7 +90,7 @@ class ThemeResourcePatch : ResourcePatch {
         return PatchResultSuccess()
     }
 
-    private fun addResourceColor(
+    private fun addColorResource(
         context: ResourceContext,
         resourceFile: String,
         colorName: String,