chore: merge branch dev to main (#1300)

.releaserc

@@ -17,7 +17,7 @@
         "assets": [
           "README.md",
           "CHANGELOG.md",
-          "gradle.properties",X
+          "gradle.properties",
           "patches.json"
         ]
       }

CHANGELOG.md

@@ -1,3 +1,12 @@
+# [2.146.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.145.0...v2.146.0-dev.1) (2022-12-18)
+
+
+### Features
+
+* **predictive-back-gesture:** exclude by default ([176d34b](https://github.com/revanced/revanced-patches/commit/176d34b2ff92d0eb627dad86ad87f559df3db815))
+* **twitter/timeline-ads:** add clarifying notice to description ([0eca2af](https://github.com/revanced/revanced-patches/commit/0eca2af1a4a688903c61ff6469ffea90c60f06a6))
+* **youtube:** bump patches compatibility to v17.49.37 ([83ebc73](https://github.com/revanced/revanced-patches/commit/83ebc731130d3d216ac4b815382d8f13548cf665))
+
 # [2.145.0](https://github.com/revanced/revanced-patches/compare/v2.144.0...v2.145.0) (2022-12-18)
 
 

README.md

@@ -9,53 +9,53 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `always-autorepeat` | Always repeats the playing video again. | 17.45.36 |
+| `always-autorepeat` | Always repeats the playing video again. | 17.49.37 |
 | `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
-| `comments` | Hides components related to comments. | 17.45.36 |
+| `comments` | Hides components related to comments. | 17.49.37 |
 | `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
-| `custom-video-buffer` | Lets you change the buffers of videos. | 17.45.36 |
+| `custom-video-buffer` | Lets you change the buffers of videos. | 17.49.37 |
-| `custom-video-speed` | Adds more video speed options. | 17.45.36 |
+| `custom-video-speed` | Adds more video speed options. | 17.49.37 |
 | `debugging` | Adds debugging options. | all |
-| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 17.45.36 |
+| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 17.49.37 |
-| `disable-auto-player-popup-panels` | Disable automatic popup panels (playlist or live chat) on video player. | 17.45.36 |
+| `disable-auto-player-popup-panels` | Disable automatic popup panels (playlist or live chat) on video player. | 17.49.37 |
-| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.45.36 |
+| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.49.37 |
-| `disable-startup-shorts-player` | Disables playing YouTube Shorts when launching YouTube. | 17.45.36 |
+| `disable-startup-shorts-player` | Disables playing YouTube Shorts when launching YouTube. | 17.49.37 |
 | `disable-zoom-haptics` | Disables haptics when zooming. | all |
-| `downloads` | Enables downloading music and videos from YouTube. | 17.45.36 |
+| `downloads` | Enables downloading music and videos from YouTube. | 17.49.37 |
-| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.45.36 |
+| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.49.37 |
-| `general-ads` | Removes general ads. | 17.45.36 |
+| `general-ads` | Removes general ads. | 17.49.37 |
-| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.45.36 |
+| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.49.37 |
-| `hide-album-cards` | Hides the album cards below the artist description. | 17.45.36 |
+| `hide-album-cards` | Hides the album cards below the artist description. | 17.49.37 |
-| `hide-artist-card` | Hides the artist card below the searchbar. | 17.45.36 |
+| `hide-artist-card` | Hides the artist card below the searchbar. | 17.49.37 |
-| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.45.36 |
+| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.49.37 |
-| `hide-captions-button` | Hides the captions button on video player. | 17.45.36 |
+| `hide-captions-button` | Hides the captions button on video player. | 17.49.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.45.36 |
+| `hide-create-button` | Hides the create button in the navigation bar. | 17.49.37 |
-| `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 17.45.36 |
+| `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 17.49.37 |
-| `hide-email-address` | Hides the email address in the account switcher. | 17.45.36 |
+| `hide-email-address` | Hides the email address in the account switcher. | 17.49.37 |
-| `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 17.45.36 |
+| `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 17.49.37 |
-| `hide-info-cards` | Hides info-cards in videos. | 17.45.36 |
+| `hide-info-cards` | Hides info-cards in videos. | 17.49.37 |
-| `hide-my-mix` | Hides mix playlists. | 17.45.36 |
+| `hide-my-mix` | Hides mix playlists. | 17.49.37 |
-| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.45.36 |
+| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.49.37 |
-| `hide-time-and-seekbar` | Hides progress bar and time counter on videos. | 17.45.36 |
+| `hide-time-and-seekbar` | Hides progress bar and time counter on videos. | 17.49.37 |
-| `hide-video-buttons` | Adds options to hide action buttons under a video. | 17.45.36 |
+| `hide-video-buttons` | Adds options to hide action buttons under a video. | 17.49.37 |
-| `hide-watch-in-vr` | Hides the Watch in VR option in the player settings flyout panel. | 17.45.36 |
+| `hide-watch-in-vr` | Hides the Watch in VR option in the player settings flyout panel. | 17.49.37 |
-| `hide-watermark` | Hides creator's watermarks on videos. | 17.45.36 |
+| `hide-watermark` | Hides creator's watermarks on videos. | 17.49.37 |
-| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.45.36 |
+| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.49.37 |
-| `minimized-playback` | Enables minimized and background playback. | 17.45.36 |
+| `minimized-playback` | Enables minimized and background playback. | 17.49.37 |
-| `old-quality-layout` | Enables the original video quality flyout in the video player settings | 17.45.36 |
+| `old-quality-layout` | Enables the original video quality flyout in the video player settings | 17.49.37 |
-| `open-links-directly` | Bypasses URL redirects and opens links directly inside YouTube app. | 17.45.36 |
+| `open-links-directly` | Bypasses URL redirects and opens links directly inside YouTube app. | 17.49.37 |
 | `premium-heading` | Shows premium branding on the home screen. | all |
-| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.45.36 |
+| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.49.37 |
-| `remove-player-button-background` | Removes the background from the video player buttons. | 17.45.36 |
+| `remove-player-button-background` | Removes the background from the video player buttons. | 17.49.37 |
-| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.45.36 |
+| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.49.37 |
-| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.45.36 |
+| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.49.37 |
 | `settings` | Adds settings for ReVanced to YouTube. | all |
-| `sponsorblock` | Integrate SponsorBlock. | 17.45.36 |
+| `sponsorblock` | Integrate SponsorBlock. | 17.49.37 |
-| `swipe-controls` | Adds volume and brightness swipe controls. | 17.45.36 |
+| `swipe-controls` | Adds volume and brightness swipe controls. | 17.49.37 |
-| `tablet-mini-player` | Enables the tablet mini player layout. | 17.45.36 |
+| `tablet-mini-player` | Enables the tablet mini player layout. | 17.49.37 |
 | `theme` | Applies a custom theme. | all |
-| `video-ads` | Removes ads in the video player. | 17.45.36 |
+| `video-ads` | Removes ads in the video player. | 17.49.37 |
 </details>
 
 ### [📦 `com.google.android.apps.youtube.music`](https://play.google.com/store/apps/details?id=com.google.android.apps.youtube.music)
@@ -137,7 +137,7 @@ The official Patch bundle provided by ReVanced and the community.
 |:--------:|:--------------:|:-----------------:|
 | `dynamic-color` | Replaces the default Twitter Blue with the users Material You palette. | all |
 | `monochrome-icon` | Adds a monochrome icon. | all |
-| `timeline-ads` | Removes ads from the Twitter timeline. | all |
+| `timeline-ads` | Removes ads from the Twitter timeline. Might require clearing app data to remove already cached ads. | all |
 </details>
 
 ### [📦 `com.reddit.frontpage`](https://play.google.com/store/apps/details?id=com.reddit.frontpage)

build.gradle.kts

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

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.145.0
+version = 2.146.0-dev.1

src/main/kotlin/app/revanced/patches/all/interaction/gestures/patch/PredictiveBackGesturePatch.kt

@@ -9,7 +9,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.Patch
 
-@Patch
+@Patch(false)
 @Name("predictive-back-gesture")
 @Description("Enables the predictive back gesture introduced on Android 13.")
 @Version("0.0.1")

src/main/kotlin/app/revanced/patches/shared/fingerprints/SeekbarFingerprint.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.shared.fingerprints
+
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object SeekbarFingerprint : MethodFingerprint(
+    "V",
+    strings = listOf("timed_markers_width")
+)

src/main/kotlin/app/revanced/patches/shared/fingerprints/SeekbarOnDrawFingerprint.kt

@@ -0,0 +1,8 @@
+package app.revanced.patches.shared.fingerprints
+
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object SeekbarOnDrawFingerprint : MethodFingerprint(
+    customFingerprint = { it.name == "onDraw" }
+)

src/main/kotlin/app/revanced/patches/twitter/ad/timeline/patch/TimelineAdsPatch.kt

@@ -25,7 +25,7 @@ import org.jf.dexlib2.iface.reference.StringReference
 
 @Patch
 @Name("timeline-ads")
-@Description("Removes ads from the Twitter timeline.")
+@Description("Removes ads from the Twitter timeline. Might require clearing app data to remove already cached ads.")
 @TimelineAdsCompatibility
 @Version("0.0.1")
 class TimelineAdsPatch : BytecodePatch(

src/main/kotlin/app/revanced/patches/youtube/ad/general/annotation/GeneralAdsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/ad/video/annotations/VideoAdsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/annotation/DownloadsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/annotation/SeekbarTappingCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/annotation/SwipeControlsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/annotations/AutoCaptionsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/annotations/AutoplayButtonCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/annotations/HideButtonsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/comments/annotations/CommentsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/annotations/FullscreenPanelsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/hidealbumcards/annotations/AlbumCardsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/hideartistcard/annotations/HideArtistCardCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/hidecrowdfundingbox/annotations/CrowdfundingBoxCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/hideendscreencards/annotations/HideEndScreenCardsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/hideinfocards/annotations/HideInfocardsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/hidemixplaylists/annotations/MixPlaylistsPatchCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/annotations/HideTimeAndSeekbarCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -5,18 +5,20 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 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.patches.youtube.layout.hidetimeandseekbar.annotations.HideTimeAndSeekbarCompatibility
+import app.revanced.patches.shared.fingerprints.SeekbarFingerprint
-import app.revanced.patches.youtube.layout.hidetimeandseekbar.fingerprints.TimeCounterFingerprint
+import app.revanced.patches.shared.fingerprints.SeekbarOnDrawFingerprint
-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.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.layout.hidetimeandseekbar.annotations.HideTimeAndSeekbarCompatibility
+import app.revanced.patches.youtube.layout.hidetimeandseekbar.fingerprints.TimeCounterFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 
 @Patch
 @DependsOn([IntegrationsPatch::class, SettingsPatch::class])
@@ -26,7 +28,7 @@ import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 @Version("0.0.1")
 class HideTimeAndSeekbarPatch : BytecodePatch(
     listOf(
-        CreateVideoPlayerSeekbarFingerprint, TimeCounterFingerprint
+        SeekbarFingerprint, TimeCounterFingerprint
     )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
@@ -40,7 +42,9 @@ class HideTimeAndSeekbarPatch : BytecodePatch(
             )
         )
 
-        val createVideoPlayerSeekbarMethod = CreateVideoPlayerSeekbarFingerprint.result!!.mutableMethod
+        val createVideoPlayerSeekbarMethod = SeekbarFingerprint.result!!.let {
+            SeekbarOnDrawFingerprint.apply { resolve(context, it.mutableClass) }
+        }.result!!.mutableMethod
 
         createVideoPlayerSeekbarMethod.addInstructions(
             0, """

src/main/kotlin/app/revanced/patches/youtube/layout/oldqualitylayout/annotations/OldQualityLayoutCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/personalinformation/annotations/HideEmailAddressCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/annotations/PivotBarCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/playerbuttonbackground/annotations/PlayerButtonBackgroundCompatibility.kt

@@ -4,7 +4,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [
-        Package("com.google.android.youtube", arrayOf("17.45.36"))
+        Package("com.google.android.youtube", arrayOf("17.49.37"))
     ]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/playerpopuppanels/annotations/PlayerPopupPanelsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/reels/annotations/HideReelsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -1,5 +1,6 @@
 package app.revanced.patches.youtube.layout.returnyoutubedislike.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -51,8 +52,8 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
         VideoIdPatch.injectCall("Lapp/revanced/integrations/patches/ReturnYouTubeDislikePatch;->newVideoLoaded(Ljava/lang/String;)V")
 
         with(TextComponentFingerprint
-            .also { it.resolve(context, TextComponentSpecParentFingerprint.result!!.classDef) }
+            .apply { resolve(context, TextComponentSpecParentFingerprint.result!!.classDef) }
-            .result ?: return PatchResultError("Could not find createComponent method")
+            .result ?: return TextComponentFingerprint.toErrorResult()
         ) {
             val createComponentMethod = mutableMethod
 

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/annotations/SponsorBlockCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/CreateVideoPlayerSeekbarFingerprint.kt

@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object CreateVideoPlayerSeekbarFingerprint : MethodFingerprint(
-    "V",
-    strings = listOf("timed_markers_width")
-)

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

@@ -16,12 +16,14 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.shared.fingerprints.SeekbarFingerprint
+import app.revanced.patches.shared.fingerprints.SeekbarOnDrawFingerprint
+import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
 import app.revanced.patches.youtube.layout.autocaptions.fingerprints.StartVideoInformerFingerprint
 import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
 import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.*
 import app.revanced.patches.youtube.layout.sponsorblock.resource.patch.SponsorBlockResourcePatch
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
 import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch
 import app.revanced.patches.youtube.misc.video.information.patch.VideoInformationPatch
 import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
@@ -48,7 +50,7 @@ import org.jf.dexlib2.iface.reference.StringReference
 @Version("0.0.1")
 class SponsorBlockBytecodePatch : BytecodePatch(
     listOf(
-        CreateVideoPlayerSeekbarFingerprint,
+        SeekbarFingerprint,
         NextGenWatchLayoutFingerprint,
         AppendTimeFingerprint,
         PlayerOverlaysLayoutInitFingerprint,
@@ -85,7 +87,9 @@ class SponsorBlockBytecodePatch : BytecodePatch(
         /*
          Seekbar drawing
          */
-        val seekbarSignatureResult = CreateVideoPlayerSeekbarFingerprint.result!!
+        val seekbarSignatureResult = SeekbarFingerprint.result!!.let {
+            SeekbarOnDrawFingerprint.apply { resolve(context, it.mutableClass) }
+        }.result!!
         val seekbarMethod = seekbarSignatureResult.mutableMethod
         val seekbarMethodInstructions = seekbarMethod.implementation!!.instructions
 
@@ -96,7 +100,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
             if (instruction.opcode != Opcode.MOVE_OBJECT_FROM16) continue
             seekbarMethod.addInstruction(
                 index + 1,
-                "invoke-static {v0}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarRect(Ljava/lang/Object;)V"
+                "invoke-static/range {p0 .. p0}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarRect(Ljava/lang/Object;)V"
             )
             break
         }
@@ -120,10 +124,10 @@ class SponsorBlockBytecodePatch : BytecodePatch(
         /*
         Set rectangle absolute left and right positions
         */
-        val drawRectangleInstructions = seekbarMethodInstructions.filter {
+        val drawRectangleInstructions = seekbarMethodInstructions.withIndex().filter { (_, instruction) ->
-            it is ReferenceInstruction && (it.reference as? MethodReference)?.name == "drawRect" && it is FiveRegisterInstruction
+            instruction is ReferenceInstruction && (instruction.reference as? MethodReference)?.name == "drawRect"
-        }.map { // TODO: improve code
+        }.map { (index, instruction) -> // TODO: improve code
-            seekbarMethodInstructions.indexOf(it) to (it as FiveRegisterInstruction).registerD
+            index to (instruction as FiveRegisterInstruction).registerD
         }
 
         val (indexRight, rectangleRightRegister) = drawRectangleInstructions[0]

src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/annotations/StartupShortsResetCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/annotations/TabletMiniPlayerCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/watchinvr/annotations/WatchinVRCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/watermark/annotations/HideWaterwarkCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/annotations/WideSearchbarCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/DrawActionBarFingerprint.kt

@@ -0,0 +1,27 @@
+package app.revanced.patches.youtube.layout.widesearchbar.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 DrawActionBarFingerprint : MethodFingerprint(
+    "V",
+    AccessFlags.PRIVATE or AccessFlags.FINAL,
+    listOf("I", "I"),
+    listOf(
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.SGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.IGET_OBJECT,
+        Opcode.CONST,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_STATIC,
+    ),
+)

src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/IsInOfflineModeCheckFingerprint.kt

@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.widesearchbar.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object IsInOfflineModeCheckFingerprint : MethodFingerprint(
-    "L",
-    strings = listOf("bundle_is_in_offline_mode")
-)

src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/IsInOfflineModeCheckResultFingerprint.kt

@@ -1,18 +0,0 @@
-package app.revanced.patches.youtube.layout.widesearchbar.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object IsInOfflineModeCheckResultFingerprint : MethodFingerprint(
-    "L",
-    parameters = listOf("L", "L", "L", "L", "L"),
-    opcodes = listOf(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.NEW_INSTANCE,
-        Opcode.MOVE_OBJECT,
-        Opcode.MOVE_OBJECT,
-        Opcode.MOVE_OBJECT,
-    ),
-)

src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/patch/WideSearchbarPatch.kt

@@ -8,7 +8,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -18,8 +17,7 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.layout.widesearchbar.annotations.WideSearchbarCompatibility
-import app.revanced.patches.youtube.layout.widesearchbar.fingerprints.IsInOfflineModeCheckFingerprint
+import app.revanced.patches.youtube.layout.widesearchbar.fingerprints.DrawActionBarFingerprint
-import app.revanced.patches.youtube.layout.widesearchbar.fingerprints.IsInOfflineModeCheckResultFingerprint
 import app.revanced.patches.youtube.layout.widesearchbar.fingerprints.SetWordmarkHeaderFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
@@ -32,7 +30,7 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 @Version("0.0.1")
 class WideSearchbarPatch : BytecodePatch(
     listOf(
-        SetWordmarkHeaderFingerprint, IsInOfflineModeCheckFingerprint
+        SetWordmarkHeaderFingerprint, DrawActionBarFingerprint
     )
 ) {
     private companion object {
@@ -75,16 +73,12 @@ class WideSearchbarPatch : BytecodePatch(
             )
         )
 
-        // resolve fingerprints
+        val result = DrawActionBarFingerprint.result ?: return DrawActionBarFingerprint.toErrorResult()
-        IsInOfflineModeCheckFingerprint.result?.let {
-            if (!IsInOfflineModeCheckResultFingerprint.resolve(context, it.classDef))
-                return IsInOfflineModeCheckResultFingerprint.toErrorResult()
-        } ?: return IsInOfflineModeCheckFingerprint.toErrorResult()
 
         // patch methods
         mapOf(
             SetWordmarkHeaderFingerprint to 1,
-            IsInOfflineModeCheckResultFingerprint to 0
+            DrawActionBarFingerprint to result.scanResult.patternScanResult!!.endIndex
         ).forEach { (fingerprint, callIndex) ->
             context.walkMutable(callIndex, fingerprint).injectSearchBarHook()
         }

src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/annotations/AutoRepeatCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/annotations/FixPlaybackCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/annotations/HDRBrightnessCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/integrations/annotations/IntegrationsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/annotation/LithoFilterCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/patch/LithoFilterPatch.kt

@@ -19,6 +19,7 @@ import app.revanced.patches.youtube.misc.litho.filter.fingerprints.EmptyComponen
 import org.jf.dexlib2.iface.instruction.Instruction
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
 import org.jf.dexlib2.iface.reference.FieldReference
 import org.jf.dexlib2.iface.reference.MethodReference
 
@@ -44,14 +45,16 @@ class LithoFilterPatch : BytecodePatch(
                 val builderMethodDescriptor = instruction(builderMethodIndex).toDescriptor()
                 val emptyComponentFieldDescriptor = instruction(emptyComponentFieldIndex).toDescriptor()
 
+                val stringBuilderRegister = (instruction(insertHookIndex - 1) as TwoRegisterInstruction).registerA
+
                 addInstructions(
                     insertHookIndex, // right after setting the component.pathBuilder field,
                     """
-                        invoke-static {v5, v2}, Lapp/revanced/integrations/patches/LithoFilterPatch;->filter(Ljava/lang/StringBuilder;Ljava/lang/String;)Z
+                        invoke-static {v$stringBuilderRegister, v0}, Lapp/revanced/integrations/patches/LithoFilterPatch;->filter(Ljava/lang/StringBuilder;Ljava/lang/String;)Z
                         move-result v$clobberedRegister
                         if-eqz v$clobberedRegister, :not_an_ad
-                        move-object/from16 v2, p1
+                        move-object/from16 v0, p1
-                        invoke-static {v2}, $builderMethodDescriptor
+                        invoke-static {v0}, $builderMethodDescriptor
                         move-result-object v0
                         iget-object v0, v0, $emptyComponentFieldDescriptor
                         return-object v0

src/main/kotlin/app/revanced/patches/youtube/misc/microg/annotations/MicroGPatchCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/annotations/MinimizedPlaybackCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/annotations/OpenLinksDirectlyCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/annotation/PlayerControlsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/playeroverlay/annotation/PlayerOverlaysHookCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/playertype/annotation/PlayerTypeHookCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/ThemeConstructorFingerprint.kt

@@ -0,0 +1,12 @@
+package app.revanced.patches.youtube.misc.settings.bytecode.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object ThemeConstructorFingerprint : MethodFingerprint(
+    "L",
+    AccessFlags.PUBLIC or AccessFlags.STATIC,
+    listOf("L"),
+    strings = listOf("settings.SettingsActivity", ":android:show_fragment", "settings.GeneralPrefsFragment")
+)

src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/ThemeSetterAppFingerprint.kt

@@ -6,18 +6,7 @@ import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 object ThemeSetterAppFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "L", "L"), listOf(
+    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, opcodes = listOf(
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.SGET_OBJECT,
-        Opcode.IF_NE,
         Opcode.CONST, //target reference
         Opcode.GOTO,
         Opcode.CONST, //target reference

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

@@ -1,11 +1,13 @@
 package app.revanced.patches.youtube.misc.settings.bytecode.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -16,6 +18,7 @@ import app.revanced.patches.shared.settings.util.AbstractPreferenceScreen
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.annotations.SettingsCompatibility
 import app.revanced.patches.youtube.misc.settings.bytecode.fingerprints.LicenseActivityFingerprint
+import app.revanced.patches.youtube.misc.settings.bytecode.fingerprints.ThemeConstructorFingerprint
 import app.revanced.patches.youtube.misc.settings.bytecode.fingerprints.ThemeSetterAppFingerprint
 import app.revanced.patches.youtube.misc.settings.bytecode.fingerprints.ThemeSetterSystemFingerprint
 import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsResourcePatch
@@ -33,7 +36,7 @@ import org.jf.dexlib2.util.MethodUtil
 @SettingsCompatibility
 @Version("0.0.1")
 class SettingsPatch : BytecodePatch(
-    listOf(LicenseActivityFingerprint, ThemeSetterSystemFingerprint, ThemeSetterAppFingerprint)
+    listOf(LicenseActivityFingerprint, ThemeSetterSystemFingerprint, ThemeConstructorFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
         fun buildInvokeInstructionsString(
@@ -44,48 +47,47 @@ class SettingsPatch : BytecodePatch(
         ) = "invoke-static {$registers}, $classDescriptor->$methodName($parameters)V"
 
         // apply the current theme of the settings page
-        with(ThemeSetterSystemFingerprint.result!!) {
+        ThemeSetterSystemFingerprint.result!!.let { result ->
-            with(mutableMethod) {
+            val call = buildInvokeInstructionsString()
-                val call = buildInvokeInstructionsString()
+            result.mutableMethod.apply {
-
                 addInstruction(
-                    scanResult.patternScanResult!!.startIndex,
+                    result.scanResult.patternScanResult!!.startIndex, call
-                    call
                 )
-
+                addInstructions(
-                addInstruction(
+                    implementation!!.instructions.size - 1, call
-                    mutableMethod.implementation!!.instructions.size - 1,
-                    call
                 )
             }
         }
 
         // set the theme based on the preference of the app
-        with(ThemeSetterAppFingerprint.result!!) {
+        with((ThemeConstructorFingerprint.result?.let {
-            with(mutableMethod) {
+            ThemeSetterAppFingerprint.apply {
-                fun buildInstructionsString(theme: Int) = """
+                if (!resolve(context, it.classDef)) return ThemeSetterAppFingerprint.toErrorResult()
+            }
+        } ?: return ThemeConstructorFingerprint.toErrorResult()).result!!) {
+            fun buildInstructionsString(theme: Int) = """
                     const/4 v0, 0x$theme
                     ${buildInvokeInstructionsString(parameters = "I")}
                 """
 
+            val patternScanResult = scanResult.patternScanResult!!
+
+            mutableMethod.apply {
                 addInstructions(
-                    scanResult.patternScanResult!!.endIndex + 1,
+                    patternScanResult.endIndex + 1, buildInstructionsString(1)
-                    buildInstructionsString(1)
                 )
                 addInstructions(
-                    scanResult.patternScanResult!!.endIndex - 7,
+                    patternScanResult.endIndex - 7, buildInstructionsString(0)
-                    buildInstructionsString(0)
                 )
 
                 addInstructions(
-                    scanResult.patternScanResult!!.endIndex - 9,
+                    patternScanResult.endIndex - 9, buildInstructionsString(1)
-                    buildInstructionsString(1)
                 )
                 addInstructions(
-                    mutableMethod.implementation!!.instructions.size - 2,
+                    implementation!!.instructions.size - 2, buildInstructionsString(0)
-                    buildInstructionsString(0)
                 )
             }
+
         }
 
         // set the theme based on the preference of the device
@@ -100,8 +102,7 @@ class SettingsPatch : BytecodePatch(
 
                 // initialize the settings
                 addInstructions(
-                    1,
+                    1, """
-                    """
                         ${buildSettingsActivityInvokeString()}
                         return-void
                     """
@@ -134,8 +135,7 @@ class SettingsPatch : BytecodePatch(
         fun addPreferenceScreen(preferenceScreen: app.revanced.patches.shared.settings.preference.impl.PreferenceScreen) =
             SettingsResourcePatch.addPreferenceScreen(preferenceScreen)
 
-        fun addPreference(preference: Preference) =
+        fun addPreference(preference: Preference) = SettingsResourcePatch.addPreference(preference)
-            SettingsResourcePatch.addPreference(preference)
 
         fun renameIntentsTargetPackage(newPackage: String) {
             SettingsResourcePatch.overrideIntentsTargetPackage = newPackage

src/main/kotlin/app/revanced/patches/youtube/misc/video/information/annotation/VideoInformationCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/video/quality/annotations/RememberVideoQualityCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/video/speed/custom/annotations/CustomPlaybackSpeedCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/video/videoid/annotation/VideoIdCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/annotations/CustomVideoBufferCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.45.36")
+        "com.google.android.youtube", arrayOf("17.49.37")
     )]
 )
 @Target(AnnotationTarget.CLASS)