chore(release): 2.69.1 [skip ci]

## [2.69.1](https://github.com/revanced/revanced-patches/compare/v2.69.0...v2.69.1) (2022-09-24)

### Bug Fixes

* **sponsorblock:** reflect changes to strings ([#585](https://github.com/revanced/revanced-patches/issues/585)) ([ee3a9c5](19484ca2bc))

CHANGELOG.md

@@ -1,3 +1,64 @@
+## [2.69.1](https://github.com/revanced/revanced-patches/compare/v2.69.0...v2.69.1) (2022-09-24)
+
+
+### Bug Fixes
+
+* **sponsorblock:** reflect changes to strings ([#585](https://github.com/revanced/revanced-patches/issues/585)) ([d03568a](https://github.com/revanced/revanced-patches/commit/d03568aa39195a07bec62f43d929923825c67d3f))
+
+# [2.69.0](https://github.com/revanced/revanced-patches/compare/v2.68.3...v2.69.0) (2022-09-24)
+
+
+### Features
+
+* `spotify-theme` patch ([#608](https://github.com/revanced/revanced-patches/issues/608)) ([7ee1b78](https://github.com/revanced/revanced-patches/commit/7ee1b78e8048698ef6490445dd012e2d88b4d332))
+
+## [2.68.3](https://github.com/revanced/revanced-patches/compare/v2.68.2...v2.68.3) (2022-09-23)
+
+
+### Bug Fixes
+
+* **seekbar-tapping:** do not disable seekbar when hiding it ([#600](https://github.com/revanced/revanced-patches/issues/600)) ([68a9457](https://github.com/revanced/revanced-patches/commit/68a9457464c786a61b756eb18ca5f1ce05316636))
+
+## [2.68.2](https://github.com/revanced/revanced-patches/compare/v2.68.1...v2.68.2) (2022-09-23)
+
+
+### Bug Fixes
+
+* **hide-time-and-seekbar:** don't draw the seekbar ([#594](https://github.com/revanced/revanced-patches/issues/594)) ([46e0195](https://github.com/revanced/revanced-patches/commit/46e0195f760dc11ec8d2068ffb57997eccab1aff))
+
+## [2.68.1](https://github.com/revanced/revanced-patches/compare/v2.68.0...v2.68.1) (2022-09-23)
+
+
+### Bug Fixes
+
+* **sponsorblock:** resolve unresolved fingerprint ([e7296f3](https://github.com/revanced/revanced-patches/commit/e7296f3424bed78a0149cca9bf6e29243e962150))
+
+# [2.68.0](https://github.com/revanced/revanced-patches/compare/v2.67.1...v2.68.0) (2022-09-23)
+
+
+### Bug Fixes
+
+* **hide-premium-navbar:** remove the correct instructions ([#591](https://github.com/revanced/revanced-patches/issues/591)) ([b4b0c97](https://github.com/revanced/revanced-patches/commit/b4b0c972d28cf7591ece04d154d1183c8431cb77))
+
+
+### Features
+
+* **tiktok:** adapt `tiktok-download` with `tiktok-settings`. ([#586](https://github.com/revanced/revanced-patches/issues/586)) ([876b726](https://github.com/revanced/revanced-patches/commit/876b7266109b099597dd19d6ed3fa3dac098b73b))
+
+## [2.67.1](https://github.com/revanced/revanced-patches/compare/v2.67.0...v2.67.1) (2022-09-23)
+
+# [2.67.0](https://github.com/revanced/revanced-patches/compare/v2.66.2...v2.67.0) (2022-09-23)
+
+
+### Bug Fixes
+
+* **hide-premium-nav-bar:** invalid import ([#590](https://github.com/revanced/revanced-patches/issues/590)) ([37ad223](https://github.com/revanced/revanced-patches/commit/37ad22360e6ac5e1b1dce474fe6a4e3813e03330))
+
+
+### Features
+
+* `hide-premium-nav-bar` patch ([#589](https://github.com/revanced/revanced-patches/issues/589)) ([1811416](https://github.com/revanced/revanced-patches/commit/18114168d7f8c3dd41d1f124c3524c7ca850d33d))
+
 ## [2.66.2](https://github.com/revanced/revanced-patches/compare/v2.66.1...v2.66.2) (2022-09-22)
 
 

README.md

@@ -4,60 +4,21 @@ The official Patch bundle provided by ReVanced and the community.
 
 > Looking for the JSON variant of this? [Click here](patches.json).
 
-### 📦 `com.google.android.youtube`
+### 📦 `com.spotify.music`
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
-| `premium-heading` | Shows premium branding on the home screen. | all |
-| `theme` | Applies a custom theme. | all |
-| `old-quality-layout` | Enables the original quality flyout menu. | 17.36.37 |
-| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.36.37 |
-| `sponsorblock` | Integrate SponsorBlock. | 17.36.37 |
-| `hide-watermark` | Hides creator's watermarks on videos. | 17.36.37 |
-| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.36.37 |
-| `hide-create-button` | Hides the create button in the navigation bar. | 17.36.37 |
-| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.36.37 |
-| `tablet-mini-player` | Enables the tablet mini player layout. | 17.36.37 |
-| `hide-time-and-seekbar` | Hides progress bar and time counter on videos. | 17.36.37 |
-| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.36.37 |
-| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 17.36.37 |
-| `disable-auto-player-popup-panels` | Disable automatic popup panels (playlist or live chat) on video player. | 17.36.37 |
-| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.36.37 |
-| `hide-cast-button` | Hides the cast button in the video player. | all |
-| `video-ads` | Removes ads in the video player. | 17.36.37 |
-| `general-ads` | Removes general ads. | 17.36.37 |
-| `hide-infocard-suggestions` | Hides infocards in videos. | 17.36.37 |
-| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.36.37 |
-| `downloads` | Enables downloading music and videos from YouTube. | 17.36.37 |
-| `swipe-controls` | Adds volume and brightness swipe controls. | 17.36.37 |
-| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.36.37 |
-| `settings` | Adds settings for ReVanced to YouTube. | all |
-| `minimized-playback` | Enables minimized and background playback. | 17.36.37 |
-| `custom-video-buffer` | Lets you change the buffers of videos. | 17.36.37 |
-| `custom-playback-speed` | Adds more video playback speed options. | 17.36.37 |
-| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.36.37 |
-| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
-| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.36.37 |
-| `enable-debugging` | Enables app debugging by patching the manifest file. | all |
-| `always-autorepeat` | Always repeats the playing video again. | 17.36.37 |
+| `hide-premium-navbar` | Removes the premium tab from the navbar. | all |
+| `spotify-theme` | Applies a custom theme. | all |
 </details>
 
-### 📦 `com.vanced.android.youtube`
+### 📦 `com.twitter.android`
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
-</details>
-
-### 📦 `de.dwd.warnapp`
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `promo-code-unlock` | Disables the validation of promo code. Any code will work to unlock all features. | all |
+| `timeline-ads` | Removes ads from the Twitter timeline. | all |
 </details>
 
 ### 📦 `com.reddit.frontpage`
@@ -69,23 +30,6 @@ The official Patch bundle provided by ReVanced and the community.
 | `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | all |
 </details>
 
-### 📦 `com.google.android.apps.youtube.music`
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `background-play` | Enables playing music in the background. | 5.23.50 |
-| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.23.50 |
-| `compact-header` | Hides the music category bar at the top of the homepage. | 5.23.50 |
-| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.23.50 |
-| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.23.50 |
-| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.23.50 |
-| `music-video-ads` | Removes ads in the music player. | 5.23.50 |
-| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.23.50 |
-| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.23.50 |
-| `exclusive-audio-playback` | Enables the option to play music without video. | 5.23.50 |
-</details>
-
 ### 📦 `com.garzotto.pflotsh.ecmwf_a`
 <details>
 
@@ -94,17 +38,42 @@ The official Patch bundle provided by ReVanced and the community.
 | `pflotsh-ecmwf-subscription-unlock` | Unlocks all subscription features. | 3.5.4 |
 </details>
 
+### 📦 `com.google.android.apps.youtube.music`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.23.50 |
+| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.23.50 |
+| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.23.50 |
+| `compact-header` | Hides the music category bar at the top of the homepage. | 5.23.50 |
+| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.23.50 |
+| `background-play` | Enables playing music in the background. | 5.23.50 |
+| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.23.50 |
+| `music-video-ads` | Removes ads in the music player. | 5.23.50 |
+| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.23.50 |
+| `exclusive-audio-playback` | Enables the option to play music without video. | 5.23.50 |
+</details>
+
+### 📦 `de.dwd.warnapp`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `promo-code-unlock` | Disables the validation of promo code. Any code will work to unlock all features. | all |
+</details>
+
 ### 📦 `com.ss.android.ugc.trill`
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
 | `tiktok-feed-filter` | Filters tiktok videos: removing ads, removing livestreams. | all |
-| `tiktok-ads` | Removes ads from TikTok. | all |
-| `tiktok-seekbar` | Show progress bar for all video. | all |
 | `tiktok-download` | Removes download restrictions and changes the default path to download to. | all |
-| `tiktok-settings` | Add settings menu to TikTok. | all |
+| `tiktok-seekbar` | Show progress bar for all video. | all |
 | `tiktok-force-login` | Do not force login. | all |
+| `tiktok-settings` | Add settings menu to TikTok. | all |
+| `tiktok-ads` | Removes ads from TikTok. | all |
 </details>
 
 ### 📦 `com.zhiliaoapp.musically`
@@ -113,19 +82,59 @@ The official Patch bundle provided by ReVanced and the community.
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
 | `tiktok-feed-filter` | Filters tiktok videos: removing ads, removing livestreams. | all |
-| `tiktok-ads` | Removes ads from TikTok. | all |
-| `tiktok-seekbar` | Show progress bar for all video. | all |
 | `tiktok-download` | Removes download restrictions and changes the default path to download to. | all |
-| `tiktok-settings` | Add settings menu to TikTok. | all |
+| `tiktok-seekbar` | Show progress bar for all video. | all |
 | `tiktok-force-login` | Do not force login. | all |
+| `tiktok-settings` | Add settings menu to TikTok. | all |
+| `tiktok-ads` | Removes ads from TikTok. | all |
 </details>
 
-### 📦 `com.twitter.android`
+### 📦 `com.google.android.youtube`
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `timeline-ads` | Removes ads from the Twitter timeline. | all |
+| `swipe-controls` | Adds volume and brightness swipe controls. | 17.36.37 |
+| `downloads` | Enables downloading music and videos from YouTube. | 17.36.37 |
+| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.36.37 |
+| `hide-cast-button` | Hides the cast button in the video player. | all |
+| `hide-create-button` | Hides the create button in the navigation bar. | 17.36.37 |
+| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.36.37 |
+| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.36.37 |
+| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.36.37 |
+| `premium-heading` | Shows premium branding on the home screen. | all |
+| `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
+| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.36.37 |
+| `old-quality-layout` | Enables the original quality flyout menu. | 17.36.37 |
+| `theme` | Applies a custom theme. | all |
+| `hide-watermark` | Hides creator's watermarks on videos. | 17.36.37 |
+| `sponsorblock` | Integrate SponsorBlock. | 17.36.37 |
+| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.36.37 |
+| `hide-time-and-seekbar` | Hides progress bar and time counter on videos. | 17.36.37 |
+| `disable-auto-player-popup-panels` | Disable automatic popup panels (playlist or live chat) on video player. | 17.36.37 |
+| `tablet-mini-player` | Enables the tablet mini player layout. | 17.36.37 |
+| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 17.36.37 |
+| `minimized-playback` | Enables minimized and background playback. | 17.36.37 |
+| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
+| `custom-video-buffer` | Lets you change the buffers of videos. | 17.36.37 |
+| `always-autorepeat` | Always repeats the playing video again. | 17.36.37 |
+| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.36.37 |
+| `settings` | Adds settings for ReVanced to YouTube. | all |
+| `enable-debugging` | Enables app debugging by patching the manifest file. | all |
+| `custom-playback-speed` | Adds more video playback speed options. | 17.36.37 |
+| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.36.37 |
+| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.36.37 |
+| `video-ads` | Removes ads in the video player. | 17.36.37 |
+| `general-ads` | Removes general ads. | 17.36.37 |
+| `hide-infocard-suggestions` | Hides infocards in videos. | 17.36.37 |
+</details>
+
+### 📦 `com.vanced.android.youtube`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
 </details>
 
 

build.gradle.kts

@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation("app.revanced:revanced-patcher:5.0.0")
+    implementation("app.revanced:revanced-patcher:5.0.1")
     implementation("app.revanced:multidexlib2:2.5.2.r2")
     // Required for meta
     implementation("com.google.code.gson:gson:2.9.1")

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.66.2
+version = 2.69.1

src/main/kotlin/app/revanced/patches/spotify/layout/theme/annotations/ThemeCompatibility.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.spotify.layout.theme.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.spotify.music")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class ThemeCompatibility

src/main/kotlin/app/revanced/patches/spotify/layout/theme/patch/ThemePatch.kt

@@ -0,0 +1,70 @@
+package app.revanced.patches.spotify.layout.theme.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.patch.OptionsContainer
+import app.revanced.patcher.patch.PatchOption
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.ResourcePatch
+import app.revanced.patches.spotify.layout.theme.annotations.ThemeCompatibility
+import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
+import org.w3c.dom.Element
+
+@Patch
+@DependsOn([FixLocaleConfigErrorPatch::class])
+@Name("spotify-theme")
+@Description("Applies a custom theme.")
+@ThemeCompatibility
+@Version("0.0.1")
+class ThemePatch : ResourcePatch() {
+    override fun execute(data: ResourceData): PatchResult {
+        data.xmlEditor["res/values/colors.xml"].use { editor ->
+            val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
+
+            for (i in 0 until resourcesNode.childNodes.length) {
+                val node = resourcesNode.childNodes.item(i) as? Element ?: continue
+
+                node.textContent = when (node.getAttribute("name")) {
+                    "gray_7" -> backgroundColor!!
+                    "dark_brightaccent_background_base", "dark_base_text_brightaccent", "green_light" -> accentColor!!
+                    "dark_brightaccent_background_press" -> accentPressedColor!!
+                    else -> continue
+                }
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+
+    companion object : OptionsContainer() {
+        var backgroundColor: String? by option(
+            PatchOption.StringOption(
+                key = "backgroundColor",
+                default = "@android:color/black",
+                title = "Background color",
+                description = "The background color. Can be a hex color or a resource reference.",
+            )
+        )
+        var accentColor: String? by option(
+            PatchOption.StringOption(
+                key = "accentColor",
+                default = "#ff1ed760",
+                title = "Accent color",
+                description = "The accent color ('spotify green' by default). Can be a hex color or a resource reference.",
+            )
+        )
+        var accentPressedColor: String? by option(
+            PatchOption.StringOption(
+                key = "accentPressedColor",
+                default = "#ff169c46",
+                title = "Pressed accent for the dark theme",
+                description = "The color when accented buttons are pressed, by default slightly darker than accent. Can be a hex color or a resource reference.",
+            )
+        )
+    }
+}

src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/annotations/PremiumNavbarTabCompatibility.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.spotify.premium_navbar_tab.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.spotify.music")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class PremiumNavbarTabCompatibility

src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/fingerprints/AddPremiumNavbarTabFingerprint.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.spotify.premium_navbar_tab.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.spotify.premium_navbar_tab.annotations.PremiumNavbarTabCompatibility
+
+@Name("premium-navbar-fingerprint")
+@Version("0.0.1")
+@PremiumNavbarTabCompatibility
+object AddPremiumNavbarTabFingerprint : MethodFingerprint(
+    parameters = listOf("L", "L", "L", "L", "L", "L")
+)

src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/fingerprints/AddPremiumNavbarTabParentFingerprint.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.spotify.premium_navbar_tab.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.spotify.premium_navbar_tab.annotations.PremiumNavbarTabCompatibility
+
+@Name("add-premium-navbar-tab-parent-fingerprint")
+@Version("0.0.1")
+@PremiumNavbarTabCompatibility
+object AddPremiumNavbarTabParentFingerprint : MethodFingerprint(
+     strings = listOf("com.samsung.android.samsungaccount.action.REQUEST_AUTHCODE")
+)

src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/patch/PremiumNavbarTabPatch.kt

@@ -0,0 +1,62 @@
+package app.revanced.patches.spotify.premium_navbar_tab.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.removeInstruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.spotify.premium_navbar_tab.annotations.PremiumNavbarTabCompatibility
+import app.revanced.patches.spotify.premium_navbar_tab.fingerprints.AddPremiumNavbarTabFingerprint
+import app.revanced.patches.spotify.premium_navbar_tab.fingerprints.AddPremiumNavbarTabParentFingerprint
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+
+@Patch
+@Name("hide-premium-navbar")
+@Description("Removes the premium tab from the navbar.")
+@PremiumNavbarTabCompatibility
+@Version("0.0.1")
+@DependsOn([ResourceIdMappingProviderResourcePatch::class])
+class PremiumNavbarTabPatch : BytecodePatch(
+    listOf(
+        AddPremiumNavbarTabParentFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val parentResult = AddPremiumNavbarTabParentFingerprint.result!!
+        AddPremiumNavbarTabFingerprint.resolve(data, parentResult.classDef)
+
+        val result = AddPremiumNavbarTabFingerprint.result!!
+
+        val method = result.mutableMethod
+        val methodInstructions = method.implementation!!.instructions
+        val lastInstructionIdx = methodInstructions.size - 1
+
+        val premiumTabId = ResourceIdMappingProviderResourcePatch.resourceMappings.single{it.type == "id" && it.name == "premium_tab"}.id
+
+        var removeAmount = 2
+        // 2nd const remove method
+        for ((i, instruction) in methodInstructions.asReversed().withIndex()) {
+            if (instruction.opcode.ordinal != Opcode.CONST.ordinal) continue
+            if ((instruction as WideLiteralInstruction).wideLiteral != premiumTabId) continue
+
+            val findThreshold = 10
+            val constIndex = lastInstructionIdx - i
+            val invokeInstruction = methodInstructions.subList(constIndex, constIndex + findThreshold).first {
+                it.opcode.ordinal == Opcode.INVOKE_VIRTUAL_RANGE.ordinal
+            }
+            method.removeInstruction(methodInstructions.indexOf(invokeInstruction))
+
+            if (--removeAmount == 0) break
+        }
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/patch/DownloadsPatch.kt

@@ -5,9 +5,13 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.data.impl.toMethodWalker
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.replaceInstruction
 import app.revanced.patcher.extensions.replaceInstructions
-import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
@@ -16,6 +20,7 @@ import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonS
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint2
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint3
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.DownloadPathParentFingerprint
+import app.revanced.patches.tiktok.misc.settings.fingerprints.SettingsStatusLoadFingerprint
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
@@ -31,7 +36,8 @@ class DownloadsPatch : BytecodePatch(
         ACLCommonShareFingerprint,
         ACLCommonShareFingerprint2,
         ACLCommonShareFingerprint3,
-        DownloadPathParentFingerprint
+        DownloadPathParentFingerprint,
+        SettingsStatusLoadFingerprint
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
@@ -53,11 +59,16 @@ class DownloadsPatch : BytecodePatch(
         )
         //Download videos without watermark.
         val method3 = ACLCommonShareFingerprint3.result!!.mutableMethod
-        method3.replaceInstructions(
+        method3.addInstructions(
             0,
             """
+                invoke-static {}, Lapp/revanced/tiktok/download/DownloadsPatch;->shouldRemoveWatermark()Z
+                move-result v0
+                if-eqz v0, :noremovewatermark
                 const/4 v0, 0x1
                 return v0
+                :noremovewatermark
+                nop
             """
         )
         //Change the download path patch
@@ -77,7 +88,6 @@ class DownloadsPatch : BytecodePatch(
         }
         if (targetOffset == -1) return PatchResultError("Can not find download path uri method.")
         //Change videos' download path.
-        val downloadPath = "$downloadPathParent/$downloadPathChild"
         val downloadUriMethod = data
             .toMethodWalker(DownloadPathParentFingerprint.result!!.method)
             .nextMethod(targetOffset, true)
@@ -85,10 +95,11 @@ class DownloadsPatch : BytecodePatch(
         downloadUriMethod.implementation!!.instructions.forEachIndexed { index, instruction ->
             if (instruction.opcode == Opcode.SGET_OBJECT) {
                 val overrideRegister = (instruction as OneRegisterInstruction).registerA
-                downloadUriMethod.replaceInstruction(
-                    index,
+                downloadUriMethod.addInstructions(
+                    index + 1,
                     """
-                        const-string v$overrideRegister, "$downloadPath"
+                        invoke-static {}, Lapp/revanced/tiktok/download/DownloadsPatch;->getDownloadPath()Ljava/lang/String;
+                        move-result-object v$overrideRegister
                     """
                 )
             }
@@ -106,30 +117,11 @@ class DownloadsPatch : BytecodePatch(
                 }
             }
         }
+        val method5 = SettingsStatusLoadFingerprint.result!!.mutableMethod
+        method5.addInstruction(
+            0,
+            "invoke-static {}, Lapp/revanced/tiktok/settingsmenu/SettingsStatus;->enableDownload()V"
+        )
         return PatchResultSuccess()
     }
-
-    companion object : OptionsContainer() {
-        private var downloadPathParent: String? by option(
-            PatchOption.StringListOption(
-                key = "mediaFolder",
-                default = "DCIM",
-                options = listOf(
-                    "DCIM", "Movies", "Pictures"
-                ),
-                title = "Media folder",
-                description = "The media root folder to download to.",
-                required = true
-            )
-        )
-        private var downloadPathChild: String? by option(
-            PatchOption.StringOption(
-                key = "downloadPath",
-                default = "TikTok",
-                title = "Download path",
-                description = "Download path relative to the media folder.",
-                required = true
-            )
-        )
-    }
 }

src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/fingerprints/InlineTimeBarWrapperFingerprint.kt

@@ -1,35 +0,0 @@
-package app.revanced.patches.youtube.layout.hidetimeandseekbar.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.hidetimeandseekbar.annotations.HideTimeAndSeekbarCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("inline-time-bar-wrapper-fingerprint")
-@MatchingMethod("Lcom/google/android/apps/youtube/app/common/player/overlay/InlineTimeBarWrapper;", "onLayout")
-@FuzzyPatternScanMethod(3)
-@HideTimeAndSeekbarCompatibility
-@Version("0.0.1")
-object InlineTimeBarWrapperFingerprint : MethodFingerprint(
-    "V", AccessFlags.PROTECTED or AccessFlags.FINAL, listOf("Z", "I", "I", "I", "I"), listOf(
-        Opcode.SUB_INT_2ADDR,
-        Opcode.SUB_INT,
-        Opcode.IF_EQZ,
-        Opcode.IF_NEZ,
-        Opcode.GOTO_16,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.SUB_INT,
-        Opcode.CONST_4,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT,
-        Opcode.IGET_OBJECT,
-    )
-)

src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/fingerprints/TimeCounterFingerprint.kt

@@ -11,16 +11,22 @@ import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("time-counter-fingerprint")
-@MatchingMethod("Lfez", "a")
+@MatchingMethod("Lfga", "pk")
 @FuzzyPatternScanMethod(3)
 @HideTimeAndSeekbarCompatibility
 @Version("0.0.1")
 object TimeCounterFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("J"), listOf(
-        Opcode.SGET_OBJECT,
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
+        Opcode.IGET_OBJECT,
+        Opcode.IGET_WIDE,
         Opcode.CONST_WIDE_16,
-        Opcode.ADD_LONG_2ADDR,
+        Opcode.CMP_LONG,
+        Opcode.IF_LEZ,
+        Opcode.IGET_OBJECT,
+        Opcode.IF_EQZ,
         Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_WIDE,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ,
+        Opcode.GOTO,
     )
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/patch/HideTimeAndSeekbarPatch.kt

@@ -10,9 +10,9 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patches.youtube.layout.hidetimeandseekbar.fingerprints.InlineTimeBarWrapperFingerprint
 import app.revanced.patches.youtube.layout.hidetimeandseekbar.fingerprints.TimeCounterFingerprint
 import app.revanced.patches.youtube.layout.hidetimeandseekbar.annotations.HideTimeAndSeekbarCompatibility
+import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.CreateVideoPlayerSeekbarFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
@@ -26,7 +26,7 @@ import app.revanced.patches.youtube.misc.settings.framework.components.impl.Swit
 @Version("0.0.1")
 class HideTimeAndSeekbarPatch : BytecodePatch(
     listOf(
-        InlineTimeBarWrapperFingerprint, TimeCounterFingerprint
+        CreateVideoPlayerSeekbarFingerprint, TimeCounterFingerprint
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
@@ -40,10 +40,11 @@ class HideTimeAndSeekbarPatch : BytecodePatch(
             )
         )
 
-        val inlineTimeBarWrapperMethod = InlineTimeBarWrapperFingerprint.result!!.mutableMethod
+        val createVideoPlayerSeekbarMethod = CreateVideoPlayerSeekbarFingerprint.result!!.mutableMethod
 
-        inlineTimeBarWrapperMethod.addInstructions(
+        createVideoPlayerSeekbarMethod.addInstructions(
             0, """
+            const/4 v0, 0x0
             invoke-static { }, Lapp/revanced/integrations/patches/HideTimeAndSeekbarPatch;->hideTimeAndSeekbar()Z
             move-result v0
             if-eqz v0, :hide_time_and_seekbar
@@ -60,8 +61,7 @@ class HideTimeAndSeekbarPatch : BytecodePatch(
             invoke-static { }, Lapp/revanced/integrations/patches/HideTimeAndSeekbarPatch;->hideTimeAndSeekbar()Z
             move-result v0
             if-eqz v0, :hide_time_and_seekbar
-            const-string v0, ""
-            return-object v0
+            return-void
             :hide_time_and_seekbar
             nop
         """

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt

@@ -55,7 +55,8 @@ class SponsorBlockBytecodePatch : BytecodePatch(
         AppendTimeFingerprint,
         PlayerInitFingerprint,
         PlayerOverlaysLayoutInitFingerprint,
-        ShortsPlayerConstructorFingerprint
+        ShortsPlayerConstructorFingerprint,
+        StartVideoInformerFingerprint
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {/*

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

@@ -14,10 +14,10 @@
     <string name="general_adjusting_sum">This is the number of milliseconds you can move when you use the time adjustment buttons while adding new segment</string>
     <string name="general_min_duration">Minimum segment duration</string>
     <string name="general_min_duration_sum">Segments shorter than the set value (in seconds) will not be skipped or shown in the player</string>
-    <string name="general_uuid">Your unique user id</string>
+    <string name="general_uuid">Your private user id</string>
     <string name="general_uuid_sum">This should be kept private. This is like a password and should not be shared with anyone. If someone has this, they can impersonate you</string>
     <string name="settings_ie">Import/Export settings</string>
-    <string name="settings_ie_sum">This is your entire configuration that is applicable in the desktop extension in JSON. This includes your userID, so be sure to share this wisely.</string>
+    <string name="settings_ie_sum">This is your entire configuration that is applicable in the desktop extension in JSON. This includes your Private userID, so be sure to share this wisely.</string>
     <string name="general_api_url">Change API URL</string>
     <string name="general_api_url_sum">The address SponsorBlock uses to make calls to the server. &lt;b>Don\'t change this unless you know what you\'re doing.&lt;/b></string>
     <string name="settings_import_successful">Settings were successfully imported</string>