chore: Release v5.18.0-dev.2 [skip ci]

# [5.18.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.18.0-dev.1...v5.18.0-dev.2) (2025-03-28)

### Bug Fixes

* **Spotify:** Ignore optional attributes if not present ([#4688](https://github.com/ReVanced/revanced-patches/issues/4688)) ([84f5854](84f585492e))

.github/workflows/pull_strings.yml

@@ -2,7 +2,7 @@ name: Pull strings
 
 on:
   schedule:
-    - cron: "0 */6 * * *"
+    - cron: "0 */12 * * *"
   workflow_dispatch:
 
 jobs:

CHANGELOG.md

@@ -1,3 +1,325 @@
+# [5.18.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.18.0-dev.1...v5.18.0-dev.2) (2025-03-28)
+
+
+### Bug Fixes
+
+* **Spotify:** Ignore optional attributes if not present ([#4688](https://github.com/ReVanced/revanced-patches/issues/4688)) ([84f5854](https://github.com/ReVanced/revanced-patches/commit/84f585492e4be3604c6c7680ffb3bebcea5a675f))
+
+# [5.18.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.17.0...v5.18.0-dev.1) (2025-03-28)
+
+
+### Features
+
+* **YouTube:** Support version `20.07.39` ([#4677](https://github.com/ReVanced/revanced-patches/issues/4677)) ([c1379f6](https://github.com/ReVanced/revanced-patches/commit/c1379f6e520c683d2c9d6a490a69ca542168b3b3))
+
+# [5.17.0](https://github.com/ReVanced/revanced-patches/compare/v5.16.1...v5.17.0) (2025-03-28)
+
+
+### Bug Fixes
+
+* **Facebook - Hide 'Sponsored Stories':** Constrain patch to latest compatible version ([#4657](https://github.com/ReVanced/revanced-patches/issues/4657)) ([46bd1c8](https://github.com/ReVanced/revanced-patches/commit/46bd1c829acd5f83600025e0ceb7d482ae80be69))
+* **Spotify - Unlock Premium:** Override additional attributes ([#4651](https://github.com/ReVanced/revanced-patches/issues/4651)) ([568b40d](https://github.com/ReVanced/revanced-patches/commit/568b40da9692eae9039bbb3cec513a61ca627c24))
+* **Spotify - Unlock Premium:** Use correct patch description convention ([a486522](https://github.com/ReVanced/revanced-patches/commit/a4865228f8481d2efc8fbf4e90902a03289d9a3f))
+* **X / Twitter:** Constrain patches to latest compatible versions ([#4683](https://github.com/ReVanced/revanced-patches/issues/4683)) ([f579728](https://github.com/ReVanced/revanced-patches/commit/f5797289f45186052537982c7f5db6f2b0769aee))
+* **YouTube - Navigation buttons:** Add user dialog message to 'Disable translucent status bar' ([a4a0e68](https://github.com/ReVanced/revanced-patches/commit/a4a0e6869e23d15ee09262460f4e290c90629eeb))
+
+
+### Features
+
+* **Spotify - Unlock Premium:** Disable the "Spotify Premium" upsell experiment in context menus ([9a10ee4](https://github.com/ReVanced/revanced-patches/commit/9a10ee4d22fb53da2012a182e038749d3ad72377))
+
+# [5.17.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.17.0-dev.3...v5.17.0-dev.4) (2025-03-28)
+
+
+### Bug Fixes
+
+* **X / Twitter:** Constrain patches to latest compatible versions ([#4683](https://github.com/ReVanced/revanced-patches/issues/4683)) ([f579728](https://github.com/ReVanced/revanced-patches/commit/f5797289f45186052537982c7f5db6f2b0769aee))
+
+# [5.17.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.17.0-dev.2...v5.17.0-dev.3) (2025-03-28)
+
+
+### Bug Fixes
+
+* **Spotify - Unlock Premium:** Override additional attributes ([#4651](https://github.com/ReVanced/revanced-patches/issues/4651)) ([568b40d](https://github.com/ReVanced/revanced-patches/commit/568b40da9692eae9039bbb3cec513a61ca627c24))
+
+# [5.17.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.17.0-dev.1...v5.17.0-dev.2) (2025-03-27)
+
+
+### Bug Fixes
+
+* **YouTube - Navigation buttons:** Add user dialog message to 'Disable translucent status bar' ([a4a0e68](https://github.com/ReVanced/revanced-patches/commit/a4a0e6869e23d15ee09262460f4e290c90629eeb))
+
+# [5.17.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.16.2-dev.1...v5.17.0-dev.1) (2025-03-27)
+
+
+### Bug Fixes
+
+* **Spotify - Unlock Premium:** Use correct patch description convention ([a486522](https://github.com/ReVanced/revanced-patches/commit/a4865228f8481d2efc8fbf4e90902a03289d9a3f))
+
+
+### Features
+
+* **Spotify - Unlock Premium:** Disable the "Spotify Premium" upsell experiment in context menus ([9a10ee4](https://github.com/ReVanced/revanced-patches/commit/9a10ee4d22fb53da2012a182e038749d3ad72377))
+
+## [5.16.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.16.1...v5.16.2-dev.1) (2025-03-26)
+
+
+### Bug Fixes
+
+* **Facebook - Hide 'Sponsored Stories':** Constrain patch to latest compatible version ([#4657](https://github.com/ReVanced/revanced-patches/issues/4657)) ([46bd1c8](https://github.com/ReVanced/revanced-patches/commit/46bd1c829acd5f83600025e0ceb7d482ae80be69))
+
+## [5.16.1](https://github.com/ReVanced/revanced-patches/compare/v5.16.0...v5.16.1) (2025-03-26)
+
+
+### Bug Fixes
+
+* **Spotify - Unlock Premium:** Override streaming attribute attempting to fix streaming issues ([06be36c](https://github.com/ReVanced/revanced-patches/commit/06be36cddf3430b4179dff696b3d15718cd6963b))
+
+## [5.16.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.16.0...v5.16.1-dev.1) (2025-03-26)
+
+
+### Bug Fixes
+
+* **Spotify - Unlock Premium:** Override streaming attribute attempting to fix streaming issues ([06be36c](https://github.com/ReVanced/revanced-patches/commit/06be36cddf3430b4179dff696b3d15718cd6963b))
+
+# [5.16.0](https://github.com/ReVanced/revanced-patches/compare/v5.15.0...v5.16.0) (2025-03-26)
+
+
+### Bug Fixes
+
+* **YouTube - Settings:** System navigation bar is located above the settings ui on Android 15+ ([f7497be](https://github.com/ReVanced/revanced-patches/commit/f7497be2c5e4abcde6eb55b84955124a28f55cae))
+
+
+### Features
+
+* **Spotify:** Add `Unlock premium` patch ([#4644](https://github.com/ReVanced/revanced-patches/issues/4644)) ([f048c50](https://github.com/ReVanced/revanced-patches/commit/f048c50e56fc1f5a5c607860be4206ef83b528fe))
+* **YouTube - Comments:** Add `Hide AI Comments summary` ([#4634](https://github.com/ReVanced/revanced-patches/issues/4634)) ([e9b7f26](https://github.com/ReVanced/revanced-patches/commit/e9b7f263f739bd130f6ea79913851a52355977c5))
+* **YouTube - Video description:** Add `Hide AI-generated video summary` ([#4636](https://github.com/ReVanced/revanced-patches/issues/4636)) ([521fd48](https://github.com/ReVanced/revanced-patches/commit/521fd48602432ab436d8711c19d7130b2b05af12))
+
+# [5.16.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.16.0-dev.1...v5.16.0-dev.2) (2025-03-26)
+
+
+### Features
+
+* **Spotify:** Add `Unlock premium` patch ([#4644](https://github.com/ReVanced/revanced-patches/issues/4644)) ([f048c50](https://github.com/ReVanced/revanced-patches/commit/f048c50e56fc1f5a5c607860be4206ef83b528fe))
+
+# [5.16.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.15.0...v5.16.0-dev.1) (2025-03-24)
+
+
+### Bug Fixes
+
+* **YouTube - Settings:** System navigation bar is located above the settings ui on Android 15+ ([f7497be](https://github.com/ReVanced/revanced-patches/commit/f7497be2c5e4abcde6eb55b84955124a28f55cae))
+
+
+### Features
+
+* **YouTube - Comments:** Add `Hide AI Comments summary` ([#4634](https://github.com/ReVanced/revanced-patches/issues/4634)) ([e9b7f26](https://github.com/ReVanced/revanced-patches/commit/e9b7f263f739bd130f6ea79913851a52355977c5))
+* **YouTube - Video description:** Add `Hide AI-generated video summary` ([#4636](https://github.com/ReVanced/revanced-patches/issues/4636)) ([521fd48](https://github.com/ReVanced/revanced-patches/commit/521fd48602432ab436d8711c19d7130b2b05af12))
+
+# [5.15.0](https://github.com/ReVanced/revanced-patches/compare/v5.14.0...v5.15.0) (2025-03-21)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof app version:** Change oldest spoof target to 19.01.34 ([5012439](https://github.com/ReVanced/revanced-patches/commit/5012439a8e53b2a4ab5e85c47976e1ab28a51208))
+* **YouTube - Spoof app version:** Remove broken spoof targets that YouTube no longer supports ([#4610](https://github.com/ReVanced/revanced-patches/issues/4610)) ([883fbe7](https://github.com/ReVanced/revanced-patches/commit/883fbe71233c57cb1241e57c122b43f40722acc7))
+* **YouTube:** Do not show restart prompt more than once if setting change is canceled ([49797fe](https://github.com/ReVanced/revanced-patches/commit/49797fe8d0c4a0981ef621a31356c4315ae3777b))
+
+
+### Features
+
+* **YouTube - SponsorBlock:** Add opacity setting to category segment colors ([#4582](https://github.com/ReVanced/revanced-patches/issues/4582)) ([6e8ffba](https://github.com/ReVanced/revanced-patches/commit/6e8ffbade9e03658f725622631e44dabf2995861))
+
+# [5.15.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.15.0-dev.3...v5.15.0-dev.4) (2025-03-21)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof app version:** Change oldest spoof target to 19.01.34 ([5012439](https://github.com/ReVanced/revanced-patches/commit/5012439a8e53b2a4ab5e85c47976e1ab28a51208))
+
+# [5.15.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.15.0-dev.2...v5.15.0-dev.3) (2025-03-20)
+
+
+### Bug Fixes
+
+* **YouTube:** Do not show restart prompt more than once if setting change is canceled ([49797fe](https://github.com/ReVanced/revanced-patches/commit/49797fe8d0c4a0981ef621a31356c4315ae3777b))
+
+# [5.15.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.15.0-dev.1...v5.15.0-dev.2) (2025-03-19)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof app version:** Remove broken spoof targets that YouTube no longer supports ([#4610](https://github.com/ReVanced/revanced-patches/issues/4610)) ([883fbe7](https://github.com/ReVanced/revanced-patches/commit/883fbe71233c57cb1241e57c122b43f40722acc7))
+
+# [5.15.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.14.0...v5.15.0-dev.1) (2025-03-19)
+
+
+### Features
+
+* **YouTube - SponsorBlock:** Add opacity setting to category segment colors ([#4582](https://github.com/ReVanced/revanced-patches/issues/4582)) ([6e8ffba](https://github.com/ReVanced/revanced-patches/commit/6e8ffbade9e03658f725622631e44dabf2995861))
+
+# [5.14.0](https://github.com/ReVanced/revanced-patches/compare/v5.13.0...v5.14.0) (2025-03-09)
+
+
+### Bug Fixes
+
+* **Boost for reddit - Client spoof:** Use a different user agent to combat Reddit's API issues ([5d3c817](https://github.com/ReVanced/revanced-patches/commit/5d3c8175b34a3f6ae2732b25db0851773a8c000d))
+* **YouTube - Change form factor:** Restore Automotive form factor watch history menu, channel pages, and community posts ([#4541](https://github.com/ReVanced/revanced-patches/issues/4541)) ([aa5c001](https://github.com/ReVanced/revanced-patches/commit/aa5c001968446e5270c756256724e917009612cd))
+* **YouTube - Hide ads:** Hide new type of buttoned ad ([#4528](https://github.com/ReVanced/revanced-patches/issues/4528)) ([4387a7b](https://github.com/ReVanced/revanced-patches/commit/4387a7b131f49729e902e008bb4cec073635c040))
+* **YouTube - Hide layout components:** Do not hide Movie/Courses start page content if 'Hide horizontal shelves' is enabled ([62a6164](https://github.com/ReVanced/revanced-patches/commit/62a6164b88b64200b517a5ba6b800d8214dbbad8))
+* **YouTube - Theme:** Resolve dark mode startup crash with Android 9.0 ([741c2d5](https://github.com/ReVanced/revanced-patches/commit/741c2d59406f5d602554bb3a3c0b8982f42848b4))
+* **YouTube:** Change language settings menu to use native language names ([#4568](https://github.com/ReVanced/revanced-patches/issues/4568)) ([6f3f8fd](https://github.com/ReVanced/revanced-patches/commit/6f3f8fdce05501e4fa4423c2170a916fbea3b199))
+* **YouTube:** Combine `Restore old video quality menu` and `Remember video quality` into `Video quality` patch ([#4552](https://github.com/ReVanced/revanced-patches/issues/4552)) ([ee67b76](https://github.com/ReVanced/revanced-patches/commit/ee67b763d5c5947a5b1ef4420b1efa820ed6af83))
+
+
+### Features
+
+* **Infinity for Reddit:** Add support for package name on IzzyOnDroid ([#4554](https://github.com/ReVanced/revanced-patches/issues/4554)) ([cf9f959](https://github.com/ReVanced/revanced-patches/commit/cf9f959923076c10a7f0a29f6ba277f5a055ec07))
+* **Spotify:** Add `Spoof signature` patch ([#4576](https://github.com/ReVanced/revanced-patches/issues/4576)) ([3646c70](https://github.com/ReVanced/revanced-patches/commit/3646c70556b67a6b7ecf9b86869ebf03c3611333))
+* **YouTube - Remember video quality:** Add separate Shorts default quality settings ([#4543](https://github.com/ReVanced/revanced-patches/issues/4543)) ([88142ab](https://github.com/ReVanced/revanced-patches/commit/88142ab464192b564b1b8d56a6b45663f77f5e00))
+
+# [5.14.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v5.14.0-dev.8...v5.14.0-dev.9) (2025-03-09)
+
+
+### Features
+
+* **Spotify:** Add `Spoof signature` patch ([#4576](https://github.com/ReVanced/revanced-patches/issues/4576)) ([3646c70](https://github.com/ReVanced/revanced-patches/commit/3646c70556b67a6b7ecf9b86869ebf03c3611333))
+
+# [5.14.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v5.14.0-dev.7...v5.14.0-dev.8) (2025-03-09)
+
+
+### Bug Fixes
+
+* **YouTube - Theme:** Resolve dark mode startup crash with Android 9.0 ([741c2d5](https://github.com/ReVanced/revanced-patches/commit/741c2d59406f5d602554bb3a3c0b8982f42848b4))
+
+# [5.14.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v5.14.0-dev.6...v5.14.0-dev.7) (2025-03-08)
+
+
+### Bug Fixes
+
+* **YouTube:** Change language settings menu to use native language names ([#4568](https://github.com/ReVanced/revanced-patches/issues/4568)) ([6f3f8fd](https://github.com/ReVanced/revanced-patches/commit/6f3f8fdce05501e4fa4423c2170a916fbea3b199))
+
+# [5.14.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.14.0-dev.5...v5.14.0-dev.6) (2025-03-07)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Do not hide Movie/Courses start page content if 'Hide horizontal shelves' is enabled ([62a6164](https://github.com/ReVanced/revanced-patches/commit/62a6164b88b64200b517a5ba6b800d8214dbbad8))
+
+# [5.14.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.14.0-dev.4...v5.14.0-dev.5) (2025-03-06)
+
+
+### Features
+
+* **Infinity for Reddit:** Add support for package name on IzzyOnDroid ([#4554](https://github.com/ReVanced/revanced-patches/issues/4554)) ([cf9f959](https://github.com/ReVanced/revanced-patches/commit/cf9f959923076c10a7f0a29f6ba277f5a055ec07))
+
+# [5.14.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.14.0-dev.3...v5.14.0-dev.4) (2025-03-06)
+
+
+### Bug Fixes
+
+* **YouTube:** Combine `Restore old video quality menu` and `Remember video quality` into `Video quality` patch ([#4552](https://github.com/ReVanced/revanced-patches/issues/4552)) ([ee67b76](https://github.com/ReVanced/revanced-patches/commit/ee67b763d5c5947a5b1ef4420b1efa820ed6af83))
+
+# [5.14.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.14.0-dev.2...v5.14.0-dev.3) (2025-03-06)
+
+
+### Bug Fixes
+
+* **Boost for reddit - Client spoof:** Use a different user agent to combat Reddit's API issues ([5d3c817](https://github.com/ReVanced/revanced-patches/commit/5d3c8175b34a3f6ae2732b25db0851773a8c000d))
+
+# [5.14.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.14.0-dev.1...v5.14.0-dev.2) (2025-03-06)
+
+
+### Bug Fixes
+
+* **YouTube - Hide ads:** Hide new type of buttoned ad ([#4528](https://github.com/ReVanced/revanced-patches/issues/4528)) ([4387a7b](https://github.com/ReVanced/revanced-patches/commit/4387a7b131f49729e902e008bb4cec073635c040))
+
+# [5.14.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.13.1-dev.1...v5.14.0-dev.1) (2025-03-06)
+
+
+### Features
+
+* **YouTube - Remember video quality:** Add separate Shorts default quality settings ([#4543](https://github.com/ReVanced/revanced-patches/issues/4543)) ([88142ab](https://github.com/ReVanced/revanced-patches/commit/88142ab464192b564b1b8d56a6b45663f77f5e00))
+
+## [5.13.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.13.0...v5.13.1-dev.1) (2025-03-06)
+
+
+### Bug Fixes
+
+* **YouTube - Change form factor:** Restore Automotive form factor watch history menu, channel pages, and community posts ([#4541](https://github.com/ReVanced/revanced-patches/issues/4541)) ([aa5c001](https://github.com/ReVanced/revanced-patches/commit/aa5c001968446e5270c756256724e917009612cd))
+
+# [5.13.0](https://github.com/ReVanced/revanced-patches/compare/v5.12.0...v5.13.0) (2025-03-03)
+
+
+### Bug Fixes
+
+* **TikTok:** Resolve startup app crash ([18c0fc2](https://github.com/ReVanced/revanced-patches/commit/18c0fc2a7f186f50a904fd25dbaa739abdd24993))
+* **TikTok:** Resolve startup app crash ([6466398](https://github.com/ReVanced/revanced-patches/commit/64663983b84de1f28636205f61bf0a24c83968d1))
+* **TikTok:** Resolve startup app crash ([c14bc24](https://github.com/ReVanced/revanced-patches/commit/c14bc244550de30eca975ca7c09e8eb0c47534b5))
+* **TikTok:** Resolve startup app crash ([d700076](https://github.com/ReVanced/revanced-patches/commit/d7000768a5e5a688c9f4e48858ac34e352222c1e))
+* **YouTube - Copy video URL:** Use correct button ordering ([5e622cc](https://github.com/ReVanced/revanced-patches/commit/5e622ccf66d34af31c6026fa7f4d332460c6ecb0))
+* **YouTube - Hide filter bar:** Fix `Hide in feed` not working in subscriptions feed ([#4512](https://github.com/ReVanced/revanced-patches/issues/4512)) ([634d0ee](https://github.com/ReVanced/revanced-patches/commit/634d0ee12e31491c7ee1d4ceb002daf8366a3c15))
+* **YouTube - Hide layout components:** Do not hide 'Show anyway' button in search results ([4ac8854](https://github.com/ReVanced/revanced-patches/commit/4ac8854b99808a8957f3b0b7438e1e0cdedffbaf))
+* **YouTube - Hide player components:** Show correct end video thumbnail if `Hide end screen suggested video` is enabled ([#4502](https://github.com/ReVanced/revanced-patches/issues/4502)) ([6c4885a](https://github.com/ReVanced/revanced-patches/commit/6c4885a1d5dfff50100b01840b5552d92e83ee4a))
+* **YouTube - Hide video action buttons:** Move 'Disable Like and Subscribe glow' to action buttons settings menu ([29b265d](https://github.com/ReVanced/revanced-patches/commit/29b265d8fdaa48502650be9623bfc518a57a0bb1))
+* **YouTube - Return YouTube Dislike:** Use correct number formatting if using a different ReVanced language ([edf66f4](https://github.com/ReVanced/revanced-patches/commit/edf66f4e16d46156cb8b8e31d18cb8dbcb87737e))
+* **YouTube - Spoof app version:** Force old settings menus if spoofing to older app targets ([#4490](https://github.com/ReVanced/revanced-patches/issues/4490)) ([45e7c46](https://github.com/ReVanced/revanced-patches/commit/45e7c46dd9c70c926b8b1a97ada668f90f5f6f8c))
+* **YouTube - Spoof video streams:** Resolve playback issues with dynamic player config ([#4521](https://github.com/ReVanced/revanced-patches/issues/4521)) ([647e764](https://github.com/ReVanced/revanced-patches/commit/647e7642efc0c00db17ccb6a620d1c96ccf4afed))
+* **YouTube - Swipe controls:** Adjust the overlay text size ([#4503](https://github.com/ReVanced/revanced-patches/issues/4503)) ([6dc4bf7](https://github.com/ReVanced/revanced-patches/commit/6dc4bf75e09ed6f05534919d7b769b720043abce))
+* **YouTube:** Do not hide player controls when using double tap to skip forward ([#4487](https://github.com/ReVanced/revanced-patches/issues/4487)) ([63fe870](https://github.com/ReVanced/revanced-patches/commit/63fe870d48ca2217327b952bde241b7f16ced850))
+* **YouTube:** Fix player button fade out animations ([#4469](https://github.com/ReVanced/revanced-patches/issues/4469)) ([bf8e775](https://github.com/ReVanced/revanced-patches/commit/bf8e7759f9bdbdfef419a879fb3dd7cf0dff0098))
+* **YouTube:** Resolve button flickering when taping seekbar ([#4500](https://github.com/ReVanced/revanced-patches/issues/4500)) ([1f08047](https://github.com/ReVanced/revanced-patches/commit/1f08047b48cc9555a4887d16ec7219a55a77251f))
+
+
+### Features
+
+* **Infinity for Reddit:** Add support for Infinity for Reddit Plus ([#4511](https://github.com/ReVanced/revanced-patches/issues/4511)) ([d74732b](https://github.com/ReVanced/revanced-patches/commit/d74732b7596104321bde263201d95649e4bd0eee))
+* **NU.nl:** Add `Hide ads` and `Spoof Certificate` patch ([#4368](https://github.com/ReVanced/revanced-patches/issues/4368)) ([f3268fb](https://github.com/ReVanced/revanced-patches/commit/f3268fb03ca25fb5465e36015b6c9dec2c84a655))
+* **YouTube - Navigation buttons:** Add 'Hide notifications' setting ([#4485](https://github.com/ReVanced/revanced-patches/issues/4485)) ([506d241](https://github.com/ReVanced/revanced-patches/commit/506d2414bbc760e764e5a514b32926083d6ecb6b))
+* **YouTube - Swipe controls:** Swipe controls UI improvements ([#4422](https://github.com/ReVanced/revanced-patches/issues/4422)) ([198e4d2](https://github.com/ReVanced/revanced-patches/commit/198e4d2a2315c24a09eb9ecfefbd131a75384d2c))
+
+# [5.13.0-dev.19](https://github.com/ReVanced/revanced-patches/compare/v5.13.0-dev.18...v5.13.0-dev.19) (2025-03-02)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Resolve playback issues with dynamic player config ([#4521](https://github.com/ReVanced/revanced-patches/issues/4521)) ([647e764](https://github.com/ReVanced/revanced-patches/commit/647e7642efc0c00db17ccb6a620d1c96ccf4afed))
+
+# [5.13.0-dev.18](https://github.com/ReVanced/revanced-patches/compare/v5.13.0-dev.17...v5.13.0-dev.18) (2025-02-28)
+
+
+### Features
+
+* **Infinity for Reddit:** Add support for Infinity for Reddit Plus ([#4511](https://github.com/ReVanced/revanced-patches/issues/4511)) ([d74732b](https://github.com/ReVanced/revanced-patches/commit/d74732b7596104321bde263201d95649e4bd0eee))
+
+# [5.13.0-dev.17](https://github.com/ReVanced/revanced-patches/compare/v5.13.0-dev.16...v5.13.0-dev.17) (2025-02-27)
+
+
+### Bug Fixes
+
+* **YouTube - Hide filter bar:** Fix `Hide in feed` not working in subscriptions feed ([#4512](https://github.com/ReVanced/revanced-patches/issues/4512)) ([634d0ee](https://github.com/ReVanced/revanced-patches/commit/634d0ee12e31491c7ee1d4ceb002daf8366a3c15))
+
+# [5.13.0-dev.16](https://github.com/ReVanced/revanced-patches/compare/v5.13.0-dev.15...v5.13.0-dev.16) (2025-02-27)
+
+
+### Features
+
+* **NU.nl:** Add `Hide ads` and `Spoof Certificate` patch ([#4368](https://github.com/ReVanced/revanced-patches/issues/4368)) ([f3268fb](https://github.com/ReVanced/revanced-patches/commit/f3268fb03ca25fb5465e36015b6c9dec2c84a655))
+
+# [5.13.0-dev.15](https://github.com/ReVanced/revanced-patches/compare/v5.13.0-dev.14...v5.13.0-dev.15) (2025-02-25)
+
+
+### Bug Fixes
+
+* **YouTube - Hide player components:** Show correct end video thumbnail if `Hide end screen suggested video` is enabled ([#4502](https://github.com/ReVanced/revanced-patches/issues/4502)) ([6c4885a](https://github.com/ReVanced/revanced-patches/commit/6c4885a1d5dfff50100b01840b5552d92e83ee4a))
+
+# [5.13.0-dev.14](https://github.com/ReVanced/revanced-patches/compare/v5.13.0-dev.13...v5.13.0-dev.14) (2025-02-25)
+
+
+### Bug Fixes
+
+* **YouTube - Swipe controls:** Adjust the overlay text size ([#4503](https://github.com/ReVanced/revanced-patches/issues/4503)) ([6dc4bf7](https://github.com/ReVanced/revanced-patches/commit/6dc4bf75e09ed6f05534919d7b769b720043abce))
+
 # [5.13.0-dev.13](https://github.com/ReVanced/revanced-patches/compare/v5.13.0-dev.12...v5.13.0-dev.13) (2025-02-24)
 
 

extensions/nunl/build.gradle.kts

@@ -0,0 +1,4 @@
+dependencies {
+    compileOnly(project(":extensions:shared:library"))
+    compileOnly(project(":extensions:nunl:stub"))
+}

extensions/nunl/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest/>

extensions/nunl/src/main/java/app/revanced/extension/nunl/ads/HideAdsPatch.java

@@ -0,0 +1,114 @@
+package app.revanced.extension.nunl.ads;
+
+import nl.nu.performance.api.client.interfaces.Block;
+import nl.nu.performance.api.client.unions.SmallArticleLinkFlavor;
+import nl.nu.performance.api.client.objects.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import app.revanced.extension.shared.Logger;
+
+@SuppressWarnings("unused")
+public class HideAdsPatch {
+    private static final String[] blockedHeaderBlocks = {
+            "Aanbiedingen (Adverteerders)",
+            "Aangeboden door NUshop"
+    };
+
+    // "Rubrieken" menu links to ads.
+    private static final String[] blockedLinkBlocks = {
+            "Van onze adverteerders"
+    };
+
+    public static void filterAds(List<Block> blocks) {
+        try {
+            ArrayList<Block> cleanedList = new ArrayList<>();
+
+            boolean skipFullHeader = false;
+            boolean skipUntilDivider = false;
+
+            int index = 0;
+            while (index < blocks.size()) {
+                Block currentBlock = blocks.get(index);
+
+                // Because of pagination, we might not see the Divider in front of it.
+                // Just remove it as is and leave potential extra spacing visible on the screen.
+                if (currentBlock instanceof DpgBannerBlock) {
+                    index++;
+                    continue;
+                }
+
+                if (index + 1 < blocks.size()) {
+                    // Filter Divider -> DpgMediaBanner -> Divider.
+                    if (currentBlock instanceof DividerBlock
+                            && blocks.get(index + 1) instanceof DpgBannerBlock) {
+                        index += 2;
+                        continue;
+                    }
+
+                    // Filter Divider -> LinkBlock (... -> LinkBlock -> LinkBlock-> LinkBlock -> Divider).
+                    if (currentBlock instanceof DividerBlock
+                            && blocks.get(index + 1) instanceof LinkBlock linkBlock) {
+                        Link link = linkBlock.getLink();
+                        if (link != null && link.getTitle() != null) {
+                            for (String blockedLinkBlock : blockedLinkBlocks) {
+                                if (blockedLinkBlock.equals(link.getTitle().getText())) {
+                                    skipUntilDivider = true;
+                                    break;
+                                }
+                            }
+                            if (skipUntilDivider) {
+                                index++;
+                                continue;
+                            }
+                        }
+                    }
+                }
+
+                // Skip LinkBlocks with a "flavor" claiming to be "isPartner" (sponsored inline ads).
+                if (currentBlock instanceof LinkBlock linkBlock
+                        && linkBlock.getLink() != null
+                        && linkBlock.getLink().getLinkFlavor() instanceof SmallArticleLinkFlavor smallArticleLinkFlavor
+                        && smallArticleLinkFlavor.isPartner() != null
+                        && smallArticleLinkFlavor.isPartner()) {
+                    index++;
+                    continue;
+                }
+
+                if (currentBlock instanceof DividerBlock) {
+                    skipUntilDivider = false;
+                }
+
+                // Filter HeaderBlock with known ads until next HeaderBlock.
+                if (currentBlock instanceof HeaderBlock headerBlock) {
+                    StyledText headerText = headerBlock.component20();
+                    if (headerText != null) {
+                        skipFullHeader = false;
+                        for (String blockedHeaderBlock : blockedHeaderBlocks) {
+                            if (blockedHeaderBlock.equals(headerText.getText())) {
+                                skipFullHeader = true;
+                                break;
+                            }
+                        }
+                        if (skipFullHeader) {
+                            index++;
+                            continue;
+                        }
+                    }
+                }
+
+                if (!skipFullHeader && !skipUntilDivider) {
+                    cleanedList.add(currentBlock);
+                }
+                index++;
+            }
+
+            // Replace list in-place to not deal with moving the result to the correct register in smali.
+            blocks.clear();
+            blocks.addAll(cleanedList);
+        } catch (Exception ex) {
+            Logger.printException(() -> "filterAds failure", ex);
+        }
+    }
+}

extensions/nunl/stub/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    id(libs.plugins.android.library.get().pluginId)
+}
+
+android {
+    namespace = "app.revanced.extension"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 26
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+}

extensions/nunl/stub/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest/>

extensions/nunl/stub/src/main/java/nl/nu/performance/api/client/interfaces/Block.java

@@ -0,0 +1,5 @@
+package nl.nu.performance.api.client.interfaces;
+
+public class Block {
+
+}

extensions/nunl/stub/src/main/java/nl/nu/performance/api/client/objects/DividerBlock.java

@@ -0,0 +1,7 @@
+package nl.nu.performance.api.client.objects;
+
+import nl.nu.performance.api.client.interfaces.Block;
+
+public class DividerBlock extends Block  {
+
+}

extensions/nunl/stub/src/main/java/nl/nu/performance/api/client/objects/DpgBannerBlock.java

@@ -0,0 +1,7 @@
+package nl.nu.performance.api.client.objects;
+
+import nl.nu.performance.api.client.interfaces.Block;
+
+public class DpgBannerBlock extends Block {
+
+}

extensions/nunl/stub/src/main/java/nl/nu/performance/api/client/objects/HeaderBlock.java

@@ -0,0 +1,10 @@
+package nl.nu.performance.api.client.objects;
+
+import nl.nu.performance.api.client.interfaces.Block;
+
+public class HeaderBlock extends Block {
+    // returns title
+    public final StyledText component20() {
+        throw new UnsupportedOperationException("Stub");
+    }
+}

extensions/nunl/stub/src/main/java/nl/nu/performance/api/client/objects/Link.java

@@ -0,0 +1,13 @@
+package nl.nu.performance.api.client.objects;
+
+import nl.nu.performance.api.client.unions.LinkFlavor;
+
+public class Link {
+    public final StyledText getTitle() {
+        throw new UnsupportedOperationException("Stub");
+    }
+
+    public final LinkFlavor getLinkFlavor() {
+        throw new UnsupportedOperationException("Stub");
+    }
+}

extensions/nunl/stub/src/main/java/nl/nu/performance/api/client/objects/LinkBlock.java

@@ -0,0 +1,10 @@
+package nl.nu.performance.api.client.objects;
+
+import android.os.Parcelable;
+import nl.nu.performance.api.client.interfaces.Block;
+
+public abstract class LinkBlock extends Block implements Parcelable {
+    public final Link getLink() {
+        throw new UnsupportedOperationException("Stub");
+    }
+}

extensions/nunl/stub/src/main/java/nl/nu/performance/api/client/objects/StyledText.java

@@ -0,0 +1,7 @@
+package nl.nu.performance.api.client.objects;
+
+public class StyledText  {
+    public final String getText() {
+        throw new UnsupportedOperationException("Stub");
+    }
+}

extensions/nunl/stub/src/main/java/nl/nu/performance/api/client/unions/LinkFlavor.java

@@ -0,0 +1,4 @@
+package nl.nu.performance.api.client.unions;
+
+public interface LinkFlavor {
+}

extensions/nunl/stub/src/main/java/nl/nu/performance/api/client/unions/SmallArticleLinkFlavor.java

@@ -0,0 +1,7 @@
+package nl.nu.performance.api.client.unions;
+
+public class SmallArticleLinkFlavor implements LinkFlavor {
+    public final Boolean isPartner() {
+        throw new UnsupportedOperationException("Stub");
+    }
+}

extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java

@@ -362,27 +362,18 @@ public class Utils {
     }
 
     public static void setContext(Context appContext) {
-        // Must initially set context as the language settings needs it.
+        // Must initially set context to check the app language.
         context = appContext;
+        Logger.initializationInfo(Utils.class, "Set context: " + appContext);
 
         AppLanguage language = BaseSettings.REVANCED_LANGUAGE.get();
         if (language != AppLanguage.DEFAULT) {
             // Create a new context with the desired language.
+            Logger.printDebug(() -> "Using app language: " + language);
             Configuration config = appContext.getResources().getConfiguration();
             config.setLocale(language.getLocale());
             context = appContext.createConfigurationContext(config);
         }
-
-        // In some apps like TikTok, the Setting classes can load in weird orders due to cyclic class dependencies.
-        // Calling the regular printDebug method here can cause a Settings context null pointer exception,
-        // even though the context is already set before the call.
-        //
-        // The initialization logger methods do not directly or indirectly
-        // reference the Context or any Settings and are unaffected by this problem.
-        //
-        // Info level also helps debug if a patch hook is called before
-        // the context is set since debug logging is off by default.
-        Logger.initializationInfo(Utils.class, "Set context: " + appContext);
     }
 
     public static void setClipboard(@NonNull String text) {

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/AppLanguage.java

@@ -8,6 +8,9 @@ public enum AppLanguage {
      */
     DEFAULT,
 
+    // Languages codes not included with YouTube, but are translated on Crowdin
+    GA,
+
     // Language codes found in locale_config.xml
     // All region specific variants have been removed.
     AF,

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java

@@ -22,12 +22,23 @@ import app.revanced.extension.shared.settings.Setting;
 
 @SuppressWarnings("deprecation")
 public abstract class AbstractPreferenceFragment extends PreferenceFragment {
+
     /**
      * Indicates that if a preference changes,
      * to apply the change from the Setting to the UI component.
      */
     public static boolean settingImportInProgress;
 
+    /**
+     * Prevents recursive calls during preference <-> UI syncing from showing extra dialogs.
+     */
+    private static boolean updatingPreference;
+
+    /**
+     * Used to prevent showing reboot dialog, if user cancels a setting user dialog.
+     */
+    private static boolean showingUserDialogMessage;
+
     /**
      * Confirm and restart dialog button text and title.
      * Set by subclasses if Strings cannot be added as a resource.
@@ -35,13 +46,13 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
     @Nullable
     protected static String restartDialogButtonText, restartDialogTitle, confirmDialogTitle;
 
-    /**
-     * Used to prevent showing reboot dialog, if user cancels a setting user dialog.
-     */
-    private boolean showingUserDialogMessage;
-
     private final SharedPreferences.OnSharedPreferenceChangeListener listener = (sharedPreferences, str) -> {
         try {
+            if (updatingPreference) {
+                Logger.printDebug(() -> "Ignoring preference change as sync is in progress");
+                return;
+            }
+
             Setting<?> setting = Setting.getSettingFromPath(Objects.requireNonNull(str));
             if (setting == null) {
                 return;
@@ -63,10 +74,13 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
                 }
             }
 
+            updatingPreference = true;
             // Apply 'Setting <- Preference', unless during importing when it needs to be 'Setting -> Preference'.
+            // Updating here can can cause a recursive call back into this same method.
             updatePreference(pref, setting, true, settingImportInProgress);
             // Update any other preference availability that may now be different.
             updateUIAvailability();
+            updatingPreference = false;
         } catch (Exception ex) {
             Logger.printException(() -> "OnSharedPreferenceChangeListener failure", ex);
         }
@@ -97,7 +111,9 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
         if (confirmDialogTitle == null) {
             confirmDialogTitle = str("revanced_settings_confirm_user_dialog_title");
         }
+
         showingUserDialogMessage = true;
+
         new AlertDialog.Builder(context)
                 .setTitle(confirmDialogTitle)
                 .setMessage(Objects.requireNonNull(setting.userDialogMessage).toString())
@@ -141,14 +157,16 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
      * @return If the preference is currently set to the default value of the Setting.
      */
     protected boolean prefIsSetToDefault(Preference pref, Setting<?> setting) {
+        Object defaultValue = setting.defaultValue;
         if (pref instanceof SwitchPreference switchPref) {
-            return switchPref.isChecked() == (Boolean) setting.defaultValue;
+            return switchPref.isChecked() == (Boolean) defaultValue;
         }
+        String defaultValueString = defaultValue.toString();
         if (pref instanceof EditTextPreference editPreference) {
-            return editPreference.getText().equals(setting.defaultValue.toString());
+            return editPreference.getText().equals(defaultValueString);
         }
         if (pref instanceof ListPreference listPref) {
-            return listPref.getValue().equals(setting.defaultValue.toString());
+            return listPref.getValue().equals(defaultValueString);
         }
 
         throw new IllegalStateException("Must override method to handle "
@@ -158,16 +176,16 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
     /**
      * Syncs all UI Preferences to any {@link Setting} they represent.
      */
-    private void updatePreferenceScreen(@NonNull PreferenceScreen screen,
+    private void updatePreferenceScreen(@NonNull PreferenceGroup group,
                                         boolean syncSettingValue,
                                         boolean applySettingToPreference) {
         // Alternatively this could iterate thru all Settings and check for any matching Preferences,
         // but there are many more Settings than UI preferences so it's more efficient to only check
         // the Preferences.
-        for (int i = 0, prefCount = screen.getPreferenceCount(); i < prefCount; i++) {
-            Preference pref = screen.getPreference(i);
-            if (pref instanceof PreferenceScreen) {
-                updatePreferenceScreen((PreferenceScreen) pref, syncSettingValue, applySettingToPreference);
+        for (int i = 0, prefCount = group.getPreferenceCount(); i < prefCount; i++) {
+            Preference pref = group.getPreference(i);
+            if (pref instanceof PreferenceGroup subGroup) {
+                updatePreferenceScreen(subGroup, syncSettingValue, applySettingToPreference);
             } else if (pref.hasKey()) {
                 String key = pref.getKey();
                 Setting<?> setting = Setting.getSettingFromPath(key);
@@ -255,7 +273,7 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
         }
     }
 
-    public static void showRestartDialog(@NonNull final Context context) {
+    public static void showRestartDialog(Context context) {
         Utils.verifyOnMainThread();
         if (restartDialogTitle == null) {
             restartDialogTitle = str("revanced_settings_restart_title");
@@ -263,6 +281,7 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
         if (restartDialogButtonText == null) {
             restartDialogButtonText = str("revanced_settings_restart");
         }
+
         new AlertDialog.Builder(context)
                 .setMessage(restartDialogTitle)
                 .setPositiveButton(restartDialogButtonText, (dialog, id)

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/NoTitlePreferenceCategory.java

@@ -0,0 +1,54 @@
+package app.revanced.extension.shared.settings.preference;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.preference.PreferenceCategory;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * Empty preference category with no title, used to organize and group related preferences together.
+ */
+@SuppressWarnings({"unused", "deprecation"})
+public class NoTitlePreferenceCategory extends PreferenceCategory {
+
+    public NoTitlePreferenceCategory(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public NoTitlePreferenceCategory(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public NoTitlePreferenceCategory(Context context) {
+        super(context);
+    }
+
+    @Override
+    @SuppressLint("MissingSuperCall")
+    protected View onCreateView(ViewGroup parent) {
+        // Return an zero-height view to eliminate empty title space.
+        return new View(getContext());
+    }
+
+    @Override
+    public CharSequence getTitle() {
+        // Title can be used for sorting. Return the first sub preference title.
+        if (getPreferenceCount() > 0) {
+            return getPreference(0).getTitle();
+        }
+
+        return super.getTitle();
+    }
+
+    @Override
+    public int getTitleRes() {
+        if (getPreferenceCount() > 0) {
+            return getPreference(0).getTitleRes();
+        }
+
+        return super.getTitleRes();
+    }
+}
+

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ResettableEditTextPreference.java

@@ -1,5 +1,7 @@
 package app.revanced.extension.shared.settings.preference;
 
+import static app.revanced.extension.shared.StringRef.str;
+
 import android.app.AlertDialog;
 import android.content.Context;
 import android.os.Bundle;
@@ -8,17 +10,23 @@ import android.util.AttributeSet;
 import android.widget.Button;
 import android.widget.EditText;
 
-import app.revanced.extension.shared.Utils;
-import app.revanced.extension.shared.settings.Setting;
-import app.revanced.extension.shared.Logger;
+import androidx.annotation.Nullable;
 
 import java.util.Objects;
 
-import static app.revanced.extension.shared.StringRef.str;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.Setting;
 
 @SuppressWarnings({"unused", "deprecation"})
 public class ResettableEditTextPreference extends EditTextPreference {
 
+    /**
+     * Setting to reset.
+     */
+    @Nullable
+    private Setting<?> setting;
+
     public ResettableEditTextPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
@@ -32,12 +40,22 @@ public class ResettableEditTextPreference extends EditTextPreference {
         super(context);
     }
 
+    public void setSetting(@Nullable Setting<?> setting) {
+        this.setting = setting;
+    }
+
     @Override
     protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
         super.onPrepareDialogBuilder(builder);
         Utils.setEditTextDialogTheme(builder);
 
-        Setting<?> setting = Setting.getSettingFromPath(getKey());
+        if (setting == null) {
+            String key = getKey();
+            if (key != null) {
+                setting = Setting.getSettingFromPath(key);
+            }
+        }
+
         if (setting != null) {
             builder.setNeutralButton(str("revanced_settings_reset"), null);
         }
@@ -54,8 +72,7 @@ public class ResettableEditTextPreference extends EditTextPreference {
         }
         button.setOnClickListener(v -> {
             try {
-                Setting<?> setting = Objects.requireNonNull(Setting.getSettingFromPath(getKey()));
-                String defaultStringValue = setting.defaultValue.toString();
+                String defaultStringValue = Objects.requireNonNull(setting).defaultValue.toString();
                 EditText editText = getEditText();
                 editText.setText(defaultStringValue);
                 editText.setSelection(defaultStringValue.length()); // move cursor to end of text

extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/SpoofVideoStreamsPatch.java

@@ -107,6 +107,36 @@ public class SpoofVideoStreamsPatch {
         return false;
     }
 
+    /**
+     * Injection point.
+     * Turns off a feature flag that interferes with spoofing.
+     */
+    public static boolean useMediaFetchHotConfigReplacement(boolean original) {
+        if (original) {
+            Logger.printDebug(() -> "useMediaFetchHotConfigReplacement is set on");
+        }
+
+        if (!SPOOF_STREAMING_DATA) {
+            return original;
+        }
+        return false;
+    }
+
+    /**
+     * Injection point.
+     * Turns off a feature flag that interferes with video playback.
+     */
+    public static boolean usePlaybackStartFeatureFlag(boolean original) {
+        if (original) {
+            Logger.printDebug(() -> "usePlaybackStartFeatureFlag is set on");
+        }
+
+        if (!SPOOF_STREAMING_DATA) {
+            return original;
+        }
+        return false;
+    }
+
     /**
      * Injection point.
      */

extensions/spotify/build.gradle.kts

@@ -0,0 +1,16 @@
+dependencies {
+    compileOnly(project(":extensions:shared:library"))
+    compileOnly(project(":extensions:spotify:stub"))
+    compileOnly(libs.annotation)
+}
+
+android {
+    defaultConfig {
+        minSdk = 24
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}

extensions/spotify/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest/>

extensions/spotify/stub/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    id(libs.plugins.android.library.get().pluginId)
+}
+
+android {
+    namespace = "app.revanced.extension"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 26
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+}

extensions/spotify/stub/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest/>

extensions/spotify/stub/src/main/java/com/spotify/remoteconfig/internal/AccountAttribute.java

@@ -0,0 +1,5 @@
+package com.spotify.remoteconfig.internal;
+
+public final class AccountAttribute {
+    public Object value_;
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/BackgroundPlaybackPatch.java

@@ -1,7 +1,7 @@
 package app.revanced.extension.youtube.patches;
 
 import app.revanced.extension.youtube.settings.Settings;
-import app.revanced.extension.youtube.shared.PlayerType;
+import app.revanced.extension.youtube.shared.ShortsPlayerState;
 
 @SuppressWarnings("unused")
 public class BackgroundPlaybackPatch {
@@ -23,16 +23,7 @@ public class BackgroundPlaybackPatch {
         // 7. Close the Short
         // 8. Resume playing the regular video
         // 9. Minimize the app (PIP should appear)
-        if (!VideoInformation.lastVideoIdIsShort()) {
-            return true; // Definitely is not a Short.
-        }
-
-        // TODO: Add better hook.
-        // Might be a Shorts, or might be a prior regular video on screen again after a Shorts was closed.
-        // This incorrectly prevents PIP if player is in WATCH_WHILE_MINIMIZED after closing a Shorts,
-        // But there's no way around this unless an additional hook is added to definitively detect
-        // the Shorts player is on screen. This use case is unusual anyways so it's not a huge concern.
-        return !PlayerType.getCurrent().isNoneHiddenOrMinimized();
+        return !ShortsPlayerState.isOpen();
     }
 
     /**

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeFormFactorPatch.java

@@ -1,9 +1,17 @@
 package app.revanced.extension.youtube.patches;
 
+import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButton;
+
+import android.view.View;
+
 import androidx.annotation.Nullable;
 
-import app.revanced.extension.shared.Utils;
+import java.util.Objects;
+
+import app.revanced.extension.shared.Logger;
 import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.youtube.shared.NavigationBar;
+import app.revanced.extension.youtube.shared.PlayerType;
 
 @SuppressWarnings("unused")
 public class ChangeFormFactorPatch {
@@ -41,14 +49,57 @@ public class ChangeFormFactorPatch {
 
     @Nullable
     private static final Integer FORM_FACTOR_TYPE = Settings.CHANGE_FORM_FACTOR.get().formFactorType;
+    private static final boolean USING_AUTOMOTIVE_TYPE = Objects.requireNonNull(
+            FormFactor.AUTOMOTIVE.formFactorType).equals(FORM_FACTOR_TYPE);
 
     /**
      * Injection point.
      */
     public static int getFormFactor(int original) {
-        return FORM_FACTOR_TYPE == null
-                ? original
-                : FORM_FACTOR_TYPE;
+        if (FORM_FACTOR_TYPE == null) return original;
+
+        if (USING_AUTOMOTIVE_TYPE) {
+            // Do not change if the player is opening or is opened,
+            // otherwise the video description cannot be opened.
+            PlayerType current = PlayerType.getCurrent();
+            if (current.isMaximizedOrFullscreen() || current == PlayerType.WATCH_WHILE_SLIDING_MINIMIZED_MAXIMIZED) {
+                Logger.printDebug(() -> "Using original form factor for player");
+                return original;
+            }
+
+            if (!NavigationBar.isSearchBarActive()) {
+                // Automotive type shows error 400 when opening a channel page and using some explore tab.
+                // This is a bug in unpatched YouTube that occurs on actual Android Automotive devices.
+                // Work around the issue by using the original form factor if not in search and the
+                // navigation back button is present.
+                if (NavigationBar.isBackButtonVisible()) {
+                    Logger.printDebug(() -> "Using original form factor, as back button is visible without search present");
+                    return original;
+                }
+
+                // Do not change library tab otherwise watch history is hidden.
+                // Do this check last since the current navigation button is required.
+                if (NavigationButton.getSelectedNavigationButton() == NavigationButton.LIBRARY) {
+                    return original;
+                }
+            }
+        }
+
+        return FORM_FACTOR_TYPE;
     }
 
+    /**
+     * Injection point.
+     */
+    public static void navigationTabCreated(NavigationButton button, View tabView) {
+        // On first startup of the app the navigation buttons are fetched and updated.
+        // If the user immediately opens the 'You' or opens a video, then the call to
+        // update the navigtation buttons will use the non automotive form factor
+        // and the explore tab is missing.
+        // Fixing this is not so simple because of the concurrent calls for the player and You tab.
+        // For now, always hide the explore tab.
+        if (USING_AUTOMOTIVE_TYPE && button == NavigationButton.EXPLORE) {
+            tabView.setVisibility(View.GONE);
+        }
+    }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableAutoCaptionsPatch.java

@@ -1,7 +1,7 @@
 package app.revanced.extension.youtube.patches;
 
 import app.revanced.extension.youtube.settings.Settings;
-import app.revanced.extension.youtube.shared.PlayerType;
+import app.revanced.extension.youtube.shared.ShortsPlayerState;
 
 @SuppressWarnings("unused")
 public class DisableAutoCaptionsPatch {
@@ -14,7 +14,7 @@ public class DisableAutoCaptionsPatch {
     public static boolean autoCaptionsEnabled() {
         return Settings.AUTO_CAPTIONS.get()
                 // Do not use auto captions for Shorts.
-                && !PlayerType.getCurrent().isNoneHiddenOrSlidingMinimized();
+                && ShortsPlayerState.isOpen();
     }
 
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableResumingStartupShortsPlayerPatch.java

@@ -2,7 +2,7 @@ package app.revanced.extension.youtube.patches;
 
 import app.revanced.extension.youtube.settings.Settings;
 
-/** @noinspection unused*/
+@SuppressWarnings("unused")
 public class DisableResumingStartupShortsPlayerPatch {
 
     /**
@@ -11,4 +11,11 @@ public class DisableResumingStartupShortsPlayerPatch {
     public static boolean disableResumingStartupShortsPlayer() {
         return Settings.DISABLE_RESUMING_SHORTS_PLAYER.get();
     }
+
+    /**
+     * Injection point.
+     */
+    public static boolean disableResumingStartupShortsPlayer(boolean original) {
+        return original && !Settings.DISABLE_RESUMING_SHORTS_PLAYER.get();
+    }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableSuggestedVideoEndScreenPatch.java

@@ -1,24 +0,0 @@
-package app.revanced.extension.youtube.patches;
-
-import android.annotation.SuppressLint;
-import android.widget.ImageView;
-
-import app.revanced.extension.youtube.settings.Settings;
-
-/** @noinspection unused*/
-public final class DisableSuggestedVideoEndScreenPatch {
-    @SuppressLint("StaticFieldLeak")
-    private static ImageView lastView;
-
-    public static void closeEndScreen(final ImageView imageView) {
-        if (!Settings.DISABLE_SUGGESTED_VIDEO_END_SCREEN.get()) return;
-
-        // Prevent adding the listener multiple times.
-        if (lastView == imageView) return;
-        lastView = imageView;
-
-        imageView.getViewTreeObserver().addOnGlobalLayoutListener(() -> {
-            if (imageView.isShown()) imageView.callOnClick();
-        });
-    }
-}

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/EnableDebuggingPatch.java

@@ -24,7 +24,7 @@ public final class EnableDebuggingPatch {
     /**
      * Injection point.
      */
-    public static boolean isBooleanFeatureFlagEnabled(boolean value, long flag) {
+    public static boolean isBooleanFeatureFlagEnabled(boolean value, Long flag) {
         if (LOG_FEATURE_FLAGS && value) {
             if (featureFlags.putIfAbsent(flag, true) == null) {
                 Logger.printDebug(() -> "boolean feature is enabled: " + flag);

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideEndScreenSuggestedVideoPatch.java

@@ -0,0 +1,13 @@
+package app.revanced.extension.youtube.patches;
+
+import app.revanced.extension.youtube.settings.Settings;
+
+@SuppressWarnings("unused")
+public final class HideEndScreenSuggestedVideoPatch {
+    /**
+     * Injection point.
+     */
+    public static boolean hideEndScreenSuggestedVideo() {
+        return Settings.HIDE_END_SCREEN_SUGGESTED_VIDEO.get();
+    }
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/MiniplayerPatch.java

@@ -43,10 +43,13 @@ public final class MiniplayerPatch {
         MODERN_2(null, 2),
         MODERN_3(null, 3),
         /**
-         * Half broken miniplayer, that might be work in progress or left over abandoned code.
-         * Can force this type by editing the import/export settings.
+         * Works and is functional with 20.03+
          */
-        MODERN_4(null, 4);
+        MODERN_4(null, 4),
+        /**
+         * Half broken miniplayer, and in 20.02 and earlier is declared as type 4.
+         */
+        MODERN_5(null, 5);
 
         /**
          * Legacy tablet hook value.
@@ -126,12 +129,13 @@ public final class MiniplayerPatch {
     private static final boolean DRAG_AND_DROP_ENABLED =
             CURRENT_TYPE.isModern() && Settings.MINIPLAYER_DRAG_AND_DROP.get();
 
-    private static final boolean HIDE_EXPAND_CLOSE_ENABLED =
-            Settings.MINIPLAYER_HIDE_EXPAND_CLOSE.get()
-                    && Settings.MINIPLAYER_HIDE_EXPAND_CLOSE.isAvailable();
+    private static final boolean HIDE_OVERLAY_BUTTONS_ENABLED =
+            Settings.MINIPLAYER_HIDE_OVERLAY_BUTTONS.get()
+                    && Settings.MINIPLAYER_HIDE_OVERLAY_BUTTONS.isAvailable();
 
     private static final boolean HIDE_SUBTEXT_ENABLED =
-            (CURRENT_TYPE == MODERN_1 || CURRENT_TYPE == MODERN_3) && Settings.MINIPLAYER_HIDE_SUBTEXT.get();
+            (CURRENT_TYPE == MODERN_1 || CURRENT_TYPE == MODERN_3 || CURRENT_TYPE == MODERN_4)
+                    && Settings.MINIPLAYER_HIDE_SUBTEXT.get();
 
     // 19.25 is last version that has forward/back buttons for phones,
     // but buttons still show for tablets/foldable devices and they don't work well so always hide.
@@ -139,7 +143,7 @@ public final class MiniplayerPatch {
             && (VersionCheckPatch.IS_19_34_OR_GREATER || Settings.MINIPLAYER_HIDE_REWIND_FORWARD.get());
 
     private static final boolean MINIPLAYER_ROUNDED_CORNERS_ENABLED =
-            Settings.MINIPLAYER_ROUNDED_CORNERS.get();
+            CURRENT_TYPE.isModern() && Settings.MINIPLAYER_ROUNDED_CORNERS.get();
 
     private static final boolean MINIPLAYER_HORIZONTAL_DRAG_ENABLED =
             DRAG_AND_DROP_ENABLED && Settings.MINIPLAYER_HORIZONTAL_DRAG.get();
@@ -172,11 +176,12 @@ public final class MiniplayerPatch {
         }
     }
 
-    public static final class MiniplayerHideExpandCloseAvailability implements Setting.Availability {
+    public static final class MiniplayerHideOverlayButtonsAvailability implements Setting.Availability {
         @Override
         public boolean isAvailable() {
             MiniplayerType type = Settings.MINIPLAYER_TYPE.get();
-            return (!IS_19_20_OR_GREATER && (type == MODERN_1 || type == MODERN_3))
+            return type == MODERN_4
+                    || (!IS_19_20_OR_GREATER && (type == MODERN_1 || type == MODERN_3))
                     || (!IS_19_26_OR_GREATER && type == MODERN_1
                     && !Settings.MINIPLAYER_DOUBLE_TAP_ACTION.get() && !Settings.MINIPLAYER_DRAG_AND_DROP.get())
                     || (IS_19_29_OR_GREATER && type == MODERN_3);
@@ -227,9 +232,13 @@ public final class MiniplayerPatch {
     /**
      * Injection point.
      */
-    public static void adjustMiniplayerOpacity(ImageView view) {
+    public static void adjustMiniplayerOpacity(View view) {
         if (CURRENT_TYPE == MODERN_1) {
-            view.setImageAlpha(OPACITY_LEVEL);
+            if (view instanceof ImageView imageView) {
+                imageView.setImageAlpha(OPACITY_LEVEL);
+            } else {
+                Logger.printException(() -> "Unknown miniplayer overlay view: " + view);
+            }
         }
     }
 
@@ -247,7 +256,7 @@ public final class MiniplayerPatch {
     /**
      * Injection point.
      */
-    public static boolean enableMiniplayerDoubleTapAction(boolean original) {
+    public static boolean getMiniplayerDoubleTapAction(boolean original) {
         if (CURRENT_TYPE == DEFAULT) {
             return original;
         }
@@ -258,7 +267,7 @@ public final class MiniplayerPatch {
     /**
      * Injection point.
      */
-    public static boolean enableMiniplayerDragAndDrop(boolean original) {
+    public static boolean getMiniplayerDragAndDrop(boolean original) {
         if (CURRENT_TYPE == DEFAULT) {
             return original;
         }
@@ -266,13 +275,36 @@ public final class MiniplayerPatch {
         return DRAG_AND_DROP_ENABLED;
     }
 
+    /**
+     * Injection point.
+     */
+    public static boolean getRoundedCorners(boolean original) {
+        if (CURRENT_TYPE == DEFAULT) {
+            return original;
+        }
+
+        return MINIPLAYER_ROUNDED_CORNERS_ENABLED;
+    }
 
     /**
      * Injection point.
      */
-    public static boolean setRoundedCorners(boolean original) {
-        if (CURRENT_TYPE.isModern()) {
-            return MINIPLAYER_ROUNDED_CORNERS_ENABLED;
+    public static boolean getHorizontalDrag(boolean original) {
+        if (CURRENT_TYPE == DEFAULT) {
+            return original;
+        }
+
+        return MINIPLAYER_HORIZONTAL_DRAG_ENABLED;
+    }
+
+    /**
+     * Injection point.
+     */
+    public static boolean getMaximizeAnimation(boolean original) {
+        // This must be forced on if horizontal drag is enabled,
+        // otherwise the UI has visual glitches when maximizing the miniplayer.
+        if (MINIPLAYER_HORIZONTAL_DRAG_ENABLED) {
+            return true;
         }
 
         return original;
@@ -281,7 +313,7 @@ public final class MiniplayerPatch {
     /**
      * Injection point.
      */
-    public static int setMiniplayerDefaultSize(int original) {
+    public static int getMiniplayerDefaultSize(int original) {
         if (CURRENT_TYPE.isModern()) {
             return MINIPLAYER_SIZE;
         }
@@ -289,29 +321,26 @@ public final class MiniplayerPatch {
         return original;
     }
 
+    /**
+     * Injection point.
+     */
+    public static void hideMiniplayerExpandClose(View view) {
+        Utils.hideViewByRemovingFromParentUnderCondition(HIDE_OVERLAY_BUTTONS_ENABLED, view);
+    }
 
     /**
      * Injection point.
      */
-    public static boolean setHorizontalDrag(boolean original) {
-        if (CURRENT_TYPE.isModern()) {
-            return MINIPLAYER_HORIZONTAL_DRAG_ENABLED;
+    public static void hideMiniplayerActionButton(View view) {
+        if (CURRENT_TYPE == MODERN_4) {
+            Utils.hideViewByRemovingFromParentUnderCondition(HIDE_OVERLAY_BUTTONS_ENABLED, view);
         }
-
-        return original;
     }
 
     /**
      * Injection point.
      */
-    public static void hideMiniplayerExpandClose(ImageView view) {
-        Utils.hideViewByRemovingFromParentUnderCondition(HIDE_EXPAND_CLOSE_ENABLED, view);
-    }
-
-    /**
-     * Injection point.
-     */
-    public static void hideMiniplayerRewindForward(ImageView view) {
+    public static void hideMiniplayerRewindForward(View view) {
         Utils.hideViewByRemovingFromParentUnderCondition(HIDE_REWIND_FORWARD_ENABLED, view);
     }
 

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/PlayerTypeHookPatch.java

@@ -1,8 +1,11 @@
 package app.revanced.extension.youtube.patches;
 
+import android.view.View;
+
 import androidx.annotation.Nullable;
 
 import app.revanced.extension.youtube.shared.PlayerType;
+import app.revanced.extension.youtube.shared.ShortsPlayerState;
 import app.revanced.extension.youtube.shared.VideoState;
 
 @SuppressWarnings("unused")
@@ -24,4 +27,26 @@ public class PlayerTypeHookPatch {
 
         VideoState.setFromString(youTubeVideoState.name());
     }
+
+    /**
+     * Injection point.
+     *
+     * Add a listener to the shorts player overlay View.
+     * Triggered when a shorts player is attached or detached to Windows.
+     *
+     * @param view shorts player overlay (R.id.reel_watch_player).
+     */
+    public static void onShortsCreate(View view) {
+        view.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
+            @Override
+            public void onViewAttachedToWindow(@Nullable View v) {
+                ShortsPlayerState.setOpen(true);
+            }
+
+            @Override
+            public void onViewDetachedFromWindow(@Nullable View v) {
+                ShortsPlayerState.setOpen(false);
+            }
+        });
+    }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ReturnYouTubeDislikePatch.java

@@ -21,7 +21,6 @@ import java.util.Objects;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.youtube.patches.components.ReturnYouTubeDislikeFilterPatch;
-import app.revanced.extension.youtube.patches.spoof.SpoofAppVersionPatch;
 import app.revanced.extension.youtube.returnyoutubedislike.ReturnYouTubeDislike;
 import app.revanced.extension.youtube.returnyoutubedislike.requests.ReturnYouTubeDislikeApi;
 import app.revanced.extension.youtube.settings.Settings;
@@ -47,9 +46,6 @@ import app.revanced.extension.youtube.shared.PlayerType;
 @SuppressWarnings("unused")
 public class ReturnYouTubeDislikePatch {
 
-    public static final boolean IS_SPOOFING_TO_NON_LITHO_SHORTS_PLAYER =
-            SpoofAppVersionPatch.isSpoofingToLessThan("18.34.00");
-
     /**
      * RYD data for the current video on screen.
      */
@@ -347,137 +343,6 @@ public class ReturnYouTubeDislikePatch {
         }
     }
 
-    //
-    // Non litho Shorts player.
-    //
-
-    /**
-     * Replacement text to use for "Dislikes" while RYD is fetching.
-     */
-    private static final Spannable SHORTS_LOADING_SPAN = new SpannableString("-");
-
-    /**
-     * Dislikes TextViews used by Shorts.
-     *
-     * Multiple TextViews are loaded at once (for the prior and next videos to swipe to).
-     * Keep track of all of them, and later pick out the correct one based on their on screen position.
-     */
-    private static final List<WeakReference<TextView>> shortsTextViewRefs = new ArrayList<>();
-
-    private static void clearRemovedShortsTextViews() {
-        shortsTextViewRefs.removeIf(ref -> ref.get() == null);
-    }
-
-    /**
-     * Injection point.  Called when a Shorts dislike is updated.  Always on main thread.
-     * Handles update asynchronously, otherwise Shorts video will be frozen while the UI thread is blocked.
-     *
-     * @return if RYD is enabled and the TextView was updated.
-     */
-    public static boolean setShortsDislikes(@NonNull View likeDislikeView) {
-        try {
-            if (!Settings.RYD_ENABLED.get()) {
-                return false;
-            }
-            if (!Settings.RYD_SHORTS.get() || Settings.HIDE_SHORTS_DISLIKE_BUTTON.get()) {
-                // Must clear the data here, in case a new video was loaded while PlayerType
-                // suggested the video was not a short (can happen when spoofing to an old app version).
-                clearData();
-                return false;
-            }
-            Logger.printDebug(() -> "setShortsDislikes");
-
-            TextView textView = (TextView) likeDislikeView;
-            textView.setText(SHORTS_LOADING_SPAN); // Change 'Dislike' text to the loading text.
-            shortsTextViewRefs.add(new WeakReference<>(textView));
-
-            if (likeDislikeView.isSelected() && isShortTextViewOnScreen(textView)) {
-                Logger.printDebug(() -> "Shorts dislike is already selected");
-                ReturnYouTubeDislike videoData = currentVideoData;
-                if (videoData != null) videoData.setUserVote(Vote.DISLIKE);
-            }
-
-            // For the first short played, the Shorts dislike hook is called after the video id hook.
-            // But for most other times this hook is called before the video id (which is not ideal).
-            // Must update the TextViews here, and also after the videoId changes.
-            updateOnScreenShortsTextViews(false);
-
-            return true;
-        } catch (Exception ex) {
-            Logger.printException(() -> "setShortsDislikes failure", ex);
-            return false;
-        }
-    }
-
-    /**
-     * @param forceUpdate if false, then only update the 'loading text views.
-     *                    If true, update all on screen text views.
-     */
-    private static void updateOnScreenShortsTextViews(boolean forceUpdate) {
-        try {
-            clearRemovedShortsTextViews();
-            if (shortsTextViewRefs.isEmpty()) {
-                return;
-            }
-            ReturnYouTubeDislike videoData = currentVideoData;
-            if (videoData == null) {
-                return;
-            }
-
-            Logger.printDebug(() -> "updateShortsTextViews");
-
-            Runnable update = () -> {
-                Spanned shortsDislikesSpan = videoData.getDislikeSpanForShort(SHORTS_LOADING_SPAN);
-                Utils.runOnMainThreadNowOrLater(() -> {
-                    String videoId = videoData.getVideoId();
-                    if (!videoId.equals(VideoInformation.getVideoId())) {
-                        // User swiped to new video before fetch completed
-                        Logger.printDebug(() -> "Ignoring stale dislikes data for short: " + videoId);
-                        return;
-                    }
-
-                    // Update text views that appear to be visible on screen.
-                    // Only 1 will be the actual textview for the current Short,
-                    // but discarded and not yet garbage collected views can remain.
-                    // So must set the dislike span on all views that match.
-                    for (WeakReference<TextView> textViewRef : shortsTextViewRefs) {
-                        TextView textView = textViewRef.get();
-                        if (textView == null) {
-                            continue;
-                        }
-                        if (isShortTextViewOnScreen(textView)
-                                && (forceUpdate || textView.getText().toString().equals(SHORTS_LOADING_SPAN.toString()))) {
-                            Logger.printDebug(() -> "Setting Shorts TextView to: " + shortsDislikesSpan);
-                            textView.setText(shortsDislikesSpan);
-                        }
-                    }
-                });
-            };
-            if (videoData.fetchCompleted()) {
-                update.run(); // Network call is completed, no need to wait on background thread.
-            } else {
-                Utils.runOnBackgroundThread(update);
-            }
-        } catch (Exception ex) {
-            Logger.printException(() -> "updateOnScreenShortsTextViews failure", ex);
-        }
-    }
-
-    /**
-     * Check if a view is within the screen bounds.
-     */
-    private static boolean isShortTextViewOnScreen(@NonNull View view) {
-        final int[] location = new int[2];
-        view.getLocationInWindow(location);
-        if (location[0] <= 0 && location[1] <= 0) { // Lower bound
-            return false;
-        }
-        Rect windowRect = new Rect();
-        view.getWindowVisibleDisplayFrame(windowRect); // Upper bound
-        return location[0] < windowRect.width() && location[1] < windowRect.height();
-    }
-
-
     //
     // Video Id and voting hooks (all players).
     //
@@ -503,8 +368,7 @@ public class ReturnYouTubeDislikePatch {
             if (videoIdIsShort && (!isShortAndOpeningOrPlaying || !Settings.RYD_SHORTS.get())) {
                 return;
             }
-            final boolean waitForFetchToComplete = !IS_SPOOFING_TO_NON_LITHO_SHORTS_PLAYER
-                    && videoIdIsShort && !lastPlayerResponseWasShort;
+            final boolean waitForFetchToComplete = videoIdIsShort && !lastPlayerResponseWasShort;
 
             Logger.printDebug(() -> "Prefetching RYD for video: " + videoId);
             ReturnYouTubeDislike fetch = ReturnYouTubeDislike.getFetchForVideoId(videoId);
@@ -557,12 +421,6 @@ public class ReturnYouTubeDislikePatch {
                 data.setVideoIdIsShort(true);
             }
             currentVideoData = data;
-
-            // Current video id hook can be called out of order with the non litho Shorts text view hook.
-            // Must manually update again here.
-            if (isNoneHiddenOrSlidingMinimized) {
-                updateOnScreenShortsTextViews(true);
-            }
         } catch (Exception ex) {
             Logger.printException(() -> "newVideoLoaded failure", ex);
         }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VersionCheckPatch.java

@@ -3,11 +3,15 @@ package app.revanced.extension.youtube.patches;
 import app.revanced.extension.shared.Utils;
 
 public class VersionCheckPatch {
-    public static final boolean IS_19_17_OR_GREATER = Utils.getAppVersionName().compareTo("19.17.00") >= 0;
-    public static final boolean IS_19_20_OR_GREATER = Utils.getAppVersionName().compareTo("19.20.00") >= 0;
-    public static final boolean IS_19_21_OR_GREATER = Utils.getAppVersionName().compareTo("19.21.00") >= 0;
-    public static final boolean IS_19_26_OR_GREATER = Utils.getAppVersionName().compareTo("19.26.00") >= 0;
-    public static final boolean IS_19_29_OR_GREATER = Utils.getAppVersionName().compareTo("19.29.00") >= 0;
-    public static final boolean IS_19_34_OR_GREATER = Utils.getAppVersionName().compareTo("19.34.00") >= 0;
-    public static final boolean IS_19_46_OR_GREATER = Utils.getAppVersionName().compareTo("19.46.00") >= 0;
+    private static boolean isVersionOrGreater(String version) {
+        return Utils.getAppVersionName().compareTo(version) >= 0;
+    }
+
+    public static final boolean IS_19_17_OR_GREATER = isVersionOrGreater("19.17.00");
+    public static final boolean IS_19_20_OR_GREATER = isVersionOrGreater("19.20.00");
+    public static final boolean IS_19_21_OR_GREATER = isVersionOrGreater("19.21.00");
+    public static final boolean IS_19_26_OR_GREATER = isVersionOrGreater("19.26.00");
+    public static final boolean IS_19_29_OR_GREATER = isVersionOrGreater("19.29.00");
+    public static final boolean IS_19_34_OR_GREATER = isVersionOrGreater("19.34.00");
+    public static final boolean IS_19_46_OR_GREATER = isVersionOrGreater("19.46.00");
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/AdsFilter.java

@@ -74,6 +74,7 @@ public final class AdsFilter extends Filter {
                 "video_display_button_group_layout",
                 "landscape_image_wide_button_layout",
                 "video_display_carousel_button_group_layout",
+                "video_display_full_buttoned_short_dr_layout",
                 "compact_landscape_image_layout", // Tablet layout search results.
                 "text_image_no_button_layout" // Tablet layout search results.
         );

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/AdvancedVideoQualityMenuFilter.java

@@ -2,20 +2,20 @@ package app.revanced.extension.youtube.patches.components;
 
 import androidx.annotation.Nullable;
 
-import app.revanced.extension.youtube.patches.playback.quality.RestoreOldVideoQualityMenuPatch;
+import app.revanced.extension.youtube.patches.playback.quality.AdvancedVideoQualityMenuPatch;
 import app.revanced.extension.youtube.settings.Settings;
 
 /**
- * Abuse LithoFilter for {@link RestoreOldVideoQualityMenuPatch}.
+ * Abuse LithoFilter for {@link AdvancedVideoQualityMenuPatch}.
  */
-public final class VideoQualityMenuFilterPatch extends Filter {
+public final class AdvancedVideoQualityMenuFilter extends Filter {
     // Must be volatile or synchronized, as litho filtering runs off main thread
     // and this field is then access from the main thread.
     public static volatile boolean isVideoQualityMenuVisible;
 
-    public VideoQualityMenuFilterPatch() {
+    public AdvancedVideoQualityMenuFilter() {
         addPathCallbacks(new StringFilterGroup(
-                Settings.RESTORE_OLD_VIDEO_QUALITY_MENU,
+                Settings.ADVANCED_VIDEO_QUALITY_MENU,
                 "quick_quality_sheet_content.eml-js"
         ));
     }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/CommentsFilter.java

@@ -12,10 +12,12 @@ final class CommentsFilter extends Filter {
 
     private final StringFilterGroup commentComposer;
     private final ByteArrayFilterGroup emojiPickerBufferGroup;
+    private final StringFilterGroup filterChipBar;
+    private final ByteArrayFilterGroup aiCommentsSummary;
     
     public CommentsFilter() {
         var chatSummary = new StringFilterGroup(
-                Settings.HIDE_COMMENTS_CHAT_SUMMARY,
+                Settings.HIDE_COMMENTS_AI_CHAT_SUMMARY,
                 "live_chat_summary_banner.eml"
         );
 
@@ -58,6 +60,16 @@ final class CommentsFilter extends Filter {
                 "id.comment.quick_emoji.button"
         );
 
+        filterChipBar = new StringFilterGroup(
+                Settings.HIDE_COMMENTS_AI_SUMMARY,
+                "filter_chip_bar.eml"
+        );
+
+        aiCommentsSummary = new ByteArrayFilterGroup(
+                null,
+                "yt_fill_spark_"
+        );
+
         addPathCallbacks(
                 chatSummary,
                 commentsByMembers,
@@ -65,7 +77,8 @@ final class CommentsFilter extends Filter {
                 createAShort,
                 previewComment,
                 thanksButton,
-                commentComposer
+                commentComposer,
+                filterChipBar
         );
     }
 
@@ -84,6 +97,13 @@ final class CommentsFilter extends Filter {
             return false;
         }
 
+        if (matchedGroup == filterChipBar) {
+            if (aiCommentsSummary.check(protobufBufferArray).isFiltered()) {
+                return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
+            }
+            return false;
+        }
+
         return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
     }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/DescriptionComponentsFilter.java

@@ -23,6 +23,11 @@ final class DescriptionComponentsFilter extends Filter {
                 "metadata"
         );
 
+        final StringFilterGroup aiGeneratedVideoSummarySection = new StringFilterGroup(
+                Settings.HIDE_AI_GENERATED_VIDEO_SUMMARY_SECTION,
+                "cell_expandable_metadata.eml"
+        );
+
         final StringFilterGroup attributesSection = new StringFilterGroup(
                 Settings.HIDE_ATTRIBUTES_SECTION,
                 "gaming_section",
@@ -67,6 +72,7 @@ final class DescriptionComponentsFilter extends Filter {
         );
 
         addPathCallbacks(
+                aiGeneratedVideoSummarySection,
                 attributesSection,
                 infoCardsSection,
                 howThisWasMadeSection,

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java

@@ -98,6 +98,11 @@ public final class LayoutComponentsFilter extends Filter {
                 "compact_banner"
         );
 
+        final var subscriptionsChipBar = new StringFilterGroup(
+                Settings.HIDE_FILTER_BAR_FEED_IN_FEED,
+                "subscriptions_chip_bar"
+        );
+
         inFeedSurvey = new StringFilterGroup(
                 Settings.HIDE_FEED_SURVEY,
                 "in_feed_survey",
@@ -264,6 +269,7 @@ public final class LayoutComponentsFilter extends Filter {
                 singleItemInformationPanel,
                 emergencyBox,
                 subscribersCommunityGuidelines,
+                subscriptionsChipBar,
                 channelGuidelines,
                 audioTrackButton,
                 artistCard,
@@ -456,6 +462,12 @@ public final class LayoutComponentsFilter extends Filter {
             return true;
         }
 
+        // Do not hide if the navigation back button is visible,
+        // otherwise the content shelves in the YouTube Movie/Courses pages is hidden.
+        if (NavigationBar.isBackButtonVisible()) {
+            return false;
+        }
+
         // Check navigation button last.
         // Only filter if the library tab is not selected.
         // This check is important as the shelf layout is used for the library tab playlists.

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/quality/AdvancedVideoQualityMenuPatch.java

@@ -8,30 +8,30 @@ import android.widget.ListView;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
-import app.revanced.extension.youtube.patches.components.VideoQualityMenuFilterPatch;
+import app.revanced.extension.youtube.patches.components.AdvancedVideoQualityMenuFilter;
 import app.revanced.extension.youtube.settings.Settings;
 
 /**
- * This patch contains the logic to show the old video quality menu.
+ * This patch contains the logic to always open the advanced video quality menu.
  * Two methods are required, because the quality menu is a RecyclerView in the new YouTube version
  * and a ListView in the old one.
  */
 @SuppressWarnings("unused")
-public final class RestoreOldVideoQualityMenuPatch {
+public final class AdvancedVideoQualityMenuPatch {
 
     /**
      * Injection point.
      */
     public static void onFlyoutMenuCreate(RecyclerView recyclerView) {
-        if (!Settings.RESTORE_OLD_VIDEO_QUALITY_MENU.get()) return;
+        if (!Settings.ADVANCED_VIDEO_QUALITY_MENU.get()) return;
 
         recyclerView.getViewTreeObserver().addOnDrawListener(() -> {
             try {
                 // Check if the current view is the quality menu.
-                if (!VideoQualityMenuFilterPatch.isVideoQualityMenuVisible || recyclerView.getChildCount() == 0) {
+                if (!AdvancedVideoQualityMenuFilter.isVideoQualityMenuVisible || recyclerView.getChildCount() == 0) {
                     return;
                 }
-                VideoQualityMenuFilterPatch.isVideoQualityMenuVisible = false;
+                AdvancedVideoQualityMenuFilter.isVideoQualityMenuVisible = false;
 
                 ViewParent quickQualityViewParent = Utils.getParentView(recyclerView, 3);
                 if (!(quickQualityViewParent instanceof ViewGroup)) {
@@ -39,16 +39,15 @@ public final class RestoreOldVideoQualityMenuPatch {
                 }
 
                 View firstChild = recyclerView.getChildAt(0);
-                if (!(firstChild instanceof ViewGroup)) {
+                if (!(firstChild instanceof ViewGroup firstChildGroup)) {
                     return;
                 }
 
-                ViewGroup advancedQualityParentView = (ViewGroup) firstChild;
-                if (advancedQualityParentView.getChildCount() < 4) {
+                if (firstChildGroup.getChildCount() < 4) {
                     return;
                 }
 
-                View advancedQualityView = advancedQualityParentView.getChildAt(3);
+                View advancedQualityView = firstChildGroup.getChildAt(3);
                 if (advancedQualityView == null) {
                     return;
                 }
@@ -71,7 +70,7 @@ public final class RestoreOldVideoQualityMenuPatch {
      * Used to force the creation of the advanced menu item for the Shorts quality flyout.
      */
     public static boolean forceAdvancedVideoQualityMenuCreation(boolean original) {
-        return Settings.RESTORE_OLD_VIDEO_QUALITY_MENU.get() || original;
+        return Settings.ADVANCED_VIDEO_QUALITY_MENU.get() || original;
     }
 
     /**
@@ -79,8 +78,8 @@ public final class RestoreOldVideoQualityMenuPatch {
      *
      * Used if spoofing to an old app version, and also used for the Shorts video quality flyout.
      */
-    public static void showOldVideoQualityMenu(final ListView listView) {
-        if (!Settings.RESTORE_OLD_VIDEO_QUALITY_MENU.get()) return;
+    public static void showAdvancedVideoQualityMenu(ListView listView) {
+        if (!Settings.ADVANCED_VIDEO_QUALITY_MENU.get()) return;
 
         listView.setOnHierarchyChangeListener(new ViewGroup.OnHierarchyChangeListener() {
             @Override

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/quality/RememberVideoQualityPatch.java

@@ -12,15 +12,19 @@ import java.util.List;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.BooleanSetting;
 import app.revanced.extension.shared.settings.IntegerSetting;
 import app.revanced.extension.youtube.patches.VideoInformation;
 import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.youtube.shared.ShortsPlayerState;
 
 @SuppressWarnings("unused")
 public class RememberVideoQualityPatch {
     private static final int AUTOMATIC_VIDEO_QUALITY_VALUE = -2;
-    private static final IntegerSetting wifiQualitySetting = Settings.VIDEO_QUALITY_DEFAULT_WIFI;
-    private static final IntegerSetting mobileQualitySetting = Settings.VIDEO_QUALITY_DEFAULT_MOBILE;
+    private static final IntegerSetting videoQualityWifi = Settings.VIDEO_QUALITY_DEFAULT_WIFI;
+    private static final IntegerSetting videoQualityMobile = Settings.VIDEO_QUALITY_DEFAULT_MOBILE;
+    private static final IntegerSetting shortsQualityWifi = Settings.SHORTS_QUALITY_DEFAULT_WIFI;
+    private static final IntegerSetting shortsQualityMobile = Settings.SHORTS_QUALITY_DEFAULT_MOBILE;
 
     private static boolean qualityNeedsUpdating;
 
@@ -41,17 +45,29 @@ public class RememberVideoQualityPatch {
     @Nullable
     private static List<Integer> videoQualities;
 
+    private static boolean shouldRememberVideoQuality() {
+        BooleanSetting preference = ShortsPlayerState.isOpen() ?
+                Settings.REMEMBER_SHORTS_QUALITY_LAST_SELECTED
+                : Settings.REMEMBER_VIDEO_QUALITY_LAST_SELECTED;
+        return preference.get();
+    }
+
     private static void changeDefaultQuality(int defaultQuality) {
         String networkTypeMessage;
+        boolean useShortsPreference = ShortsPlayerState.isOpen();
         if (Utils.getNetworkType() == NetworkType.MOBILE) {
-            mobileQualitySetting.save(defaultQuality);
+            if (useShortsPreference) shortsQualityMobile.save(defaultQuality);
+            else videoQualityMobile.save(defaultQuality);
             networkTypeMessage = str("revanced_remember_video_quality_mobile");
         } else {
-            wifiQualitySetting.save(defaultQuality);
+            if (useShortsPreference) shortsQualityWifi.save(defaultQuality);
+            else videoQualityWifi.save(defaultQuality);
             networkTypeMessage = str("revanced_remember_video_quality_wifi");
         }
-        Utils.showToastShort(
-                str("revanced_remember_video_quality_toast", networkTypeMessage, (defaultQuality + "p")));
+        Utils.showToastShort(str(
+                useShortsPreference ? "revanced_remember_video_quality_toast_shorts" : "revanced_remember_video_quality_toast",
+                networkTypeMessage, (defaultQuality + "p")
+        ));
     }
 
     /**
@@ -62,9 +78,10 @@ public class RememberVideoQualityPatch {
      */
     public static int setVideoQuality(Object[] qualities, final int originalQualityIndex, Object qInterface, String qIndexMethod) {
         try {
+            boolean useShortsPreference = ShortsPlayerState.isOpen();
             final int preferredQuality = Utils.getNetworkType() == NetworkType.MOBILE
-                    ? mobileQualitySetting.get()
-                    : wifiQualitySetting.get();
+                    ? (useShortsPreference ? shortsQualityMobile : videoQualityMobile).get()
+                    : (useShortsPreference ? shortsQualityWifi : videoQualityWifi).get();
 
             if (!userChangedDefaultQuality && preferredQuality == AUTOMATIC_VIDEO_QUALITY_VALUE) {
                 return originalQualityIndex; // Nothing to do.
@@ -141,17 +158,17 @@ public class RememberVideoQualityPatch {
      * Injection point.  Old quality menu.
      */
     public static void userChangedQuality(int selectedQualityIndex) {
-        if (!Settings.REMEMBER_VIDEO_QUALITY_LAST_SELECTED.get()) return;
-
-        userSelectedQualityIndex = selectedQualityIndex;
-        userChangedDefaultQuality = true;
+        if (shouldRememberVideoQuality()) {
+            userSelectedQualityIndex = selectedQualityIndex;
+            userChangedDefaultQuality = true;
+        }
     }
 
     /**
      * Injection point.  New quality menu.
      */
     public static void userChangedQualityInNewFlyout(int selectedQuality) {
-        if (!Settings.REMEMBER_VIDEO_QUALITY_LAST_SELECTED.get()) return;
+        if (!shouldRememberVideoQuality()) return;
 
         changeDefaultQuality(selectedQuality); // Quality is human readable resolution (ie: 1080).
     }

extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ReturnYouTubeDislike.java

@@ -37,7 +37,6 @@ import java.util.concurrent.*;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.youtube.ThemeHelper;
-import app.revanced.extension.youtube.patches.spoof.SpoofAppVersionPatch;
 import app.revanced.extension.youtube.returnyoutubedislike.requests.RYDVoteData;
 import app.revanced.extension.youtube.returnyoutubedislike.requests.ReturnYouTubeDislikeApi;
 import app.revanced.extension.youtube.settings.Settings;
@@ -87,9 +86,6 @@ public class ReturnYouTubeDislike {
      */
     private static final char MIDDLE_SEPARATOR_CHARACTER = '◎'; // 'bullseye'
 
-    private static final boolean IS_SPOOFING_TO_OLD_SEPARATOR_COLOR
-            = SpoofAppVersionPatch.isSpoofingToLessThan("18.10.00");
-
     /**
      * Cached lookup of all video ids.
      */
@@ -118,7 +114,7 @@ public class ReturnYouTubeDislike {
     private static final Rect middleSeparatorBounds;
 
     /**
-     * Left separator horizontal padding for Rolling Number layout.
+     * Horizontal padding between the left and middle separator.
      */
     public static final int leftSeparatorShapePaddingPixels;
     private static final ShapeDrawable leftSeparatorShape;
@@ -133,7 +129,7 @@ public class ReturnYouTubeDislike {
                 (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 3.7f, dp);
         middleSeparatorBounds = new Rect(0, 0, middleSeparatorSize, middleSeparatorSize);
 
-        leftSeparatorShapePaddingPixels = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10.0f, dp);
+        leftSeparatorShapePaddingPixels = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 8.4f, dp);
 
         leftSeparatorShape = new ShapeDrawable(new RectShape());
         leftSeparatorShape.setBounds(leftSeparatorBounds);
@@ -184,17 +180,8 @@ public class ReturnYouTubeDislike {
      * Color of the left and middle separator, based on the color of the right separator.
      * It's unknown where YT gets the color from, and the values here are approximated by hand.
      * Ideally, this would be the actual color YT uses at runtime.
-     *
-     * Older versions before the 'Me' library tab use a slightly different color.
-     * If spoofing was previously used and is now turned off,
-     * or an old version was recently upgraded then the old colors are sometimes still used.
      */
     private static int getSeparatorColor() {
-        if (IS_SPOOFING_TO_OLD_SEPARATOR_COLOR) {
-            return ThemeHelper.isDarkTheme()
-                    ? 0x29AAAAAA  // transparent dark gray
-                    : 0xFFD9D9D9; // light gray
-        }
         return ThemeHelper.isDarkTheme()
                 ? 0x33FFFFFF
                 : 0xFFD9D9D9;
@@ -251,7 +238,7 @@ public class ReturnYouTubeDislike {
             String leftSeparatorString = getTextDirectionString();
             final Spannable leftSeparatorSpan;
             if (isRollingNumber) {
-                 leftSeparatorSpan = new SpannableString(leftSeparatorString);
+                leftSeparatorSpan = new SpannableString(leftSeparatorString);
             } else {
                 leftSeparatorString += "  ";
                 leftSeparatorSpan = new SpannableString(leftSeparatorString);
@@ -636,7 +623,7 @@ public class ReturnYouTubeDislike {
                 userVote = vote;
                 clearUICache();
             }
-            
+
             if (future.isDone()) {
                 // Update the fetched vote data.
                 RYDVoteData voteData = getFetchData(MAX_MILLISECONDS_TO_BLOCK_UI_WAITING_FOR_FETCH);

extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java

@@ -3,7 +3,6 @@ package app.revanced.extension.youtube.settings;
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
 import static app.revanced.extension.shared.settings.Setting.Availability;
-import static app.revanced.extension.shared.settings.Setting.migrateFromOldPreferences;
 import static app.revanced.extension.shared.settings.Setting.migrateOldSettingToNew;
 import static app.revanced.extension.shared.settings.Setting.parent;
 import static app.revanced.extension.shared.settings.Setting.parentsAny;
@@ -11,7 +10,6 @@ import static app.revanced.extension.youtube.patches.ChangeFormFactorPatch.FormF
 import static app.revanced.extension.youtube.patches.ChangeStartPagePatch.StartPage;
 import static app.revanced.extension.youtube.patches.ExitFullscreenPatch.FullscreenMode;
 import static app.revanced.extension.youtube.patches.ForceOriginalAudioPatch.ForceOriginalAudioAvailability;
-import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerHideExpandCloseAvailability;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerHorizontalDragAvailability;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.MINIMAL;
@@ -21,7 +19,6 @@ import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerT
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.MODERN_4;
 import static app.revanced.extension.youtube.patches.OpenShortsInRegularPlayerPatch.ShortsPlayerType;
 import static app.revanced.extension.youtube.patches.SeekbarThumbnailsPatch.SeekbarThumbnailsHighQualityAvailability;
-import static app.revanced.extension.youtube.patches.VersionCheckPatch.IS_19_17_OR_GREATER;
 import static app.revanced.extension.youtube.sponsorblock.objects.CategoryBehaviour.IGNORE;
 import static app.revanced.extension.youtube.sponsorblock.objects.CategoryBehaviour.MANUAL_SKIP;
 import static app.revanced.extension.youtube.sponsorblock.objects.CategoryBehaviour.SKIP_AUTOMATICALLY;
@@ -38,20 +35,23 @@ import app.revanced.extension.shared.settings.IntegerSetting;
 import app.revanced.extension.shared.settings.LongSetting;
 import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.shared.settings.StringSetting;
-import app.revanced.extension.shared.settings.preference.SharedPrefCategory;
 import app.revanced.extension.youtube.patches.AlternativeThumbnailsPatch.DeArrowAvailability;
 import app.revanced.extension.youtube.patches.AlternativeThumbnailsPatch.StillImagesAvailability;
 import app.revanced.extension.youtube.patches.AlternativeThumbnailsPatch.ThumbnailOption;
 import app.revanced.extension.youtube.patches.AlternativeThumbnailsPatch.ThumbnailStillTime;
+import app.revanced.extension.youtube.patches.MiniplayerPatch;
 import app.revanced.extension.youtube.sponsorblock.SponsorBlockSettings;
 
 public class Settings extends BaseSettings {
     // Video
-    public static final BooleanSetting DISABLE_HDR_VIDEO = new BooleanSetting("revanced_disable_hdr_video", FALSE);
-    public static final BooleanSetting RESTORE_OLD_VIDEO_QUALITY_MENU = new BooleanSetting("revanced_restore_old_video_quality_menu", TRUE);
-    public static final BooleanSetting REMEMBER_VIDEO_QUALITY_LAST_SELECTED = new BooleanSetting("revanced_remember_video_quality_last_selected", FALSE);
     public static final IntegerSetting VIDEO_QUALITY_DEFAULT_WIFI = new IntegerSetting("revanced_video_quality_default_wifi", -2);
     public static final IntegerSetting VIDEO_QUALITY_DEFAULT_MOBILE = new IntegerSetting("revanced_video_quality_default_mobile", -2);
+    public static final BooleanSetting REMEMBER_VIDEO_QUALITY_LAST_SELECTED = new BooleanSetting("revanced_remember_video_quality_last_selected", FALSE);
+    public static final IntegerSetting SHORTS_QUALITY_DEFAULT_WIFI = new IntegerSetting("revanced_shorts_quality_default_wifi", -2, true);
+    public static final IntegerSetting SHORTS_QUALITY_DEFAULT_MOBILE = new IntegerSetting("revanced_shorts_quality_default_mobile", -2, true);
+    public static final BooleanSetting REMEMBER_SHORTS_QUALITY_LAST_SELECTED = new BooleanSetting("revanced_remember_shorts_quality_last_selected", FALSE);
+    public static final BooleanSetting ADVANCED_VIDEO_QUALITY_MENU = new BooleanSetting("revanced_advanced_video_quality_menu", TRUE);
+    public static final BooleanSetting DISABLE_HDR_VIDEO = new BooleanSetting("revanced_disable_hdr_video", FALSE);
     // Speed
     public static final FloatSetting SPEED_TAP_AND_HOLD = new FloatSetting("revanced_speed_tap_and_hold", 2.0f, true);
     public static final BooleanSetting REMEMBER_PLAYBACK_SPEED_LAST_SELECTED = new BooleanSetting("revanced_remember_playback_speed_last_selected", FALSE);
@@ -125,7 +125,6 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting COPY_VIDEO_URL_TIMESTAMP = new BooleanSetting("revanced_copy_video_url_timestamp", TRUE);
     public static final BooleanSetting DISABLE_FULLSCREEN_AMBIENT_MODE = new BooleanSetting("revanced_disable_fullscreen_ambient_mode", TRUE, true);
     public static final BooleanSetting DISABLE_ROLLING_NUMBER_ANIMATIONS = new BooleanSetting("revanced_disable_rolling_number_animations", FALSE);
-    public static final BooleanSetting DISABLE_SUGGESTED_VIDEO_END_SCREEN = new BooleanSetting("revanced_disable_suggested_video_end_screen", FALSE, true);
     public static final EnumSetting<FullscreenMode> EXIT_FULLSCREEN = new EnumSetting<>("revanced_exit_fullscreen", FullscreenMode.DISABLED);
     public static final BooleanSetting HIDE_AUTOPLAY_BUTTON = new BooleanSetting("revanced_hide_autoplay_button", TRUE, true);
     public static final BooleanSetting HIDE_CAPTIONS_BUTTON = new BooleanSetting("revanced_hide_captions_button", FALSE);
@@ -135,6 +134,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_COMMUNITY_GUIDELINES = new BooleanSetting("revanced_hide_community_guidelines", TRUE);
     public static final BooleanSetting HIDE_EMERGENCY_BOX = new BooleanSetting("revanced_hide_emergency_box", TRUE);
     public static final BooleanSetting HIDE_ENDSCREEN_CARDS = new BooleanSetting("revanced_hide_endscreen_cards", FALSE);
+    public static final BooleanSetting HIDE_END_SCREEN_SUGGESTED_VIDEO = new BooleanSetting("revanced_end_screen_suggested_video", FALSE, true);
     public static final BooleanSetting HIDE_HIDE_CHANNEL_GUIDELINES = new BooleanSetting("revanced_hide_channel_guidelines", TRUE);
     public static final BooleanSetting HIDE_INFO_PANELS = new BooleanSetting("revanced_hide_info_panels", TRUE);
     public static final BooleanSetting HIDE_INFO_CARDS = new BooleanSetting("revanced_hide_info_cards", FALSE);
@@ -156,7 +156,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting MINIPLAYER_DOUBLE_TAP_ACTION = new BooleanSetting("revanced_miniplayer_double_tap_action", TRUE, true, MINIPLAYER_ANY_MODERN);
     public static final BooleanSetting MINIPLAYER_DRAG_AND_DROP = new BooleanSetting("revanced_miniplayer_drag_and_drop", TRUE, true, MINIPLAYER_ANY_MODERN);
     public static final BooleanSetting MINIPLAYER_HORIZONTAL_DRAG = new BooleanSetting("revanced_miniplayer_horizontal_drag", FALSE, true, new MiniplayerHorizontalDragAvailability());
-    public static final BooleanSetting MINIPLAYER_HIDE_EXPAND_CLOSE = new BooleanSetting("revanced_miniplayer_hide_expand_close", FALSE, true, new MiniplayerHideExpandCloseAvailability());
+    public static final BooleanSetting MINIPLAYER_HIDE_OVERLAY_BUTTONS = new BooleanSetting("revanced_miniplayer_hide_overlay_buttons", FALSE, true, new MiniplayerPatch.MiniplayerHideOverlayButtonsAvailability());
     public static final BooleanSetting MINIPLAYER_HIDE_SUBTEXT = new BooleanSetting("revanced_miniplayer_hide_subtext", FALSE, true, MINIPLAYER_TYPE.availability(MODERN_1, MODERN_3));
     public static final BooleanSetting MINIPLAYER_HIDE_REWIND_FORWARD = new BooleanSetting("revanced_miniplayer_hide_rewind_forward", TRUE, true, MINIPLAYER_TYPE.availability(MODERN_1));
     public static final BooleanSetting MINIPLAYER_ROUNDED_CORNERS = new BooleanSetting("revanced_miniplayer_rounded_corners", TRUE, true, MINIPLAYER_ANY_MODERN);
@@ -168,14 +168,16 @@ public class Settings extends BaseSettings {
     public static final StringSetting EXTERNAL_DOWNLOADER_PACKAGE_NAME = new StringSetting("revanced_external_downloader_name",
             "org.schabi.newpipe" /* NewPipe */, parentsAny(EXTERNAL_DOWNLOADER, EXTERNAL_DOWNLOADER_ACTION_BUTTON));
     // Comments
-    public static final BooleanSetting HIDE_COMMENTS_CHAT_SUMMARY = new BooleanSetting("revanced_hide_comments_chat_summary", FALSE);
+    public static final BooleanSetting HIDE_COMMENTS_AI_CHAT_SUMMARY = new BooleanSetting("revanced_hide_comments_ai_chat_summary", FALSE);
+    public static final BooleanSetting HIDE_COMMENTS_AI_SUMMARY = new BooleanSetting("revanced_hide_comments_ai_summary", FALSE);
     public static final BooleanSetting HIDE_COMMENTS_BY_MEMBERS_HEADER = new BooleanSetting("revanced_hide_comments_by_members_header", FALSE);
     public static final BooleanSetting HIDE_COMMENTS_CREATE_A_SHORT_BUTTON = new BooleanSetting("revanced_hide_comments_create_a_short_button", TRUE);
+    public static final BooleanSetting HIDE_COMMENTS_TIMESTAMP_AND_EMOJI_BUTTONS = new BooleanSetting("revanced_hide_comments_timestamp_and_emoji_buttons", TRUE);
     public static final BooleanSetting HIDE_COMMENTS_PREVIEW_COMMENT = new BooleanSetting("revanced_hide_comments_preview_comment", FALSE);
     public static final BooleanSetting HIDE_COMMENTS_SECTION = new BooleanSetting("revanced_hide_comments_section", FALSE);
     public static final BooleanSetting HIDE_COMMENTS_THANKS_BUTTON = new BooleanSetting("revanced_hide_comments_thanks_button", TRUE);
-    public static final BooleanSetting HIDE_COMMENTS_TIMESTAMP_AND_EMOJI_BUTTONS = new BooleanSetting("revanced_hide_comments_timestamp_and_emoji_buttons", TRUE);
     // Description
+    public static final BooleanSetting HIDE_AI_GENERATED_VIDEO_SUMMARY_SECTION = new BooleanSetting("revanced_hide_ai_generated_video_summary_section", FALSE);
     public static final BooleanSetting HIDE_ATTRIBUTES_SECTION = new BooleanSetting("revanced_hide_attributes_section", FALSE);
     public static final BooleanSetting HIDE_CHAPTERS_SECTION = new BooleanSetting("revanced_hide_chapters_section", TRUE);
     public static final BooleanSetting HIDE_HOW_THIS_WAS_MADE_SECTION = new BooleanSetting("revanced_hide_how_this_was_made_section", FALSE);
@@ -218,7 +220,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting SPOOF_APP_VERSION = new BooleanSetting("revanced_spoof_app_version", FALSE, true, "revanced_spoof_app_version_user_dialog_message");
     public static final BooleanSetting WIDE_SEARCHBAR = new BooleanSetting("revanced_wide_searchbar", FALSE, true);
     public static final EnumSetting<StartPage> CHANGE_START_PAGE = new EnumSetting<>("revanced_change_start_page", StartPage.DEFAULT, true);
-    public static final StringSetting SPOOF_APP_VERSION_TARGET = new StringSetting("revanced_spoof_app_version_target", IS_19_17_OR_GREATER ? "19.26.42" : "17.33.42", true, parent(SPOOF_APP_VERSION));
+    public static final StringSetting SPOOF_APP_VERSION_TARGET = new StringSetting("revanced_spoof_app_version_target", "19.01.34", true, parent(SPOOF_APP_VERSION));
     // Custom filter
     public static final BooleanSetting CUSTOM_FILTER = new BooleanSetting("revanced_custom_filter", FALSE);
     public static final StringSetting CUSTOM_FILTER_STRINGS = new StringSetting("revanced_custom_filter_strings", "", true, parent(CUSTOM_FILTER));
@@ -231,7 +233,8 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_NOTIFICATIONS_BUTTON = new BooleanSetting("revanced_hide_notifications_button", FALSE, true);
     public static final BooleanSetting SWITCH_CREATE_WITH_NOTIFICATIONS_BUTTON = new BooleanSetting("revanced_switch_create_with_notifications_button", TRUE, true,
             "revanced_switch_create_with_notifications_button_user_dialog_message");
-    public static final BooleanSetting DISABLE_TRANSLUCENT_STATUS_BAR = new BooleanSetting("revanced_disable_translucent_status_bar", FALSE, true);
+    public static final BooleanSetting DISABLE_TRANSLUCENT_STATUS_BAR = new BooleanSetting("revanced_disable_translucent_status_bar", FALSE, true,
+            "revanced_disable_translucent_status_bar_user_dialog_message");
     public static final BooleanSetting DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT = new BooleanSetting("revanced_disable_translucent_navigation_bar_light", FALSE, true);
     public static final BooleanSetting DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK = new BooleanSetting("revanced_disable_translucent_navigation_bar_dark", FALSE, true);
 
@@ -284,7 +287,6 @@ public class Settings extends BaseSettings {
             "revanced_seekbar_thumbnails_high_quality_dialog_message", new SeekbarThumbnailsHighQualityAvailability());
     public static final BooleanSetting SLIDE_TO_SEEK = new BooleanSetting("revanced_slide_to_seek", FALSE, true);
     public static final BooleanSetting SEEKBAR_CUSTOM_COLOR = new BooleanSetting("revanced_seekbar_custom_color", FALSE, true);
-    private static final StringSetting DEPRECATED_SEEKBAR_CUSTOM_COLOR_PRIMARY = new StringSetting("revanced_seekbar_custom_color_value", "#FF0033");
     public static final StringSetting SEEKBAR_CUSTOM_COLOR_PRIMARY = new StringSetting("revanced_seekbar_custom_color_primary", "#FF0033", true, parent(SEEKBAR_CUSTOM_COLOR));
     public static final StringSetting SEEKBAR_CUSTOM_COLOR_ACCENT = new StringSetting("revanced_seekbar_custom_color_accent", "#FF2791", true, parent(SEEKBAR_CUSTOM_COLOR));
 
@@ -322,7 +324,6 @@ public class Settings extends BaseSettings {
             parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
     public static final IntegerSetting SWIPE_OVERLAY_OPACITY = new IntegerSetting("revanced_swipe_overlay_background_opacity", 60, true,
             parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
-    private static final IntegerSetting DEPRECATED_SWIPE_OVERLAY_BACKGROUND_ALPHA = new IntegerSetting("revanced_swipe_overlay_background_alpha", 127);
     public static final LongSetting SWIPE_OVERLAY_TIMEOUT = new LongSetting("revanced_swipe_overlay_timeout", 500L, true,
             parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
     public static final BooleanSetting SWIPE_SAVE_AND_RESTORE_BRIGHTNESS = new BooleanSetting("revanced_swipe_save_and_restore_brightness", TRUE, true, parent(SWIPE_BRIGHTNESS));
@@ -364,47 +365,54 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting SB_SEEN_GUIDELINES = new BooleanSetting("sb_seen_guidelines", FALSE, false, false);
     public static final StringSetting SB_CATEGORY_SPONSOR = new StringSetting("sb_sponsor", SKIP_AUTOMATICALLY_ONCE.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_SPONSOR_COLOR = new StringSetting("sb_sponsor_color", "#00D400");
+    public static final FloatSetting  SB_CATEGORY_SPONSOR_OPACITY = new FloatSetting("sb_sponsor_opacity", 0.8f);
     public static final StringSetting SB_CATEGORY_SELF_PROMO = new StringSetting("sb_selfpromo", MANUAL_SKIP.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_SELF_PROMO_COLOR = new StringSetting("sb_selfpromo_color", "#FFFF00");
+    public static final FloatSetting  SB_CATEGORY_SELF_PROMO_OPACITY = new FloatSetting("sb_selfpromo_opacity", 0.8f);
     public static final StringSetting SB_CATEGORY_INTERACTION = new StringSetting("sb_interaction", MANUAL_SKIP.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_INTERACTION_COLOR = new StringSetting("sb_interaction_color", "#CC00FF");
+    public static final FloatSetting  SB_CATEGORY_INTERACTION_OPACITY = new FloatSetting("sb_interaction_opacity", 0.8f);
     public static final StringSetting SB_CATEGORY_HIGHLIGHT = new StringSetting("sb_highlight", MANUAL_SKIP.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_HIGHLIGHT_COLOR = new StringSetting("sb_highlight_color", "#FF1684");
+    public static final FloatSetting  SB_CATEGORY_HIGHLIGHT_OPACITY = new FloatSetting("sb_highlight_opacity", 0.8f);
     public static final StringSetting SB_CATEGORY_INTRO = new StringSetting("sb_intro", MANUAL_SKIP.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_INTRO_COLOR = new StringSetting("sb_intro_color", "#00FFFF");
+    public static final FloatSetting  SB_CATEGORY_INTRO_OPACITY = new FloatSetting("sb_intro_opacity", 0.8f);
     public static final StringSetting SB_CATEGORY_OUTRO = new StringSetting("sb_outro", MANUAL_SKIP.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_OUTRO_COLOR = new StringSetting("sb_outro_color", "#0202ED");
+    public static final FloatSetting  SB_CATEGORY_OUTRO_OPACITY = new FloatSetting("sb_outro_opacity", 0.8f);
     public static final StringSetting SB_CATEGORY_PREVIEW = new StringSetting("sb_preview", IGNORE.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_PREVIEW_COLOR = new StringSetting("sb_preview_color", "#008FD6");
+    public static final FloatSetting  SB_CATEGORY_PREVIEW_OPACITY = new FloatSetting("sb_preview_opacity", 0.8f);
     public static final StringSetting SB_CATEGORY_FILLER = new StringSetting("sb_filler", IGNORE.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_FILLER_COLOR = new StringSetting("sb_filler_color", "#7300FF");
+    public static final FloatSetting  SB_CATEGORY_FILLER_OPACITY = new FloatSetting("sb_filler_opacity", 0.8f);
     public static final StringSetting SB_CATEGORY_MUSIC_OFFTOPIC = new StringSetting("sb_music_offtopic", MANUAL_SKIP.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_MUSIC_OFFTOPIC_COLOR = new StringSetting("sb_music_offtopic_color", "#FF9900");
+    public static final FloatSetting  SB_CATEGORY_MUSIC_OFFTOPIC_OPACITY = new FloatSetting("sb_music_offtopic_opacity", 0.8f);
     public static final StringSetting SB_CATEGORY_UNSUBMITTED = new StringSetting("sb_unsubmitted", SKIP_AUTOMATICALLY.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_UNSUBMITTED_COLOR = new StringSetting("sb_unsubmitted_color", "#FFFFFF");
+    public static final FloatSetting  SB_CATEGORY_UNSUBMITTED_OPACITY = new FloatSetting("sb_unsubmitted_opacity", 1.0f);
 
     // Deprecated migrations
-    public static final StringSetting DEPRECATED_SB_UUID_OLD_MIGRATION_SETTING = new StringSetting("uuid", ""); // Delete sometime in 2024
     private static final BooleanSetting DEPRECATED_HIDE_PLAYER_BUTTONS = new BooleanSetting("revanced_hide_player_buttons", FALSE, true);
     private static final BooleanSetting DEPRECATED_HIDE_PLAYER_FLYOUT_VIDEO_QUALITY_FOOTER = new BooleanSetting("revanced_hide_video_quality_menu_footer", FALSE);
+    private static final IntegerSetting DEPRECATED_SWIPE_OVERLAY_BACKGROUND_ALPHA = new IntegerSetting("revanced_swipe_overlay_background_alpha", 127);
+    private static final StringSetting DEPRECATED_SEEKBAR_CUSTOM_COLOR_PRIMARY = new StringSetting("revanced_seekbar_custom_color_value", "#FF0033");
+    private static final BooleanSetting DEPRECATED_DISABLE_SUGGESTED_VIDEO_END_SCREEN = new BooleanSetting("revanced_disable_suggested_video_end_screen", FALSE);
+    private static final BooleanSetting DEPRECATED_RESTORE_OLD_VIDEO_QUALITY_MENU = new BooleanSetting("revanced_restore_old_video_quality_menu", TRUE);
 
     static {
         // region Migration
 
-        // Do _not_ delete this SB private user id migration property until sometime in early 2025.
-        // This is the only setting that cannot be reconfigured if lost,
-        // and more time should be given for users who rarely upgrade.
-        SharedPrefCategory sbPrefs = new SharedPrefCategory("sponsor-block");
-        // Remove the "sb_" prefix, as old settings are saved without it.
-        String key = DEPRECATED_SB_UUID_OLD_MIGRATION_SETTING.key.substring(3);
-        migrateFromOldPreferences(sbPrefs, DEPRECATED_SB_UUID_OLD_MIGRATION_SETTING, key);
-
-        migrateOldSettingToNew(DEPRECATED_SB_UUID_OLD_MIGRATION_SETTING, SB_PRIVATE_USER_ID);
-
         migrateOldSettingToNew(DEPRECATED_HIDE_PLAYER_BUTTONS, HIDE_PLAYER_PREVIOUS_NEXT_BUTTONS);
 
         migrateOldSettingToNew(DEPRECATED_HIDE_PLAYER_FLYOUT_VIDEO_QUALITY_FOOTER, HIDE_PLAYER_FLYOUT_VIDEO_QUALITY_FOOTER);
 
+        migrateOldSettingToNew(DEPRECATED_DISABLE_SUGGESTED_VIDEO_END_SCREEN, HIDE_END_SCREEN_SUGGESTED_VIDEO);
+
+        migrateOldSettingToNew(DEPRECATED_RESTORE_OLD_VIDEO_QUALITY_MENU, ADVANCED_VIDEO_QUALITY_MENU);
+
         // Migrate renamed enum.
         //noinspection deprecation
         if (MINIPLAYER_TYPE.get() == MiniplayerType.PHONE) {
@@ -440,6 +448,12 @@ public class Settings extends BaseSettings {
             DEPRECATED_SWIPE_OVERLAY_BACKGROUND_ALPHA.resetToDefault();
         }
 
+        // Old spoof versions that no longer work.
+        if (SPOOF_APP_VERSION_TARGET.get().compareTo(SPOOF_APP_VERSION_TARGET.defaultValue) < 0) {
+            Logger.printInfo(() -> "Resetting spoof app version target");
+            SPOOF_APP_VERSION_TARGET.resetToDefault();
+        }
+
         // endregion
 
         // region SB import/export callbacks

extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedPreferenceFragment.java

@@ -18,7 +18,6 @@ import android.widget.TextView;
 import android.widget.Toolbar;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import app.revanced.extension.shared.Logger;
@@ -74,7 +73,8 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
             }
         }
 
-        Collections.sort(pairsToSort, (pair1, pair2) -> pair1.first.compareToIgnoreCase(pair2.first));
+        pairsToSort.sort((pair1, pair2)
+                -> pair1.first.compareToIgnoreCase(pair2.first));
 
         CharSequence[] sortedEntries = new CharSequence[entrySize];
         CharSequence[] sortedEntryValues = new CharSequence[entrySize];
@@ -109,6 +109,7 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
                 CustomPlaybackSpeedPatch.initializeListPreference(playbackPreference);
             }
 
+            sortPreferenceListMenu(Settings.CHANGE_START_PAGE);
             sortPreferenceListMenu(Settings.SPOOF_VIDEO_STREAMS_LANGUAGE);
             sortPreferenceListMenu(BaseSettings.REVANCED_LANGUAGE);
         } catch (Exception ex) {
@@ -137,11 +138,13 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
                                     .findViewById(android.R.id.content)
                                     .getParent();
 
-                            // Fix required for Android 15 and YT 19.45+
+                            // Fix edge-to-edge screen with Android 15 and YT 19.45+
+                            // https://developer.android.com/develop/ui/views/layout/edge-to-edge#system-bars-insets
                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                                 rootView.setOnApplyWindowInsetsListener((v, insets) -> {
                                     Insets statusInsets = insets.getInsets(WindowInsets.Type.statusBars());
-                                    v.setPadding(0, statusInsets.top, 0, 0);
+                                    Insets navInsets = insets.getInsets(WindowInsets.Type.navigationBars());
+                                    v.setPadding(0, statusInsets.top, 0, navInsets.bottom);
                                     return insets;
                                 });
                             }

extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ReturnYouTubeDislikePreferenceFragment.java

@@ -14,6 +14,7 @@ import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.youtube.patches.ReturnYouTubeDislikePatch;
@@ -85,9 +86,7 @@ public class ReturnYouTubeDislikePreferenceFragment extends PreferenceFragment {
             shortsPreference = new SwitchPreference(context);
             shortsPreference.setChecked(Settings.RYD_SHORTS.get());
             shortsPreference.setTitle(str("revanced_ryd_shorts_title"));
-            String shortsSummary = ReturnYouTubeDislikePatch.IS_SPOOFING_TO_NON_LITHO_SHORTS_PLAYER
-                            ? str("revanced_ryd_shorts_summary_on")
-                            : str("revanced_ryd_shorts_summary_on_disclaimer");
+            String shortsSummary = str("revanced_ryd_shorts_summary_on_disclaimer");
             shortsPreference.setSummaryOn(shortsSummary);
             shortsPreference.setSummaryOff(str("revanced_ryd_shorts_summary_off"));
             shortsPreference.setOnPreferenceChangeListener((pref, newValue) -> {
@@ -237,6 +236,8 @@ public class ReturnYouTubeDislikePreferenceFragment extends PreferenceFragment {
                         "revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_non_zero_summary"));
                 preferenceScreen.addPreference(statisticPreference);
             }
+
+            Utils.setPreferenceTitlesToMultiLineIfNeeded(preferenceScreen);
         } catch (Exception ex) {
             Logger.printException(() -> "onCreate failure", ex);
         }

extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SponsorBlockPreferenceFragment.java

@@ -17,6 +17,7 @@ import androidx.annotation.Nullable;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.Setting;
+import app.revanced.extension.shared.settings.preference.ResettableEditTextPreference;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.sponsorblock.SegmentPlaybackController;
 import app.revanced.extension.youtube.sponsorblock.SponsorBlockSettings;
@@ -44,8 +45,8 @@ public class SponsorBlockPreferenceFragment extends PreferenceFragment {
     private SwitchPreference showTimeWithoutSegments;
     private SwitchPreference toastOnConnectionError;
 
-    private EditTextPreference newSegmentStep;
-    private EditTextPreference minSegmentDuration;
+    private ResettableEditTextPreference newSegmentStep;
+    private ResettableEditTextPreference minSegmentDuration;
     private EditTextPreference privateUserId;
     private EditTextPreference importExport;
     private Preference apiUrl;
@@ -159,6 +160,8 @@ public class SponsorBlockPreferenceFragment extends PreferenceFragment {
 
             addAboutCategory(context, preferenceScreen);
 
+            Utils.setPreferenceTitlesToMultiLineIfNeeded(preferenceScreen);
+
             updateUI();
         } catch (Exception ex) {
             Logger.printException(() -> "onCreate failure", ex);
@@ -268,7 +271,8 @@ public class SponsorBlockPreferenceFragment extends PreferenceFragment {
             return true;
         });
 
-        newSegmentStep = new EditTextPreference(context);
+        newSegmentStep = new ResettableEditTextPreference(context);
+        newSegmentStep.setSetting(Settings.SB_CREATE_NEW_SEGMENT_STEP);
         newSegmentStep.setTitle(str("revanced_sb_general_adjusting"));
         newSegmentStep.setSummary(str("revanced_sb_general_adjusting_sum"));
         newSegmentStep.getEditText().setInputType(InputType.TYPE_CLASS_NUMBER);
@@ -326,7 +330,8 @@ public class SponsorBlockPreferenceFragment extends PreferenceFragment {
         });
         category.addPreference(trackSkips);
 
-        minSegmentDuration = new EditTextPreference(context);
+        minSegmentDuration = new ResettableEditTextPreference(context);
+        minSegmentDuration.setSetting(Settings.SB_SEGMENT_MIN_DURATION);
         minSegmentDuration.setTitle(str("revanced_sb_general_min_duration"));
         minSegmentDuration.setSummary(str("revanced_sb_general_min_duration_sum"));
         minSegmentDuration.getEditText().setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
@@ -345,7 +350,15 @@ public class SponsorBlockPreferenceFragment extends PreferenceFragment {
         });
         category.addPreference(minSegmentDuration);
 
-        privateUserId = new EditTextPreference(context);
+        privateUserId = new EditTextPreference(context) {
+            protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
+                Utils.setEditTextDialogTheme(builder);
+
+                builder.setNeutralButton(str("revanced_sb_settings_copy"), (dialog, which) -> {
+                    Utils.setClipboard(getEditText().getText().toString());
+                });
+            }
+        };
         privateUserId.setTitle(str("revanced_sb_general_uuid"));
         privateUserId.setSummary(str("revanced_sb_general_uuid_sum"));
         privateUserId.setOnPreferenceChangeListener((preference1, newValue) -> {
@@ -504,7 +517,7 @@ public class SponsorBlockPreferenceFragment extends PreferenceFragment {
 
             if (stats.totalSegmentCountIncludingIgnored > 0) {
                 // If user has not created any segments, there's no reason to set a username.
-                EditTextPreference preference = new EditTextPreference(context);
+                EditTextPreference preference = new ResettableEditTextPreference(context);
                 statsCategory.addPreference(preference);
                 String userName = stats.userName;
                 preference.setTitle(fromHtml(str("revanced_sb_stats_username", userName)));

extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java

@@ -73,6 +73,7 @@ public class SpoofStreamingDataSideEffectsPreference extends Preference {
         if (currentClientType == clientType) {
             return;
         }
+        currentClientType = clientType;
 
         Logger.printDebug(() -> "Updating spoof stream side effects preference");
         setEnabled(BaseSettings.SPOOF_VIDEO_STREAMS.get());

extensions/youtube/src/main/java/app/revanced/extension/youtube/shared/NavigationBar.java

@@ -3,7 +3,9 @@ package app.revanced.extension.youtube.shared;
 import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButton.CREATE;
 
 import android.app.Activity;
+import android.graphics.drawable.Drawable;
 import android.view.View;
+import android.widget.FrameLayout;
 
 import androidx.annotation.Nullable;
 
@@ -24,12 +26,22 @@ import app.revanced.extension.youtube.settings.Settings;
 @SuppressWarnings("unused")
 public final class NavigationBar {
 
+    /**
+     * Interface to call obfuscated methods in AppCompat Toolbar class.
+     */
+    public interface AppCompatToolbarPatchInterface {
+        Drawable patch_getNavigationIcon();
+    }
+
     //
-    // Search bar
+    // Search and toolbar.
     //
 
     private static volatile WeakReference<View> searchBarResultsRef = new WeakReference<>(null);
 
+    private static volatile WeakReference<AppCompatToolbarPatchInterface> toolbarResultsRef
+            = new WeakReference<>(null);
+
     /**
      * Injection point.
      */
@@ -37,6 +49,22 @@ public final class NavigationBar {
         searchBarResultsRef = new WeakReference<>(searchbarResults);
     }
 
+    /**
+     * Injection point.
+     */
+    public static void setToolbar(FrameLayout layout) {
+        AppCompatToolbarPatchInterface toolbar = Utils.getChildView(layout, false, (view) ->
+                view instanceof AppCompatToolbarPatchInterface
+        );
+
+        if (toolbar == null) {
+            Logger.printException(() -> "Could not find navigation toolbar");
+            return;
+        }
+
+        toolbarResultsRef = new WeakReference<>(toolbar);
+    }
+
     /**
      * @return If the search bar is on screen.  This includes if the player
      *         is on screen and the search results are behind the player (and not visible).
@@ -47,8 +75,13 @@ public final class NavigationBar {
         return searchbarResults != null && searchbarResults.getParent() != null;
     }
 
+    public static boolean isBackButtonVisible() {
+        AppCompatToolbarPatchInterface toolbar = toolbarResultsRef.get();
+        return toolbar != null && toolbar.patch_getNavigationIcon() != null;
+    }
+
     //
-    // Navigation bar buttons
+    // Navigation bar buttons.
     //
 
     /**

extensions/youtube/src/main/java/app/revanced/extension/youtube/shared/PlayerType.kt

@@ -5,7 +5,7 @@ import app.revanced.extension.youtube.Event
 import app.revanced.extension.youtube.patches.VideoInformation
 
 /**
- * Main player type.
+ * Regular player type.
  */
 enum class PlayerType {
     /**
@@ -90,8 +90,6 @@ enum class PlayerType {
      * Does not include the first moment after a short is opened when a regular video is minimized on screen,
      * or while watching a short with a regular video present on a spoofed 16.x version of YouTube.
      * To include those situations instead use [isNoneHiddenOrMinimized].
-     *
-     * @see VideoInformation
      */
     fun isNoneOrHidden(): Boolean {
         return this == NONE || this == HIDDEN
@@ -107,8 +105,11 @@ enum class PlayerType {
      * when spoofing to an old version this will return false even
      * though a Short is being opened or is on screen (see [isNoneHiddenOrMinimized]).
      *
+     * Instead of this method, consider using {@link ShortsPlayerState}
+     * which may work better for some situations.
+     *
      * @return If nothing, a Short, or a regular video is sliding off screen to a dismissed or hidden state.
-     * @see VideoInformation
+     * @see ShortsPlayerState
      */
     fun isNoneHiddenOrSlidingMinimized(): Boolean {
         return isNoneOrHidden() || this == WATCH_WHILE_SLIDING_MINIMIZED_DISMISSED
@@ -125,9 +126,12 @@ enum class PlayerType {
      * Typically used to detect if a Short is playing when the player cannot be in a minimized state,
      * such as the user interacting with a button or element of the player.
      *
+     * Instead of this method, consider using {@link ShortsPlayerState}
+     * which may work better for some situations.
+     *
      * @return If nothing, a Short, a regular video is sliding off screen to a dismissed or hidden state,
      *         a regular video is minimized (and a new video is not being opened).
-     * @see VideoInformation
+     * @see ShortsPlayerState
      */
     fun isNoneHiddenOrMinimized(): Boolean {
         return isNoneHiddenOrSlidingMinimized() || this == WATCH_WHILE_MINIMIZED

extensions/youtube/src/main/java/app/revanced/extension/youtube/shared/ShortsPlayerState.kt

@@ -0,0 +1,38 @@
+package app.revanced.extension.youtube.shared
+
+import app.revanced.extension.shared.Logger
+import app.revanced.extension.youtube.Event
+
+/**
+ * Shorts player state.
+ */
+class ShortsPlayerState {
+    companion object {
+
+        @JvmStatic
+        fun setOpen(open: Boolean) {
+            if (isOpen != open) {
+                Logger.printDebug { "ShortsPlayerState open changed to: $isOpen" }
+                isOpen = open
+                onChange(open)
+            }
+        }
+
+        @Volatile
+        private var isOpen = false
+
+        /**
+         * Shorts player state change listener.
+         */
+        @JvmStatic
+        val onChange = Event<Boolean>()
+
+        /**
+         * If the Shorts player is currently open.
+         */
+        @JvmStatic
+        fun isOpen(): Boolean {
+            return isOpen
+        }
+    }
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockSettings.java

@@ -136,7 +136,7 @@ public class SponsorBlockSettings {
             for (SegmentCategory category : categories) {
                 JSONObject categoryObject = new JSONObject();
                 String categoryKey = category.keyValue;
-                categoryObject.put("color", category.colorString());
+                categoryObject.put("color", category.getColorString());
                 barTypesObject.put(categoryKey, categoryObject);
 
                 if (category.behaviour != CategoryBehaviour.IGNORE) {

extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockUtils.java

@@ -5,7 +5,12 @@ import static app.revanced.extension.shared.StringRef.str;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.text.Html;
+import android.graphics.Color;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.StyleSpan;
 import android.widget.EditText;
 
 import androidx.annotation.NonNull;
@@ -33,7 +38,7 @@ import app.revanced.extension.youtube.sponsorblock.ui.SponsorBlockViewController
  * Not thread safe. All fields/methods must be accessed from the main thread.
  */
 public class SponsorBlockUtils {
-    private static final String LOCKED_COLOR = "#FFC83D";
+    private static final int LOCKED_COLOR = Color.parseColor("#FFC83D");
     private static final String MANUAL_EDIT_TIME_TEXT_HINT = "hh:mm:ss.sss";
     private static final Pattern manualEditTimePattern
             = Pattern.compile("((\\d{1,2}):)?(\\d{1,2}):(\\d{2})(\\.(\\d{1,3}))?");
@@ -160,32 +165,34 @@ public class SponsorBlockUtils {
             SegmentVote[] voteOptions = (segment.category == SegmentCategory.HIGHLIGHT)
                     ? SegmentVote.voteTypesWithoutCategoryChange // highlight segments cannot change category
                     : SegmentVote.values();
-            CharSequence[] items = new CharSequence[voteOptions.length];
+            final int voteOptionsLength = voteOptions.length;
+            final boolean userIsVip = Settings.SB_USER_IS_VIP.get();
+            CharSequence[] items = new CharSequence[voteOptionsLength];
 
-            for (int i = 0; i < voteOptions.length; i++) {
+            for (int i = 0; i < voteOptionsLength; i++) {
                 SegmentVote voteOption = voteOptions[i];
-                String title = voteOption.title.toString();
-                if (Settings.SB_USER_IS_VIP.get() && segment.isLocked && voteOption.shouldHighlight) {
-                    items[i] = Html.fromHtml(String.format("<font color=\"%s\">%s</font>", LOCKED_COLOR, title));
-                } else {
-                    items[i] = title;
+                CharSequence title = voteOption.title.toString();
+                if (userIsVip && segment.isLocked && voteOption.highlightIfVipAndVideoIsLocked) {
+                    SpannableString coloredTitle = new SpannableString(title);
+                    coloredTitle.setSpan(new ForegroundColorSpan(LOCKED_COLOR),
+                            0, title.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                    title = coloredTitle;
                 }
+                items[i] = title;
             }
 
-            new AlertDialog.Builder(context)
-                    .setItems(items, (dialog1, which1) -> {
-                        SegmentVote voteOption = voteOptions[which1];
-                        switch (voteOption) {
-                            case UPVOTE:
-                            case DOWNVOTE:
-                                SBRequester.voteForSegmentOnBackgroundThread(segment, voteOption);
-                                break;
-                            case CATEGORY_CHANGE:
-                                onNewCategorySelect(segment, context);
-                                break;
-                        }
-                    })
-                    .show();
+            new AlertDialog.Builder(context).setItems(items, (dialog1, which1) -> {
+                SegmentVote voteOption = voteOptions[which1];
+                switch (voteOption) {
+                    case UPVOTE:
+                    case DOWNVOTE:
+                        SBRequester.voteForSegmentOnBackgroundThread(segment, voteOption);
+                        break;
+                    case CATEGORY_CHANGE:
+                        onNewCategorySelect(segment, context);
+                        break;
+                }
+            }).show();
         } catch (Exception ex) {
             Logger.printException(() -> "segmentVoteClickListener failure", ex);
         }
@@ -282,7 +289,6 @@ public class SponsorBlockUtils {
                 return;
             }
 
-
             final int numberOfSegments = segments.length;
             CharSequence[] titles = new CharSequence[numberOfSegments];
             for (int i = 0; i < numberOfSegments; i++) {
@@ -290,22 +296,33 @@ public class SponsorBlockUtils {
                 if (segment.category == SegmentCategory.UNSUBMITTED) {
                     continue;
                 }
-                StringBuilder htmlBuilder = new StringBuilder();
-                htmlBuilder.append(String.format("<b><font color=\"#%06X\">⬤</font> %s<br>",
-                        segment.category.color, segment.category.title));
-                htmlBuilder.append(formatSegmentTime(segment.start));
-                if (segment.category != SegmentCategory.HIGHLIGHT) {
-                    htmlBuilder.append(" to ").append(formatSegmentTime(segment.end));
+
+                SpannableStringBuilder spannableBuilder = new SpannableStringBuilder();
+
+                spannableBuilder.append(segment.category.getTitleWithColorDot());
+                spannableBuilder.append('\n');
+
+                String startTime = formatSegmentTime(segment.start);
+                if (segment.category == SegmentCategory.HIGHLIGHT) {
+                    spannableBuilder.append(startTime);
+                } else {
+                    String toFromString = str("revanced_sb_vote_segment_time_to_from",
+                            startTime, formatSegmentTime(segment.end));
+                    spannableBuilder.append(toFromString);
                 }
-                htmlBuilder.append("</b>");
-                if (i + 1 != numberOfSegments) // prevents trailing new line after last segment
-                    htmlBuilder.append("<br>");
-                titles[i] = Html.fromHtml(htmlBuilder.toString());
+
+                if (i + 1 != numberOfSegments) {
+                    // prevents trailing new line after last segment
+                    spannableBuilder.append('\n');
+                }
+
+                spannableBuilder.setSpan(new StyleSpan(android.graphics.Typeface.BOLD),
+                        0, spannableBuilder.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+                titles[i] = spannableBuilder;
             }
 
-            new AlertDialog.Builder(context)
-                    .setItems(titles, segmentVoteClickListener)
-                    .show();
+            new AlertDialog.Builder(context).setItems(titles, segmentVoteClickListener).show();
         } catch (Exception ex) {
             Logger.printException(() -> "onVotingClicked failure", ex);
         }

extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategory.java

@@ -1,13 +1,14 @@
 package app.revanced.extension.youtube.sponsorblock.objects;
 
-import static app.revanced.extension.youtube.settings.Settings.*;
 import static app.revanced.extension.shared.StringRef.sf;
+import static app.revanced.extension.youtube.settings.Settings.*;
 
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.text.Html;
-import android.text.Spanned;
+import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -15,43 +16,45 @@ import androidx.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 
-import app.revanced.extension.shared.Utils;
-import app.revanced.extension.shared.settings.StringSetting;
-import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.StringRef;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.FloatSetting;
+import app.revanced.extension.shared.settings.StringSetting;
+import app.revanced.extension.youtube.settings.Settings;
 
 public enum SegmentCategory {
     SPONSOR("sponsor", sf("revanced_sb_segments_sponsor"), sf("revanced_sb_segments_sponsor_sum"), sf("revanced_sb_skip_button_sponsor"), sf("revanced_sb_skipped_sponsor"),
-            SB_CATEGORY_SPONSOR, SB_CATEGORY_SPONSOR_COLOR),
+            SB_CATEGORY_SPONSOR, SB_CATEGORY_SPONSOR_COLOR, SB_CATEGORY_SPONSOR_OPACITY),
     SELF_PROMO("selfpromo", sf("revanced_sb_segments_selfpromo"), sf("revanced_sb_segments_selfpromo_sum"), sf("revanced_sb_skip_button_selfpromo"), sf("revanced_sb_skipped_selfpromo"),
-            SB_CATEGORY_SELF_PROMO, SB_CATEGORY_SELF_PROMO_COLOR),
+            SB_CATEGORY_SELF_PROMO, SB_CATEGORY_SELF_PROMO_COLOR, SB_CATEGORY_SELF_PROMO_OPACITY),
     INTERACTION("interaction", sf("revanced_sb_segments_interaction"), sf("revanced_sb_segments_interaction_sum"), sf("revanced_sb_skip_button_interaction"), sf("revanced_sb_skipped_interaction"),
-            SB_CATEGORY_INTERACTION, SB_CATEGORY_INTERACTION_COLOR),
+            SB_CATEGORY_INTERACTION, SB_CATEGORY_INTERACTION_COLOR, SB_CATEGORY_INTERACTION_OPACITY),
     /**
      * Unique category that is treated differently than the rest.
      */
     HIGHLIGHT("poi_highlight", sf("revanced_sb_segments_highlight"), sf("revanced_sb_segments_highlight_sum"), sf("revanced_sb_skip_button_highlight"), sf("revanced_sb_skipped_highlight"),
-            SB_CATEGORY_HIGHLIGHT, SB_CATEGORY_HIGHLIGHT_COLOR),
+            SB_CATEGORY_HIGHLIGHT, SB_CATEGORY_HIGHLIGHT_COLOR, SB_CATEGORY_HIGHLIGHT_OPACITY),
     INTRO("intro", sf("revanced_sb_segments_intro"), sf("revanced_sb_segments_intro_sum"),
             sf("revanced_sb_skip_button_intro_beginning"), sf("revanced_sb_skip_button_intro_middle"), sf("revanced_sb_skip_button_intro_end"),
             sf("revanced_sb_skipped_intro_beginning"), sf("revanced_sb_skipped_intro_middle"), sf("revanced_sb_skipped_intro_end"),
-            SB_CATEGORY_INTRO, SB_CATEGORY_INTRO_COLOR),
+            SB_CATEGORY_INTRO, SB_CATEGORY_INTRO_COLOR, SB_CATEGORY_INTRO_OPACITY),
     OUTRO("outro", sf("revanced_sb_segments_outro"), sf("revanced_sb_segments_outro_sum"), sf("revanced_sb_skip_button_outro"), sf("revanced_sb_skipped_outro"),
-            SB_CATEGORY_OUTRO, SB_CATEGORY_OUTRO_COLOR),
+            SB_CATEGORY_OUTRO, SB_CATEGORY_OUTRO_COLOR, SB_CATEGORY_OUTRO_OPACITY),
     PREVIEW("preview", sf("revanced_sb_segments_preview"), sf("revanced_sb_segments_preview_sum"),
             sf("revanced_sb_skip_button_preview_beginning"), sf("revanced_sb_skip_button_preview_middle"), sf("revanced_sb_skip_button_preview_end"),
             sf("revanced_sb_skipped_preview_beginning"), sf("revanced_sb_skipped_preview_middle"), sf("revanced_sb_skipped_preview_end"),
-            SB_CATEGORY_PREVIEW, SB_CATEGORY_PREVIEW_COLOR),
+            SB_CATEGORY_PREVIEW, SB_CATEGORY_PREVIEW_COLOR, SB_CATEGORY_PREVIEW_OPACITY),
     FILLER("filler", sf("revanced_sb_segments_filler"), sf("revanced_sb_segments_filler_sum"), sf("revanced_sb_skip_button_filler"), sf("revanced_sb_skipped_filler"),
-            SB_CATEGORY_FILLER, SB_CATEGORY_FILLER_COLOR),
+            SB_CATEGORY_FILLER, SB_CATEGORY_FILLER_COLOR, SB_CATEGORY_FILLER_OPACITY),
     MUSIC_OFFTOPIC("music_offtopic", sf("revanced_sb_segments_nomusic"), sf("revanced_sb_segments_nomusic_sum"), sf("revanced_sb_skip_button_nomusic"), sf("revanced_sb_skipped_nomusic"),
-            SB_CATEGORY_MUSIC_OFFTOPIC, SB_CATEGORY_MUSIC_OFFTOPIC_COLOR),
+            SB_CATEGORY_MUSIC_OFFTOPIC, SB_CATEGORY_MUSIC_OFFTOPIC_COLOR, SB_CATEGORY_MUSIC_OFFTOPIC_OPACITY),
     UNSUBMITTED("unsubmitted", StringRef.empty, StringRef.empty, sf("revanced_sb_skip_button_unsubmitted"), sf("revanced_sb_skipped_unsubmitted"),
-            SB_CATEGORY_UNSUBMITTED, SB_CATEGORY_UNSUBMITTED_COLOR),;
+            SB_CATEGORY_UNSUBMITTED, SB_CATEGORY_UNSUBMITTED_COLOR, SB_CATEGORY_UNSUBMITTED_OPACITY);
 
     private static final StringRef skipSponsorTextCompact = sf("revanced_sb_skip_button_compact");
     private static final StringRef skipSponsorTextCompactHighlight = sf("revanced_sb_skip_button_compact_highlight");
@@ -90,12 +93,10 @@ public enum SegmentCategory {
             mValuesMap.put(value.keyValue, value);
     }
 
-    @NonNull
     public static SegmentCategory[] categoriesWithoutUnsubmitted() {
         return categoriesWithoutUnsubmitted;
     }
 
-    @NonNull
     public static SegmentCategory[] categoriesWithoutHighlights() {
         return categoriesWithoutHighlights;
     }
@@ -106,7 +107,7 @@ public enum SegmentCategory {
     }
 
     /**
-     * Must be called if behavior of any category is changed
+     * Must be called if behavior of any category is changed.
      */
     public static void updateEnabledCategories() {
         Utils.verifyOnMainThread();
@@ -133,32 +134,33 @@ public enum SegmentCategory {
         updateEnabledCategories();
     }
 
-    @NonNull
-    public final String keyValue;
-    @NonNull
-    public final StringSetting behaviorSetting;
-    @NonNull
-    private final StringSetting colorSetting;
+    public static int applyOpacityToColor(int color, float opacity) {
+        if (opacity < 0 || opacity > 1.0f) {
+            throw new IllegalArgumentException("Invalid opacity: " + opacity);
+        }
+        final int opacityInt = (int) (255 * opacity);
+        return (color & 0x00FFFFFF) | (opacityInt << 24);
+    }
+
+    public final String keyValue;
+    public final StringSetting behaviorSetting; // TODO: Replace with EnumSetting.
+    private final StringSetting colorSetting;
+    private final FloatSetting opacitySetting;
 
-    @NonNull
     public final StringRef title;
-    @NonNull
     public final StringRef description;
 
     /**
      * Skip button text, if the skip occurs in the first quarter of the video
      */
-    @NonNull
     public final StringRef skipButtonTextBeginning;
     /**
      * Skip button text, if the skip occurs in the middle half of the video
      */
-    @NonNull
     public final StringRef skipButtonTextMiddle;
     /**
      * Skip button text, if the skip occurs in the last quarter of the video
      */
-    @NonNull
     public final StringRef skipButtonTextEnd;
     /**
      * Skipped segment toast, if the skip occurred in the first quarter of the video
@@ -179,10 +181,7 @@ public enum SegmentCategory {
     @NonNull
     public final Paint paint;
 
-    /**
-     * Value must be changed using {@link #setColor(String)}.
-     */
-    public int color;
+    private int color;
 
     /**
      * Value must be changed using {@link #setBehaviour(CategoryBehaviour)}.
@@ -194,17 +193,20 @@ public enum SegmentCategory {
     SegmentCategory(String keyValue, StringRef title, StringRef description,
                     StringRef skipButtonText,
                     StringRef skippedToastText,
-                    StringSetting behavior, StringSetting color) {
+                    StringSetting behavior,
+                    StringSetting color, FloatSetting opacity) {
         this(keyValue, title, description,
                 skipButtonText, skipButtonText, skipButtonText,
                 skippedToastText, skippedToastText, skippedToastText,
-                behavior, color);
+                behavior,
+                color, opacity);
     }
 
     SegmentCategory(String keyValue, StringRef title, StringRef description,
                     StringRef skipButtonTextBeginning, StringRef skipButtonTextMiddle, StringRef skipButtonTextEnd,
                     StringRef skippedToastBeginning, StringRef skippedToastMiddle, StringRef skippedToastEnd,
-                    StringSetting behavior, StringSetting color) {
+                    StringSetting behavior,
+                    StringSetting color, FloatSetting opacity) {
         this.keyValue = Objects.requireNonNull(keyValue);
         this.title = Objects.requireNonNull(title);
         this.description = Objects.requireNonNull(description);
@@ -216,6 +218,7 @@ public enum SegmentCategory {
         this.skippedToastEnd = Objects.requireNonNull(skippedToastEnd);
         this.behaviorSetting = Objects.requireNonNull(behavior);
         this.colorSetting = Objects.requireNonNull(color);
+        this.opacitySetting = Objects.requireNonNull(opacity);
         this.paint = new Paint();
         loadFromSettings();
     }
@@ -232,11 +235,14 @@ public enum SegmentCategory {
         this.behaviour = savedBehavior;
 
         String colorString = colorSetting.get();
+        final float opacity = opacitySetting.get();
         try {
             setColor(colorString);
+            setOpacity(opacity);
         } catch (Exception ex) {
-            Logger.printException(() -> "Invalid color: " + colorString, ex);
+            Logger.printException(() -> "Invalid color: " + colorString + " opacity: " + opacity, ex);
             colorSetting.resetToDefault();
+            opacitySetting.resetToDefault();
             loadFromSettings();
         }
     }
@@ -245,45 +251,78 @@ public enum SegmentCategory {
         this.behaviour = Objects.requireNonNull(behaviour);
         this.behaviorSetting.save(behaviour.reVancedKeyValue);
     }
-    /**
-     * @return HTML color format string
-     */
-    @NonNull
-    public String colorString() {
-        return String.format("#%06X", color);
-    }
 
-    public void setColor(@NonNull String colorString) throws IllegalArgumentException {
-        final int color = Color.parseColor(colorString) & 0xFFFFFF;
-        this.color = color;
+    private void updateColor() {
+        color = applyOpacityToColor(color, opacitySetting.get());
         paint.setColor(color);
-        paint.setAlpha(255);
-        colorSetting.save(colorString); // Save after parsing.
     }
 
-    public void resetColor() {
+    /**
+     * @param opacity Segment color opacity between [0, 1].
+     */
+    public void setOpacity(float opacity) throws IllegalArgumentException {
+        if (opacity < 0 || opacity > 1) {
+            throw new IllegalArgumentException("Invalid opacity: " + opacity);
+        }
+
+        opacitySetting.save(opacity);
+        updateColor();
+    }
+
+    public float getOpacity() {
+        return opacitySetting.get();
+    }
+
+    public void resetColorAndOpacity() {
         setColor(colorSetting.defaultValue);
+        setOpacity(opacitySetting.defaultValue);
     }
 
-    @NonNull
-    private static String getCategoryColorDotHTML(int color) {
-        color &= 0xFFFFFF;
-        return String.format("<font color=\"#%06X\">⬤</font>", color);
+    /**
+     * @param colorString Segment color with #RRGGBB format.
+     */
+    public void setColor(String colorString) throws IllegalArgumentException {
+        color = Color.parseColor(colorString);
+        colorSetting.save(colorString);
+
+        updateColor();
     }
 
-    @NonNull
-    public static Spanned getCategoryColorDot(int color) {
-        return Html.fromHtml(getCategoryColorDotHTML(color));
+    /**
+     * @return Integer color of #RRGGBB format.
+     */
+    public int getColorNoOpacity() {
+        return color & 0x00FFFFFF;
     }
 
-    @NonNull
-    public Spanned getCategoryColorDot() {
+    /**
+     * @return Hex color string of #RRGGBB format with no opacity level.
+     */
+    public String getColorString() {
+        return String.format(Locale.US, "#%06X", getColorNoOpacity());
+    }
+
+    private static SpannableString getCategoryColorDotSpan(String text, int color) {
+        SpannableString dotSpan = new SpannableString('⬤' + text);
+        dotSpan.setSpan(new ForegroundColorSpan(color), 0, 1,
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        return dotSpan;
+    }
+
+    public static SpannableString getCategoryColorDot(int color) {
+        return getCategoryColorDotSpan("", color);
+    }
+
+    public SpannableString getCategoryColorDot() {
         return getCategoryColorDot(color);
     }
 
-    @NonNull
-    public Spanned getTitleWithColorDot() {
-        return Html.fromHtml(getCategoryColorDotHTML(color) + " " + title);
+    public SpannableString getTitleWithColorDot(int categoryColor) {
+        return getCategoryColorDotSpan(" " + title, categoryColor);
+    }
+
+    public SpannableString getTitleWithColorDot() {
+        return getTitleWithColorDot(color);
     }
 
     /**
@@ -291,7 +330,6 @@ public enum SegmentCategory {
      * @param videoLength      length of the video
      * @return the skip button text
      */
-    @NonNull
     StringRef getSkipButtonText(long segmentStartTime, long videoLength) {
         if (Settings.SB_COMPACT_SKIP_BUTTON.get()) {
             return (this == SegmentCategory.HIGHLIGHT)
@@ -300,7 +338,7 @@ public enum SegmentCategory {
         }
 
         if (videoLength == 0) {
-            return skipButtonTextBeginning; // video is still loading.  Assume it's the beginning
+            return skipButtonTextBeginning; // Video is still loading. Assume it's the beginning.
         }
         final float position = segmentStartTime / (float) videoLength;
         if (position < 0.25f) {
@@ -316,10 +354,9 @@ public enum SegmentCategory {
      * @param videoLength      length of the video
      * @return 'skipped segment' toast message
      */
-    @NonNull
     StringRef getSkippedToastText(long segmentStartTime, long videoLength) {
         if (videoLength == 0) {
-            return skippedToastBeginning; // video is still loading.  Assume it's the beginning
+            return skippedToastBeginning; // Video is still loading. Assume it's the beginning.
         }
         final float position = segmentStartTime / (float) videoLength;
         if (position < 0.25f) {

extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategoryListPreference.java

@@ -1,6 +1,7 @@
 package app.revanced.extension.youtube.sponsorblock.objects;
 
 import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.youtube.sponsorblock.objects.SegmentCategory.applyOpacityToColor;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -11,11 +12,10 @@ import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
 import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.TableLayout;
-import android.widget.TableRow;
+import android.widget.GridLayout;
 import android.widget.TextView;
 
+import java.util.Locale;
 import java.util.Objects;
 
 import app.revanced.extension.shared.Logger;
@@ -24,27 +24,38 @@ import app.revanced.extension.shared.Utils;
 @SuppressWarnings("deprecation")
 public class SegmentCategoryListPreference extends ListPreference {
     private final SegmentCategory category;
-    private EditText mEditText;
-    private int mClickedDialogEntryIndex;
+    private TextView colorDotView;
+    private EditText colorEditText;
+    private EditText opacityEditText;
+    /**
+     * #RRGGBB
+     */
+    private int categoryColor;
+    /**
+     * [0, 1]
+     */
+    private float categoryOpacity;
+    private int selectedDialogEntryIndex;
 
     public SegmentCategoryListPreference(Context context, SegmentCategory category) {
         super(context);
-        final boolean isHighlightCategory = category == SegmentCategory.HIGHLIGHT;
         this.category = Objects.requireNonNull(category);
 
         // Edit: Using preferences to sync together multiple pieces
-        // of code together is messy and should be rethought.
+        // of code is messy and should be rethought.
         setKey(category.behaviorSetting.key);
         setDefaultValue(category.behaviorSetting.defaultValue);
+
+        final boolean isHighlightCategory = category == SegmentCategory.HIGHLIGHT;
         setEntries(isHighlightCategory
                 ? CategoryBehaviour.getBehaviorDescriptionsWithoutSkipOnce()
                 : CategoryBehaviour.getBehaviorDescriptions());
         setEntryValues(isHighlightCategory
                 ? CategoryBehaviour.getBehaviorKeyValuesWithoutSkipOnce()
                 : CategoryBehaviour.getBehaviorKeyValues());
-
         setSummary(category.description.toString());
-        updateTitle();
+
+        updateTitleFromCategory();
     }
 
     @Override
@@ -52,26 +63,40 @@ public class SegmentCategoryListPreference extends ListPreference {
         try {
             Utils.setEditTextDialogTheme(builder);
 
+            categoryColor = category.getColorNoOpacity();
+            categoryOpacity = category.getOpacity();
+
             Context context = builder.getContext();
-            TableLayout table = new TableLayout(context);
-            table.setOrientation(LinearLayout.HORIZONTAL);
-            table.setPadding(70, 0, 150, 0);
-
-            TableRow row = new TableRow(context);
+            GridLayout gridLayout = new GridLayout(context);
+            gridLayout.setPadding(70, 0, 150, 0); // Padding for the entire layout.
+            gridLayout.setColumnCount(3);
+            gridLayout.setRowCount(2);
 
+            GridLayout.LayoutParams gridParams = new GridLayout.LayoutParams();
+            gridParams.rowSpec = GridLayout.spec(0); // First row.
+            gridParams.columnSpec = GridLayout.spec(0); // First column.
             TextView colorTextLabel = new TextView(context);
             colorTextLabel.setText(str("revanced_sb_color_dot_label"));
-            row.addView(colorTextLabel);
+            colorTextLabel.setLayoutParams(gridParams);
+            gridLayout.addView(colorTextLabel);
 
-            TextView colorDotView = new TextView(context);
-            colorDotView.setText(category.getCategoryColorDot());
-            colorDotView.setPadding(30, 0, 30, 0);
-            row.addView(colorDotView);
+            gridParams = new GridLayout.LayoutParams();
+            gridParams.rowSpec = GridLayout.spec(0); // First row.
+            gridParams.columnSpec = GridLayout.spec(1); // Second column.
+            gridParams.setMargins(0, 0, 10, 0);
+            colorDotView = new TextView(context);
+            colorDotView.setLayoutParams(gridParams);
+            gridLayout.addView(colorDotView);
+            updateCategoryColorDot();
 
-            mEditText = new EditText(context);
-            mEditText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS);
-            mEditText.setText(category.colorString());
-            mEditText.addTextChangedListener(new TextWatcher() {
+            gridParams = new GridLayout.LayoutParams();
+            gridParams.rowSpec = GridLayout.spec(0); // First row.
+            gridParams.columnSpec = GridLayout.spec(2); // Third column.
+            colorEditText = new EditText(context);
+            colorEditText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS);
+            colorEditText.setTextLocale(Locale.US);
+            colorEditText.setText(category.getColorString());
+            colorEditText.addTextChangedListener(new TextWatcher() {
                 @Override
                 public void beforeTextChanged(CharSequence s, int start, int count, int after) {
                 }
@@ -81,29 +106,94 @@ public class SegmentCategoryListPreference extends ListPreference {
                 }
 
                 @Override
-                public void afterTextChanged(Editable s) {
+                public void afterTextChanged(Editable edit) {
                     try {
-                        String colorString = s.toString();
+                        String colorString = edit.toString();
+                        final int colorStringLength = colorString.length();
+
                         if (!colorString.startsWith("#")) {
-                            s.insert(0, "#"); // recursively calls back into this method
+                            edit.insert(0, "#"); // Recursively calls back into this method.
                             return;
                         }
-                        if (colorString.length() > 7) {
-                            s.delete(7, colorString.length());
+
+                        final int maxColorStringLength = 7; // #RRGGBB
+                        if (colorStringLength > maxColorStringLength) {
+                            edit.delete(maxColorStringLength, colorStringLength);
                             return;
                         }
-                        final int color = Color.parseColor(colorString);
-                        colorDotView.setText(SegmentCategory.getCategoryColorDot(color));
+
+                        categoryColor = Color.parseColor(colorString);
+                        updateCategoryColorDot();
                     } catch (IllegalArgumentException ex) {
-                        // ignore
+                        // Ignore.
                     }
                 }
             });
-            mEditText.setLayoutParams(new TableRow.LayoutParams(0, TableRow.LayoutParams.WRAP_CONTENT, 1f));
-            row.addView(mEditText);
+            colorEditText.setLayoutParams(gridParams);
+            gridLayout.addView(colorEditText);
 
-            table.addView(row);
-            builder.setView(table);
+            gridParams = new GridLayout.LayoutParams();
+            gridParams.rowSpec = GridLayout.spec(1); // Second row.
+            gridParams.columnSpec = GridLayout.spec(0, 1); // First and second column.
+            TextView opacityLabel = new TextView(context);
+            opacityLabel.setText(str("revanced_sb_color_opacity_label"));
+            opacityLabel.setLayoutParams(gridParams);
+            gridLayout.addView(opacityLabel);
+
+            gridParams = new GridLayout.LayoutParams();
+            gridParams.rowSpec = GridLayout.spec(1); // Second row.
+            gridParams.columnSpec = GridLayout.spec(2); // Third column.
+            opacityEditText = new EditText(context);
+            opacityEditText.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
+            opacityEditText.addTextChangedListener(new TextWatcher() {
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                }
+
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                }
+
+                @Override
+                public void afterTextChanged(Editable edit) {
+                    try {
+                        String editString = edit.toString();
+                        final int opacityStringLength = editString.length();
+
+                        final int maxOpacityStringLength = 4; // [0.00, 1.00]
+                        if (opacityStringLength > maxOpacityStringLength) {
+                            edit.delete(maxOpacityStringLength, opacityStringLength);
+                            return;
+                        }
+
+                        final float opacity = opacityStringLength == 0
+                                ? 0
+                                : Float.parseFloat(editString);
+                        if (opacity < 0) {
+                            categoryOpacity = 0;
+                            edit.replace(0, opacityStringLength, "0");
+                            return;
+                        } else if (opacity > 1.0f) {
+                            categoryOpacity = 1;
+                            edit.replace(0, opacityStringLength, "1.0");
+                            return;
+                        } else if (!editString.endsWith(".")) {
+                            // Ignore "0." and "1." until the user finishes entering a valid number.
+                            categoryOpacity = opacity;
+                        }
+
+                        updateCategoryColorDot();
+                    } catch (NumberFormatException ex) {
+                        // Should never happen.
+                        Logger.printException(() -> "Could not parse opacity string", ex);
+                    }
+                }
+            });
+            opacityEditText.setLayoutParams(gridParams);
+            gridLayout.addView(opacityEditText);
+            updateOpacityText();
+
+            builder.setView(gridLayout);
             builder.setTitle(category.title.toString());
 
             builder.setPositiveButton(android.R.string.ok, (dialog, which) -> {
@@ -111,8 +201,8 @@ public class SegmentCategoryListPreference extends ListPreference {
             });
             builder.setNeutralButton(str("revanced_sb_reset_color"), (dialog, which) -> {
                 try {
-                    category.resetColor();
-                    updateTitle();
+                    category.resetColorAndOpacity();
+                    updateTitleFromCategory();
                     Utils.showToastShort(str("revanced_sb_color_reset"));
                 } catch (Exception ex) {
                     Logger.printException(() -> "setNeutralButton failure", ex);
@@ -120,8 +210,9 @@ public class SegmentCategoryListPreference extends ListPreference {
             });
             builder.setNegativeButton(android.R.string.cancel, null);
 
-            mClickedDialogEntryIndex = findIndexOfValue(getValue());
-            builder.setSingleChoiceItems(getEntries(), mClickedDialogEntryIndex, (dialog, which) -> mClickedDialogEntryIndex = which);
+            selectedDialogEntryIndex = findIndexOfValue(getValue());
+            builder.setSingleChoiceItems(getEntries(), selectedDialogEntryIndex,
+                    (dialog, which) -> selectedDialogEntryIndex = which);
         } catch (Exception ex) {
             Logger.printException(() -> "onPrepareDialogBuilder failure", ex);
         }
@@ -130,30 +221,51 @@ public class SegmentCategoryListPreference extends ListPreference {
     @Override
     protected void onDialogClosed(boolean positiveResult) {
         try {
-            if (positiveResult && mClickedDialogEntryIndex >= 0 && getEntryValues() != null) {
-                String value = getEntryValues()[mClickedDialogEntryIndex].toString();
+            if (positiveResult && selectedDialogEntryIndex >= 0 && getEntryValues() != null) {
+                String value = getEntryValues()[selectedDialogEntryIndex].toString();
                 if (callChangeListener(value)) {
                     setValue(value);
                     category.setBehaviour(Objects.requireNonNull(CategoryBehaviour.byReVancedKeyValue(value)));
                     SegmentCategory.updateEnabledCategories();
                 }
-                String colorString = mEditText.getText().toString();
+
                 try {
-                    if (!colorString.equals(category.colorString())) {
+                    String colorString = colorEditText.getText().toString();
+                    if (!colorString.equals(category.getColorString()) || categoryOpacity != category.getOpacity()) {
                         category.setColor(colorString);
+                        category.setOpacity(categoryOpacity);
                         Utils.showToastShort(str("revanced_sb_color_changed"));
                     }
                 } catch (IllegalArgumentException ex) {
                     Utils.showToastShort(str("revanced_sb_color_invalid"));
                 }
-                updateTitle();
+
+                updateTitleFromCategory();
             }
         } catch (Exception ex) {
             Logger.printException(() -> "onDialogClosed failure", ex);
         }
     }
 
-    private void updateTitle() {
-        setTitle(category.getTitleWithColorDot());
+    private void applyOpacityToCategoryColor() {
+        categoryColor = applyOpacityToColor(categoryColor, categoryOpacity);
+    }
+
+    private void updateTitleFromCategory() {
+        categoryColor = category.getColorNoOpacity();
+        categoryOpacity = category.getOpacity();
+        applyOpacityToCategoryColor();
+
+        setTitle(category.getTitleWithColorDot(categoryColor));
+    }
+
+    private void updateCategoryColorDot() {
+        applyOpacityToCategoryColor();
+
+        colorDotView.setText(SegmentCategory.getCategoryColorDot(categoryColor));
+    }
+
+    private void updateOpacityText() {
+        opacityEditText.setText(String.format(Locale.US, "%.2f", categoryOpacity));
     }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SponsorSegment.java

@@ -23,12 +23,15 @@ public class SponsorSegment implements Comparable<SponsorSegment> {
         @NonNull
         public final StringRef title;
         public final int apiVoteType;
-        public final boolean shouldHighlight;
+        /**
+         * If the option should be highlighted for VIP users.
+         */
+        public final boolean highlightIfVipAndVideoIsLocked;
 
-        SegmentVote(@NonNull StringRef title, int apiVoteType, boolean shouldHighlight) {
+        SegmentVote(@NonNull StringRef title, int apiVoteType, boolean highlightIfVipAndVideoIsLocked) {
             this.title = title;
             this.apiVoteType = apiVoteType;
-            this.shouldHighlight = shouldHighlight;
+            this.highlightIfVipAndVideoIsLocked = highlightIfVipAndVideoIsLocked;
         }
     }
 

extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/views/SwipeControlsOverlayLayout.kt

@@ -18,7 +18,7 @@ import kotlin.math.min
 import kotlin.math.round
 
 /**
- * Main overlay layout for displaying volume and brightness level with both circular and rectangular progress bars.
+ * Main overlay layout for displaying volume and brightness level with both circular and horizontal progress bars.
  */
 class SwipeControlsOverlayLayout(
     context: Context,
@@ -69,7 +69,7 @@ class SwipeControlsOverlayLayout(
         }
         addView(circularProgressView)
 
-        // Initialize rectangular progress bar
+        // Initialize horizontal progress bar
         val screenWidth = resources.displayMetrics.widthPixels
         val layoutWidth = (screenWidth * 2 / 3).toInt() // 2/3 of screen width
         horizontalProgressView = HorizontalProgressView(
@@ -152,10 +152,7 @@ class SwipeControlsOverlayLayout(
 }
 
 /**
- * Abstract base class for progress views to reduce code duplication.
- */
-/**
- * Abstract base class for progress views to reduce code duplication.
+ * Abstract base class for progress views.
  */
 abstract class AbstractProgressView(
     context: Context,
@@ -183,10 +180,9 @@ abstract class AbstractProgressView(
     public val textPaint           = Paint(Paint.ANTI_ALIAS_FLAG).apply {
         color     = overlayTextColor
         textAlign = Paint.Align.CENTER
-        textSize  = 30f // Can adjust based on need
+        textSize  = 40f // Can adjust based on need
     }
 
-
     protected var progress = 0
     protected var maxProgress = 100
     protected var displayText: String = "0"
@@ -211,7 +207,7 @@ abstract class AbstractProgressView(
 }
 
 /**
- * Custom view for rendering a circular progress indicator with text and icon.
+ * Custom view for rendering a circular progress indicator with icons and text.
  */
 class CircularProgressView(
     context: Context,
@@ -235,7 +231,7 @@ class CircularProgressView(
     private val rectF = RectF()
 
     init {
-        textPaint.textSize = 40f // Override default text size for horizontal view
+        textPaint.textSize = 40f // Override default text size for circular view
         progressPaint.strokeWidth       = 20f
         fillBackgroundPaint.strokeWidth = 20f
         progressPaint.strokeCap       = Paint.Cap.ROUND
@@ -266,7 +262,7 @@ class CircularProgressView(
             it.draw(canvas)
         }
 
-        // If not in icon-only mode, draw the text inside the ring.
+        // If not a minimal style mode, draw the text inside the ring.
         if (!overlayShowOverlayMinimalStyle) {
             canvas.drawText(displayText, width / 2f, height / 2f + 60f, textPaint)
         }
@@ -300,7 +296,7 @@ class HorizontalProgressView(
     private val padding  = 40f
 
     init {
-        textPaint.textSize        = 30f // Override default text size for horizontal view
+        textPaint.textSize        = 36f // Override default text size for horizontal view
         progressPaint.strokeWidth = 0f
         progressPaint.strokeCap   = Paint.Cap.BUTT
         progressPaint.style       = Paint.Style.FILL

gradle.properties

@@ -3,4 +3,4 @@ org.gradle.jvmargs = -Xms512M -Xmx2048M
 org.gradle.parallel = true
 android.useAndroidX = true
 kotlin.code.style = official
-version = 5.13.0-dev.13
+version = 5.18.0-dev.2

patches/api/patches.api

@@ -348,6 +348,14 @@ public final class app/revanced/patches/nfctoolsse/misc/pro/UnlockProPatchKt {
 	public static final fun getUnlockProPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/nunl/ads/HideAdsPatchKt {
+	public static final fun getHideAdsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
+public final class app/revanced/patches/nunl/firebase/SpoofCertificatePatchKt {
+	public static final fun getSpoofCertificatePatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/nyx/misc/pro/UnlockProPatchKt {
 	public static final fun getUnlockProPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -768,8 +776,8 @@ public final class app/revanced/patches/shared/misc/settings/preference/TextPref
 }
 
 public final class app/revanced/patches/shared/misc/spoof/SpoofVideoStreamsPatchKt {
-	public static final fun spoofVideoStreamsPatch (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/BytecodePatch;
-	public static synthetic fun spoofVideoStreamsPatch$default (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/BytecodePatch;
+	public static final fun spoofVideoStreamsPatch (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/BytecodePatch;
+	public static synthetic fun spoofVideoStreamsPatch$default (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
 public final class app/revanced/patches/shared/misc/spoof/UserAgentClientSpoofPatchKt {
@@ -808,6 +816,18 @@ public final class app/revanced/patches/spotify/lite/ondemand/OnDemandPatchKt {
 	public static final fun getOnDemandPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/spotify/misc/UnlockPremiumPatchKt {
+	public static final fun getUnlockPremiumPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
+public final class app/revanced/patches/spotify/misc/extension/ExtensionPatchKt {
+	public static final fun getSharedExtensionPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
+public final class app/revanced/patches/spotify/misc/fix/SpoofSignaturePatchKt {
+	public static final fun getSpoofSignaturePatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/spotify/navbar/PremiumNavbarTabPatchKt {
 	public static final fun getPremiumNavbarTabPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1116,6 +1136,10 @@ public final class app/revanced/patches/youtube/layout/hide/endscreencards/HideE
 	public static final fun getHideEndscreenCardsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/youtube/layout/hide/endscreensuggestion/HideEndScreenSuggestedVideoPatchKt {
+	public static final fun getHideEndScreenSuggestedVideoPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatchKt {
 	public static final fun getDisableFullscreenAmbientModePatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1161,17 +1185,7 @@ public final class app/revanced/patches/youtube/layout/hide/time/HideTimestampPa
 }
 
 public final class app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatchKt {
-	public static final fun getFloatyBarButtonTopMargin ()J
-	public static final fun getMiniplayerMaxSize ()J
 	public static final fun getMiniplayerPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
-	public static final fun getModernMiniplayerClose ()J
-	public static final fun getModernMiniplayerExpand ()J
-	public static final fun getModernMiniplayerForwardButton ()J
-	public static final fun getModernMiniplayerRewindButton ()J
-	public static final fun getPlayerOverlays ()J
-	public static final fun getScrimOverlay ()J
-	public static final fun getYtOutlinePictureInPictureWhite24 ()J
-	public static final fun getYtOutlineXWhite24 ()J
 }
 
 public final class app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatchKt {
@@ -1366,6 +1380,12 @@ public final class app/revanced/patches/youtube/misc/playservice/VersionCheckPat
 	public static final fun is_19_46_or_greater ()Z
 	public static final fun is_19_47_or_greater ()Z
 	public static final fun is_19_49_or_greater ()Z
+	public static final fun is_20_02_or_greater ()Z
+	public static final fun is_20_03_or_greater ()Z
+	public static final fun is_20_05_or_greater ()Z
+	public static final fun is_20_07_or_greater ()Z
+	public static final fun is_20_09_or_greater ()Z
+	public static final fun is_20_10_or_greater ()Z
 }
 
 public final class app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatchKt {
@@ -1451,6 +1471,10 @@ public final class app/revanced/patches/youtube/video/quality/RememberVideoQuali
 	public static final fun getRememberVideoQualityPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/youtube/video/quality/VideoQualityPatchKt {
+	public static final fun getVideoQualityPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/youtube/video/speed/PlaybackSpeedPatchKt {
 	public static final fun getPlaybackSpeedPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }

patches/src/main/kotlin/app/revanced/patches/all/misc/connectivity/wifi/spoof/SpoofWifiPatch.kt

@@ -5,10 +5,10 @@ import app.revanced.patches.all.misc.transformation.IMethodCall
 import app.revanced.patches.all.misc.transformation.filterMapInstruction35c
 import app.revanced.patches.all.misc.transformation.transformInstructionsPatch
 
-internal const val EXTENSION_CLASS_DESCRIPTOR_PREFIX =
+private const val EXTENSION_CLASS_DESCRIPTOR_PREFIX =
     "Lapp/revanced/extension/all/connectivity/wifi/spoof/SpoofWifiPatch"
 
-internal const val EXTENSION_CLASS_DESCRIPTOR = "$EXTENSION_CLASS_DESCRIPTOR_PREFIX;"
+private const val EXTENSION_CLASS_DESCRIPTOR = "$EXTENSION_CLASS_DESCRIPTOR_PREFIX;"
 
 @Suppress("unused")
 val spoofWifiPatch = bytecodePatch(

patches/src/main/kotlin/app/revanced/patches/all/misc/versioncode/ChangeVersionCodePatch.kt

@@ -8,9 +8,8 @@ import org.w3c.dom.Element
 @Suppress("unused")
 val changeVersionCodePatch = resourcePatch(
     name = "Change version code",
-    description = "Changes the version code of the app. By default the highest version code is set. " +
-        "This allows older versions of an app to be installed " +
-        "if their version code is set to the same or a higher value and can stop app stores to update the app.",
+    description = "Changes the version code of the app. This will turn off app store updates " +
+            "and allows downgrading an existing app install to an older app version.",
     use = false,
 ) {
     val versionCode by intOption(
@@ -21,7 +20,8 @@ val changeVersionCodePatch = resourcePatch(
             "Highest" to Int.MAX_VALUE,
         ),
         title = "Version code",
-        description = "The version code to use",
+        description = "The version code to use. Using the highest value turns off app store " +
+                "updates and allows downgrading an existing app install to an older app version.",
         required = true,
     ) { versionCode -> versionCode!! >= 1 }
 

patches/src/main/kotlin/app/revanced/patches/facebook/ads/mainfeed/HideSponsoredStoriesPatch.kt

@@ -14,7 +14,7 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter
 val hideSponsoredStoriesPatch = bytecodePatch(
     name = "Hide 'Sponsored Stories'",
 ) {
-    compatibleWith("com.facebook.katana")
+    compatibleWith("com.facebook.katana"("490.0.0.63.82"))
 
     execute {
         val sponsoredDataModelTemplateMethod = getSponsoredDataModelTemplateFingerprint.originalMethod

patches/src/main/kotlin/app/revanced/patches/music/misc/spoof/SpoofClientPatch.kt

@@ -17,7 +17,7 @@ import com.android.tools.smali.dexlib2.iface.reference.TypeReference
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter
 
-internal const val EXTENSION_CLASS_DESCRIPTOR =
+private const val EXTENSION_CLASS_DESCRIPTOR =
     "Lapp/revanced/extension/music/spoof/SpoofClientPatch;"
 
 // TODO: Replace this patch with spoofVideoStreamsPatch once possible.

patches/src/main/kotlin/app/revanced/patches/nunl/ads/Fingerprints.kt

@@ -0,0 +1,44 @@
+package app.revanced.patches.nunl.ads
+
+import app.revanced.patcher.fingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+internal val jwUtilCreateAdvertisementFingerprint = fingerprint {
+    accessFlags(AccessFlags.PRIVATE, AccessFlags.STATIC)
+    custom { methodDef, classDef ->
+        classDef.type == "Lnl/sanomamedia/android/nu/video/util/JWUtil;" && methodDef.name == "createAdvertising"
+    }
+}
+
+internal val screenMapperFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("Lnl/nu/android/bff/domain/models/screen/ScreenEntity;")
+    parameters("Lnl/nu/performance/api/client/objects/Screen;")
+
+    opcodes(
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IF_EQZ,
+        Opcode.CHECK_CAST
+    )
+
+    custom { methodDef, classDef ->
+        classDef.type == "Lnl/nu/android/bff/data/mappers/ScreenMapper;" && methodDef.name == "map"
+    }
+}
+
+internal val nextPageRepositoryImplFingerprint = fingerprint {
+    accessFlags(AccessFlags.PRIVATE, AccessFlags.FINAL)
+    returns("Lnl/nu/android/bff/domain/models/Page;")
+    parameters("Lnl/nu/performance/api/client/PacResponse;", "Ljava/lang/String;")
+
+    opcodes(
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IF_EQZ,
+        Opcode.CHECK_CAST
+    )
+
+    custom { methodDef, classDef ->
+        classDef.type == "Lnl/nu/android/bff/data/repositories/NextPageRepositoryImpl;" && methodDef.name == "mapToPage"
+    }
+}

patches/src/main/kotlin/app/revanced/patches/nunl/ads/HideAdsPatch.kt

@@ -0,0 +1,51 @@
+package app.revanced.patches.nunl.ads
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.shared.misc.extension.sharedExtensionPatch
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Suppress("unused")
+val hideAdsPatch = bytecodePatch(
+    name = "Hide ads",
+    description = "Hide ads and sponsored articles in list pages and remove pre-roll ads on videos.",
+) {
+    compatibleWith("nl.sanomamedia.android.nu"("11.0.0", "11.0.1", "11.1.0"))
+
+    dependsOn(sharedExtensionPatch("nunl", mainActivityOnCreateHook))
+
+    execute {
+        // Disable video pre-roll ads.
+        // Whenever the app tries to create an ad via JWUtils.createAdvertising, don't actually tell the underlying JWPlayer library to do so => JWPlayer will not display ads.
+        jwUtilCreateAdvertisementFingerprint.method.addInstructions(
+            0,
+            """
+                new-instance v0, Lcom/jwplayer/pub/api/configuration/ads/VastAdvertisingConfig${'$'}Builder;
+                invoke-direct { v0 }, Lcom/jwplayer/pub/api/configuration/ads/VastAdvertisingConfig${'$'}Builder;-><init>()V
+                invoke-virtual { v0 }, Lcom/jwplayer/pub/api/configuration/ads/VastAdvertisingConfig${'$'}Builder;->build()Lcom/jwplayer/pub/api/configuration/ads/VastAdvertisingConfig;
+                move-result-object v0
+                return-object v0
+            """,
+        )
+
+        // Filter injected content from API calls out of lists.
+        arrayOf(screenMapperFingerprint, nextPageRepositoryImplFingerprint).forEach {
+            // Index of instruction moving result of BlockPage;->getBlocks(...).
+            val moveGetBlocksResultObjectIndex = it.patternMatch!!.startIndex
+            it.method.apply {
+                val moveInstruction = getInstruction<OneRegisterInstruction>(moveGetBlocksResultObjectIndex)
+
+                val listRegister = moveInstruction.registerA
+
+                // Add instruction after moving List<Block> to register and then filter this List<Block> in place.
+                addInstructions(
+                    moveGetBlocksResultObjectIndex + 1,
+                    """
+                        invoke-static { v$listRegister }, Lapp/revanced/extension/nunl/ads/HideAdsPatch;->filterAds(Ljava/util/List;)V
+                    """,
+                )
+            }
+        }
+    }
+}

patches/src/main/kotlin/app/revanced/patches/nunl/ads/Hooks.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.nunl.ads
+
+import app.revanced.patches.shared.misc.extension.extensionHook
+
+internal val mainActivityOnCreateHook = extensionHook {
+    custom { method, classDef ->
+        classDef.type == "Lnl/sanomamedia/android/nu/main/NUMainActivity;" && method.name == "onCreate"
+    }
+}

patches/src/main/kotlin/app/revanced/patches/nunl/firebase/Fingerprints.kt

@@ -0,0 +1,20 @@
+package app.revanced.patches.nunl.firebase
+
+import app.revanced.patcher.fingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal val getFingerprintHashForPackageFingerprints = arrayOf(
+    "Lcom/google/firebase/installations/remote/FirebaseInstallationServiceClient;",
+    "Lcom/google/firebase/remoteconfig/internal/ConfigFetchHttpClient;",
+    "Lcom/google/firebase/remoteconfig/internal/ConfigRealtimeHttpClient;"
+).map { className ->
+    fingerprint {
+        accessFlags(AccessFlags.PRIVATE)
+        parameters()
+        returns("Ljava/lang/String;")
+
+        custom { methodDef, classDef ->
+            classDef.type == className && methodDef.name == "getFingerprintHashForPackage"
+        }
+    }
+}

patches/src/main/kotlin/app/revanced/patches/nunl/firebase/SpoofCertificatePatch.kt

@@ -0,0 +1,24 @@
+package app.revanced.patches.nunl.firebase
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.patch.bytecodePatch
+
+@Suppress("unused")
+val spoofCertificatePatch = bytecodePatch(
+    name = "Spoof certificate",
+    description = "Spoofs the X-Android-Cert header to allow push messages.",
+) {
+    compatibleWith("nl.sanomamedia.android.nu")
+
+    execute {
+        getFingerprintHashForPackageFingerprints.forEach { fingerprint ->
+            fingerprint.method.addInstructions(
+                0,
+                """
+                    const-string v0, "eae41fc018df2731a9b6ae1ac327da44a288667b"
+                    return-object v0
+                """,
+            )
+        }
+    }
+}

patches/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/api/SpoofClientPatch.kt

@@ -1,7 +1,10 @@
 package app.revanced.patches.reddit.customclients.boostforreddit.api
 
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patches.reddit.customclients.spoofClientPatch
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 val spoofClientPatch = spoofClientPatch(redirectUri = "http://rubenmayayo.com") { clientIdOption ->
     compatibleWith("com.rubenmayayo.reddit")
@@ -23,14 +26,15 @@ val spoofClientPatch = spoofClientPatch(redirectUri = "http://rubenmayayo.com")
 
         // region Patch user agent.
 
-        // Use a random number as the platform in the user agent string.
-        val platformName = (0..100000).random()
-        val platformParameter = 0
-
-        buildUserAgentFingerprint.method.addInstructions(
-            0,
-            "const-string p$platformParameter, \"$platformName\"",
-        )
+        // Use a random user agent.
+        val randomName = (0..100000).random()
+        val userAgent = "$randomName:app.revanced.$randomName:v1.0.0 (by /u/revanced)"
+        buildUserAgentFingerprint.let {
+            val userAgentTemplateIndex = it.stringMatches!!.first().index
+            val register = it.method.getInstruction<OneRegisterInstruction>(userAgentTemplateIndex).registerA
+            
+            it.method.replaceInstruction(userAgentTemplateIndex, "const-string v$register, \"$userAgent\"")
+        }
 
         // endregion
     }

patches/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/SpoofClientPatch.kt

@@ -8,7 +8,11 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethodImplementation
 
 val spoofClientPatch = spoofClientPatch(redirectUri = "infinity://localhost") { clientIdOption ->
-    compatibleWith("ml.docilealligator.infinityforreddit")
+    compatibleWith(
+        "ml.docilealligator.infinityforreddit",
+        "ml.docilealligator.infinityforreddit.plus",
+        "ml.docilealligator.infinityforreddit.patreon"
+    )
 
     val clientId by clientIdOption
 

patches/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/subscription/UnlockSubscriptionPatch.kt

@@ -11,7 +11,11 @@ val unlockSubscriptionPatch = bytecodePatch(
 ) {
     dependsOn(spoofClientPatch)
 
-    compatibleWith("ml.docilealligator.infinityforreddit")
+    compatibleWith(
+        "ml.docilealligator.infinityforreddit",
+        "ml.docilealligator.infinityforreddit.plus",
+        "ml.docilealligator.infinityforreddit.patreon"
+    )
 
     execute {
         setOf(

patches/src/main/kotlin/app/revanced/patches/shared/misc/settings/preference/BasePreference.kt

@@ -17,7 +17,7 @@ import org.w3c.dom.Element
 @Suppress("MemberVisibilityCanBePrivate")
 abstract class BasePreference(
     val key: String? = null,
-    val titleKey: String = "${key}_title",
+    val titleKey: String? = "${key}_title",
     val summaryKey: String? = "${key}_summary",
     val icon: String? = null,
     val layout: String? = null,
@@ -35,7 +35,7 @@ abstract class BasePreference(
     open fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit): Element =
         ownerDocument.createElement(tag).apply {
             key?.let { setAttribute("android:key", it) }
-            setAttribute("android:title", "@string/${titleKey}")
+            titleKey?.let { setAttribute("android:title", "@string/${titleKey}") }
             summaryKey?.let { addSummary(it) }
             icon?.let {
                 setAttribute("android:icon", it)

patches/src/main/kotlin/app/revanced/patches/shared/misc/settings/preference/PreferenceCategory.kt

@@ -17,7 +17,7 @@ import org.w3c.dom.Document
 @Suppress("MemberVisibilityCanBePrivate")
 open class PreferenceCategory(
     key: String? = null,
-    titleKey: String = "${key}_title",
+    titleKey: String? = "${key}_title",
     icon: String? = null,
     layout: String? = null,
     sorting: Sorting = Sorting.BY_TITLE,

patches/src/main/kotlin/app/revanced/patches/shared/misc/spoof/Fingerprints.kt

@@ -137,3 +137,33 @@ internal val patchIncludedExtensionMethodFingerprint = fingerprint {
         classDef.type == EXTENSION_CLASS_DESCRIPTOR && method.name == "isPatchIncluded"
     }
 }
+
+// Feature flag that turns on Platypus programming language code compiled to native C++.
+// This code appears to replace the player config after the streams are loaded.
+// Flag is present in YouTube 19.34, but is missing Platypus stream replacement code until 19.43.
+// Flag and Platypus code is also present in newer versions of YouTube Music.
+internal const val MEDIA_FETCH_HOT_CONFIG_FEATURE_FLAG = 45645570L
+
+internal val mediaFetchHotConfigFingerprint = fingerprint {
+    literal { MEDIA_FETCH_HOT_CONFIG_FEATURE_FLAG }
+}
+
+// 20.10+
+internal const val MEDIA_FETCH_HOT_CONFIG_ALTERNATIVE_FEATURE_FLAG = 45683169L
+
+internal val mediaFetchHotConfigAlternativeFingerprint = fingerprint {
+    literal { MEDIA_FETCH_HOT_CONFIG_ALTERNATIVE_FEATURE_FLAG }
+}
+
+// Feature flag that enables different code for parsing and starting video playback,
+// but it's exact purpose is not known. If this flag is enabled while stream spoofing
+// then videos will never start playback and load forever.
+// Flag does not seem to affect playback if spoofing is off.
+internal const val PLAYBACK_START_CHECK_ENDPOINT_USED_FEATURE_FLAG = 45665455L
+
+internal val playbackStartDescriptorFeatureFlagFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    parameters()
+    returns("Z")
+    literal { PLAYBACK_START_CHECK_ENDPOINT_USED_FEATURE_FLAG }
+}

patches/src/main/kotlin/app/revanced/patches/shared/misc/spoof/SpoofVideoStreamsPatch.kt

@@ -31,10 +31,13 @@ internal const val EXTENSION_CLASS_DESCRIPTOR =
 
 fun spoofVideoStreamsPatch(
     block: BytecodePatchBuilder.() -> Unit = {},
+    fixMediaFetchHotConfigChanges: BytecodePatchBuilder.() -> Boolean = { false },
+    fixMediaFetchHotConfigAlternativeChanges: BytecodePatchBuilder.() -> Boolean = { false },
+    fixParsePlaybackResponseFeatureFlag: BytecodePatchBuilder.() -> Boolean = { false },
     executeBlock: BytecodePatchContext.() -> Unit = {},
 ) = bytecodePatch(
     name = "Spoof video streams",
-    description = "Spoofs the client video streams to fix playback.",
+    description = "Adds options to spoof the client video streams to fix playback.",
 ) {
     block()
 
@@ -238,6 +241,31 @@ fun spoofVideoStreamsPatch(
 
         // endregion
 
+        // region turn off stream config replacement feature flag.
+
+        if (fixMediaFetchHotConfigChanges()) {
+            mediaFetchHotConfigFingerprint.method.insertFeatureFlagBooleanOverride(
+                MEDIA_FETCH_HOT_CONFIG_FEATURE_FLAG,
+                "$EXTENSION_CLASS_DESCRIPTOR->useMediaFetchHotConfigReplacement(Z)Z"
+            )
+        }
+
+        if (fixMediaFetchHotConfigAlternativeChanges()) {
+            mediaFetchHotConfigAlternativeFingerprint.method.insertFeatureFlagBooleanOverride(
+                MEDIA_FETCH_HOT_CONFIG_ALTERNATIVE_FEATURE_FLAG,
+                "$EXTENSION_CLASS_DESCRIPTOR->useMediaFetchHotConfigReplacement(Z)Z"
+            )
+        }
+
+        if (fixParsePlaybackResponseFeatureFlag()) {
+            playbackStartDescriptorFeatureFlagFingerprint.method.insertFeatureFlagBooleanOverride(
+                PLAYBACK_START_CHECK_ENDPOINT_USED_FEATURE_FLAG,
+                "$EXTENSION_CLASS_DESCRIPTOR->usePlaybackStartFeatureFlag(Z)Z"
+            )
+        }
+
+        // endregion
+
         executeBlock()
     }
 }

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

@@ -10,6 +10,7 @@ import org.w3c.dom.Element
 val customThemePatch = resourcePatch(
     name = "Custom theme",
     description = "Applies a custom theme.",
+    use = false,
 ) {
     compatibleWith("com.spotify.music")
 

patches/src/main/kotlin/app/revanced/patches/spotify/misc/Fingerprints.kt

@@ -0,0 +1,23 @@
+package app.revanced.patches.spotify.misc
+
+import app.revanced.patcher.fingerprint
+
+internal val accountAttributeFingerprint = fingerprint {
+    custom { _, c -> c.endsWith("internal/AccountAttribute;") }
+}
+
+internal val productStateProtoFingerprint = fingerprint {
+    returns("Ljava/util/Map;")
+    custom { _, classDef ->
+        classDef.endsWith("ProductStateProto;")
+    }
+}
+
+internal val buildQueryParametersFingerprint = fingerprint {
+    strings("trackRows", "device_type:tablet")
+}
+
+internal val contextMenuExperimentsFingerprint = fingerprint {
+    parameters("L")
+    strings("remove_ads_upsell_enabled")
+}

patches/src/main/kotlin/app/revanced/patches/spotify/misc/extension/ExtensionPatch.kt

@@ -0,0 +1,5 @@
+package app.revanced.patches.spotify.misc.extension
+
+import app.revanced.patches.shared.misc.extension.sharedExtensionPatch
+
+val sharedExtensionPatch = sharedExtensionPatch("spotify", spotifyMainActivityOnCreate)

patches/src/main/kotlin/app/revanced/patches/spotify/misc/extension/Hooks.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.spotify.misc.extension
+
+import app.revanced.patches.shared.misc.extension.extensionHook
+
+internal val spotifyMainActivityOnCreate = extensionHook {
+    custom { method, classDef ->
+        classDef.type == "Lcom/spotify/music/SpotifyMainActivity;" &&
+                method.name == "onCreate"
+    }
+}

patches/src/main/kotlin/app/revanced/patches/spotify/misc/fix/Fingerprints.kt

@@ -0,0 +1,5 @@
+package app.revanced.patches.spotify.misc.fix
+
+import app.revanced.patcher.fingerprint
+
+internal val getAppSignatureFingerprint = fingerprint { strings("Failed to get the application signatures") }

patches/src/main/kotlin/app/revanced/patches/spotify/misc/fix/SpoofSignaturePatch.kt

@@ -0,0 +1,33 @@
+package app.revanced.patches.spotify.misc.fix
+
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.indexOfFirstInstructionReversedOrThrow
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Suppress("unused")
+val spoofSignaturePatch = bytecodePatch(
+    name = "Spoof signature",
+    description = "Spoofs the signature of the app to fix various functions of the app.",
+) {
+    compatibleWith("com.spotify.music")
+
+    execute {
+        getAppSignatureFingerprint.method.apply {
+            val failedToGetSignaturesStringMatch = getAppSignatureFingerprint.stringMatches!!.first()
+
+            val concatSignaturesIndex = indexOfFirstInstructionReversedOrThrow(
+                failedToGetSignaturesStringMatch.index,
+                Opcode.MOVE_RESULT_OBJECT,
+            )
+
+            val register = getInstruction<OneRegisterInstruction>(concatSignaturesIndex).registerA
+
+            val expectedSignature = "d6a6dced4a85f24204bf9505ccc1fce114cadb32"
+
+            replaceInstruction(concatSignaturesIndex, "const-string v$register, \"$expectedSignature\"")
+        }
+    }
+}

patches/src/main/kotlin/app/revanced/patches/spotify/navbar/Fingerprints.kt

@@ -1,11 +0,0 @@
-package app.revanced.patches.spotify.navbar
-
-import app.revanced.patcher.fingerprint
-import app.revanced.util.literal
-import com.android.tools.smali.dexlib2.AccessFlags
-
-internal val addNavBarItemFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("V")
-    literal { showBottomNavigationItemsTextId }
-}

patches/src/main/kotlin/app/revanced/patches/spotify/navbar/PremiumNavbarTabPatch.kt

@@ -1,50 +1,12 @@
 package app.revanced.patches.spotify.navbar
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patcher.patch.resourcePatch
-import app.revanced.patches.shared.misc.mapping.get
-import app.revanced.patches.shared.misc.mapping.resourceMappingPatch
-import app.revanced.patches.shared.misc.mapping.resourceMappings
-
-internal var showBottomNavigationItemsTextId = -1L
-    private set
-internal var premiumTabId = -1L
-    private set
-
-private val premiumNavbarTabResourcePatch = resourcePatch {
-    dependsOn(resourceMappingPatch)
-
-    execute {
-        premiumTabId = resourceMappings["id", "premium_tab"]
-
-        showBottomNavigationItemsTextId = resourceMappings[
-            "bool",
-            "show_bottom_navigation_items_text",
-        ]
-    }
-}
+import app.revanced.patches.spotify.misc.unlockPremiumPatch
 
+@Deprecated("Superseded by unlockPremiumPatch", ReplaceWith("unlockPremiumPatch"))
 @Suppress("unused")
 val premiumNavbarTabPatch = bytecodePatch(
-    name = "Premium navbar tab",
     description = "Hides the premium tab from the navigation bar.",
 ) {
-    dependsOn(premiumNavbarTabResourcePatch)
-
-    compatibleWith("com.spotify.music")
-
-    // If the navigation bar item is the premium tab, do not add it.
-    execute {
-        addNavBarItemFingerprint.method.addInstructions(
-            0,
-            """
-                const v1, $premiumTabId
-                if-ne p5, v1, :continue
-                return-void
-                :continue
-                nop
-            """,
-        )
-    }
+    dependsOn(unlockPremiumPatch)
 }

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

@@ -11,7 +11,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction22c
 import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 
-internal const val EXTENSION_CLASS_DESCRIPTOR =
+private const val EXTENSION_CLASS_DESCRIPTOR =
     "Lapp/revanced/extension/tiktok/settings/AdPersonalizationActivityHook;"
 
 val settingsPatch = bytecodePatch(

patches/src/main/kotlin/app/revanced/patches/tudortmund/lockscreen/ShowOnLockscreenPatch.kt

@@ -12,7 +12,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
-internal const val EXTENSION_CLASS_DESCRIPTOR =
+private const val EXTENSION_CLASS_DESCRIPTOR =
     "Lapp/revanced/extension/tudortmund/lockscreen/ShowOnLockscreenPatch;"
 
 @Suppress("unused")

patches/src/main/kotlin/app/revanced/patches/twitter/misc/dynamiccolor/DynamicColorPatch.kt

@@ -10,7 +10,13 @@ val dynamicColorPatch = resourcePatch(
     name = "Dynamic color",
     description = "Replaces the default X (Formerly Twitter) Blue with the user's Material You palette.",
 ) {
-    compatibleWith("com.twitter.android")
+    compatibleWith(
+        "com.twitter.android"(
+            "10.84.0-release.0",
+            "10.60.0-release.0",
+            "10.48.0-release.0"
+        )
+    )
 
     execute {
         val resDirectory = get("res")

patches/src/main/kotlin/app/revanced/patches/twitter/misc/hook/HookPatch.kt

@@ -11,7 +11,15 @@ fun hookPatch(
 ) = bytecodePatch(name) {
     dependsOn(jsonHookPatch)
 
-    compatibleWith("com.twitter.android")
+    compatibleWith(
+        "com.twitter.android"(
+            // 10.85+ uses Pairip and requires additional changes to work.
+            "10.84.0-release.0",
+            // Confirmed to not show reply ads. Slightly newer versions may also work.
+            "10.60.0-release.0",
+            "10.48.0-release.0"
+        )
+    )
 
     execute {
         addJsonHook(JsonHook(hookClassDescriptor))

patches/src/main/kotlin/app/revanced/patches/twitter/misc/links/ChangeLinkSharingDomainPatch.kt

@@ -37,7 +37,13 @@ val changeLinkSharingDomainPatch = bytecodePatch(
         sharedExtensionPatch,
     )
 
-    compatibleWith("com.twitter.android")
+    compatibleWith(
+        "com.twitter.android"(
+            "10.84.0-release.0",
+            "10.60.0-release.0",
+            "10.48.0-release.0"
+        )
+    )
 
     val domainName by stringOption(
         key = "domainName",

patches/src/main/kotlin/app/revanced/patches/twitter/misc/links/SanitizeSharingLinksPatch.kt

@@ -8,7 +8,13 @@ val sanitizeSharingLinksPatch = bytecodePatch(
     name = "Sanitize sharing links",
     description = "Removes the tracking query parameters from links before they are shared.",
 ) {
-    compatibleWith("com.twitter.android")
+    compatibleWith(
+        "com.twitter.android"(
+            "10.84.0-release.0",
+            "10.60.0-release.0",
+            "10.48.0-release.0"
+        )
+    )
 
     execute {
         sanitizeSharingLinksFingerprint.method.addInstructions(

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

@@ -82,9 +82,8 @@ val hideAdsPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt

@@ -11,7 +11,7 @@ import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
 import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 
-internal const val EXTENSION_CLASS_DESCRIPTOR =
+private const val EXTENSION_CLASS_DESCRIPTOR =
     "Lapp/revanced/extension/youtube/patches/HideGetPremiumPatch;"
 
 val hideGetPremiumPatch = bytecodePatch(
@@ -29,9 +29,8 @@ val hideGetPremiumPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

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

@@ -27,9 +27,8 @@ val videoAdsPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlPatch.kt

@@ -57,9 +57,8 @@ val copyVideoUrlPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt

@@ -28,9 +28,8 @@ val removeViewerDiscretionDialogPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

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

@@ -50,7 +50,7 @@ private val downloadsResourcePatch = resourcePatch {
     }
 }
 
-internal const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/youtube/patches/DownloadsPatch;"
+private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/youtube/patches/DownloadsPatch;"
 
 internal const val BUTTON_DESCRIPTOR = "Lapp/revanced/extension/youtube/videoplayer/ExternalDownloadButton;"
 
@@ -72,9 +72,8 @@ val downloadsPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

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

@@ -27,9 +27,8 @@ val disablePreciseSeekingGesturePatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

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

@@ -15,8 +15,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
 val enableSeekbarTappingPatch = bytecodePatch(
-    name = "Seekbar tapping",
-    description = "Adds an option to enable tap-to-seek on the seekbar of the video player.",
+    name = "Enable tap to seek",
+    description = "Adds an option to enable tap to seek on the seekbar of the video player.",
 ) {
     dependsOn(
         sharedExtensionPatch,
@@ -30,9 +30,8 @@ val enableSeekbarTappingPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )