chore: Release v5.24.0-dev.5 [skip ci]

# [5.24.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.24.0-dev.4...v5.24.0-dev.5) (2025-05-17)

### Bug Fixes

* **Spotify - Fix third party launchers widgets:** Add missing compatibility annotation ([e68cd70](e68cd70f66))

### Features

* **YouTube - Settings:** Add ability to search in settings ([#4881](https://github.com/ReVanced/revanced-patches/issues/4881)) ([14a8f4f](14a8f4fb96))

CHANGELOG.md

@@ -1,3 +1,328 @@
+# [5.24.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.24.0-dev.4...v5.24.0-dev.5) (2025-05-17)
+
+
+### Bug Fixes
+
+* **Spotify - Fix third party launchers widgets:** Add missing compatibility annotation ([0493f80](https://github.com/ReVanced/revanced-patches/commit/0493f8035b26b90c5f8e42be2e2a5ce73d8685a5))
+
+
+### Features
+
+* **YouTube - Settings:** Add ability to search in settings ([#4881](https://github.com/ReVanced/revanced-patches/issues/4881)) ([aca8b20](https://github.com/ReVanced/revanced-patches/commit/aca8b207c15f254bcc9ad94bc7dfb895f21d4058))
+
+# [5.24.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.24.0-dev.3...v5.24.0-dev.4) (2025-05-16)
+
+
+### Features
+
+* **Spotify:** Add `Fix third party launchers widgets` patch ([#4893](https://github.com/ReVanced/revanced-patches/issues/4893)) ([23bfdc9](https://github.com/ReVanced/revanced-patches/commit/23bfdc98fbbcc8ecf0ffbf8704f58dd2272e4af2))
+
+# [5.24.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.24.0-dev.2...v5.24.0-dev.3) (2025-05-14)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Fix `Hide video recommendation labels` ([#4956](https://github.com/ReVanced/revanced-patches/issues/4956)) ([ae05ac3](https://github.com/ReVanced/revanced-patches/commit/ae05ac38151ebd3197953af97ca0dd847a04cc2d))
+
+# [5.24.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.24.0-dev.1...v5.24.0-dev.2) (2025-05-14)
+
+
+### Features
+
+* **GmsCore support:** Open vendor specific DontKillMyApp if available ([#4952](https://github.com/ReVanced/revanced-patches/issues/4952)) ([b89927a](https://github.com/ReVanced/revanced-patches/commit/b89927a10e3b909a3c37fbb75c16a7abbce44560))
+* **YouTube - Hide player components:** Hide related video overlay in fullscreen ([#4938](https://github.com/ReVanced/revanced-patches/issues/4938)) ([ac9be97](https://github.com/ReVanced/revanced-patches/commit/ac9be9760c9965e54df196b227a310d64ead4bf5))
+
+# [5.24.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.23.0...v5.24.0-dev.1) (2025-05-12)
+
+
+### Features
+
+* **NU.nl:** Support version `11.3.0` ([#4925](https://github.com/ReVanced/revanced-patches/issues/4925)) ([bedde60](https://github.com/ReVanced/revanced-patches/commit/bedde60fc1a52b0fd491174b3b5b887435eb621a))
+
+# [5.23.0](https://github.com/ReVanced/revanced-patches/compare/v5.22.0...v5.23.0) (2025-05-10)
+
+
+### Bug Fixes
+
+* Correct incorrect fingerprint ([c3bab89](https://github.com/ReVanced/revanced-patches/commit/c3bab89fc4189e38c10eee0caa36289de7e29dfa))
+* Fix incorrect fingerprints ([#4917](https://github.com/ReVanced/revanced-patches/issues/4917)) ([49ca329](https://github.com/ReVanced/revanced-patches/commit/49ca3290a726cdba7bc9b62ffcd8d46e6f04778e))
+* **Spotify - Unlock Spotify Premium:** Remove pop up premium ads ([#4842](https://github.com/ReVanced/revanced-patches/issues/4842)) ([00aa200](https://github.com/ReVanced/revanced-patches/commit/00aa2000ba2eef15a0dd827c2bd84c2e85c412e0))
+* **YouTube:** Improve litho filtering performance ([#4904](https://github.com/ReVanced/revanced-patches/issues/4904)) ([7b43986](https://github.com/ReVanced/revanced-patches/commit/7b43986871a68e5cb43331d2fb2fdb9ef67438ad))
+* **YouTube:** Simplify litho filtering patch ([#4910](https://github.com/ReVanced/revanced-patches/issues/4910)) ([bd53955](https://github.com/ReVanced/revanced-patches/commit/bd53955df738bb7b819eb91a3e776e9d2ca5c74a))
+
+
+### Features
+
+* **Lightroom:** Constrain patches to last working version ([efef03b](https://github.com/ReVanced/revanced-patches/commit/efef03b80da21552d0d8be6913faba64e4fb5ed1))
+* **Pandora:** Add `Disable audio ads` and `Unlimited skips` patch ([#4841](https://github.com/ReVanced/revanced-patches/issues/4841)) ([0cf7a4c](https://github.com/ReVanced/revanced-patches/commit/0cf7a4c6be615ed0a52a6bacf87592f5f43ff575))
+* **Prime Video:** Add `Skip ads` patch ([#4824](https://github.com/ReVanced/revanced-patches/issues/4824)) ([bb672c4](https://github.com/ReVanced/revanced-patches/commit/bb672c4674ddc201b8b2648c3906cfc31ef43f10))
+* **Spotify:** Add `Sanitize sharing links` patch ([#4829](https://github.com/ReVanced/revanced-patches/issues/4829)) ([2e3511d](https://github.com/ReVanced/revanced-patches/commit/2e3511d03c8198bbdb9336888df038a33fb3ab8c))
+
+# [5.23.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v5.23.0-dev.6...v5.23.0-dev.7) (2025-05-06)
+
+
+### Bug Fixes
+
+* Fix incorrect fingerprints ([#4917](https://github.com/ReVanced/revanced-patches/issues/4917)) ([49ca329](https://github.com/ReVanced/revanced-patches/commit/49ca3290a726cdba7bc9b62ffcd8d46e6f04778e))
+
+# [5.23.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.23.0-dev.5...v5.23.0-dev.6) (2025-05-06)
+
+
+### Bug Fixes
+
+* Correct incorrect fingerprint ([c3bab89](https://github.com/ReVanced/revanced-patches/commit/c3bab89fc4189e38c10eee0caa36289de7e29dfa))
+
+# [5.23.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.23.0-dev.4...v5.23.0-dev.5) (2025-05-06)
+
+
+### Bug Fixes
+
+* **Spotify - Unlock Spotify Premium:** Remove pop up premium ads ([#4842](https://github.com/ReVanced/revanced-patches/issues/4842)) ([00aa200](https://github.com/ReVanced/revanced-patches/commit/00aa2000ba2eef15a0dd827c2bd84c2e85c412e0))
+
+
+### Features
+
+* **Pandora:** Add `Disable audio ads` and `Unlimited skips` patch ([#4841](https://github.com/ReVanced/revanced-patches/issues/4841)) ([0cf7a4c](https://github.com/ReVanced/revanced-patches/commit/0cf7a4c6be615ed0a52a6bacf87592f5f43ff575))
+* **Prime Video:** Add `Skip ads` patch ([#4824](https://github.com/ReVanced/revanced-patches/issues/4824)) ([bb672c4](https://github.com/ReVanced/revanced-patches/commit/bb672c4674ddc201b8b2648c3906cfc31ef43f10))
+
+# [5.23.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.23.0-dev.3...v5.23.0-dev.4) (2025-05-06)
+
+
+### Features
+
+* **Spotify:** Add `Sanitize sharing links` patch ([#4829](https://github.com/ReVanced/revanced-patches/issues/4829)) ([2e3511d](https://github.com/ReVanced/revanced-patches/commit/2e3511d03c8198bbdb9336888df038a33fb3ab8c))
+
+# [5.23.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.23.0-dev.2...v5.23.0-dev.3) (2025-05-05)
+
+
+### Bug Fixes
+
+* **YouTube:** Simplify litho filtering patch ([#4910](https://github.com/ReVanced/revanced-patches/issues/4910)) ([bd53955](https://github.com/ReVanced/revanced-patches/commit/bd53955df738bb7b819eb91a3e776e9d2ca5c74a))
+
+# [5.23.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.23.0-dev.1...v5.23.0-dev.2) (2025-05-04)
+
+
+### Bug Fixes
+
+* **YouTube:** Improve litho filtering performance ([#4904](https://github.com/ReVanced/revanced-patches/issues/4904)) ([7b43986](https://github.com/ReVanced/revanced-patches/commit/7b43986871a68e5cb43331d2fb2fdb9ef67438ad))
+
+# [5.23.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.22.0...v5.23.0-dev.1) (2025-05-02)
+
+
+### Features
+
+* **Lightroom:** Constrain patches to last working version ([efef03b](https://github.com/ReVanced/revanced-patches/commit/efef03b80da21552d0d8be6913faba64e4fb5ed1))
+
+# [5.22.0](https://github.com/ReVanced/revanced-patches/compare/v5.21.0...v5.22.0) (2025-05-01)
+
+
+### Bug Fixes
+
+* **TikTok - Feed filter:** Hide ads in following feed ([#4844](https://github.com/ReVanced/revanced-patches/issues/4844)) ([c255ac1](https://github.com/ReVanced/revanced-patches/commit/c255ac18e0b2dcf917bd0559876be5a2a81023db))
+* **YouTube - Hide layout components:** Hide new type of community posts ([#4888](https://github.com/ReVanced/revanced-patches/issues/4888)) ([f0c9c35](https://github.com/ReVanced/revanced-patches/commit/f0c9c35778ab43a99149ee5ad0ccfd8aeb09f638))
+* **YouTube - Hide Shorts components:** Hide action buttons A/B button layout ([#4889](https://github.com/ReVanced/revanced-patches/issues/4889)) ([9dcd3d3](https://github.com/ReVanced/revanced-patches/commit/9dcd3d35dddf019547ab6ce431bac7a5a8a4c291))
+* **YouTube - Shorts autoplay:** Fix autoplay with YT 20.12 ([06b35b2](https://github.com/ReVanced/revanced-patches/commit/06b35b2a7d7371915881e8f430c32ce15fa224de))
+* **YouTube - Spoof app version:** Do not hide spoof version in general settings menu ([#4861](https://github.com/ReVanced/revanced-patches/issues/4861)) ([f459c3c](https://github.com/ReVanced/revanced-patches/commit/f459c3c7fae3a1b8addf3354488dcef9f95255cc))
+
+
+### Features
+
+* **TikTok - Feed Filter:** Remove TikTok Shop from feed. ([#4851](https://github.com/ReVanced/revanced-patches/issues/4851)) ([f198bec](https://github.com/ReVanced/revanced-patches/commit/f198bece653e3e1adf083129dedb77c1d1a633d7))
+* **YouTube - GmsCore support:** Show troubleshooting in app text if the user recently changed their account details ([#4879](https://github.com/ReVanced/revanced-patches/issues/4879)) ([ab4bdc8](https://github.com/ReVanced/revanced-patches/commit/ab4bdc8a2519cee15f79bf95d89e7ea56ea464ee))
+
+# [5.22.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.22.0-dev.3...v5.22.0-dev.4) (2025-04-30)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Hide new type of community posts ([#4888](https://github.com/ReVanced/revanced-patches/issues/4888)) ([f0c9c35](https://github.com/ReVanced/revanced-patches/commit/f0c9c35778ab43a99149ee5ad0ccfd8aeb09f638))
+* **YouTube - Hide Shorts components:** Hide action buttons A/B button layout ([#4889](https://github.com/ReVanced/revanced-patches/issues/4889)) ([9dcd3d3](https://github.com/ReVanced/revanced-patches/commit/9dcd3d35dddf019547ab6ce431bac7a5a8a4c291))
+
+# [5.22.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.22.0-dev.2...v5.22.0-dev.3) (2025-04-29)
+
+
+### Features
+
+* **YouTube - GmsCore support:** Show troubleshooting in app text if the user recently changed their account details ([#4879](https://github.com/ReVanced/revanced-patches/issues/4879)) ([ab4bdc8](https://github.com/ReVanced/revanced-patches/commit/ab4bdc8a2519cee15f79bf95d89e7ea56ea464ee))
+
+# [5.22.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.22.0-dev.1...v5.22.0-dev.2) (2025-04-27)
+
+
+### Bug Fixes
+
+* **YouTube - Shorts autoplay:** Fix autoplay with YT 20.12 ([06b35b2](https://github.com/ReVanced/revanced-patches/commit/06b35b2a7d7371915881e8f430c32ce15fa224de))
+
+# [5.22.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.21.0...v5.22.0-dev.1) (2025-04-26)
+
+
+### Bug Fixes
+
+* **TikTok - Feed filter:** Hide ads in following feed ([#4844](https://github.com/ReVanced/revanced-patches/issues/4844)) ([c255ac1](https://github.com/ReVanced/revanced-patches/commit/c255ac18e0b2dcf917bd0559876be5a2a81023db))
+* **YouTube - Spoof app version:** Do not hide spoof version in general settings menu ([#4861](https://github.com/ReVanced/revanced-patches/issues/4861)) ([f459c3c](https://github.com/ReVanced/revanced-patches/commit/f459c3c7fae3a1b8addf3354488dcef9f95255cc))
+
+
+### Features
+
+* **TikTok - Feed Filter:** Remove TikTok Shop from feed. ([#4851](https://github.com/ReVanced/revanced-patches/issues/4851)) ([f198bec](https://github.com/ReVanced/revanced-patches/commit/f198bece653e3e1adf083129dedb77c1d1a633d7))
+
+# [5.21.0](https://github.com/ReVanced/revanced-patches/compare/v5.20.1...v5.21.0) (2025-04-25)
+
+
+### Bug Fixes
+
+* `Hide ADB status` patch ([#4814](https://github.com/ReVanced/revanced-patches/issues/4814)) ([dc89be0](https://github.com/ReVanced/revanced-patches/commit/dc89be0e94880733f862b250d95d4848f02c594d))
+* **GmsCore Support:** Correct the description to refer to the app being patched ([2bbcf9d](https://github.com/ReVanced/revanced-patches/commit/2bbcf9d82ca2f442572a6aa886cc611b0d56ff0a))
+* **Wide search bar:** Fix patching `19.16.39` ([433dbc3](https://github.com/ReVanced/revanced-patches/commit/433dbc3bf81823369e146035c954281e84d3a436))
+* **YouTube - Change start page:** Add option to always override start page on app launch ([#4832](https://github.com/ReVanced/revanced-patches/issues/4832)) ([5062e24](https://github.com/ReVanced/revanced-patches/commit/5062e24433ba38eba397438e8fde32099109d3c3))
+* **YouTube - Disable auto captions:** Correctly hide captions with YT 20.12 ([5ecbe82](https://github.com/ReVanced/revanced-patches/commit/5ecbe823ed5197533328cc37f1de5cd1f048a217))
+* **YouTube - Hide video action buttons:** Add option to hide 'Ask' button ([#4852](https://github.com/ReVanced/revanced-patches/issues/4852)) ([43bcf5a](https://github.com/ReVanced/revanced-patches/commit/43bcf5a098c9008cc11dc7df9680437d5effbb32))
+* **YouTube - Hide video action buttons:** Hide A/B layout buttons ([4db5d3c](https://github.com/ReVanced/revanced-patches/commit/4db5d3c3d5ac04faf70cc07fb309b324d752e7e3))
+* **YouTube - Wide search bar:** Do not force phone layout for tablet devices ([#4827](https://github.com/ReVanced/revanced-patches/issues/4827)) ([0cb38f9](https://github.com/ReVanced/revanced-patches/commit/0cb38f9f367a7fe742d8ca336150049181d637b6))
+
+
+### Features
+
+* Add `Hide ADB status` patch ([#4585](https://github.com/ReVanced/revanced-patches/issues/4585)) ([1ea8047](https://github.com/ReVanced/revanced-patches/commit/1ea8047aefdaa358e9af8038923ac54d68a39176))
+* **X / Twitter:** Support version `10.86.0-release.0` ([#4805](https://github.com/ReVanced/revanced-patches/issues/4805)) ([655b390](https://github.com/ReVanced/revanced-patches/commit/655b39043ad77efcb4380de67c3f603666e7bc49))
+* **YouTube - Swipe controls:** Add option for vertical progress bar ([#4811](https://github.com/ReVanced/revanced-patches/issues/4811)) ([ebee07e](https://github.com/ReVanced/revanced-patches/commit/ebee07ec3aba6fd3adbd8e0af30390e197879d89))
+* **YouTube:** Support version `20.12.46` ([#4779](https://github.com/ReVanced/revanced-patches/issues/4779)) ([703359f](https://github.com/ReVanced/revanced-patches/commit/703359f0c16b613c204cf16cf42227b628f664fa))
+
+# [5.21.0-dev.12](https://github.com/ReVanced/revanced-patches/compare/v5.21.0-dev.11...v5.21.0-dev.12) (2025-04-24)
+
+
+### Bug Fixes
+
+* **YouTube - Hide video action buttons:** Add option to hide 'Ask' button ([#4852](https://github.com/ReVanced/revanced-patches/issues/4852)) ([43bcf5a](https://github.com/ReVanced/revanced-patches/commit/43bcf5a098c9008cc11dc7df9680437d5effbb32))
+
+# [5.21.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v5.21.0-dev.10...v5.21.0-dev.11) (2025-04-24)
+
+
+### Bug Fixes
+
+* **GmsCore Support:** Correct the description to refer to the app being patched ([2bbcf9d](https://github.com/ReVanced/revanced-patches/commit/2bbcf9d82ca2f442572a6aa886cc611b0d56ff0a))
+
+# [5.21.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v5.21.0-dev.9...v5.21.0-dev.10) (2025-04-23)
+
+
+### Features
+
+* **YouTube - Swipe controls:** Add option for vertical progress bar ([#4811](https://github.com/ReVanced/revanced-patches/issues/4811)) ([ebee07e](https://github.com/ReVanced/revanced-patches/commit/ebee07ec3aba6fd3adbd8e0af30390e197879d89))
+
+# [5.21.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v5.21.0-dev.8...v5.21.0-dev.9) (2025-04-21)
+
+
+### Bug Fixes
+
+* **YouTube - Hide video action buttons:** Hide A/B layout buttons ([4db5d3c](https://github.com/ReVanced/revanced-patches/commit/4db5d3c3d5ac04faf70cc07fb309b324d752e7e3))
+
+# [5.21.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v5.21.0-dev.7...v5.21.0-dev.8) (2025-04-20)
+
+
+### Bug Fixes
+
+* **Wide search bar:** Fix patching `19.16.39` ([433dbc3](https://github.com/ReVanced/revanced-patches/commit/433dbc3bf81823369e146035c954281e84d3a436))
+
+# [5.21.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v5.21.0-dev.6...v5.21.0-dev.7) (2025-04-20)
+
+
+### Bug Fixes
+
+* **YouTube - Change start page:** Add option to always override start page on app launch ([#4832](https://github.com/ReVanced/revanced-patches/issues/4832)) ([5062e24](https://github.com/ReVanced/revanced-patches/commit/5062e24433ba38eba397438e8fde32099109d3c3))
+
+# [5.21.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.21.0-dev.5...v5.21.0-dev.6) (2025-04-19)
+
+
+### Bug Fixes
+
+* **YouTube - Wide search bar:** Do not force phone layout for tablet devices ([#4827](https://github.com/ReVanced/revanced-patches/issues/4827)) ([0cb38f9](https://github.com/ReVanced/revanced-patches/commit/0cb38f9f367a7fe742d8ca336150049181d637b6))
+
+# [5.21.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.21.0-dev.4...v5.21.0-dev.5) (2025-04-18)
+
+
+### Bug Fixes
+
+* `Hide ADB status` patch ([#4814](https://github.com/ReVanced/revanced-patches/issues/4814)) ([dc89be0](https://github.com/ReVanced/revanced-patches/commit/dc89be0e94880733f862b250d95d4848f02c594d))
+
+# [5.21.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.21.0-dev.3...v5.21.0-dev.4) (2025-04-17)
+
+
+### Bug Fixes
+
+* **YouTube - Disable auto captions:** Correctly hide captions with YT 20.12 ([5ecbe82](https://github.com/ReVanced/revanced-patches/commit/5ecbe823ed5197533328cc37f1de5cd1f048a217))
+
+# [5.21.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.21.0-dev.2...v5.21.0-dev.3) (2025-04-16)
+
+
+### Features
+
+* **X / Twitter:** Support version `10.86.0-release.0` ([#4805](https://github.com/ReVanced/revanced-patches/issues/4805)) ([655b390](https://github.com/ReVanced/revanced-patches/commit/655b39043ad77efcb4380de67c3f603666e7bc49))
+
+# [5.21.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.21.0-dev.1...v5.21.0-dev.2) (2025-04-16)
+
+
+### Features
+
+* Add `Hide ADB status` patch ([#4585](https://github.com/ReVanced/revanced-patches/issues/4585)) ([1ea8047](https://github.com/ReVanced/revanced-patches/commit/1ea8047aefdaa358e9af8038923ac54d68a39176))
+
+# [5.21.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.20.1...v5.21.0-dev.1) (2025-04-16)
+
+
+### Features
+
+* **YouTube:** Support version `20.12.46` ([#4779](https://github.com/ReVanced/revanced-patches/issues/4779)) ([703359f](https://github.com/ReVanced/revanced-patches/commit/703359f0c16b613c204cf16cf42227b628f664fa))
+
+## [5.20.1](https://github.com/ReVanced/revanced-patches/compare/v5.20.0...v5.20.1) (2025-04-15)
+
+
+### Bug Fixes
+
+* **Spotify - Custom theme:** Support latest app target ([#4800](https://github.com/ReVanced/revanced-patches/issues/4800)) ([03d0eb2](https://github.com/ReVanced/revanced-patches/commit/03d0eb2f8c0f3e48d53bdab38d34057f2020bb65))
+
+## [5.20.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.20.0...v5.20.1-dev.1) (2025-04-15)
+
+
+### Bug Fixes
+
+* **Spotify - Custom theme:** Support latest app target ([#4800](https://github.com/ReVanced/revanced-patches/issues/4800)) ([03d0eb2](https://github.com/ReVanced/revanced-patches/commit/03d0eb2f8c0f3e48d53bdab38d34057f2020bb65))
+
+# [5.20.0](https://github.com/ReVanced/revanced-patches/compare/v5.19.1...v5.20.0) (2025-04-15)
+
+
+### Bug Fixes
+
+* **Duolingo - Hide ads:**  Support lastest app release ([#4790](https://github.com/ReVanced/revanced-patches/issues/4790)) ([215fccb](https://github.com/ReVanced/revanced-patches/commit/215fccbaf2fdd54251c46cbda106029eb304996b))
+* **Spotify - Unlock Spotify Premium:** Remove premium restriction for 'Spotify Connect' ([#4782](https://github.com/ReVanced/revanced-patches/issues/4782)) ([50f5b1a](https://github.com/ReVanced/revanced-patches/commit/50f5b1ac54372542d76e87626f00ddefb54da125))
+* **Spotify:** Fix login by replacing `Spoof signature` patch with new `Spoof package info` patch ([#4794](https://github.com/ReVanced/revanced-patches/issues/4794)) ([d639151](https://github.com/ReVanced/revanced-patches/commit/d639151641352ce651037b17fb65bd58953cd51c))
+* **YouTube - Remove background playback restrictions:** Restore PiP button functionality after screen is unlocked ([6837348](https://github.com/ReVanced/revanced-patches/commit/6837348c45156d6743a63fef8b6e045087afbda8))
+
+
+### Features
+
+* Add `Set target SDK version 34` patch (Disable edge-to-edge display) ([#4780](https://github.com/ReVanced/revanced-patches/issues/4780)) ([dcf6178](https://github.com/ReVanced/revanced-patches/commit/dcf6178f19f86dd1b57d54c855b8c47b086dd33a))
+* **Spotify - Custom theme:** Add option to use unmodified player background gradient ([#4741](https://github.com/ReVanced/revanced-patches/issues/4741)) ([0ee3693](https://github.com/ReVanced/revanced-patches/commit/0ee36939f43f325afca37119db1cf1af3b63be27))
+* **YouTube - Swipe controls:** Add option to change volume swipe sensitivity (step size) ([#4557](https://github.com/ReVanced/revanced-patches/issues/4557)) ([8957325](https://github.com/ReVanced/revanced-patches/commit/8957325d78eb42e087c4c1ff0abedb2146aa4423))
+
+# [5.20.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v5.20.0-dev.6...v5.20.0-dev.7) (2025-04-15)
+
+
+### Bug Fixes
+
+* **Spotify:** Fix login by replacing `Spoof signature` patch with new `Spoof package info` patch ([#4794](https://github.com/ReVanced/revanced-patches/issues/4794)) ([d639151](https://github.com/ReVanced/revanced-patches/commit/d639151641352ce651037b17fb65bd58953cd51c))
+
+# [5.20.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.20.0-dev.5...v5.20.0-dev.6) (2025-04-15)
+
+
+### Bug Fixes
+
+* **Duolingo - Hide ads:**  Support lastest app release ([#4790](https://github.com/ReVanced/revanced-patches/issues/4790)) ([215fccb](https://github.com/ReVanced/revanced-patches/commit/215fccbaf2fdd54251c46cbda106029eb304996b))
+
+# [5.20.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.20.0-dev.4...v5.20.0-dev.5) (2025-04-14)
+
+
+### Features
+
+* **YouTube - Swipe controls:** Add option to change volume swipe sensitivity (step size) ([#4557](https://github.com/ReVanced/revanced-patches/issues/4557)) ([8957325](https://github.com/ReVanced/revanced-patches/commit/8957325d78eb42e087c4c1ff0abedb2146aa4423))
+
 # [5.20.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.20.0-dev.3...v5.20.0-dev.4) (2025-04-14)
 
 

extensions/all/misc/adb/hide-adb/build.gradle.kts

@@ -0,0 +1,16 @@
+android {
+    namespace = "app.revanced.extension"
+
+    defaultConfig {
+        minSdk = 21
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}
+
+dependencies {
+    compileOnly(libs.annotation)
+}

extensions/all/misc/adb/hide-adb/src/main/AndroidManifest.xml

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

extensions/all/misc/adb/hide-adb/src/main/java/app/revanced/extension/all/misc/hide/adb/HideAdbPatch.java

@@ -0,0 +1,28 @@
+package app.revanced.extension.all.misc.hide.adb;
+
+import android.content.ContentResolver;
+import android.provider.Settings;
+
+import java.util.Arrays;
+import java.util.List;
+
+@SuppressWarnings("unused")
+public final class HideAdbPatch {
+    private static final List<String> SPOOF_SETTINGS = Arrays.asList("adb_enabled", "adb_wifi_enabled", "development_settings_enabled");
+
+    public static int getInt(ContentResolver cr, String name) throws Settings.SettingNotFoundException {
+        if (SPOOF_SETTINGS.contains(name)) {
+            return 0;
+        }
+
+        return Settings.Global.getInt(cr, name);
+    }
+
+    public static int getInt(ContentResolver cr, String name, int def) {
+        if (SPOOF_SETTINGS.contains(name)) {
+            return 0;
+        }
+
+        return Settings.Global.getInt(cr, name, def);
+    }
+}

extensions/all/misc/connectivity/wifi/spoof/spoof-wifi/src/main/java/app/revanced/extension/all/misc/connectivity/wifi/spoof/SpoofWifiPatch.java

@@ -1,4 +1,4 @@
-package app.revanced.extension.all.connectivity.wifi.spoof;
+package app.revanced.extension.all.misc.connectivity.wifi.spoof;
 
 import android.app.PendingIntent;
 import android.content.Context;

extensions/all/misc/screencapture/remove-screen-capture-restriction/src/main/java/app/revanced/extension/all/misc/screencapture/removerestriction/RemoveScreenCaptureRestrictionPatch.java

@@ -1,4 +1,4 @@
-package app.revanced.extension.all.screencapture.removerestriction;
+package app.revanced.extension.all.misc.screencapture.removerestriction;
 
 import android.media.AudioAttributes;
 import android.os.Build;

extensions/all/misc/screenshot/remove-screenshot-restriction/src/main/java/app/revanced/extension/all/misc/screenshot/removerestriction/RemoveScreenshotRestrictionPatch.java

@@ -1,4 +1,4 @@
-package app.revanced.extension.all.screenshot.removerestriction;
+package app.revanced.extension.all.misc.screenshot.removerestriction;
 
 import android.view.Window;
 import android.view.WindowManager;

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

@@ -82,7 +82,7 @@ public class HideAdsPatch {
 
                 // Filter HeaderBlock with known ads until next HeaderBlock.
                 if (currentBlock instanceof HeaderBlock headerBlock) {
-                    StyledText headerText = headerBlock.component20();
+                    StyledText headerText = headerBlock.getTitle();
                     if (headerText != null) {
                         skipFullHeader = false;
                         for (String blockedHeaderBlock : blockedHeaderBlocks) {

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

@@ -3,8 +3,7 @@ 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() {
+    public final StyledText getTitle() {
         throw new UnsupportedOperationException("Stub");
     }
 }

extensions/primevideo/build.gradle.kts

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

extensions/primevideo/src/main/AndroidManifest.xml

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

extensions/primevideo/src/main/java/app/revanced/extension/primevideo/ads/SkipAdsPatch.java

@@ -0,0 +1,36 @@
+package app.revanced.extension.primevideo.ads;
+
+import com.amazon.avod.fsm.SimpleTrigger;
+import com.amazon.avod.media.ads.AdBreak;
+import com.amazon.avod.media.ads.internal.state.AdBreakTrigger;
+import com.amazon.avod.media.ads.internal.state.AdEnabledPlayerTriggerType;
+import com.amazon.avod.media.playback.VideoPlayer;
+import com.amazon.avod.media.ads.internal.state.ServerInsertedAdBreakState;
+
+import app.revanced.extension.shared.Logger;
+
+@SuppressWarnings("unused")
+public final class SkipAdsPatch {
+    public static void enterServerInsertedAdBreakState(ServerInsertedAdBreakState state, AdBreakTrigger trigger, VideoPlayer player) {
+        try {
+            AdBreak adBreak = trigger.getBreak();
+
+            // There are two scenarios when entering the original method:
+            //  1. Player naturally entered an ad break while watching a video.
+            //  2. User is skipped/scrubbed to a position on the timeline. If seek position is past an ad break,
+            //     user is forced to watch an ad before continuing.
+            //
+            // Scenario 2 is indicated by trigger.getSeekStartPosition() != null, so skip directly to the scrubbing
+            // target. Otherwise, just calculate when the ad break should end and skip to there.
+            if (trigger.getSeekStartPosition() != null)
+                player.seekTo(trigger.getSeekTarget().getTotalMilliseconds());
+            else
+                player.seekTo(player.getCurrentPosition() + adBreak.getDurationExcludingAux().getTotalMilliseconds());
+
+            // Send "end of ads" trigger to state machine so everything doesn't get whacky.
+            state.doTrigger(new SimpleTrigger(AdEnabledPlayerTriggerType.NO_MORE_ADS_SKIP_TRANSITION));
+        } catch (Exception ex) {
+            Logger.printException(() -> "Failed skipping ads", ex);
+        }
+    }
+}

extensions/primevideo/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 = 21
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}

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

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

extensions/primevideo/stub/src/main/java/com/amazon/avod/fsm/SimpleTrigger.java

@@ -0,0 +1,6 @@
+package com.amazon.avod.fsm;
+
+public final class SimpleTrigger<T> implements Trigger<T> {
+    public SimpleTrigger(T triggerType) {
+    }
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/fsm/StateBase.java

@@ -0,0 +1,7 @@
+package com.amazon.avod.fsm;
+
+public abstract class StateBase<S, T> {
+    // This method orginally has protected access (modified in patch code).
+    public void doTrigger(Trigger<T> trigger) {
+    }
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/fsm/Trigger.java

@@ -0,0 +1,4 @@
+package com.amazon.avod.fsm;
+
+public interface Trigger<T> {
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/TimeSpan.java

@@ -0,0 +1,7 @@
+package com.amazon.avod.media;
+
+public final class TimeSpan {
+    public long getTotalMilliseconds() {
+        throw new UnsupportedOperationException();
+    }
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/ads/AdBreak.java

@@ -0,0 +1,7 @@
+package com.amazon.avod.media.ads;
+
+import com.amazon.avod.media.TimeSpan;
+
+public interface AdBreak {
+    TimeSpan getDurationExcludingAux();
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/ads/internal/state/AdBreakState.java

@@ -0,0 +1,4 @@
+package com.amazon.avod.media.ads.internal.state;
+
+public abstract class AdBreakState extends AdEnabledPlaybackState {
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/ads/internal/state/AdBreakTrigger.java

@@ -0,0 +1,18 @@
+package com.amazon.avod.media.ads.internal.state;
+
+import com.amazon.avod.media.ads.AdBreak;
+import com.amazon.avod.media.TimeSpan;
+
+public class AdBreakTrigger {
+    public AdBreak getBreak() {
+        throw new UnsupportedOperationException();
+    }
+
+    public TimeSpan getSeekTarget() {
+        throw new UnsupportedOperationException();
+    }
+
+    public TimeSpan getSeekStartPosition() {
+        throw new UnsupportedOperationException();
+    }
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/ads/internal/state/AdEnabledPlaybackState.java

@@ -0,0 +1,8 @@
+package com.amazon.avod.media.ads.internal.state;
+
+import com.amazon.avod.fsm.StateBase;
+import com.amazon.avod.media.playback.state.PlayerStateType;
+import com.amazon.avod.media.playback.state.trigger.PlayerTriggerType;
+
+public class AdEnabledPlaybackState extends StateBase<PlayerStateType, PlayerTriggerType> {
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/ads/internal/state/AdEnabledPlayerTriggerType.java

@@ -0,0 +1,5 @@
+package com.amazon.avod.media.ads.internal.state;
+
+public enum AdEnabledPlayerTriggerType {
+    NO_MORE_ADS_SKIP_TRANSITION
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/ads/internal/state/ServerInsertedAdBreakState.java

@@ -0,0 +1,4 @@
+package com.amazon.avod.media.ads.internal.state;
+
+public class ServerInsertedAdBreakState extends AdBreakState {
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/playback/VideoPlayer.java

@@ -0,0 +1,7 @@
+package com.amazon.avod.media.playback;
+
+public interface VideoPlayer {
+    long getCurrentPosition();
+
+    void seekTo(long positionMs);
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/playback/state/PlayerStateType.java

@@ -0,0 +1,4 @@
+package com.amazon.avod.media.playback.state;
+
+public interface PlayerStateType {
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/playback/state/trigger/PlayerTriggerType.java

@@ -0,0 +1,4 @@
+package com.amazon.avod.media.playback.state.trigger;
+
+public interface PlayerTriggerType {
+}

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

@@ -1,6 +1,7 @@
 package app.revanced.extension.shared;
 
 import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.shared.requests.Route.Method.GET;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -15,14 +16,18 @@ import android.os.Build;
 import android.os.PowerManager;
 import android.provider.Settings;
 
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
+import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Locale;
 
-/**
- * @noinspection unused
- */
+import app.revanced.extension.shared.requests.Requester;
+import app.revanced.extension.shared.requests.Route;
+
+@SuppressWarnings("unused")
 public class GmsCoreSupport {
     private static final String PACKAGE_NAME_YOUTUBE = "com.google.android.youtube";
     private static final String PACKAGE_NAME_YOUTUBE_MUSIC = "com.google.android.apps.youtube.music";
@@ -31,10 +36,24 @@ public class GmsCoreSupport {
             = getGmsCoreVendorGroupId() + ".android.gms";
     private static final Uri GMS_CORE_PROVIDER
             = Uri.parse("content://" + getGmsCoreVendorGroupId() + ".android.gsf.gservices/prefix");
-    private static final String DONT_KILL_MY_APP_LINK
-            = "https://dontkillmyapp.com";
+    private static final String DONT_KILL_MY_APP_URL
+            = "https://dontkillmyapp.com/";
+    private static final Route DONT_KILL_MY_APP_MANUFACTURER_API
+            = new Route(GET, "/api/v2/{manufacturer}.json");
+    private static final String DONT_KILL_MY_APP_NAME_PARAMETER
+            = "?app=MicroG";
+    private static final String BUILD_MANUFACTURER
+            = Build.MANUFACTURER.toLowerCase(Locale.ROOT).replace(" ", "-");
+
+    /**
+     * If a manufacturer specific page exists on DontKillMyApp.
+     */
+    @Nullable
+    private static volatile Boolean DONT_KILL_MY_APP_MANUFACTURER_SUPPORTED;
 
     private static void open(String queryOrLink) {
+        Logger.printInfo(() -> "Opening link: " + queryOrLink);
+
         Intent intent;
         try {
             // Check if queryOrLink is a valid URL.
@@ -88,7 +107,7 @@ public class GmsCoreSupport {
 
                 // Do not exit. If the app exits before launch completes (and without
                 // opening another activity), then on some devices such as Pixel phone Android 10
-                // no toast will be shown and the app will continually be relaunched
+                // no toast will be shown and the app will continually relaunch
                 // with the appearance of a hung app.
             }
 
@@ -124,11 +143,12 @@ public class GmsCoreSupport {
             try (var client = context.getContentResolver().acquireContentProviderClient(GMS_CORE_PROVIDER)) {
                 if (client == null) {
                     Logger.printInfo(() -> "GmsCore is not running in the background");
+                    checkIfDontKillMyAppSupportsManufacturer();
 
                     showBatteryOptimizationDialog(context,
                             "gms_core_dialog_not_whitelisted_not_allowed_in_background_message",
                             "gms_core_dialog_open_website_text",
-                            (dialog, id) -> open(DONT_KILL_MY_APP_LINK));
+                            (dialog, id) -> openDontKillMyApp());
                 }
             }
         } catch (Exception ex) {
@@ -143,6 +163,48 @@ public class GmsCoreSupport {
         activity.startActivityForResult(intent, 0);
     }
 
+    private static void checkIfDontKillMyAppSupportsManufacturer() {
+        Utils.runOnBackgroundThread(() -> {
+            try {
+                final long start = System.currentTimeMillis();
+                HttpURLConnection connection = Requester.getConnectionFromRoute(
+                        DONT_KILL_MY_APP_URL, DONT_KILL_MY_APP_MANUFACTURER_API, BUILD_MANUFACTURER);
+                connection.setConnectTimeout(5000);
+                connection.setReadTimeout(5000);
+
+                final boolean supported = connection.getResponseCode() == 200;
+                Logger.printInfo(() -> "Manufacturer is " + (supported ? "" : "NOT ")
+                        + "listed on DontKillMyApp: " + BUILD_MANUFACTURER
+                        + " fetch took: " + (System.currentTimeMillis() - start) + "ms");
+                DONT_KILL_MY_APP_MANUFACTURER_SUPPORTED = supported;
+            } catch (Exception ex) {
+                Logger.printInfo(() -> "Could not check if manufacturer is listed on DontKillMyApp: "
+                        + BUILD_MANUFACTURER, ex);
+                DONT_KILL_MY_APP_MANUFACTURER_SUPPORTED = null;
+            }
+        });
+    }
+
+    private static void openDontKillMyApp() {
+        final Boolean manufacturerSupported = DONT_KILL_MY_APP_MANUFACTURER_SUPPORTED;
+
+        String manufacturerPageToOpen;
+        if (manufacturerSupported == null) {
+            // Fetch has not completed yet. Only happens on extremely slow internet connections
+            // and the user spends less than 1 second reading what's on screen.
+            // Instead of waiting for the fetch (which may timeout),
+            // open the website without a vendor.
+            manufacturerPageToOpen = "";
+        } else if (manufacturerSupported) {
+            manufacturerPageToOpen = BUILD_MANUFACTURER;
+        } else {
+            // No manufacturer specific page exists. Open the general page.
+            manufacturerPageToOpen = "general";
+        }
+
+        open(DONT_KILL_MY_APP_URL + manufacturerPageToOpen + DONT_KILL_MY_APP_NAME_PARAMETER);
+    }
+
     /**
      * @return If GmsCore is not whitelisted from battery optimizations.
      */

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

@@ -371,7 +371,7 @@ public class Utils {
         if (language != AppLanguage.DEFAULT) {
             // Create a new context with the desired language.
             Logger.printDebug(() -> "Using app language: " + language);
-            Configuration config = appContext.getResources().getConfiguration();
+            Configuration config = new Configuration(appContext.getResources().getConfiguration());
             config.setLocale(language.getLocale());
             context = appContext.createConfigurationContext(config);
         }
@@ -391,16 +391,47 @@ public class Utils {
     private static Boolean isRightToLeftTextLayout;
 
     /**
-     * If the device language uses right to left text layout (hebrew, arabic, etc)
+     * @return If the device language uses right to left text layout (Hebrew, Arabic, etc).
+     *         If this should match any ReVanced language override then instead use
+     *         {@link #isRightToLeftLocale(Locale)} with {@link BaseSettings#REVANCED_LANGUAGE}.
+     *         This is the default locale of the device, which may differ if
+     *         {@link BaseSettings#REVANCED_LANGUAGE} is set to a different language.
      */
-    public static boolean isRightToLeftTextLayout() {
+    public static boolean isRightToLeftLocale() {
         if (isRightToLeftTextLayout == null) {
-            String displayLanguage = Locale.getDefault().getDisplayLanguage();
-            isRightToLeftTextLayout = new Bidi(displayLanguage, Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT).isRightToLeft();
+            isRightToLeftTextLayout = isRightToLeftLocale(Locale.getDefault());
         }
         return isRightToLeftTextLayout;
     }
 
+    /**
+     * @return If the locale uses right to left text layout (Hebrew, Arabic, etc).
+     */
+    public static boolean isRightToLeftLocale(Locale locale) {
+        String displayLanguage = locale.getDisplayLanguage();
+        return new Bidi(displayLanguage, Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT).isRightToLeft();
+    }
+
+    /**
+     * @return A UTF8 string containing a left-to-right or right-to-left
+     *         character of the device locale. If this should match any ReVanced language
+     *         override then instead use {@link #getTextDirectionString(Locale)} with
+     *         {@link BaseSettings#REVANCED_LANGUAGE}.
+     */
+    public static String getTextDirectionString() {
+        return  getTextDirectionString(isRightToLeftLocale());
+    }
+
+    public static String getTextDirectionString(Locale locale) {
+        return getTextDirectionString(isRightToLeftLocale(locale));
+    }
+
+    private static String getTextDirectionString(boolean isRightToLeft) {
+        return isRightToLeft
+                ? "\u200F"  // u200F = right to left character.
+                : "\u200E"; // u200E = left to right character.
+    }
+
     /**
      * @return if the text contains at least 1 number character,
      *         including any unicode numbers such as Arabic.
@@ -692,9 +723,10 @@ public class Utils {
     /**
      * Strips all punctuation and converts to lower case.  A null parameter returns an empty string.
      */
-    public static String removePunctuationConvertToLowercase(@Nullable CharSequence original) {
+    public static String removePunctuationToLowercase(@Nullable CharSequence original) {
         if (original == null) return "";
-        return punctuationPattern.matcher(original).replaceAll("").toLowerCase();
+        return punctuationPattern.matcher(original).replaceAll("")
+                .toLowerCase(BaseSettings.REVANCED_LANGUAGE.get().getLocale());
     }
 
     /**
@@ -726,7 +758,7 @@ public class Utils {
             final String sortValue;
             switch (preferenceSort) {
                 case BY_TITLE:
-                    sortValue = removePunctuationConvertToLowercase(preference.getTitle());
+                    sortValue = removePunctuationToLowercase(preference.getTitle());
                     break;
                 case BY_KEY:
                     sortValue = preference.getKey();
@@ -810,4 +842,12 @@ public class Utils {
         }
         return getResourceColor(colorString);
     }
+
+    public static int clamp(int value, int lower, int upper) {
+        return Math.max(lower, Math.min(value, upper));
+    }
+
+    public static float clamp(float value, float lower, float upper) {
+        return Math.max(lower, Math.min(value, upper));
+    }
 }

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

@@ -89,9 +89,11 @@ public enum AppLanguage {
     ZU;
 
     private final String language;
+    private final Locale locale;
 
     AppLanguage() {
         language = name().toLowerCase(Locale.US);
+        locale = Locale.forLanguageTag(language);
     }
 
     /**
@@ -112,6 +114,6 @@ public enum AppLanguage {
             return Locale.getDefault();
         }
 
-        return Locale.forLanguageTag(language);
+        return locale;
     }
 }

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

@@ -342,9 +342,12 @@ public abstract class Setting<T> {
 
     /**
      * Identical to calling {@link #save(Object)} using {@link #defaultValue}.
+     *
+     * @return The newly saved default value.
      */
-    public void resetToDefault() {
+    public T resetToDefault() {
         save(defaultValue);
+        return defaultValue;
     }
 
     /**

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

@@ -21,6 +21,10 @@ public class NoTitlePreferenceCategory extends PreferenceCategory {
         super(context, attrs, defStyleAttr);
     }
 
+    public NoTitlePreferenceCategory(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
     public NoTitlePreferenceCategory(Context context) {
         super(context);
     }

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

@@ -0,0 +1,107 @@
+package app.revanced.extension.shared.settings.preference;
+
+import android.content.Context;
+import android.preference.ListPreference;
+import android.util.AttributeSet;
+import android.util.Pair;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+import app.revanced.extension.shared.Utils;
+
+/**
+ * PreferenceList that sorts itself.
+ * By default the first entry is preserved in its original position,
+ * and all other entries are sorted alphabetically.
+ *
+ * Ideally the 'keep first entries to preserve' is an xml parameter,
+ * but currently that's not so simple since Extensions code cannot use
+ * generated code from the Patches repo (which is required for custom xml parameters).
+ *
+ * If any class wants to use a different getFirstEntriesToPreserve value,
+ * it needs to subclass this preference and override {@link #getFirstEntriesToPreserve}.
+ */
+@SuppressWarnings({"unused", "deprecation"})
+public class SortedListPreference extends ListPreference {
+
+    /**
+     * Sorts the current list entries.
+     *
+     * @param firstEntriesToPreserve The number of entries to preserve in their original position.
+     */
+    public void sortEntryAndValues(int firstEntriesToPreserve) {
+        CharSequence[] entries = getEntries();
+        CharSequence[] entryValues = getEntryValues();
+        if (entries == null || entryValues == null) {
+            return;
+        }
+
+        final int entrySize = entries.length;
+        if (entrySize != entryValues.length) {
+            // Xml array declaration has a missing/extra entry.
+            throw new IllegalStateException();
+        }
+
+        List<Pair<CharSequence, CharSequence>> firstEntries = new ArrayList<>(firstEntriesToPreserve);
+        SortedMap<String, Pair<CharSequence, CharSequence>> lastEntries = new TreeMap<>();
+
+        for (int i = 0; i < entrySize; i++) {
+            Pair<CharSequence, CharSequence> pair = new Pair<>(entries[i], entryValues[i]);
+            if (i < firstEntriesToPreserve) {
+                firstEntries.add(pair);
+            } else {
+                lastEntries.put(Utils.removePunctuationToLowercase(pair.first), pair);
+            }
+        }
+
+        CharSequence[] sortedEntries = new CharSequence[entrySize];
+        CharSequence[] sortedEntryValues = new CharSequence[entrySize];
+
+        int i = 0;
+        for (Pair<CharSequence, CharSequence> pair : firstEntries) {
+            sortedEntries[i] = pair.first;
+            sortedEntryValues[i] = pair.second;
+            i++;
+        }
+
+        for (Pair<CharSequence, CharSequence> pair : lastEntries.values()) {
+            sortedEntries[i] = pair.first;
+            sortedEntryValues[i] = pair.second;
+            i++;
+        }
+
+        super.setEntries(sortedEntries);
+        super.setEntryValues(sortedEntryValues);
+    }
+
+    protected int getFirstEntriesToPreserve() {
+        return 1;
+    }
+
+    public SortedListPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+
+        sortEntryAndValues(getFirstEntriesToPreserve());
+    }
+
+    public SortedListPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        sortEntryAndValues(getFirstEntriesToPreserve());
+    }
+
+    public SortedListPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        sortEntryAndValues(getFirstEntriesToPreserve());
+    }
+
+    public SortedListPreference(Context context) {
+        super(context);
+
+        sortEntryAndValues(getFirstEntriesToPreserve());
+    }
+}

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

@@ -204,7 +204,7 @@ public class StreamingDataRequest {
                     // but empty response body does.
                     if (connection.getContentLength() == 0) {
                         if (BaseSettings.DEBUG.get() && BaseSettings.DEBUG_TOAST_ON_ERROR.get()) {
-                            Utils.showToastShort("Ignoring empty spoof stream client: " + clientType);
+                            Utils.showToastShort("Debug: Ignoring empty spoof stream client " + clientType);
                         }
                     } else {
                         try (InputStream inputStream = new BufferedInputStream(connection.getInputStream());

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/privacy/SanitizeSharingLinksPatch.java

@@ -0,0 +1,43 @@
+package app.revanced.extension.spotify.misc.privacy;
+
+import android.net.Uri;
+
+import java.util.List;
+
+import app.revanced.extension.shared.Logger;
+
+@SuppressWarnings("unused")
+public final class SanitizeSharingLinksPatch {
+
+    /**
+     * Parameters that are considered undesirable and should be stripped away.
+     */
+    private static final List<String> SHARE_PARAMETERS_TO_REMOVE = List.of(
+            "si", // Share tracking parameter.
+            "utm_source" // Share source, such as "copy-link".
+    );
+
+    /**
+     * Injection point.
+     */
+    public static String sanitizeUrl(String url) {
+        try {
+            Uri uri = Uri.parse(url);
+            Uri.Builder builder = uri.buildUpon().clearQuery();
+
+            for (String paramName : uri.getQueryParameterNames()) {
+                if (!SHARE_PARAMETERS_TO_REMOVE.contains(paramName)) {
+                    for (String value : uri.getQueryParameters(paramName)) {
+                        builder.appendQueryParameter(paramName, value);
+                    }
+                }
+            }
+
+            return builder.build().toString();
+        } catch (Exception ex) {
+            Logger.printException(() -> "sanitizeUrl failure", ex);
+
+            return url;
+        }
+    }
+}

extensions/tiktok/src/main/java/app/revanced/extension/tiktok/feedfilter/FeedItemsFilter.java

@@ -2,6 +2,7 @@ package app.revanced.extension.tiktok.feedfilter;
 
 import com.ss.android.ugc.aweme.feed.model.Aweme;
 import com.ss.android.ugc.aweme.feed.model.FeedItemList;
+import com.ss.android.ugc.aweme.follow.presenter.FollowFeedList;
 
 import java.util.Iterator;
 import java.util.List;
@@ -13,22 +14,41 @@ public final class FeedItemsFilter {
             new StoryFilter(),
             new ImageVideoFilter(),
             new ViewCountFilter(),
-            new LikeCountFilter()
+            new LikeCountFilter(),
+            new ShopFilter()
     );
 
     public static void filter(FeedItemList feedItemList) {
-        Iterator<Aweme> feedItemListIterator = feedItemList.items.iterator();
-        while (feedItemListIterator.hasNext()) {
-            Aweme item = feedItemListIterator.next();
-            if (item == null) continue;
+        filterFeedList(feedItemList.items, item -> item);
+    }
 
-            for (IFilter filter : FILTERS) {
-                boolean enabled = filter.getEnabled();
-                if (enabled && filter.getFiltered(item)) {
-                    feedItemListIterator.remove();
-                    break;
-                }
+    public static void filter(FollowFeedList followFeedList) {
+        filterFeedList(followFeedList.mItems, feed -> (feed != null) ? feed.aweme : null);
+    }
+
+    private static <T> void filterFeedList(List<T> list, AwemeExtractor<T> extractor) {
+        // Could be simplified with removeIf() but requires Android 7.0+ while TikTok supports 4.0+.
+        Iterator<T> iterator = list.iterator();
+        while (iterator.hasNext()) {
+            T container = iterator.next();
+            Aweme item = extractor.extract(container);
+            if (item != null && shouldFilter(item)) {
+                iterator.remove();
             }
         }
     }
-}
+
+    private static boolean shouldFilter(Aweme item) {
+        for (IFilter filter : FILTERS) {
+            if (filter.getEnabled() && filter.getFiltered(item)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @FunctionalInterface
+    interface AwemeExtractor<T> {
+        Aweme extract(T source);
+    }
+}

extensions/tiktok/src/main/java/app/revanced/extension/tiktok/feedfilter/ShopFilter.java

@@ -0,0 +1,17 @@
+package app.revanced.extension.tiktok.feedfilter;
+
+import app.revanced.extension.tiktok.settings.Settings;
+import com.ss.android.ugc.aweme.feed.model.Aweme;
+
+public class ShopFilter implements IFilter {
+    private static final String SHOP_INFO = "placeholder_product_id";
+    @Override
+    public boolean getEnabled() {
+        return Settings.HIDE_SHOP.get();
+    }
+
+    @Override
+    public boolean getFiltered(Aweme item) {
+        return item.getShareUrl().contains(SHOP_INFO);
+    }
+}

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

@@ -11,6 +11,7 @@ import app.revanced.extension.shared.settings.StringSetting;
 public class Settings extends BaseSettings {
     public static final BooleanSetting REMOVE_ADS = new BooleanSetting("remove_ads", TRUE, true);
     public static final BooleanSetting HIDE_LIVE = new BooleanSetting("hide_live", FALSE, true);
+    public static final BooleanSetting HIDE_SHOP = new BooleanSetting("hide_shop", FALSE, true);
     public static final BooleanSetting HIDE_STORY = new BooleanSetting("hide_story", FALSE, true);
     public static final BooleanSetting HIDE_IMAGE = new BooleanSetting("hide_image", FALSE, true);
     public static final StringSetting MIN_MAX_VIEWS = new StringSetting("min_max_views", "0-" + Long.MAX_VALUE, true);

extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/FeedFilterPreferenceCategory.java

@@ -26,6 +26,11 @@ public class FeedFilterPreferenceCategory extends ConditionalPreferenceCategory
                 "Remove feed ads", "Remove ads from feed.",
                 Settings.REMOVE_ADS
         ));
+        addPreference(new TogglePreference(
+                context,
+                "Hide TikTok Shop", "Hide TikTok shop from feed.",
+                Settings.HIDE_SHOP
+        ));
         addPreference(new TogglePreference(
                 context,
                 "Hide livestreams", "Hide livestreams from feed.",

extensions/tiktok/stub/src/main/java/com/ss/android/ugc/aweme/feed/model/Aweme.java

@@ -33,4 +33,8 @@ public class Aweme {
     public AwemeStatistics getStatistics() {
         throw new UnsupportedOperationException("Stub");
     }
+
+    public String getShareUrl() {
+        throw new UnsupportedOperationException("Stub");
+    }
 }

extensions/tiktok/stub/src/main/java/com/ss/android/ugc/aweme/follow/presenter/FollowFeed.java

@@ -0,0 +1,8 @@
+package com.ss.android.ugc.aweme.follow.presenter;
+
+import com.ss.android.ugc.aweme.feed.model.Aweme;
+
+//Dummy class
+public class FollowFeed {
+    public Aweme aweme;
+}

extensions/tiktok/stub/src/main/java/com/ss/android/ugc/aweme/follow/presenter/FollowFeedList.java

@@ -0,0 +1,8 @@
+package com.ss.android.ugc.aweme.follow.presenter;
+
+import java.util.List;
+
+//Dummy class
+public class FollowFeedList {
+    public List<FollowFeed> mItems;
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/ThemeHelper.java

@@ -1,8 +1,18 @@
 package app.revanced.extension.youtube;
 
-import android.app.Activity;
-import android.graphics.Color;
+import static app.revanced.extension.shared.Utils.clamp;
 
+import android.app.Activity;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.os.Build;
+import android.text.style.ReplacementSpan;
+import android.text.TextPaint;
+import android.view.Window;
+
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import app.revanced.extension.shared.Logger;
@@ -102,4 +112,60 @@ public class ThemeHelper {
 
         return Utils.getColorFromString(colorName);
     }
+
+    /**
+     * Sets the system navigation bar color for the activity.
+     * Applies the background color obtained from {@link #getBackgroundColor()} to the navigation bar.
+     * For Android 10 (API 29) and above, enforces navigation bar contrast to ensure visibility.
+     */
+    public static void setNavigationBarColor(@Nullable Window window) {
+        if (window == null) {
+            Logger.printDebug(() -> "Cannot set navigation bar color, window is null");
+            return;
+        }
+
+        window.setNavigationBarColor(getBackgroundColor());
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            window.setNavigationBarContrastEnforced(true);
+        }
+    }
+
+    /**
+     * Adjusts the brightness of a color by lightening or darkening it based on the given factor.
+     * <p>
+     * If the factor is greater than 1, the color is lightened by interpolating toward white (#FFFFFF).
+     * If the factor is less than or equal to 1, the color is darkened by scaling its RGB components toward black (#000000).
+     * The alpha channel remains unchanged.
+     *
+     * @param color  The input color to adjust, in ARGB format.
+     * @param factor The adjustment factor. Use values > 1.0f to lighten (e.g., 1.11f for slight lightening)
+     *               or values <= 1.0f to darken (e.g., 0.95f for slight darkening).
+     * @return The adjusted color in ARGB format.
+     */
+    public static int adjustColorBrightness(int color, float factor) {
+        final int alpha = Color.alpha(color);
+        int red = Color.red(color);
+        int green = Color.green(color);
+        int blue = Color.blue(color);
+
+        if (factor > 1.0f) {
+            // Lighten: Interpolate toward white (255)
+            final float t = 1.0f - (1.0f / factor); // Interpolation parameter
+            red = Math.round(red + (255 - red) * t);
+            green = Math.round(green + (255 - green) * t);
+            blue = Math.round(blue + (255 - blue) * t);
+        } else {
+            // Darken or no change: Scale toward black
+            red = (int) (red * factor);
+            green = (int) (green * factor);
+            blue = (int) (blue * factor);
+        }
+
+        // Ensure values are within [0, 255]
+        red = clamp(red, 0, 255);
+        green = clamp(green, 0, 255);
+        blue = clamp(blue, 0, 255);
+
+        return Color.argb(alpha, red, green, blue);
+    }
 }

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

@@ -0,0 +1,28 @@
+package app.revanced.extension.youtube.patches;
+
+import static app.revanced.extension.shared.StringRef.sf;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+
+@SuppressWarnings("unused")
+public class AccountCredentialsInvalidTextPatch {
+
+    /**
+     * Injection point.
+     */
+    public static String getOfflineNetworkErrorString(String original) {
+        try {
+            if (Utils.isNetworkConnected()) {
+                Logger.printDebug(() -> "Network appears to be online, but app is showing offline error");
+                return '\n' + sf("microg_offline_account_login_error").toString();
+            }
+
+            Logger.printDebug(() -> "Network is offline");
+        } catch (Exception ex) {
+            Logger.printException(() -> "getOfflineNetworkErrorString failure", ex);
+        }
+
+        return original;
+    }
+}

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

@@ -9,6 +9,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings("unused")
@@ -81,6 +82,13 @@ public final class ChangeStartPagePatch {
         }
     }
 
+    public static class ChangeStartPageTypeAvailability implements Setting.Availability {
+        @Override
+        public boolean isAvailable() {
+            return Settings.CHANGE_START_PAGE.get() != StartPage.DEFAULT;
+        }
+    }
+
     /**
      * Intent action when YouTube is cold started from the launcher.
      * <p>
@@ -93,6 +101,8 @@ public final class ChangeStartPagePatch {
 
     private static final StartPage START_PAGE = Settings.CHANGE_START_PAGE.get();
 
+    private static final boolean CHANGE_START_PAGE_ALWAYS = Settings.CHANGE_START_PAGE_ALWAYS.get();
+
     /**
      * There is an issue where the back button on the toolbar doesn't work properly.
      * As a workaround for this issue, instead of overriding the browserId multiple times, just override it once.
@@ -104,13 +114,13 @@ public final class ChangeStartPagePatch {
             return original;
         }
 
-        if (appLaunched) {
+        if (!CHANGE_START_PAGE_ALWAYS && appLaunched) {
             Logger.printDebug(() -> "Ignore override browseId as the app already launched");
             return original;
         }
         appLaunched = true;
 
-        Logger.printDebug(() -> "Changing browseId to " + START_PAGE.id);
+        Logger.printDebug(() -> "Changing browseId to: " + START_PAGE.id);
         return START_PAGE.id;
     }
 
@@ -125,14 +135,14 @@ public final class ChangeStartPagePatch {
             return;
         }
 
-        if (appLaunched) {
+        if (!CHANGE_START_PAGE_ALWAYS && appLaunched) {
             Logger.printDebug(() -> "Ignore override intent action as the app already launched");
             return;
         }
         appLaunched = true;
 
         String intentAction = START_PAGE.id;
-        Logger.printDebug(() -> "Changing intent action to " + intentAction);
+        Logger.printDebug(() -> "Changing intent action to: " + intentAction);
         intent.setAction(intentAction);
     }
 }

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

@@ -17,8 +17,7 @@ public class CustomPlayerOverlayOpacityPatch {
 
         if (opacity < 0 || opacity > 100) {
             Utils.showToastLong(str("revanced_player_overlay_opacity_invalid_toast"));
-            Settings.PLAYER_OVERLAY_OPACITY.resetToDefault();
-            opacity = Settings.PLAYER_OVERLAY_OPACITY.defaultValue;
+            opacity = Settings.PLAYER_OVERLAY_OPACITY.resetToDefault();
         }
 
         PLAYER_OVERLAY_OPACITY_LEVEL = (opacity * 255) / 100;

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

@@ -1,20 +1,23 @@
 package app.revanced.extension.youtube.patches;
 
 import app.revanced.extension.youtube.settings.Settings;
-import app.revanced.extension.youtube.shared.ShortsPlayerState;
 
 @SuppressWarnings("unused")
 public class DisableAutoCaptionsPatch {
 
-    /**
-     * Used by injected code. Do not delete.
-     */
-    public static boolean captionsButtonDisabled;
+    private static volatile boolean captionsButtonStatus;
 
-    public static boolean autoCaptionsEnabled() {
-        return Settings.AUTO_CAPTIONS.get()
-                // Do not use auto captions for Shorts.
-                && ShortsPlayerState.isOpen();
+    /**
+     * Injection point.
+     */
+    public static boolean disableAutoCaptions() {
+        return Settings.DISABLE_AUTO_CAPTIONS.get() && !captionsButtonStatus;
     }
 
+    /**
+     * Injection point.
+     */
+    public static void setCaptionsButtonStatus(boolean status) {
+        captionsButtonStatus = status;
+    }
 }

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

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

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

@@ -162,8 +162,7 @@ public final class MiniplayerPatch {
 
         if (opacity < 0 || opacity > 100) {
             Utils.showToastLong(str("revanced_miniplayer_opacity_invalid_toast"));
-            Settings.MINIPLAYER_OPACITY.resetToDefault();
-            opacity = Settings.MINIPLAYER_OPACITY.defaultValue;
+            opacity = Settings.MINIPLAYER_OPACITY.resetToDefault();
         }
 
         OPACITY_LEVEL = (opacity * 255) / 100;

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

@@ -18,7 +18,6 @@ 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.returnyoutubedislike.ReturnYouTubeDislike;
-import app.revanced.extension.youtube.returnyoutubedislike.requests.ReturnYouTubeDislikeApi;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.PlayerType;
 
@@ -69,13 +68,6 @@ public class ReturnYouTubeDislikePatch {
     @Nullable
     private static volatile String lastPrefetchedVideoId;
 
-    public static void onRYDStatusChange(boolean rydEnabled) {
-        ReturnYouTubeDislikeApi.resetRateLimits();
-        // Must remove all values to protect against using stale data
-        // if the user enables RYD while a video is on screen.
-        clearData();
-    }
-
     private static void clearData() {
         currentVideoData = null;
         lastLithoShortsVideoData = null;
@@ -274,7 +266,7 @@ public class ReturnYouTubeDislikePatch {
             Logger.printDebug(() -> "Adding rolling number TextView changes");
             view.setCompoundDrawablePadding(ReturnYouTubeDislike.leftSeparatorShapePaddingPixels);
             ShapeDrawable separator = ReturnYouTubeDislike.getLeftSeparatorDrawable();
-            if (Utils.isRightToLeftTextLayout()) {
+            if (Utils.isRightToLeftLocale()) {
                 view.setCompoundDrawables(null, null, separator, null);
             } else {
                 view.setCompoundDrawables(separator, null, null, null);

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

@@ -2,6 +2,8 @@ package app.revanced.extension.youtube.patches;
 
 import android.app.Activity;
 
+import androidx.annotation.Nullable;
+
 import java.lang.ref.WeakReference;
 import java.util.Objects;
 
@@ -76,7 +78,7 @@ public class ShortsAutoplayPatch {
     /**
      * Injection point.
      */
-    public static Enum<?> changeShortsRepeatBehavior(Enum<?> original) {
+    public static Enum<?> changeShortsRepeatBehavior(@Nullable Enum<?> original) {
         try {
             final boolean autoplay;
 
@@ -98,17 +100,35 @@ public class ShortsAutoplayPatch {
                     : ShortsLoopBehavior.REPEAT;
 
             if (behavior.ytEnumValue != null) {
-                Logger.printDebug(() -> behavior.ytEnumValue == original
-                        ? "Changing Shorts repeat behavior from: " + original.name() + " to: " + behavior.ytEnumValue
-                        : "Behavior setting is same as original. Using original: " + original.name()
-                );
+                Logger.printDebug(() -> {
+                    String name = (original == null ? "unknown (null)" : original.name());
+                    return behavior == original
+                            ? "Behavior setting is same as original. Using original: " + name
+                            : "Changing Shorts repeat behavior from: " + name + " to: " + behavior.name();
+                });
 
                 return behavior.ytEnumValue;
             }
+
+            if (original == null) {
+                // Cannot return null, as null is used to indicate Short was auto played.
+                // Unpatched app replaces null with unknown enum type (appears to fix for bad api data).
+                Enum<?> unknown = ShortsLoopBehavior.UNKNOWN.ytEnumValue;
+                Logger.printDebug(() -> "Original is null, returning: " + unknown.name());
+                return unknown;
+            }
         } catch (Exception ex) {
-            Logger.printException(() -> "changeShortsRepeatState failure", ex);
+            Logger.printException(() -> "changeShortsRepeatBehavior failure", ex);
         }
 
         return original;
     }
+
+
+    /**
+     * Injection point.
+     */
+    public static boolean isAutoPlay(Enum<?> original) {
+        return ShortsLoopBehavior.SINGLE_PLAY.ytEnumValue == original;
+    }
 }

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

@@ -1,11 +1,48 @@
 package app.revanced.extension.youtube.patches;
 
+import android.content.res.Resources;
+import android.util.TypedValue;
+import android.view.View;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
 import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings("unused")
 public final class WideSearchbarPatch {
 
+    private static final Boolean WIDE_SEARCHBAR_ENABLED = Settings.WIDE_SEARCHBAR.get();
+
+    /**
+     * Injection point.
+     */
     public static boolean enableWideSearchbar(boolean original) {
-        return Settings.WIDE_SEARCHBAR.get() || original;
+        return WIDE_SEARCHBAR_ENABLED || original;
+    }
+
+    /**
+     * Injection point.
+     */
+    public static void setActionBar(View view) {
+        try {
+            if (!WIDE_SEARCHBAR_ENABLED) return;
+
+            View searchBarView = Utils.getChildViewByResourceName(view, "search_bar");
+
+            final int paddingLeft = searchBarView.getPaddingLeft();
+            final int paddingRight = searchBarView.getPaddingRight();
+            final int paddingTop = searchBarView.getPaddingTop();
+            final int paddingBottom = searchBarView.getPaddingBottom();
+            final int paddingStart = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
+                    8, Resources.getSystem().getDisplayMetrics());
+
+            if (Utils.isRightToLeftLocale()) {
+                searchBarView.setPadding(paddingLeft, paddingTop, paddingStart, paddingBottom);
+            } else {
+                searchBarView.setPadding(paddingStart, paddingTop, paddingRight, paddingBottom);
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "setActionBar failure", ex);
+        }
     }
 }

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

@@ -31,7 +31,7 @@ final class ButtonsFilter extends Filter {
 
         bufferFilterPathGroup = new StringFilterGroup(
                 null,
-                "|ContainerType|button.eml|"
+                "|ContainerType|button.eml"
         );
 
         addPathCallbacks(
@@ -43,7 +43,7 @@ final class ButtonsFilter extends Filter {
                 ),
                 new StringFilterGroup(
                         Settings.HIDE_DOWNLOAD_BUTTON,
-                        "|download_button.eml|"
+                        "|download_button.eml"
                 ),
                 new StringFilterGroup(
                         Settings.HIDE_PLAYLIST_BUTTON,
@@ -51,7 +51,7 @@ final class ButtonsFilter extends Filter {
                 ),
                 new StringFilterGroup(
                         Settings.HIDE_CLIP_BUTTON,
-                        "|clip_button.eml|"
+                        "|clip_button.eml"
                 )
         );
 
@@ -68,15 +68,19 @@ final class ButtonsFilter extends Filter {
                         Settings.HIDE_REMIX_BUTTON,
                         "yt_outline_youtube_shorts_plus"
                 ),
+                new ByteArrayFilterGroup(
+                        Settings.HIDE_THANKS_BUTTON,
+                        "yt_outline_dollar_sign_heart"
+                ),
+                new ByteArrayFilterGroup(
+                        Settings.HIDE_ASK_BUTTON,
+                        "yt_fill_spark"
+                ),
                 // Check for clip button both here and using a path filter,
                 // as there's a chance the path is a generic action button and won't contain 'clip_button'
                 new ByteArrayFilterGroup(
                         Settings.HIDE_CLIP_BUTTON,
                         "yt_outline_scissors"
-                ),
-                new ByteArrayFilterGroup(
-                        Settings.HIDE_THANKS_BUTTON,
-                        "yt_outline_dollar_sign_heart"
                 )
         );
     }

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

@@ -34,8 +34,6 @@ public final class LayoutComponentsFilter extends Filter {
     private final StringFilterGroup notifyMe;
     private final StringFilterGroup singleItemInformationPanel;
     private final StringFilterGroup expandableMetadata;
-    private final ByteArrayFilterGroup searchResultRecommendations;
-    private final StringFilterGroup searchResultVideo;
     private final StringFilterGroup compactChannelBarInner;
     private final StringFilterGroup compactChannelBarInnerButton;
     private final ByteArrayFilterGroup joinMembershipButton;
@@ -75,7 +73,10 @@ public final class LayoutComponentsFilter extends Filter {
                 "post_base_wrapper_slim.eml",
                 "poll_post_root.eml",
                 "videos_post_root.eml",
-                "post_shelf_slim.eml"
+                "post_shelf_slim.eml",
+                "videos_post_responsive_root.eml",
+                "text_post_responsive_root.eml",
+                "poll_post_responsive_root.eml"
         );
 
         final var communityGuidelines = new StringFilterGroup(
@@ -211,7 +212,7 @@ public final class LayoutComponentsFilter extends Filter {
 
         compactChannelBarInnerButton = new StringFilterGroup(
                 null,
-                "|button.eml|"
+                "|button.eml"
         );
 
         joinMembershipButton = new ByteArrayFilterGroup(
@@ -230,14 +231,9 @@ public final class LayoutComponentsFilter extends Filter {
                 "mixed_content_shelf"
         );
 
-        searchResultVideo = new StringFilterGroup(
-                Settings.HIDE_SEARCH_RESULT_RECOMMENDATIONS,
-                "search_video_with_context.eml"
-        );
-
-        searchResultRecommendations = new ByteArrayFilterGroup(
-                Settings.HIDE_SEARCH_RESULT_RECOMMENDATIONS,
-                "endorsement_header_footer"
+        final var searchResultRecommendationLabels = new StringFilterGroup(
+                Settings.HIDE_SEARCH_RESULT_RECOMMENDATION_LABELS,
+                "endorsement_header_footer.eml"
         );
 
         horizontalShelves = new StringFilterGroup(
@@ -255,7 +251,7 @@ public final class LayoutComponentsFilter extends Filter {
                 compactChannelBar,
                 communityPosts,
                 paidPromotion,
-                searchResultVideo,
+                searchResultRecommendationLabels,
                 latestPosts,
                 channelWatermark,
                 communityGuidelines,
@@ -297,13 +293,6 @@ public final class LayoutComponentsFilter extends Filter {
             return false;
         }
 
-        if (matchedGroup == searchResultVideo) {
-            if (searchResultRecommendations.check(protobufBufferArray).isFiltered()) {
-                return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-            }
-            return false;
-        }
-
         // The groups are excluded from the filter due to the exceptions list below.
         // Filter them separately here.
         if (matchedGroup == notifyMe || matchedGroup == inFeedSurvey || matchedGroup == expandableMetadata)

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

@@ -87,6 +87,10 @@ public final class LithoFilterPatch {
      * the buffer is saved to a ThreadLocal so each calling thread does not interfere with other threads.
      */
     private static final ThreadLocal<ByteBuffer> bufferThreadLocal = new ThreadLocal<>();
+    /**
+     * Results of calling {@link #filter(String, StringBuilder)}.
+     */
+    private static final ThreadLocal<Boolean> filterResult = new ThreadLocal<>();
 
     static {
         for (Filter filter : filters) {
@@ -140,11 +144,22 @@ public final class LithoFilterPatch {
         }
     }
 
+    /**
+     * Injection point.
+     */
+    public static boolean shouldFilter() {
+        Boolean shouldFilter = filterResult.get();
+        return shouldFilter != null && shouldFilter;
+    }
+
     /**
      * Injection point.  Called off the main thread, and commonly called by multiple threads at the same time.
      */
-    @SuppressWarnings("unused")
-    public static boolean filter(@Nullable String lithoIdentifier, @NonNull StringBuilder pathBuilder) {
+    public static void filter(@Nullable String lithoIdentifier, StringBuilder pathBuilder) {
+        filterResult.set(handleFiltering(lithoIdentifier, pathBuilder));
+    }
+
+    private static boolean handleFiltering(@Nullable String lithoIdentifier, StringBuilder pathBuilder) {
         try {
             if (pathBuilder.length() == 0) {
                 return false;

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

@@ -40,7 +40,7 @@ public class PlayerFlyoutMenuItemsFilter extends Filter {
 
         addPathCallbacks(
                 videoQualityMenuFooter,
-                new StringFilterGroup(null, "overflow_menu_item.eml|")
+                new StringFilterGroup(null, "overflow_menu_item.eml")
         );
 
         flyoutFilterGroupList.addAll(

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

@@ -1,6 +1,5 @@
 package app.revanced.extension.youtube.patches.components;
 
-import static app.revanced.extension.shared.Utils.hideViewUnderCondition;
 import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButton;
 
 import android.view.View;
@@ -52,6 +51,7 @@ public final class ShortsFilter extends Filter {
     private final StringFilterGroup suggestedAction;
     private final ByteArrayFilterGroupList suggestedActionsGroupList = new ByteArrayFilterGroupList();
 
+    private final StringFilterGroup shortsActionBar;
     private final StringFilterGroup actionButton;
     private final ByteArrayFilterGroupList videoActionButtonGroupList = new ByteArrayFilterGroupList();
 
@@ -141,6 +141,16 @@ public final class ShortsFilter extends Filter {
                 "like_fountain.eml"
         );
 
+        StringFilterGroup likeButton = new StringFilterGroup(
+                Settings.HIDE_SHORTS_LIKE_BUTTON,
+                "shorts_like_button.eml"
+        );
+
+        StringFilterGroup dislikeButton = new StringFilterGroup(
+                Settings.HIDE_SHORTS_DISLIKE_BUTTON,
+                "shorts_dislike_button.eml"
+        );
+
         joinButton = new StringFilterGroup(
                 Settings.HIDE_SHORTS_JOIN_BUTTON,
                 "sponsor_button"
@@ -156,9 +166,15 @@ public final class ShortsFilter extends Filter {
                 "reel_player_disclosure.eml"
         );
 
+        shortsActionBar = new StringFilterGroup(
+                null,
+                "shorts_action_bar.eml"
+        );
+
         actionButton = new StringFilterGroup(
                 null,
-                "shorts_video_action_button.eml"
+                // Can be simply 'button.eml' or 'shorts_video_action_button.eml'
+                "button.eml"
         );
 
         suggestedAction = new StringFilterGroup(
@@ -167,27 +183,16 @@ public final class ShortsFilter extends Filter {
         );
 
         addPathCallbacks(
-                shortsCompactFeedVideoPath, suggestedAction, actionButton, joinButton, subscribeButton,
-                paidPromotionButton, pausedOverlayButtons, channelBar, fullVideoLinkLabel, videoTitle,
-                reelSoundMetadata, soundButton, infoPanel, stickers, likeFountain
+                shortsCompactFeedVideoPath, joinButton, subscribeButton, paidPromotionButton,
+                shortsActionBar, suggestedAction, pausedOverlayButtons, channelBar,
+                fullVideoLinkLabel, videoTitle, reelSoundMetadata, soundButton, infoPanel,
+                stickers, likeFountain, likeButton, dislikeButton
         );
 
         //
-        // Action buttons
+        // All other action buttons.
         //
         videoActionButtonGroupList.addAll(
-                // This also appears as the path item 'shorts_like_button.eml'
-                new ByteArrayFilterGroup(
-                        Settings.HIDE_SHORTS_LIKE_BUTTON,
-                        "reel_like_button",
-                        "reel_like_toggled_button"
-                ),
-                // This also appears as the path item 'shorts_dislike_button.eml'
-                new ByteArrayFilterGroup(
-                        Settings.HIDE_SHORTS_DISLIKE_BUTTON,
-                        "reel_dislike_button",
-                        "reel_dislike_toggled_button"
-                ),
                 new ByteArrayFilterGroup(
                         Settings.HIDE_SHORTS_COMMENTS_BUTTON,
                         "reel_comment_button"
@@ -286,9 +291,11 @@ public final class ShortsFilter extends Filter {
                 return false;
             }
 
-            // Video action buttons (like, dislike, comment, share, remix) have the same path.
-            if (matchedGroup == actionButton) {
-                if (videoActionButtonGroupList.check(protobufBufferArray).isFiltered()) {
+            // Video action buttons (comment, share, remix) have the same path.
+            // Like and dislike are separate path filters and don't require buffer searching.
+            if (matchedGroup == shortsActionBar) {
+                if (actionButton.check(path).isFiltered()
+                        && videoActionButtonGroupList.check(protobufBufferArray).isFiltered()) {
                     return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
                 }
                 return false;
@@ -392,37 +399,6 @@ public final class ShortsFilter extends Filter {
         return original;
     }
 
-    // region Hide the buttons in older versions of YouTube. New versions use Litho.
-
-    public static void hideLikeButton(final View likeButtonView) {
-        // Cannot set the visibility to gone for like/dislike,
-        // as some other unknown YT code also sets the visibility after this hook.
-        //
-        // Setting the view to 0dp works, but that leaves a blank space where
-        // the button was (only relevant for dislikes button).
-        //
-        // Instead remove the view from the parent.
-        Utils.hideViewByRemovingFromParentUnderCondition(Settings.HIDE_SHORTS_LIKE_BUTTON, likeButtonView);
-    }
-
-    public static void hideDislikeButton(final View dislikeButtonView) {
-        Utils.hideViewByRemovingFromParentUnderCondition(Settings.HIDE_SHORTS_DISLIKE_BUTTON, dislikeButtonView);
-    }
-
-    public static void hideShortsCommentsButton(final View commentsButtonView) {
-        hideViewUnderCondition(Settings.HIDE_SHORTS_COMMENTS_BUTTON, commentsButtonView);
-    }
-
-    public static void hideShortsRemixButton(final View remixButtonView) {
-        hideViewUnderCondition(Settings.HIDE_SHORTS_REMIX_BUTTON, remixButtonView);
-    }
-
-    public static void hideShortsShareButton(final View shareButtonView) {
-        hideViewUnderCondition(Settings.HIDE_SHORTS_SHARE_BUTTON, shareButtonView);
-    }
-
-    // endregion
-
     public static void setNavigationBar(PivotBar view) {
         pivotBarRef = new WeakReference<>(view);
     }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java

@@ -1,16 +1,12 @@
 package app.revanced.extension.youtube.patches.playback.speed;
 
-import static app.revanced.extension.shared.StringRef.sf;
 import static app.revanced.extension.shared.StringRef.str;
 
-import android.preference.ListPreference;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
 
-import androidx.annotation.NonNull;
-
 import java.util.Arrays;
 
 import app.revanced.extension.shared.Logger;
@@ -21,8 +17,6 @@ import app.revanced.extension.youtube.settings.Settings;
 @SuppressWarnings("unused")
 public class CustomPlaybackSpeedPatch {
 
-    private static final float PLAYBACK_SPEED_AUTO = Settings.PLAYBACK_SPEED_DEFAULT.defaultValue;
-
     /**
      * Maximum playback speed, exclusive value.  Custom speeds must be less than this value.
      * <p>
@@ -47,19 +41,14 @@ public class CustomPlaybackSpeedPatch {
      */
     private static long lastTimeOldPlaybackMenuInvoked;
 
-    /**
-     * PreferenceList entries and values, of all available playback speeds.
-     */
-    private static String[] preferenceListEntries, preferenceListEntryValues;
-
     static {
         final float holdSpeed = Settings.SPEED_TAP_AND_HOLD.get();
+
         if (holdSpeed > 0 && holdSpeed <= PLAYBACK_SPEED_MAXIMUM) {
             TAP_AND_HOLD_SPEED = holdSpeed;
         } else {
             showInvalidCustomSpeedToast();
-            Settings.SPEED_TAP_AND_HOLD.resetToDefault();
-            TAP_AND_HOLD_SPEED = Settings.SPEED_TAP_AND_HOLD.get();
+            TAP_AND_HOLD_SPEED = Settings.SPEED_TAP_AND_HOLD.resetToDefault();
         }
 
         loadCustomSpeeds();
@@ -117,33 +106,6 @@ public class CustomPlaybackSpeedPatch {
         return false;
     }
 
-    /**
-     * Initialize a settings preference list with the available playback speeds.
-     */
-    @SuppressWarnings("deprecation")
-    public static void initializeListPreference(ListPreference preference) {
-        if (preferenceListEntries == null) {
-            final int numberOfEntries = customPlaybackSpeeds.length + 1;
-            preferenceListEntries = new String[numberOfEntries];
-            preferenceListEntryValues = new String[numberOfEntries];
-
-            // Auto speed (same behavior as unpatched).
-            preferenceListEntries[0] = sf("revanced_custom_playback_speeds_auto").toString();
-            preferenceListEntryValues[0] = String.valueOf(PLAYBACK_SPEED_AUTO);
-
-            int i = 1;
-            for (float speed : customPlaybackSpeeds) {
-                String speedString = String.valueOf(speed);
-                preferenceListEntries[i] = speedString + "x";
-                preferenceListEntryValues[i] = speedString;
-                i++;
-            }
-        }
-
-        preference.setEntries(preferenceListEntries);
-        preference.setEntryValues(preferenceListEntryValues);
-    }
-
     /**
      * Injection point.
      */

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/theme/SeekbarColorPatch.java

@@ -1,6 +1,7 @@
 package app.revanced.extension.youtube.patches.theme;
 
 import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.shared.Utils.clamp;
 
 import android.content.res.Resources;
 import android.graphics.Color;
@@ -378,14 +379,4 @@ public final class SeekbarColorPatch {
             return originalColor;
         }
     }
-
-    /** @noinspection SameParameterValue */
-    private static int clamp(int value, int lower, int upper) {
-        return Math.max(lower, Math.min(value, upper));
-    }
-
-    /** @noinspection SameParameterValue */
-    private static float clamp(float value, float lower, float upper) {
-        return Math.max(lower, Math.min(value, upper));
-    }
 }

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

@@ -235,7 +235,7 @@ public class ReturnYouTubeDislike {
         final boolean compactLayout = Settings.RYD_COMPACT_LAYOUT.get();
 
         if (!compactLayout) {
-            String leftSeparatorString = getTextDirectionString();
+            String leftSeparatorString = Utils.getTextDirectionString();
             final Spannable leftSeparatorSpan;
             if (isRollingNumber) {
                 leftSeparatorSpan = new SpannableString(leftSeparatorString);
@@ -279,12 +279,6 @@ public class ReturnYouTubeDislike {
         return new SpannableString(builder);
     }
 
-    private static @NonNull String getTextDirectionString() {
-        return Utils.isRightToLeftTextLayout()
-                ? "\u200F"  // u200F = right to left character
-                : "\u200E"; // u200E = left to right character
-    }
-
     /**
      * @return If the text is likely for a previously created likes/dislikes segmented span.
      */

extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ui/ReturnYouTubeDislikeAboutPreference.java

@@ -0,0 +1,29 @@
+package app.revanced.extension.youtube.returnyoutubedislike.ui;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import app.revanced.extension.youtube.settings.preference.UrlLinkPreference;
+
+/**
+ * Allows tapping the RYD about preference to open the website.
+ */
+@SuppressWarnings("unused")
+public class ReturnYouTubeDislikeAboutPreference extends UrlLinkPreference {
+    {
+        externalUrl = "https://returnyoutubedislike.com";
+    }
+
+    public ReturnYouTubeDislikeAboutPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+    public ReturnYouTubeDislikeAboutPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+    public ReturnYouTubeDislikeAboutPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+    public ReturnYouTubeDislikeAboutPreference(Context context) {
+        super(context);
+    }
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ui/ReturnYouTubeDislikeDebugStatsPreferenceCategory.java

@@ -0,0 +1,126 @@
+package app.revanced.extension.youtube.returnyoutubedislike.ui;
+
+import static app.revanced.extension.shared.StringRef.str;
+
+import android.content.Context;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.youtube.returnyoutubedislike.requests.ReturnYouTubeDislikeApi;
+
+@SuppressWarnings({"unused", "deprecation"})
+public class ReturnYouTubeDislikeDebugStatsPreferenceCategory extends PreferenceCategory {
+
+    private static final boolean SHOW_RYD_DEBUG_STATS = BaseSettings.DEBUG.get();
+
+    private static String createSummaryText(int value, String summaryStringZeroKey, String summaryStringOneOrMoreKey) {
+        if (value == 0) {
+            return str(summaryStringZeroKey);
+        }
+        return str(summaryStringOneOrMoreKey, value);
+    }
+
+    private static String createMillisecondStringFromNumber(long number) {
+        return String.format(str("revanced_ryd_statistics_millisecond_text"), number);
+    }
+
+    public ReturnYouTubeDislikeDebugStatsPreferenceCategory(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ReturnYouTubeDislikeDebugStatsPreferenceCategory(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public ReturnYouTubeDislikeDebugStatsPreferenceCategory(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    @Override
+    protected View onCreateView(ViewGroup parent) {
+        if (!SHOW_RYD_DEBUG_STATS) {
+            // Use an empty view to hide without removing.
+            return new View(getContext());
+        }
+
+        return super.onCreateView(parent);
+    }
+
+    protected void onAttachedToActivity() {
+        try {
+            super.onAttachedToActivity();
+            if (!SHOW_RYD_DEBUG_STATS) {
+                return;
+            }
+
+            Logger.printDebug(() -> "Updating stats preferences");
+            removeAll();
+
+            addStatisticPreference(
+                    "revanced_ryd_statistics_getFetchCallResponseTimeAverage_title",
+                    createMillisecondStringFromNumber(ReturnYouTubeDislikeApi.getFetchCallResponseTimeAverage())
+            );
+
+            addStatisticPreference(
+                    "revanced_ryd_statistics_getFetchCallResponseTimeMin_title",
+                    createMillisecondStringFromNumber(ReturnYouTubeDislikeApi.getFetchCallResponseTimeMin())
+            );
+
+            addStatisticPreference(
+                    "revanced_ryd_statistics_getFetchCallResponseTimeMax_title",
+                    createMillisecondStringFromNumber(ReturnYouTubeDislikeApi.getFetchCallResponseTimeMax())
+            );
+
+            String fetchCallTimeWaitingLastSummary;
+            final long fetchCallTimeWaitingLast = ReturnYouTubeDislikeApi.getFetchCallResponseTimeLast();
+            if (fetchCallTimeWaitingLast == ReturnYouTubeDislikeApi.FETCH_CALL_RESPONSE_TIME_VALUE_RATE_LIMIT) {
+                fetchCallTimeWaitingLastSummary = str("revanced_ryd_statistics_getFetchCallResponseTimeLast_rate_limit_summary");
+            } else {
+                fetchCallTimeWaitingLastSummary = createMillisecondStringFromNumber(fetchCallTimeWaitingLast);
+            }
+            addStatisticPreference(
+                    "revanced_ryd_statistics_getFetchCallResponseTimeLast_title",
+                    fetchCallTimeWaitingLastSummary
+            );
+
+            addStatisticPreference(
+                    "revanced_ryd_statistics_getFetchCallCount_title",
+                    createSummaryText(ReturnYouTubeDislikeApi.getFetchCallCount(),
+                            "revanced_ryd_statistics_getFetchCallCount_zero_summary",
+                            "revanced_ryd_statistics_getFetchCallCount_non_zero_summary"
+                    )
+            );
+
+            addStatisticPreference(
+                    "revanced_ryd_statistics_getFetchCallNumberOfFailures_title",
+                    createSummaryText(ReturnYouTubeDislikeApi.getFetchCallNumberOfFailures(),
+                            "revanced_ryd_statistics_getFetchCallNumberOfFailures_zero_summary",
+                            "revanced_ryd_statistics_getFetchCallNumberOfFailures_non_zero_summary"
+                    )
+            );
+
+            addStatisticPreference(
+                    "revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_title",
+                    createSummaryText(ReturnYouTubeDislikeApi.getNumberOfRateLimitRequestsEncountered(),
+                            "revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_zero_summary",
+                            "revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_non_zero_summary"
+                    )
+            );
+        } catch (Exception ex) {
+            Logger.printException(() -> "onAttachedToActivity failure", ex);
+        }
+    }
+
+    private void addStatisticPreference(String titleKey, String SummaryText) {
+        Preference statisticPreference = new Preference(getContext());
+        statisticPreference.setSelectable(false);
+        statisticPreference.setTitle(str(titleKey));
+        statisticPreference.setSummary(SummaryText);
+        addPreference(statisticPreference);
+    }
+}

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

@@ -11,8 +11,6 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.Toolbar;
 
-import java.util.Objects;
-
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.AppLanguage;
@@ -21,8 +19,6 @@ import app.revanced.extension.youtube.ThemeHelper;
 import app.revanced.extension.youtube.patches.VersionCheckPatch;
 import app.revanced.extension.youtube.patches.spoof.SpoofAppVersionPatch;
 import app.revanced.extension.youtube.settings.preference.ReVancedPreferenceFragment;
-import app.revanced.extension.youtube.settings.preference.ReturnYouTubeDislikePreferenceFragment;
-import app.revanced.extension.youtube.settings.preference.SponsorBlockPreferenceFragment;
 
 /**
  * Hooks LicenseActivity.
@@ -84,31 +80,19 @@ public class LicenseActivityHook {
     public static void initialize(Activity licenseActivity) {
         try {
             ThemeHelper.setActivityTheme(licenseActivity);
+            ThemeHelper.setNavigationBarColor(licenseActivity.getWindow());
             licenseActivity.setContentView(getResourceIdentifier(
                     "revanced_settings_with_toolbar", "layout"));
 
-            PreferenceFragment fragment;
-            String toolbarTitleResourceName;
-            String dataString = Objects.requireNonNull(licenseActivity.getIntent().getDataString());
-            switch (dataString) {
-                case "revanced_sb_settings_intent":
-                    toolbarTitleResourceName = "revanced_sb_settings_title";
-                    fragment = new SponsorBlockPreferenceFragment();
-                    break;
-                case "revanced_ryd_settings_intent":
-                    toolbarTitleResourceName = "revanced_ryd_settings_title";
-                    fragment = new ReturnYouTubeDislikePreferenceFragment();
-                    break;
-                case "revanced_settings_intent":
-                    toolbarTitleResourceName = "revanced_settings_title";
-                    fragment = new ReVancedPreferenceFragment();
-                    break;
-                default:
-                    Logger.printException(() -> "Unknown setting: " + dataString);
-                    return;
+            // Sanity check.
+            String dataString = licenseActivity.getIntent().getDataString();
+            if (!"revanced_settings_intent".equals(dataString)) {
+                Logger.printException(() -> "Unknown intent: " + dataString);
+                return;
             }
 
-            createToolbar(licenseActivity, toolbarTitleResourceName);
+            PreferenceFragment fragment = new ReVancedPreferenceFragment();
+            createToolbar(licenseActivity, fragment);
 
             //noinspection deprecation
             licenseActivity.getFragmentManager()
@@ -121,20 +105,19 @@ public class LicenseActivityHook {
     }
 
     @SuppressLint("UseCompatLoadingForDrawables")
-    private static void createToolbar(Activity activity, String toolbarTitleResourceName) {
+    private static void createToolbar(Activity activity, PreferenceFragment fragment) {
         // Replace dummy placeholder toolbar.
         // This is required to fix submenu title alignment issue with Android ASOP 15+
         ViewGroup toolBarParent = activity.findViewById(
                 getResourceIdentifier("revanced_toolbar_parent", "id"));
-        ViewGroup dummyToolbar = Utils.getChildViewByResourceName(toolBarParent,"revanced_toolbar");
+        ViewGroup dummyToolbar = Utils.getChildViewByResourceName(toolBarParent, "revanced_toolbar");
         toolbarLayoutParams = dummyToolbar.getLayoutParams();
         toolBarParent.removeView(dummyToolbar);
 
         Toolbar toolbar = new Toolbar(toolBarParent.getContext());
         toolbar.setBackgroundColor(ThemeHelper.getToolbarBackgroundColor());
         toolbar.setNavigationIcon(ReVancedPreferenceFragment.getBackButtonDrawable());
-        toolbar.setNavigationOnClickListener(view -> activity.onBackPressed());
-        toolbar.setTitle(getResourceIdentifier(toolbarTitleResourceName, "string"));
+        toolbar.setTitle(getResourceIdentifier("revanced_settings_title", "string"));
 
         final int margin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16,
                 Utils.getContext().getResources().getDisplayMetrics());
@@ -147,7 +130,11 @@ public class LicenseActivityHook {
         }
         setToolbarLayoutParams(toolbar);
 
+        // Add Search Icon and EditText for ReVancedPreferenceFragment only.
+        if (fragment instanceof ReVancedPreferenceFragment) {
+            SearchViewController.addSearchViewComponents(activity, toolbar, (ReVancedPreferenceFragment) fragment);
+        }
+
         toolBarParent.addView(toolbar, 0);
     }
-
 }

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

@@ -0,0 +1,381 @@
+package app.revanced.extension.youtube.settings;
+
+import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.shared.Utils.getResourceIdentifier;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.graphics.drawable.GradientDrawable;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.SearchView;
+import android.widget.TextView;
+import android.widget.Toolbar;
+
+import androidx.annotation.NonNull;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Deque;
+import java.util.LinkedList;
+import java.util.List;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.AppLanguage;
+import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.shared.settings.StringSetting;
+import app.revanced.extension.youtube.ThemeHelper;
+import app.revanced.extension.youtube.settings.preference.ReVancedPreferenceFragment;
+
+/**
+ * Controller for managing the search view in ReVanced settings.
+ */
+@SuppressWarnings({"deprecated", "DiscouragedApi"})
+public class SearchViewController {
+    private static final int MAX_HISTORY_SIZE = 5;
+
+    private final SearchView searchView;
+    private final FrameLayout searchContainer;
+    private final Toolbar toolbar;
+    private final Activity activity;
+    private boolean isSearchActive;
+    private final CharSequence originalTitle;
+    private final Deque<String> searchHistory;
+    private final AutoCompleteTextView autoCompleteTextView;
+    private final boolean showSettingsSearchHistory;
+
+    /**
+     * Creates a background drawable for the SearchView with rounded corners.
+     */
+    private static GradientDrawable createBackgroundDrawable(Context context) {
+        GradientDrawable background = new GradientDrawable();
+        background.setShape(GradientDrawable.RECTANGLE);
+        background.setCornerRadius(28 * context.getResources().getDisplayMetrics().density); // 28dp corner radius.
+        int baseColor = ThemeHelper.getBackgroundColor();
+        int adjustedColor = ThemeHelper.isDarkTheme()
+                ? ThemeHelper.adjustColorBrightness(baseColor, 1.11f)  // Lighten for dark theme.
+                : ThemeHelper.adjustColorBrightness(baseColor, 0.95f); // Darken for light theme.
+        background.setColor(adjustedColor);
+        return background;
+    }
+
+    /**
+     * Creates a background drawable for suggestion items with rounded corners.
+     */
+    private static GradientDrawable createSuggestionBackgroundDrawable(Context context) {
+        GradientDrawable background = new GradientDrawable();
+        background.setShape(GradientDrawable.RECTANGLE);
+        background.setCornerRadius(8 * context.getResources().getDisplayMetrics().density); // 8dp corner radius.
+        return background;
+    }
+
+    /**
+     * Adds search view components to the activity.
+     */
+    public static void addSearchViewComponents(Activity activity, Toolbar toolbar, ReVancedPreferenceFragment fragment) {
+        new SearchViewController(activity, toolbar, fragment);
+    }
+
+    private SearchViewController(Activity activity, Toolbar toolbar, ReVancedPreferenceFragment fragment) {
+        this.activity = activity;
+        this.toolbar = toolbar;
+        this.originalTitle = toolbar.getTitle();
+        this.showSettingsSearchHistory = Settings.SETTINGS_SEARCH_HISTORY.get();
+        this.searchHistory = new LinkedList<>();
+        StringSetting searchEntries = Settings.SETTINGS_SEARCH_ENTRIES;
+        if (showSettingsSearchHistory) {
+            String entries = searchEntries.get();
+            if (!entries.isBlank()) {
+                searchHistory.addAll(Arrays.asList(entries.split("\n")));
+            }
+        } else {
+            // Clear old saved history if the user turns off the feature.
+            searchEntries.resetToDefault();
+        }
+
+        // Retrieve SearchView and container from XML.
+        searchView = activity.findViewById(getResourceIdentifier(
+                "revanced_search_view", "id"));
+        searchContainer = activity.findViewById(getResourceIdentifier(
+                "revanced_search_view_container", "id"));
+
+        // Initialize AutoCompleteTextView.
+        autoCompleteTextView = searchView.findViewById(
+                searchView.getContext().getResources().getIdentifier(
+                        "android:id/search_src_text", null, null));
+
+        // Set background and query hint.
+        searchView.setBackground(createBackgroundDrawable(toolbar.getContext()));
+        searchView.setQueryHint(str("revanced_settings_search_hint"));
+
+        // Configure RTL support based on app language.
+        AppLanguage appLanguage = BaseSettings.REVANCED_LANGUAGE.get();
+        if (Utils.isRightToLeftLocale(appLanguage.getLocale())) {
+            searchView.setTextDirection(View.TEXT_DIRECTION_RTL);
+            searchView.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_END);
+        }
+
+        // Set up search history suggestions.
+        if (showSettingsSearchHistory) {
+            setupSearchHistory();
+        }
+
+        // Set up query text listener.
+        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                try {
+                    String queryTrimmed = query.trim();
+                    if (!queryTrimmed.isEmpty()) {
+                        saveSearchQuery(queryTrimmed);
+                    }
+                    // Hide suggestions on submit.
+                    if (showSettingsSearchHistory && autoCompleteTextView != null) {
+                        autoCompleteTextView.dismissDropDown();
+                    }
+                } catch (Exception ex) {
+                    Logger.printException(() -> "onQueryTextSubmit failure", ex);
+                }
+                return false;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                try {
+                    Logger.printDebug(() -> "Search query: " + newText);
+                    fragment.filterPreferences(newText);
+                    // Prevent suggestions from showing during text input.
+                    if (showSettingsSearchHistory && autoCompleteTextView != null) {
+                        if (!newText.isEmpty()) {
+                            autoCompleteTextView.dismissDropDown();
+                            autoCompleteTextView.setThreshold(Integer.MAX_VALUE); // Disable autocomplete suggestions.
+                        } else {
+                            autoCompleteTextView.setThreshold(1); // Re-enable for empty input.
+                        }
+                    }
+                } catch (Exception ex) {
+                    Logger.printException(() -> "onQueryTextChange failure", ex);
+                }
+                return true;
+            }
+        });
+
+        // Set menu and search icon.
+        final int actionSearchId = getResourceIdentifier("action_search", "id");
+        toolbar.inflateMenu(getResourceIdentifier("revanced_search_menu", "menu"));
+        MenuItem searchItem = toolbar.getMenu().findItem(actionSearchId);
+        searchItem.setIcon(getResourceIdentifier(ThemeHelper.isDarkTheme()
+                                ? "yt_outline_search_white_24"
+                                : "yt_outline_search_black_24",
+                        "drawable")).setTooltipText(null);
+
+        // Set menu item click listener.
+        toolbar.setOnMenuItemClickListener(item -> {
+            try {
+                if (item.getItemId() == actionSearchId) {
+                    if (!isSearchActive) {
+                        openSearch();
+                    }
+                    return true;
+                }
+            } catch (Exception ex) {
+                Logger.printException(() -> "menu click failure", ex);
+            }
+            return false;
+        });
+
+        // Set navigation click listener.
+        toolbar.setNavigationOnClickListener(view -> {
+            try {
+                if (isSearchActive) {
+                    closeSearch();
+                } else {
+                    activity.onBackPressed();
+                }
+            } catch (Exception ex) {
+                Logger.printException(() -> "navigation click failure", ex);
+            }
+        });
+    }
+
+    /**
+     * Sets up the search history suggestions for the SearchView with custom adapter.
+     */
+    private void setupSearchHistory() {
+        if (autoCompleteTextView != null) {
+            SearchHistoryAdapter adapter = new SearchHistoryAdapter(activity, new ArrayList<>(searchHistory));
+            autoCompleteTextView.setAdapter(adapter);
+            autoCompleteTextView.setThreshold(1); // Initial threshold for empty input.
+            autoCompleteTextView.setLongClickable(true);
+
+            // Show suggestions only when search bar is active and query is empty.
+            autoCompleteTextView.setOnFocusChangeListener((v, hasFocus) -> {
+                if (hasFocus && isSearchActive && autoCompleteTextView.getText().length() == 0) {
+                    autoCompleteTextView.showDropDown();
+                }
+            });
+        }
+    }
+
+    /**
+     * Saves a search query to the search history.
+     * @param query The search query to save.
+     */
+    private void saveSearchQuery(String query) {
+        if (!showSettingsSearchHistory) {
+            return;
+        }
+        searchHistory.remove(query); // Remove if already exists to update position.
+        searchHistory.addFirst(query); // Add to the most recent.
+
+        // Remove extra old entries.
+        while (searchHistory.size() > MAX_HISTORY_SIZE) {
+            String last = searchHistory.removeLast();
+            Logger.printDebug(() -> "Removing search history query: " + last);
+        }
+
+        saveSearchHistory();
+
+        updateSearchHistoryAdapter();
+    }
+
+    /**
+     * Removes a search query from the search history.
+     * @param query The search query to remove.
+     */
+    private void removeSearchQuery(String query) {
+        searchHistory.remove(query);
+
+        saveSearchHistory();
+
+        updateSearchHistoryAdapter();
+    }
+
+    /**
+     * Save the search history to the shared preferences.
+     */
+    private void saveSearchHistory() {
+        Logger.printDebug(() -> "Saving search history: " + searchHistory);
+
+        Settings.SETTINGS_SEARCH_ENTRIES.save(
+                String.join("\n", searchHistory)
+        );
+    }
+
+    /**
+     * Updates the search history adapter with the latest history.
+     */
+    private void updateSearchHistoryAdapter() {
+        if (autoCompleteTextView == null) {
+            return;
+        }
+
+        SearchHistoryAdapter adapter = (SearchHistoryAdapter) autoCompleteTextView.getAdapter();
+        if (adapter != null) {
+            adapter.clear();
+            adapter.addAll(searchHistory);
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    /**
+     * Opens the search view and shows the keyboard.
+     */
+    private void openSearch() {
+        isSearchActive = true;
+        toolbar.getMenu().findItem(getResourceIdentifier(
+                "action_search", "id")).setVisible(false);
+        toolbar.setTitle("");
+        searchContainer.setVisibility(View.VISIBLE);
+        searchView.requestFocus();
+
+        // Show keyboard.
+        InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.showSoftInput(searchView, InputMethodManager.SHOW_IMPLICIT);
+
+        // Show suggestions with a slight delay.
+        if (showSettingsSearchHistory && autoCompleteTextView != null && autoCompleteTextView.getText().length() == 0) {
+            searchView.postDelayed(() -> {
+                if (isSearchActive && autoCompleteTextView.getText().length() == 0) {
+                    autoCompleteTextView.showDropDown();
+                }
+            }, 100); // 100ms delay to ensure focus is stable.
+        }
+    }
+
+    /**
+     * Closes the search view and hides the keyboard.
+     */
+    private void closeSearch() {
+        isSearchActive = false;
+        toolbar.getMenu().findItem(getResourceIdentifier(
+                        "action_search", "id"))
+                .setIcon(getResourceIdentifier(ThemeHelper.isDarkTheme()
+                                ? "yt_outline_search_white_24"
+                                : "yt_outline_search_black_24",
+                        "drawable")
+                ).setVisible(true);
+        toolbar.setTitle(originalTitle);
+        searchContainer.setVisibility(View.GONE);
+        searchView.setQuery("", false);
+
+        // Hide keyboard.
+        InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(searchView.getWindowToken(), 0);
+    }
+
+    /**
+     * Custom ArrayAdapter for search history.
+     */
+    private class SearchHistoryAdapter extends ArrayAdapter<String> {
+        public SearchHistoryAdapter(Context context, List<String> history) {
+            super(context, 0, history);
+        }
+
+        @NonNull
+        @Override
+        public View getView(int position, View convertView, @NonNull android.view.ViewGroup parent) {
+            if (convertView == null) {
+                convertView = LinearLayout.inflate(getContext(), getResourceIdentifier(
+                        "revanced_search_suggestion_item", "layout"), null);
+            }
+
+            // Apply rounded corners programmatically.
+            convertView.setBackground(createSuggestionBackgroundDrawable(getContext()));
+            String query = getItem(position);
+
+            // Set query text.
+            TextView textView = convertView.findViewById(getResourceIdentifier(
+                    "suggestion_text", "id"));
+            if (textView != null) {
+                textView.setText(query);
+            }
+
+            // Set click listener for inserting query into SearchView.
+            convertView.setOnClickListener(v -> {
+                searchView.setQuery(query, true); // Insert selected query and submit.
+            });
+
+            // Set long click listener for deletion confirmation.
+            convertView.setOnLongClickListener(v -> {
+                new AlertDialog.Builder(activity)
+                        .setTitle(query)
+                        .setMessage(str("revanced_settings_search_remove_message"))
+                        .setPositiveButton(android.R.string.ok,
+                                (dialog, which) -> removeSearchQuery(query))
+                        .setNegativeButton(android.R.string.cancel, null)
+                        .show();
+                return true;
+            });
+
+            return convertView;
+        }
+    }
+}

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

@@ -7,6 +7,7 @@ import static app.revanced.extension.shared.settings.Setting.migrateOldSettingTo
 import static app.revanced.extension.shared.settings.Setting.parent;
 import static app.revanced.extension.shared.settings.Setting.parentsAny;
 import static app.revanced.extension.youtube.patches.ChangeFormFactorPatch.FormFactor;
+import static app.revanced.extension.youtube.patches.ChangeStartPagePatch.ChangeStartPageTypeAvailability;
 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;
@@ -25,6 +26,9 @@ import static app.revanced.extension.youtube.sponsorblock.objects.CategoryBehavi
 import static app.revanced.extension.youtube.sponsorblock.objects.CategoryBehaviour.SKIP_AUTOMATICALLY;
 import static app.revanced.extension.youtube.sponsorblock.objects.CategoryBehaviour.SKIP_AUTOMATICALLY_ONCE;
 
+import app.revanced.extension.shared.settings.preference.SharedPrefCategory;
+import app.revanced.extension.youtube.swipecontrols.SwipeControlsConfigurationProvider.SwipeOverlayStyle;
+
 import android.graphics.Color;
 
 import app.revanced.extension.shared.Logger;
@@ -101,7 +105,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_MOVIES_SECTION = new BooleanSetting("revanced_hide_movies_section", TRUE);
     public static final BooleanSetting HIDE_NOTIFY_ME_BUTTON = new BooleanSetting("revanced_hide_notify_me_button", TRUE);
     public static final BooleanSetting HIDE_PLAYABLES = new BooleanSetting("revanced_hide_playables", TRUE);
-    public static final BooleanSetting HIDE_SEARCH_RESULT_RECOMMENDATIONS = new BooleanSetting("revanced_hide_search_result_recommendations", TRUE);
+    public static final BooleanSetting HIDE_SEARCH_RESULT_RECOMMENDATION_LABELS = new BooleanSetting("revanced_hide_search_result_recommendation_labels", TRUE);
     public static final BooleanSetting HIDE_SHOW_MORE_BUTTON = new BooleanSetting("revanced_hide_show_more_button", TRUE, true);
     // Alternative thumbnails
     public static final EnumSetting<ThumbnailOption> ALT_THUMBNAIL_HOME = new EnumSetting<>("revanced_alt_thumbnail_home", ThumbnailOption.ORIGINAL);
@@ -124,6 +128,7 @@ public class Settings extends BaseSettings {
     // Player
     public static final BooleanSetting COPY_VIDEO_URL = new BooleanSetting("revanced_copy_video_url", FALSE);
     public static final BooleanSetting COPY_VIDEO_URL_TIMESTAMP = new BooleanSetting("revanced_copy_video_url_timestamp", TRUE);
+    public static final BooleanSetting DISABLE_AUTO_CAPTIONS = new BooleanSetting("revanced_disable_auto_captions", FALSE, 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 EnumSetting<FullscreenMode> EXIT_FULLSCREEN = new EnumSetting<>("revanced_exit_fullscreen", FullscreenMode.DISABLED);
@@ -136,6 +141,7 @@ public class Settings extends BaseSettings {
     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_RELATED_VIDEO_OVERLAY = new BooleanSetting("revanced_hide_related_video_overlay", 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);
@@ -196,6 +202,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_REPORT_BUTTON = new BooleanSetting("revanced_hide_report_button", FALSE);
     public static final BooleanSetting HIDE_SHARE_BUTTON = new BooleanSetting("revanced_hide_share_button", FALSE);
     public static final BooleanSetting HIDE_THANKS_BUTTON = new BooleanSetting("revanced_hide_thanks_button", TRUE);
+    public static final BooleanSetting HIDE_ASK_BUTTON = new BooleanSetting("revanced_hide_ask_button", FALSE);
     // Player flyout menu items
     public static final BooleanSetting HIDE_PLAYER_FLYOUT_ADDITIONAL_SETTINGS = new BooleanSetting("revanced_hide_player_flyout_additional_settings", FALSE);
     public static final BooleanSetting HIDE_PLAYER_FLYOUT_AMBIENT_MODE = new BooleanSetting("revanced_hide_player_flyout_ambient_mode", FALSE);
@@ -213,6 +220,8 @@ public class Settings extends BaseSettings {
 
     // General layout
     public static final BooleanSetting RESTORE_OLD_SETTINGS_MENUS = new BooleanSetting("revanced_restore_old_settings_menus", FALSE, true);
+    public static final BooleanSetting SETTINGS_SEARCH_HISTORY = new BooleanSetting("revanced_settings_search_history", TRUE, true);
+    public static final StringSetting SETTINGS_SEARCH_ENTRIES = new StringSetting("revanced_settings_search_entries", "", true);
     public static final EnumSetting<FormFactor> CHANGE_FORM_FACTOR = new EnumSetting<>("revanced_change_form_factor", FormFactor.DEFAULT, true, "revanced_change_form_factor_user_dialog_message");
     public static final BooleanSetting BYPASS_IMAGE_REGION_RESTRICTIONS = new BooleanSetting("revanced_bypass_image_region_restrictions", FALSE, true);
     public static final BooleanSetting GRADIENT_LOADING_SCREEN = new BooleanSetting("revanced_gradient_loading_screen", FALSE, true);
@@ -221,6 +230,8 @@ 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 BooleanSetting CHANGE_START_PAGE_ALWAYS = new BooleanSetting("revanced_change_start_page_always", FALSE, true,
+            new ChangeStartPageTypeAvailability());
     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);
@@ -294,7 +305,6 @@ public class Settings extends BaseSettings {
     // Misc
     public static final BooleanSetting ANNOUNCEMENTS = new BooleanSetting("revanced_announcements", TRUE);
     public static final IntegerSetting ANNOUNCEMENT_LAST_ID = new IntegerSetting("revanced_announcement_last_id", -1, false, false);
-    public static final BooleanSetting AUTO_CAPTIONS = new BooleanSetting("revanced_auto_captions", FALSE);
     public static final BooleanSetting AUTO_REPEAT = new BooleanSetting("revanced_auto_repeat", FALSE);
     public static final BooleanSetting BYPASS_URL_REDIRECTS = new BooleanSetting("revanced_bypass_url_redirects", TRUE);
     public static final BooleanSetting CHECK_WATCH_HISTORY_DOMAIN_NAME = new BooleanSetting("revanced_check_watch_history_domain_name", TRUE, false, false);
@@ -319,12 +329,15 @@ public class Settings extends BaseSettings {
             parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
     public static final IntegerSetting SWIPE_MAGNITUDE_THRESHOLD = new IntegerSetting("revanced_swipe_threshold", 30, true,
             parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
-    public static final BooleanSetting SWIPE_SHOW_CIRCULAR_OVERLAY = new BooleanSetting("revanced_swipe_show_circular_overlay", FALSE, true,
+    public static final IntegerSetting SWIPE_VOLUME_SENSITIVITY = new IntegerSetting("revanced_swipe_volume_sensitivity", 1, true, parent(SWIPE_VOLUME));
+    public static final EnumSetting<SwipeOverlayStyle> SWIPE_OVERLAY_STYLE = new EnumSetting<>("revanced_swipe_overlay_style", SwipeOverlayStyle.HORIZONTAL,true,
             parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
-    public static final BooleanSetting SWIPE_OVERLAY_MINIMAL_STYLE = new BooleanSetting("revanced_swipe_overlay_minimal_style", FALSE, true,
+    public static final IntegerSetting SWIPE_OVERLAY_TEXT_SIZE = new IntegerSetting("revanced_swipe_text_overlay_size", 14, true,
             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));
+    public static final StringSetting SWIPE_OVERLAY_PROGRESS_COLOR = new StringSetting("revanced_swipe_overlay_progress_color", "#FFFFFF", true,
+            parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
     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));
@@ -332,19 +345,17 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting SWIPE_LOWEST_VALUE_ENABLE_AUTO_BRIGHTNESS = new BooleanSetting("revanced_swipe_lowest_value_enable_auto_brightness", FALSE, true, parent(SWIPE_BRIGHTNESS));
 
     // ReturnYoutubeDislike
-    public static final BooleanSetting RYD_ENABLED = new BooleanSetting("ryd_enabled", TRUE);
-    public static final StringSetting RYD_USER_ID = new StringSetting("ryd_user_id", "", false, false);
-    public static final BooleanSetting RYD_SHORTS = new BooleanSetting("ryd_shorts", TRUE, parent(RYD_ENABLED));
-    public static final BooleanSetting RYD_DISLIKE_PERCENTAGE = new BooleanSetting("ryd_dislike_percentage", FALSE, parent(RYD_ENABLED));
-    public static final BooleanSetting RYD_COMPACT_LAYOUT = new BooleanSetting("ryd_compact_layout", FALSE, parent(RYD_ENABLED));
-    public static final BooleanSetting RYD_ESTIMATED_LIKE = new BooleanSetting("ryd_estimated_like", TRUE, parent(RYD_ENABLED));
-    public static final BooleanSetting RYD_TOAST_ON_CONNECTION_ERROR = new BooleanSetting("ryd_toast_on_connection_error", TRUE, parent(RYD_ENABLED));
+    public static final BooleanSetting RYD_ENABLED = new BooleanSetting("revanced_ryd_enabled", TRUE);
+    public static final StringSetting RYD_USER_ID = new StringSetting("revanced_ryd_user_id", "", false, false);
+    public static final BooleanSetting RYD_SHORTS = new BooleanSetting("revanced_ryd_shorts", TRUE, parent(RYD_ENABLED));
+    public static final BooleanSetting RYD_DISLIKE_PERCENTAGE = new BooleanSetting("revanced_ryd_dislike_percentage", FALSE, true, parent(RYD_ENABLED));
+    public static final BooleanSetting RYD_COMPACT_LAYOUT = new BooleanSetting("revanced_ryd_compact_layout", FALSE, true, parent(RYD_ENABLED));
+    public static final BooleanSetting RYD_ESTIMATED_LIKE = new BooleanSetting("revanced_ryd_estimated_like", TRUE, true, parent(RYD_ENABLED));
+    public static final BooleanSetting RYD_TOAST_ON_CONNECTION_ERROR = new BooleanSetting("revanced_ryd_toast_on_connection_error", TRUE, parent(RYD_ENABLED));
 
     // SponsorBlock
     public static final BooleanSetting SB_ENABLED = new BooleanSetting("sb_enabled", TRUE);
-    /**
-     * Do not use directly, instead use {@link SponsorBlockSettings}
-     */
+    /** Do not use id setting directly. Instead use {@link SponsorBlockSettings}. */
     public static final StringSetting SB_PRIVATE_USER_ID = new StringSetting("sb_private_user_id_Do_Not_Share", "");
     public static final IntegerSetting SB_CREATE_NEW_SEGMENT_STEP = new IntegerSetting("sb_create_new_segment_step", 150, parent(SB_ENABLED));
     public static final BooleanSetting SB_VOTING_BUTTON = new BooleanSetting("sb_voting_button", FALSE, parent(SB_ENABLED));
@@ -402,17 +413,16 @@ public class Settings extends BaseSettings {
     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);
+    private static final BooleanSetting DEPRECATED_AUTO_CAPTIONS = new BooleanSetting("revanced_auto_captions", FALSE);
 
     static {
         // region Migration
 
         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);
+        migrateOldSettingToNew(DEPRECATED_AUTO_CAPTIONS, DISABLE_AUTO_CAPTIONS);
 
         // Migrate renamed enum.
         //noinspection deprecation
@@ -455,6 +465,16 @@ public class Settings extends BaseSettings {
             SPOOF_APP_VERSION_TARGET.resetToDefault();
         }
 
+        // RYD requires manually migrating old settings since the lack of
+        // a "revanced_" on the old setting causes duplicate key exceptions during export.
+        SharedPrefCategory revancedPrefs = Setting.preferences;
+        Setting.migrateFromOldPreferences(revancedPrefs, RYD_USER_ID, "ryd_user_id");
+        Setting.migrateFromOldPreferences(revancedPrefs, RYD_ENABLED, "ryd_enabled");
+        Setting.migrateFromOldPreferences(revancedPrefs, RYD_DISLIKE_PERCENTAGE, "ryd_dislike_percentage");
+        Setting.migrateFromOldPreferences(revancedPrefs, RYD_COMPACT_LAYOUT, "ryd_compact_layout");
+        Setting.migrateFromOldPreferences(revancedPrefs, RYD_ESTIMATED_LIKE, "ryd_estimated_like");
+        Setting.migrateFromOldPreferences(revancedPrefs, RYD_TOAST_ON_CONNECTION_ERROR, "ryd_toast_on_connection_error");
+
         // endregion
 
         // region SB import/export callbacks
@@ -464,4 +484,3 @@ public class Settings extends BaseSettings {
         // endregion
     }
 }
-

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

@@ -1,23 +1,15 @@
 package app.revanced.extension.youtube.settings.preference;
 
 import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.preference.Preference;
 import android.util.AttributeSet;
 
 /**
  * Allows tapping the DeArrow about preference to open the DeArrow website.
  */
-@SuppressWarnings({"unused", "deprecation"})
-public class AlternativeThumbnailsAboutDeArrowPreference extends Preference {
+@SuppressWarnings("unused")
+public class AlternativeThumbnailsAboutDeArrowPreference extends UrlLinkPreference {
     {
-        setOnPreferenceClickListener(pref -> {
-            Intent i = new Intent(Intent.ACTION_VIEW);
-            i.setData(Uri.parse("https://dearrow.ajay.app"));
-            pref.getContext().startActivity(i);
-            return false;
-        });
+        externalUrl = "https://dearrow.ajay.app";
     }
 
     public AlternativeThumbnailsAboutDeArrowPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {

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

@@ -0,0 +1,62 @@
+package app.revanced.extension.youtube.settings.preference;
+
+import static app.revanced.extension.shared.StringRef.sf;
+
+import android.content.Context;
+import android.preference.ListPreference;
+import android.util.AttributeSet;
+
+import app.revanced.extension.youtube.patches.playback.speed.CustomPlaybackSpeedPatch;
+import app.revanced.extension.youtube.settings.Settings;
+
+/**
+ * Custom video speeds used by {@link CustomPlaybackSpeedPatch}.
+ */
+@SuppressWarnings({"unused", "deprecation"})
+public final class CustomVideoSpeedListPreference extends ListPreference {
+
+    /**
+     * Initialize a settings preference list with the available playback speeds.
+     */
+    private void initializeEntryValues() {
+        float[] customPlaybackSpeeds = CustomPlaybackSpeedPatch.customPlaybackSpeeds;
+        final int numberOfEntries = customPlaybackSpeeds.length + 1;
+        String[] preferenceListEntries = new String[numberOfEntries];
+        String[] preferenceListEntryValues = new String[numberOfEntries];
+
+        // Auto speed (same behavior as unpatched).
+        preferenceListEntries[0] = sf("revanced_custom_playback_speeds_auto").toString();
+        preferenceListEntryValues[0] = String.valueOf(Settings.PLAYBACK_SPEED_DEFAULT.defaultValue);
+
+        int i = 1;
+        for (float speed : customPlaybackSpeeds) {
+            String speedString = String.valueOf(speed);
+            preferenceListEntries[i] = speedString + "x";
+            preferenceListEntryValues[i] = speedString;
+            i++;
+        }
+
+        setEntries(preferenceListEntries);
+        setEntryValues(preferenceListEntryValues);
+    }
+
+    {
+        initializeEntryValues();
+    }
+
+    public CustomVideoSpeedListPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public CustomVideoSpeedListPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public CustomVideoSpeedListPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public CustomVideoSpeedListPreference(Context context) {
+        super(context);
+    }
+}

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

@@ -19,12 +19,15 @@ public class HtmlPreference extends Preference {
     public HtmlPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
+
     public HtmlPreference(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
     }
+
     public HtmlPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
+
     public HtmlPreference(Context context) {
         super(context);
     }

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

@@ -1,5 +1,6 @@
 package app.revanced.extension.youtube.settings.preference;
 
+import static app.revanced.extension.shared.StringRef.str;
 import static app.revanced.extension.shared.Utils.getResourceIdentifier;
 
 import android.annotation.SuppressLint;
@@ -9,34 +10,66 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.preference.ListPreference;
 import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
-import android.util.Pair;
+import android.preference.SwitchPreference;
+import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
+import android.text.style.BackgroundColorSpan;
 import android.util.TypedValue;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.widget.TextView;
 import android.widget.Toolbar;
 
+import androidx.annotation.CallSuper;
+import androidx.annotation.Nullable;
+
+import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Deque;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.BaseSettings;
-import app.revanced.extension.shared.settings.EnumSetting;
 import app.revanced.extension.shared.settings.preference.AbstractPreferenceFragment;
+import app.revanced.extension.shared.settings.preference.NoTitlePreferenceCategory;
 import app.revanced.extension.youtube.ThemeHelper;
-import app.revanced.extension.youtube.patches.playback.speed.CustomPlaybackSpeedPatch;
 import app.revanced.extension.youtube.settings.LicenseActivityHook;
-import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.youtube.sponsorblock.ui.SponsorBlockPreferenceGroup;
 
 /**
  * Preference fragment for ReVanced settings.
- *
- * @noinspection deprecation
  */
+@SuppressWarnings("deprecation")
 public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
 
+    /**
+     * The main PreferenceScreen used to display the current set of preferences.
+     * This screen is manipulated during initialization and filtering to show or hide preferences.
+     */
+    private PreferenceScreen preferenceScreen;
+
+    /**
+     * A copy of the original PreferenceScreen created during initialization.
+     * Used to restore the preference structure to its initial state after filtering or other modifications.
+     */
+    private PreferenceScreen originalPreferenceScreen;
+
+    /**
+     * Used for searching preferences. A Collection of all preferences including nested preferences.
+     * Root preferences are excluded (no need to search what's on the root screen),
+     * but their sub preferences are included.
+     */
+    private final List<AbstractPreferenceSearchData<?>> allPreferences = new ArrayList<>();
+
     @SuppressLint("UseCompatLoadingForDrawables")
     public static Drawable getBackButtonDrawable() {
         final int backButtonResource = getResourceIdentifier(ThemeHelper.isDarkTheme()
@@ -47,85 +80,140 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
     }
 
     /**
-     * Sorts a preference list by menu entries, but preserves the first value as the first entry.
-     *
-     * @noinspection SameParameterValue
+     * Initializes the preference fragment, copying the original screen to allow full restoration.
      */
-    private static void sortListPreferenceByValues(ListPreference listPreference, int firstEntriesToPreserve) {
-        CharSequence[] entries = listPreference.getEntries();
-        CharSequence[] entryValues = listPreference.getEntryValues();
-        final int entrySize = entries.length;
-
-        if (entrySize != entryValues.length) {
-            // Xml array declaration has a missing/extra entry.
-            throw new IllegalStateException();
-        }
-
-        List<Pair<String, String>> firstPairs = new ArrayList<>(firstEntriesToPreserve);
-        List<Pair<String, String>> pairsToSort = new ArrayList<>(entrySize);
-
-        for (int i = 0; i < entrySize; i++) {
-            Pair<String, String> pair = new Pair<>(entries[i].toString(), entryValues[i].toString());
-            if (i < firstEntriesToPreserve) {
-                firstPairs.add(pair);
-            } else {
-                pairsToSort.add(pair);
-            }
-        }
-
-        pairsToSort.sort((pair1, pair2)
-                -> pair1.first.compareToIgnoreCase(pair2.first));
-
-        CharSequence[] sortedEntries = new CharSequence[entrySize];
-        CharSequence[] sortedEntryValues = new CharSequence[entrySize];
-
-        int i = 0;
-        for (Pair<String, String> pair : firstPairs) {
-            sortedEntries[i] = pair.first;
-            sortedEntryValues[i] = pair.second;
-            i++;
-        }
-
-        for (Pair<String, String> pair : pairsToSort) {
-            sortedEntries[i] = pair.first;
-            sortedEntryValues[i] = pair.second;
-            i++;
-        }
-
-        listPreference.setEntries(sortedEntries);
-        listPreference.setEntryValues(sortedEntryValues);
-    }
-
     @Override
     protected void initialize() {
         super.initialize();
 
         try {
-            setPreferenceScreenToolbar(getPreferenceScreen());
+            preferenceScreen = getPreferenceScreen();
+            Utils.sortPreferenceGroups(preferenceScreen);
 
-            // If the preference was included, then initialize it based on the available playback speed.
-            Preference preference = findPreference(Settings.PLAYBACK_SPEED_DEFAULT.key);
-            if (preference instanceof ListPreference playbackPreference) {
-                CustomPlaybackSpeedPatch.initializeListPreference(playbackPreference);
+            // Store the original structure for restoration after filtering.
+            originalPreferenceScreen = getPreferenceManager().createPreferenceScreen(getContext());
+            for (int i = 0, count = preferenceScreen.getPreferenceCount(); i < count; i++) {
+                originalPreferenceScreen.addPreference(preferenceScreen.getPreference(i));
             }
 
-            sortPreferenceListMenu(Settings.CHANGE_START_PAGE);
-            sortPreferenceListMenu(Settings.SPOOF_VIDEO_STREAMS_LANGUAGE);
-            sortPreferenceListMenu(BaseSettings.REVANCED_LANGUAGE);
+            setPreferenceScreenToolbar(preferenceScreen);
         } catch (Exception ex) {
             Logger.printException(() -> "initialize failure", ex);
         }
     }
 
-    private void sortPreferenceListMenu(EnumSetting<?> setting) {
-        Preference preference = findPreference(setting.key);
-        if (preference instanceof ListPreference languagePreference) {
-            sortListPreferenceByValues(languagePreference, 1);
+    /**
+     * Called when the fragment starts, ensuring all preferences are collected after initialization.
+     */
+    @Override
+    public void onStart() {
+        super.onStart();
+        try {
+            if (allPreferences.isEmpty()) {
+                // Must collect preferences on start and not in initialize since
+                // legacy SB settings are not loaded yet.
+                Logger.printDebug(() -> "Collecting preferences to search");
+
+                // Do not show root menu preferences in search results.
+                // Instead search for everything that's not shown when search is not active.
+                collectPreferences(preferenceScreen, 1, 0);
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "onStart failure", ex);
         }
     }
 
+    /**
+     * Recursively collects all preferences from the screen or group.
+     * @param includeDepth Menu depth to start including preferences.
+     *                     A value of 0 adds all preferences.
+     */
+    private void collectPreferences(PreferenceGroup group, int includeDepth, int currentDepth) {
+        for (int i = 0, count = group.getPreferenceCount(); i < count; i++) {
+            Preference preference = group.getPreference(i);
+            if (includeDepth <= currentDepth && !(preference instanceof PreferenceCategory)
+                    && !(preference instanceof SponsorBlockPreferenceGroup)) {
+
+                AbstractPreferenceSearchData<?> data;
+                if (preference instanceof SwitchPreference switchPref) {
+                    data = new SwitchPreferenceSearchData(switchPref);
+                } else if (preference instanceof ListPreference listPref) {
+                    data = new ListPreferenceSearchData(listPref);
+                } else {
+                    data = new PreferenceSearchData(preference);
+                }
+
+                allPreferences.add(data);
+            }
+
+            if (preference instanceof PreferenceGroup subGroup) {
+                collectPreferences(subGroup, includeDepth, currentDepth + 1);
+            }
+        }
+    }
+
+    /**
+     * Filters the preferences using the given query string and applies highlighting.
+     */
+    public void filterPreferences(String query) {
+        preferenceScreen.removeAll();
+
+        if (TextUtils.isEmpty(query)) {
+            // Restore original preferences and their titles/summaries/entries.
+            for (int i = 0, count = originalPreferenceScreen.getPreferenceCount(); i < count; i++) {
+                preferenceScreen.addPreference(originalPreferenceScreen.getPreference(i));
+            }
+
+            for (AbstractPreferenceSearchData<?> data : allPreferences) {
+                data.clearHighlighting();
+            }
+
+            return;
+        }
+
+        // Navigation path -> Category
+        Map<String, PreferenceCategory> categoryMap = new HashMap<>();
+        String queryLower = Utils.removePunctuationToLowercase(query);
+
+        Pattern queryPattern = Pattern.compile(Pattern.quote(Utils.removePunctuationToLowercase(query)),
+                Pattern.CASE_INSENSITIVE);
+
+        for (AbstractPreferenceSearchData<?> data : allPreferences) {
+            if (data.matchesSearchQuery(queryLower)) {
+                data.applyHighlighting(queryLower, queryPattern);
+
+                String navigationPath = data.navigationPath;
+                PreferenceCategory group = categoryMap.computeIfAbsent(navigationPath, key -> {
+                    PreferenceCategory newGroup = new PreferenceCategory(preferenceScreen.getContext());
+                    newGroup.setTitle(navigationPath);
+                    preferenceScreen.addPreference(newGroup);
+                    return newGroup;
+                });
+                group.addPreference(data.preference);
+            }
+        }
+
+        // Show 'No results found' if search results are empty.
+        if (categoryMap.isEmpty()) {
+            Preference noResultsPreference = new Preference(preferenceScreen.getContext());
+            noResultsPreference.setTitle(str("revanced_settings_search_no_results_title", query));
+            noResultsPreference.setSummary(str("revanced_settings_search_no_results_summary"));
+            noResultsPreference.setSelectable(false);
+            // Set icon for the placeholder preference.
+            noResultsPreference.setLayoutResource(getResourceIdentifier(
+                    "revanced_preference_with_icon_no_search_result", "layout"));
+            noResultsPreference.setIcon(getResourceIdentifier(
+                    ThemeHelper.isDarkTheme() ? "yt_outline_search_white_24" : "yt_outline_search_black_24",
+                    "drawable"));
+            preferenceScreen.addPreference(noResultsPreference);
+        }
+    }
+
+    /**
+     * Sets toolbar for all nested preference screens.
+     */
     private void setPreferenceScreenToolbar(PreferenceScreen parentScreen) {
-        for (int i = 0, preferenceCount = parentScreen.getPreferenceCount(); i < preferenceCount; i++) {
+        for (int i = 0, count = parentScreen.getPreferenceCount(); i < count; i++) {
             Preference childPreference = parentScreen.getPreference(i);
             if (childPreference instanceof PreferenceScreen) {
                 // Recursively set sub preferences.
@@ -138,6 +226,9 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
                                     .findViewById(android.R.id.content)
                                     .getParent();
 
+                            // Fix the system navigation bar color for submenus.
+                            ThemeHelper.setNavigationBarColor(preferenceScreenDialog.getWindow());
+
                             // 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) {
@@ -153,6 +244,7 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
                             toolbar.setTitle(childScreen.getTitle());
                             toolbar.setNavigationIcon(getBackButtonDrawable());
                             toolbar.setNavigationOnClickListener(view -> preferenceScreenDialog.dismiss());
+
                             final int margin = (int) TypedValue.applyDimension(
                                     TypedValue.COMPLEX_UNIT_DIP, 16, getResources().getDisplayMetrics()
                             );
@@ -174,3 +266,271 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
         }
     }
 }
+
+@SuppressWarnings("deprecation")
+class AbstractPreferenceSearchData<T extends Preference> {
+    /**
+     * @return The navigation path for the given preference, such as "Player > Action buttons".
+     */
+    private static String getPreferenceNavigationString(Preference preference) {
+        Deque<CharSequence> pathElements = new ArrayDeque<>();
+
+        while (true) {
+            preference = preference.getParent();
+
+            if (preference == null) {
+                if (pathElements.isEmpty()) {
+                    return "";
+                }
+                Locale locale = BaseSettings.REVANCED_LANGUAGE.get().getLocale();
+                return Utils.getTextDirectionString(locale) + String.join(" > ", pathElements);
+            }
+
+            if (!(preference instanceof NoTitlePreferenceCategory)
+                    && !(preference instanceof SponsorBlockPreferenceGroup)) {
+                CharSequence title = preference.getTitle();
+                if (title != null && title.length() > 0) {
+                    pathElements.addFirst(title);
+                }
+            }
+        }
+    }
+
+    /**
+     * Highlights the search query in the given text by applying color span.
+     * @param text The original text to process.
+     * @param queryPattern The search query to highlight.
+     * @return The text with highlighted query matches as a SpannableStringBuilder.
+     */
+    static CharSequence highlightSearchQuery(CharSequence text, Pattern queryPattern) {
+        if (TextUtils.isEmpty(text)) {
+            return text;
+        }
+
+        final int baseColor = ThemeHelper.getBackgroundColor();
+        final int adjustedColor = ThemeHelper.isDarkTheme()
+                ? ThemeHelper.adjustColorBrightness(baseColor, 1.20f)  // Lighten for dark theme.
+                : ThemeHelper.adjustColorBrightness(baseColor, 0.95f); // Darken for light theme.
+        BackgroundColorSpan highlightSpan = new BackgroundColorSpan(adjustedColor);
+
+        SpannableStringBuilder spannable = new SpannableStringBuilder(text);
+        Matcher matcher = queryPattern.matcher(text);
+
+        while (matcher.find()) {
+            spannable.setSpan(
+                    highlightSpan,
+                    matcher.start(),
+                    matcher.end(),
+                    SpannableStringBuilder.SPAN_EXCLUSIVE_EXCLUSIVE
+            );
+        }
+
+        return spannable;
+    }
+
+    final T preference;
+    final String key;
+    final String navigationPath;
+    boolean highlightingApplied;
+
+    @Nullable
+    CharSequence originalTitle;
+    @Nullable
+    String searchTitle;
+
+    AbstractPreferenceSearchData(T pref) {
+        preference = pref;
+        key = Utils.removePunctuationToLowercase(pref.getKey());
+        navigationPath = getPreferenceNavigationString(pref);
+    }
+
+    @CallSuper
+    void updateSearchDataIfNeeded() {
+        if (highlightingApplied) {
+            // Must clear, otherwise old highlighting is still applied.
+            clearHighlighting();
+        }
+
+        CharSequence title = preference.getTitle();
+        if (originalTitle != title) { // Check using reference equality.
+            originalTitle = title;
+            searchTitle = Utils.removePunctuationToLowercase(title);
+        }
+    }
+
+    @CallSuper
+    boolean matchesSearchQuery(String query) {
+        updateSearchDataIfNeeded();
+
+        return key.contains(query)
+                || searchTitle != null && searchTitle.contains(query);
+    }
+
+    @CallSuper
+    void applyHighlighting(String query, Pattern queryPattern) {
+        preference.setTitle(highlightSearchQuery(originalTitle, queryPattern));
+        highlightingApplied = true;
+    }
+
+    @CallSuper
+    void clearHighlighting() {
+        if (highlightingApplied) {
+            preference.setTitle(originalTitle);
+            highlightingApplied = false;
+        }
+    }
+}
+
+/**
+ * Regular preference type that only uses the base preference summary.
+ * Should only be used if a more specific data class does not exist.
+ */
+@SuppressWarnings("deprecation")
+class PreferenceSearchData extends AbstractPreferenceSearchData<Preference> {
+    @Nullable
+    CharSequence originalSummary;
+    @Nullable
+    String searchSummary;
+
+    PreferenceSearchData(Preference pref) {
+        super(pref);
+    }
+
+    void updateSearchDataIfNeeded() {
+        super.updateSearchDataIfNeeded();
+
+        CharSequence summary = preference.getSummary();
+        if (originalSummary != summary) {
+            originalSummary = summary;
+            searchSummary = Utils.removePunctuationToLowercase(summary);
+        }
+    }
+
+    boolean matchesSearchQuery(String query) {
+        return super.matchesSearchQuery(query)
+                || searchSummary != null && searchSummary.contains(query);
+    }
+
+    @Override
+    void applyHighlighting(String query, Pattern queryPattern) {
+        super.applyHighlighting(query, queryPattern);
+
+        preference.setSummary(highlightSearchQuery(originalSummary, queryPattern));
+    }
+
+    @CallSuper
+    void clearHighlighting() {
+        super.clearHighlighting();
+
+        preference.setSummary(originalSummary);
+    }
+}
+
+/**
+ * Switch preference type that uses summaryOn and summaryOff.
+ */
+@SuppressWarnings("deprecation")
+class SwitchPreferenceSearchData extends AbstractPreferenceSearchData<SwitchPreference> {
+    @Nullable
+    CharSequence originalSummaryOn, originalSummaryOff;
+    @Nullable
+    String searchSummaryOn, searchSummaryOff;
+
+    SwitchPreferenceSearchData(SwitchPreference pref) {
+        super(pref);
+    }
+
+    void updateSearchDataIfNeeded() {
+        super.updateSearchDataIfNeeded();
+
+        CharSequence summaryOn = preference.getSummaryOn();
+        if (originalSummaryOn != summaryOn) {
+            originalSummaryOn = summaryOn;
+            searchSummaryOn = Utils.removePunctuationToLowercase(summaryOn);
+        }
+
+        CharSequence summaryOff = preference.getSummaryOff();
+        if (originalSummaryOff != summaryOff) {
+            originalSummaryOff = summaryOff;
+            searchSummaryOff = Utils.removePunctuationToLowercase(summaryOff);
+        }
+    }
+
+    boolean matchesSearchQuery(String query) {
+        return super.matchesSearchQuery(query)
+                || searchSummaryOn != null && searchSummaryOn.contains(query)
+                || searchSummaryOff != null && searchSummaryOff.contains(query);
+    }
+
+    @Override
+    void applyHighlighting(String query, Pattern queryPattern) {
+        super.applyHighlighting(query, queryPattern);
+
+        preference.setSummaryOn(highlightSearchQuery(originalSummaryOn, queryPattern));
+        preference.setSummaryOff(highlightSearchQuery(originalSummaryOff, queryPattern));
+    }
+
+    @CallSuper
+    void clearHighlighting() {
+        super.clearHighlighting();
+
+        preference.setSummaryOn(originalSummaryOn);
+        preference.setSummaryOff(originalSummaryOff);
+    }
+}
+
+/**
+ * List preference type that uses entries.
+ */
+@SuppressWarnings("deprecation")
+class ListPreferenceSearchData extends AbstractPreferenceSearchData<ListPreference> {
+    @Nullable
+    CharSequence[] originalEntries;
+    @Nullable
+    String searchEntries;
+
+    ListPreferenceSearchData(ListPreference pref) {
+        super(pref);
+    }
+
+    void updateSearchDataIfNeeded() {
+        super.updateSearchDataIfNeeded();
+
+        CharSequence[] entries = preference.getEntries();
+        if (originalEntries != entries) {
+            originalEntries = entries;
+            searchEntries = Utils.removePunctuationToLowercase(String.join(" ", entries));
+        }
+    }
+
+    boolean matchesSearchQuery(String query) {
+        return super.matchesSearchQuery(query)
+                || searchEntries != null && searchEntries.contains(query);
+    }
+
+    @Override
+    void applyHighlighting(String query, Pattern queryPattern) {
+        super.applyHighlighting(query, queryPattern);
+
+        if (originalEntries != null) {
+            final int length = originalEntries.length;
+            CharSequence[] highlightedEntries = new CharSequence[length];
+
+            for (int i = 0; i < length; i++) {
+                highlightedEntries[i] = highlightSearchQuery(originalEntries[i], queryPattern);
+
+                // Cannot highlight the summary text, because ListPreference uses
+                // the toString() of the summary CharSequence which strips away all formatting.
+            }
+
+            preference.setEntries(highlightedEntries);
+        }
+    }
+
+    @CallSuper
+    void clearHighlighting() {
+        super.clearHighlighting();
+
+        preference.setEntries(originalEntries);
+    }
+}

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

@@ -1,257 +0,0 @@
-package app.revanced.extension.youtube.settings.preference;
-
-import static app.revanced.extension.shared.StringRef.str;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceCategory;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
-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;
-import app.revanced.extension.youtube.returnyoutubedislike.ReturnYouTubeDislike;
-import app.revanced.extension.youtube.returnyoutubedislike.requests.ReturnYouTubeDislikeApi;
-import app.revanced.extension.youtube.settings.Settings;
-
-/** @noinspection deprecation*/
-public class ReturnYouTubeDislikePreferenceFragment extends PreferenceFragment {
-
-    /**
-     * If dislikes are shown on Shorts.
-     */
-    private SwitchPreference shortsPreference;
-
-    /**
-     * If dislikes are shown as percentage.
-     */
-    private SwitchPreference percentagePreference;
-
-    /**
-     * If segmented like/dislike button uses smaller compact layout.
-     */
-    private SwitchPreference compactLayoutPreference;
-
-    /**
-     * If hidden likes are replaced with an estimated value.
-     */
-    private SwitchPreference estimatedLikesPreference;
-
-    /**
-     * If segmented like/dislike button uses smaller compact layout.
-     */
-    private SwitchPreference toastOnRYDNotAvailable;
-
-    private void updateUIState() {
-        shortsPreference.setEnabled(Settings.RYD_SHORTS.isAvailable());
-        percentagePreference.setEnabled(Settings.RYD_DISLIKE_PERCENTAGE.isAvailable());
-        compactLayoutPreference.setEnabled(Settings.RYD_COMPACT_LAYOUT.isAvailable());
-        estimatedLikesPreference.setEnabled(Settings.RYD_ESTIMATED_LIKE.isAvailable());
-        toastOnRYDNotAvailable.setEnabled(Settings.RYD_TOAST_ON_CONNECTION_ERROR.isAvailable());
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        try {
-            Activity context = getActivity();
-            PreferenceManager manager = getPreferenceManager();
-            manager.setSharedPreferencesName(Setting.preferences.name);
-            PreferenceScreen preferenceScreen = manager.createPreferenceScreen(context);
-            setPreferenceScreen(preferenceScreen);
-
-            SwitchPreference enabledPreference = new SwitchPreference(context);
-            enabledPreference.setChecked(Settings.RYD_ENABLED.get());
-            enabledPreference.setTitle(str("revanced_ryd_enable_title"));
-            enabledPreference.setSummaryOn(str("revanced_ryd_enable_summary_on"));
-            enabledPreference.setSummaryOff(str("revanced_ryd_enable_summary_off"));
-            enabledPreference.setOnPreferenceChangeListener((pref, newValue) -> {
-                final Boolean rydIsEnabled = (Boolean) newValue;
-                Settings.RYD_ENABLED.save(rydIsEnabled);
-                ReturnYouTubeDislikePatch.onRYDStatusChange(rydIsEnabled);
-
-                updateUIState();
-                return true;
-            });
-            preferenceScreen.addPreference(enabledPreference);
-
-            shortsPreference = new SwitchPreference(context);
-            shortsPreference.setChecked(Settings.RYD_SHORTS.get());
-            shortsPreference.setTitle(str("revanced_ryd_shorts_title"));
-            String shortsSummary = str("revanced_ryd_shorts_summary_on_disclaimer");
-            shortsPreference.setSummaryOn(shortsSummary);
-            shortsPreference.setSummaryOff(str("revanced_ryd_shorts_summary_off"));
-            shortsPreference.setOnPreferenceChangeListener((pref, newValue) -> {
-                Settings.RYD_SHORTS.save((Boolean) newValue);
-                updateUIState();
-                return true;
-            });
-            preferenceScreen.addPreference(shortsPreference);
-
-            percentagePreference = new SwitchPreference(context);
-            percentagePreference.setChecked(Settings.RYD_DISLIKE_PERCENTAGE.get());
-            percentagePreference.setTitle(str("revanced_ryd_dislike_percentage_title"));
-            percentagePreference.setSummaryOn(str("revanced_ryd_dislike_percentage_summary_on"));
-            percentagePreference.setSummaryOff(str("revanced_ryd_dislike_percentage_summary_off"));
-            percentagePreference.setOnPreferenceChangeListener((pref, newValue) -> {
-                Settings.RYD_DISLIKE_PERCENTAGE.save((Boolean) newValue);
-                ReturnYouTubeDislike.clearAllUICaches();
-                updateUIState();
-                return true;
-            });
-            preferenceScreen.addPreference(percentagePreference);
-
-            compactLayoutPreference = new SwitchPreference(context);
-            compactLayoutPreference.setChecked(Settings.RYD_COMPACT_LAYOUT.get());
-            compactLayoutPreference.setTitle(str("revanced_ryd_compact_layout_title"));
-            compactLayoutPreference.setSummaryOn(str("revanced_ryd_compact_layout_summary_on"));
-            compactLayoutPreference.setSummaryOff(str("revanced_ryd_compact_layout_summary_off"));
-            compactLayoutPreference.setOnPreferenceChangeListener((pref, newValue) -> {
-                Settings.RYD_COMPACT_LAYOUT.save((Boolean) newValue);
-                ReturnYouTubeDislike.clearAllUICaches();
-                updateUIState();
-                return true;
-            });
-            preferenceScreen.addPreference(compactLayoutPreference);
-
-            estimatedLikesPreference = new SwitchPreference(context);
-            estimatedLikesPreference.setChecked(Settings.RYD_ESTIMATED_LIKE.get());
-            estimatedLikesPreference.setTitle(str("revanced_ryd_estimated_like_title"));
-            estimatedLikesPreference.setSummaryOn(str("revanced_ryd_estimated_like_summary_on"));
-            estimatedLikesPreference.setSummaryOff(str("revanced_ryd_estimated_like_summary_off"));
-            estimatedLikesPreference.setOnPreferenceChangeListener((pref, newValue) -> {
-                Settings.RYD_ESTIMATED_LIKE.save((Boolean) newValue);
-                ReturnYouTubeDislike.clearAllUICaches();
-                updateUIState();
-                return true;
-            });
-            preferenceScreen.addPreference(estimatedLikesPreference);
-
-            toastOnRYDNotAvailable = new SwitchPreference(context);
-            toastOnRYDNotAvailable.setChecked(Settings.RYD_TOAST_ON_CONNECTION_ERROR.get());
-            toastOnRYDNotAvailable.setTitle(str("revanced_ryd_toast_on_connection_error_title"));
-            toastOnRYDNotAvailable.setSummaryOn(str("revanced_ryd_toast_on_connection_error_summary_on"));
-            toastOnRYDNotAvailable.setSummaryOff(str("revanced_ryd_toast_on_connection_error_summary_off"));
-            toastOnRYDNotAvailable.setOnPreferenceChangeListener((pref, newValue) -> {
-                Settings.RYD_TOAST_ON_CONNECTION_ERROR.save((Boolean) newValue);
-                updateUIState();
-                return true;
-            });
-            preferenceScreen.addPreference(toastOnRYDNotAvailable);
-
-            updateUIState();
-
-
-            // About category
-
-            PreferenceCategory aboutCategory = new PreferenceCategory(context);
-            aboutCategory.setTitle(str("revanced_ryd_about"));
-            preferenceScreen.addPreference(aboutCategory);
-
-            // ReturnYouTubeDislike Website
-
-            Preference aboutWebsitePreference = new Preference(context);
-            aboutWebsitePreference.setTitle(str("revanced_ryd_attribution_title"));
-            aboutWebsitePreference.setSummary(str("revanced_ryd_attribution_summary"));
-            aboutWebsitePreference.setOnPreferenceClickListener(pref -> {
-                Intent i = new Intent(Intent.ACTION_VIEW);
-                i.setData(Uri.parse("https://returnyoutubedislike.com"));
-                pref.getContext().startActivity(i);
-                return false;
-            });
-            aboutCategory.addPreference(aboutWebsitePreference);
-
-            // RYD API connection statistics
-
-            if (BaseSettings.DEBUG.get()) {
-                PreferenceCategory emptyCategory = new PreferenceCategory(context); // vertical padding
-                preferenceScreen.addPreference(emptyCategory);
-
-                PreferenceCategory statisticsCategory = new PreferenceCategory(context);
-                statisticsCategory.setTitle(str("revanced_ryd_statistics_category_title"));
-                preferenceScreen.addPreference(statisticsCategory);
-
-                Preference statisticPreference;
-
-                statisticPreference = new Preference(context);
-                statisticPreference.setSelectable(false);
-                statisticPreference.setTitle(str("revanced_ryd_statistics_getFetchCallResponseTimeAverage_title"));
-                statisticPreference.setSummary(createMillisecondStringFromNumber(ReturnYouTubeDislikeApi.getFetchCallResponseTimeAverage()));
-                preferenceScreen.addPreference(statisticPreference);
-
-                statisticPreference = new Preference(context);
-                statisticPreference.setSelectable(false);
-                statisticPreference.setTitle(str("revanced_ryd_statistics_getFetchCallResponseTimeMin_title"));
-                statisticPreference.setSummary(createMillisecondStringFromNumber(ReturnYouTubeDislikeApi.getFetchCallResponseTimeMin()));
-                preferenceScreen.addPreference(statisticPreference);
-
-                statisticPreference = new Preference(context);
-                statisticPreference.setSelectable(false);
-                statisticPreference.setTitle(str("revanced_ryd_statistics_getFetchCallResponseTimeMax_title"));
-                statisticPreference.setSummary(createMillisecondStringFromNumber(ReturnYouTubeDislikeApi.getFetchCallResponseTimeMax()));
-                preferenceScreen.addPreference(statisticPreference);
-
-                String fetchCallTimeWaitingLastSummary;
-                final long fetchCallTimeWaitingLast = ReturnYouTubeDislikeApi.getFetchCallResponseTimeLast();
-                if (fetchCallTimeWaitingLast == ReturnYouTubeDislikeApi.FETCH_CALL_RESPONSE_TIME_VALUE_RATE_LIMIT) {
-                    fetchCallTimeWaitingLastSummary = str("revanced_ryd_statistics_getFetchCallResponseTimeLast_rate_limit_summary");
-                } else {
-                    fetchCallTimeWaitingLastSummary = createMillisecondStringFromNumber(fetchCallTimeWaitingLast);
-                }
-                statisticPreference = new Preference(context);
-                statisticPreference.setSelectable(false);
-                statisticPreference.setTitle(str("revanced_ryd_statistics_getFetchCallResponseTimeLast_title"));
-                statisticPreference.setSummary(fetchCallTimeWaitingLastSummary);
-                preferenceScreen.addPreference(statisticPreference);
-
-                statisticPreference = new Preference(context);
-                statisticPreference.setSelectable(false);
-                statisticPreference.setTitle(str("revanced_ryd_statistics_getFetchCallCount_title"));
-                statisticPreference.setSummary(createSummaryText(ReturnYouTubeDislikeApi.getFetchCallCount(),
-                        "revanced_ryd_statistics_getFetchCallCount_zero_summary",
-                        "revanced_ryd_statistics_getFetchCallCount_non_zero_summary"));
-                preferenceScreen.addPreference(statisticPreference);
-
-                statisticPreference = new Preference(context);
-                statisticPreference.setSelectable(false);
-                statisticPreference.setTitle(str("revanced_ryd_statistics_getFetchCallNumberOfFailures_title"));
-                statisticPreference.setSummary(createSummaryText(ReturnYouTubeDislikeApi.getFetchCallNumberOfFailures(),
-                        "revanced_ryd_statistics_getFetchCallNumberOfFailures_zero_summary",
-                        "revanced_ryd_statistics_getFetchCallNumberOfFailures_non_zero_summary"));
-                preferenceScreen.addPreference(statisticPreference);
-
-                statisticPreference = new Preference(context);
-                statisticPreference.setSelectable(false);
-                statisticPreference.setTitle(str("revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_title"));
-                statisticPreference.setSummary(createSummaryText(ReturnYouTubeDislikeApi.getNumberOfRateLimitRequestsEncountered(),
-                        "revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_zero_summary",
-                        "revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_non_zero_summary"));
-                preferenceScreen.addPreference(statisticPreference);
-            }
-
-            Utils.setPreferenceTitlesToMultiLineIfNeeded(preferenceScreen);
-        } catch (Exception ex) {
-            Logger.printException(() -> "onCreate failure", ex);
-        }
-    }
-
-    private static String createSummaryText(int value, String summaryStringZeroKey, String summaryStringOneOrMoreKey) {
-        if (value == 0) {
-            return str(summaryStringZeroKey);
-        }
-        return String.format(str(summaryStringOneOrMoreKey), value);
-    }
-
-    private static String createMillisecondStringFromNumber(long number) {
-        return String.format(str("revanced_ryd_statistics_millisecond_text"), number);
-    }
-
-}

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

@@ -1,629 +0,0 @@
-package app.revanced.extension.youtube.settings.preference;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.preference.*;
-import android.text.Html;
-import android.text.InputType;
-import android.util.TypedValue;
-import android.widget.EditText;
-import androidx.annotation.NonNull;
-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;
-import app.revanced.extension.youtube.sponsorblock.SponsorBlockUtils;
-import app.revanced.extension.youtube.sponsorblock.objects.SegmentCategory;
-import app.revanced.extension.youtube.sponsorblock.objects.SegmentCategoryListPreference;
-import app.revanced.extension.youtube.sponsorblock.objects.UserStats;
-import app.revanced.extension.youtube.sponsorblock.requests.SBRequester;
-import app.revanced.extension.youtube.sponsorblock.ui.SponsorBlockViewController;
-
-import static android.text.Html.fromHtml;
-import static app.revanced.extension.shared.StringRef.str;
-
-@SuppressWarnings("deprecation")
-public class SponsorBlockPreferenceFragment extends PreferenceFragment {
-
-    private SwitchPreference sbEnabled;
-    private SwitchPreference addNewSegment;
-    private SwitchPreference votingEnabled;
-    private SwitchPreference autoHideSkipSegmentButton;
-    private SwitchPreference compactSkipButton;
-    private SwitchPreference squareLayout;
-    private SwitchPreference showSkipToast;
-    private SwitchPreference trackSkips;
-    private SwitchPreference showTimeWithoutSegments;
-    private SwitchPreference toastOnConnectionError;
-
-    private ResettableEditTextPreference newSegmentStep;
-    private ResettableEditTextPreference minSegmentDuration;
-    private EditTextPreference privateUserId;
-    private EditTextPreference importExport;
-    private Preference apiUrl;
-
-    private PreferenceCategory statsCategory;
-    private PreferenceCategory segmentCategory;
-
-    private void updateUI() {
-        try {
-            final boolean enabled = Settings.SB_ENABLED.get();
-            if (!enabled) {
-                SponsorBlockViewController.hideAll();
-                SegmentPlaybackController.setCurrentVideoId(null);
-            } else if (!Settings.SB_CREATE_NEW_SEGMENT.get()) {
-                SponsorBlockViewController.hideNewSegmentLayout();
-            }
-            // Voting and add new segment buttons automatically show/hide themselves.
-
-            SponsorBlockViewController.updateLayout();
-
-            sbEnabled.setChecked(enabled);
-
-            addNewSegment.setChecked(Settings.SB_CREATE_NEW_SEGMENT.get());
-            addNewSegment.setEnabled(enabled);
-
-            votingEnabled.setChecked(Settings.SB_VOTING_BUTTON.get());
-            votingEnabled.setEnabled(enabled);
-
-            autoHideSkipSegmentButton.setEnabled(enabled);
-            autoHideSkipSegmentButton.setChecked(Settings.SB_AUTO_HIDE_SKIP_BUTTON.get());
-
-            compactSkipButton.setChecked(Settings.SB_COMPACT_SKIP_BUTTON.get());
-            compactSkipButton.setEnabled(enabled);
-
-            squareLayout.setChecked(Settings.SB_SQUARE_LAYOUT.get());
-            squareLayout.setEnabled(enabled);
-
-            showSkipToast.setChecked(Settings.SB_TOAST_ON_SKIP.get());
-            showSkipToast.setEnabled(enabled);
-
-            toastOnConnectionError.setChecked(Settings.SB_TOAST_ON_CONNECTION_ERROR.get());
-            toastOnConnectionError.setEnabled(enabled);
-
-            trackSkips.setChecked(Settings.SB_TRACK_SKIP_COUNT.get());
-            trackSkips.setEnabled(enabled);
-
-            showTimeWithoutSegments.setChecked(Settings.SB_VIDEO_LENGTH_WITHOUT_SEGMENTS.get());
-            showTimeWithoutSegments.setEnabled(enabled);
-
-            newSegmentStep.setText((Settings.SB_CREATE_NEW_SEGMENT_STEP.get()).toString());
-            newSegmentStep.setEnabled(enabled);
-
-            minSegmentDuration.setText((Settings.SB_SEGMENT_MIN_DURATION.get()).toString());
-            minSegmentDuration.setEnabled(enabled);
-
-            privateUserId.setText(Settings.SB_PRIVATE_USER_ID.get());
-            privateUserId.setEnabled(enabled);
-
-            // If the user has a private user id, then include a subtext that mentions not to share it.
-            String importExportSummary = SponsorBlockSettings.userHasSBPrivateId()
-                    ? str("revanced_sb_settings_ie_sum_warning")
-                    : str("revanced_sb_settings_ie_sum");
-            importExport.setSummary(importExportSummary);
-
-            apiUrl.setEnabled(enabled);
-            importExport.setEnabled(enabled);
-            segmentCategory.setEnabled(enabled);
-            statsCategory.setEnabled(enabled);
-        } catch (Exception ex) {
-            Logger.printException(() -> "update settings UI failure", ex);
-        }
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        try {
-            Activity context = getActivity();
-            PreferenceManager manager = getPreferenceManager();
-            manager.setSharedPreferencesName(Setting.preferences.name);
-            PreferenceScreen preferenceScreen = manager.createPreferenceScreen(context);
-            setPreferenceScreen(preferenceScreen);
-
-            SponsorBlockSettings.initialize();
-
-            sbEnabled = new SwitchPreference(context);
-            sbEnabled.setTitle(str("revanced_sb_enable_sb"));
-            sbEnabled.setSummary(str("revanced_sb_enable_sb_sum"));
-            preferenceScreen.addPreference(sbEnabled);
-            sbEnabled.setOnPreferenceChangeListener((preference1, newValue) -> {
-                Settings.SB_ENABLED.save((Boolean) newValue);
-                updateUI();
-                return true;
-            });
-
-            addAppearanceCategory(context, preferenceScreen);
-
-            segmentCategory = new PreferenceCategory(context);
-            segmentCategory.setTitle(str("revanced_sb_diff_segments"));
-            preferenceScreen.addPreference(segmentCategory);
-            updateSegmentCategories();
-
-            addCreateSegmentCategory(context, preferenceScreen);
-
-            addGeneralCategory(context, preferenceScreen);
-
-            statsCategory = new PreferenceCategory(context);
-            statsCategory.setTitle(str("revanced_sb_stats"));
-            preferenceScreen.addPreference(statsCategory);
-            fetchAndDisplayStats();
-
-            addAboutCategory(context, preferenceScreen);
-
-            Utils.setPreferenceTitlesToMultiLineIfNeeded(preferenceScreen);
-
-            updateUI();
-        } catch (Exception ex) {
-            Logger.printException(() -> "onCreate failure", ex);
-        }
-    }
-
-    private void addAppearanceCategory(Context context, PreferenceScreen screen) {
-        PreferenceCategory category = new PreferenceCategory(context);
-        screen.addPreference(category);
-        category.setTitle(str("revanced_sb_appearance_category"));
-
-        votingEnabled = new SwitchPreference(context);
-        votingEnabled.setTitle(str("revanced_sb_enable_voting"));
-        votingEnabled.setSummaryOn(str("revanced_sb_enable_voting_sum_on"));
-        votingEnabled.setSummaryOff(str("revanced_sb_enable_voting_sum_off"));
-        category.addPreference(votingEnabled);
-        votingEnabled.setOnPreferenceChangeListener((preference1, newValue) -> {
-            Settings.SB_VOTING_BUTTON.save((Boolean) newValue);
-            updateUI();
-            return true;
-        });
-
-        autoHideSkipSegmentButton = new SwitchPreference(context);
-        autoHideSkipSegmentButton.setTitle(str("revanced_sb_enable_auto_hide_skip_segment_button"));
-        autoHideSkipSegmentButton.setSummaryOn(str("revanced_sb_enable_auto_hide_skip_segment_button_sum_on"));
-        autoHideSkipSegmentButton.setSummaryOff(str("revanced_sb_enable_auto_hide_skip_segment_button_sum_off"));
-        category.addPreference(autoHideSkipSegmentButton);
-        autoHideSkipSegmentButton.setOnPreferenceChangeListener((preference1, newValue) -> {
-            Settings.SB_AUTO_HIDE_SKIP_BUTTON.save((Boolean) newValue);
-            updateUI();
-            return true;
-        });
-
-        compactSkipButton = new SwitchPreference(context);
-        compactSkipButton.setTitle(str("revanced_sb_enable_compact_skip_button"));
-        compactSkipButton.setSummaryOn(str("revanced_sb_enable_compact_skip_button_sum_on"));
-        compactSkipButton.setSummaryOff(str("revanced_sb_enable_compact_skip_button_sum_off"));
-        category.addPreference(compactSkipButton);
-        compactSkipButton.setOnPreferenceChangeListener((preference1, newValue) -> {
-            Settings.SB_COMPACT_SKIP_BUTTON.save((Boolean) newValue);
-            updateUI();
-            return true;
-        });
-
-        squareLayout = new SwitchPreference(context);
-        squareLayout.setTitle(str("revanced_sb_square_layout"));
-        squareLayout.setSummaryOn(str("revanced_sb_square_layout_sum_on"));
-        squareLayout.setSummaryOff(str("revanced_sb_square_layout_sum_off"));
-        category.addPreference(squareLayout);
-        squareLayout.setOnPreferenceChangeListener((preference1, newValue) -> {
-            Settings.SB_SQUARE_LAYOUT.save((Boolean) newValue);
-            updateUI();
-            return true;
-        });
-
-        showSkipToast = new SwitchPreference(context);
-        showSkipToast.setTitle(str("revanced_sb_general_skiptoast"));
-        showSkipToast.setSummaryOn(str("revanced_sb_general_skiptoast_sum_on"));
-        showSkipToast.setSummaryOff(str("revanced_sb_general_skiptoast_sum_off"));
-        showSkipToast.setOnPreferenceClickListener(preference1 -> {
-            Utils.showToastShort(str("revanced_sb_skipped_sponsor"));
-            return false;
-        });
-        showSkipToast.setOnPreferenceChangeListener((preference1, newValue) -> {
-            Settings.SB_TOAST_ON_SKIP.save((Boolean) newValue);
-            updateUI();
-            return true;
-        });
-        category.addPreference(showSkipToast);
-
-        showTimeWithoutSegments = new SwitchPreference(context);
-        showTimeWithoutSegments.setTitle(str("revanced_sb_general_time_without"));
-        showTimeWithoutSegments.setSummaryOn(str("revanced_sb_general_time_without_sum_on"));
-        showTimeWithoutSegments.setSummaryOff(str("revanced_sb_general_time_without_sum_off"));
-        showTimeWithoutSegments.setOnPreferenceChangeListener((preference1, newValue) -> {
-            Settings.SB_VIDEO_LENGTH_WITHOUT_SEGMENTS.save((Boolean) newValue);
-            updateUI();
-            return true;
-        });
-        category.addPreference(showTimeWithoutSegments);
-    }
-
-    private void addCreateSegmentCategory(Context context, PreferenceScreen screen) {
-        PreferenceCategory category = new PreferenceCategory(context);
-        screen.addPreference(category);
-        category.setTitle(str("revanced_sb_create_segment_category"));
-
-        addNewSegment = new SwitchPreference(context);
-        addNewSegment.setTitle(str("revanced_sb_enable_create_segment"));
-        addNewSegment.setSummaryOn(str("revanced_sb_enable_create_segment_sum_on"));
-        addNewSegment.setSummaryOff(str("revanced_sb_enable_create_segment_sum_off"));
-        category.addPreference(addNewSegment);
-        addNewSegment.setOnPreferenceChangeListener((preference1, o) -> {
-            Boolean newValue = (Boolean) o;
-            if (newValue && !Settings.SB_SEEN_GUIDELINES.get()) {
-                new AlertDialog.Builder(preference1.getContext())
-                        .setTitle(str("revanced_sb_guidelines_popup_title"))
-                        .setMessage(str("revanced_sb_guidelines_popup_content"))
-                        .setNegativeButton(str("revanced_sb_guidelines_popup_already_read"), null)
-                        .setPositiveButton(str("revanced_sb_guidelines_popup_open"), (dialogInterface, i) -> openGuidelines())
-                        .setOnDismissListener(dialog -> Settings.SB_SEEN_GUIDELINES.save(true))
-                        .setCancelable(false)
-                        .show();
-            }
-            Settings.SB_CREATE_NEW_SEGMENT.save(newValue);
-            updateUI();
-            return true;
-        });
-
-        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);
-        newSegmentStep.setOnPreferenceChangeListener((preference1, newValue) -> {
-            try {
-                final int newAdjustmentValue = Integer.parseInt(newValue.toString());
-                if (newAdjustmentValue != 0) {
-                    Settings.SB_CREATE_NEW_SEGMENT_STEP.save(newAdjustmentValue);
-                    return true;
-                }
-            } catch (NumberFormatException ex) {
-                Logger.printInfo(() -> "Invalid new segment step", ex);
-            }
-
-            Utils.showToastLong(str("revanced_sb_general_adjusting_invalid"));
-            updateUI();
-            return false;
-        });
-        category.addPreference(newSegmentStep);
-
-        Preference guidelinePreferences = new Preference(context);
-        guidelinePreferences.setTitle(str("revanced_sb_guidelines_preference_title"));
-        guidelinePreferences.setSummary(str("revanced_sb_guidelines_preference_sum"));
-        guidelinePreferences.setOnPreferenceClickListener(preference1 -> {
-            openGuidelines();
-            return true;
-        });
-        category.addPreference(guidelinePreferences);
-    }
-
-    private void addGeneralCategory(final Context context, PreferenceScreen screen) {
-        PreferenceCategory category = new PreferenceCategory(context);
-        screen.addPreference(category);
-        category.setTitle(str("revanced_sb_general"));
-
-        toastOnConnectionError = new SwitchPreference(context);
-        toastOnConnectionError.setTitle(str("revanced_sb_toast_on_connection_error_title"));
-        toastOnConnectionError.setSummaryOn(str("revanced_sb_toast_on_connection_error_summary_on"));
-        toastOnConnectionError.setSummaryOff(str("revanced_sb_toast_on_connection_error_summary_off"));
-        toastOnConnectionError.setOnPreferenceChangeListener((preference1, newValue) -> {
-            Settings.SB_TOAST_ON_CONNECTION_ERROR.save((Boolean) newValue);
-            updateUI();
-            return true;
-        });
-        category.addPreference(toastOnConnectionError);
-
-        trackSkips = new SwitchPreference(context);
-        trackSkips.setTitle(str("revanced_sb_general_skipcount"));
-        trackSkips.setSummaryOn(str("revanced_sb_general_skipcount_sum_on"));
-        trackSkips.setSummaryOff(str("revanced_sb_general_skipcount_sum_off"));
-        trackSkips.setOnPreferenceChangeListener((preference1, newValue) -> {
-            Settings.SB_TRACK_SKIP_COUNT.save((Boolean) newValue);
-            updateUI();
-            return true;
-        });
-        category.addPreference(trackSkips);
-
-        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);
-        minSegmentDuration.setOnPreferenceChangeListener((preference1, newValue) -> {
-            try {
-                Float minTimeDuration = Float.valueOf(newValue.toString());
-                Settings.SB_SEGMENT_MIN_DURATION.save(minTimeDuration);
-                return true;
-            } catch (NumberFormatException ex) {
-                Logger.printInfo(() -> "Invalid minimum segment duration", ex);
-            }
-
-            Utils.showToastLong(str("revanced_sb_general_min_duration_invalid"));
-            updateUI();
-            return false;
-        });
-        category.addPreference(minSegmentDuration);
-
-        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) -> {
-            String newUUID = newValue.toString();
-            if (!SponsorBlockSettings.isValidSBUserId(newUUID)) {
-                Utils.showToastLong(str("revanced_sb_general_uuid_invalid"));
-                return false;
-            }
-
-            Settings.SB_PRIVATE_USER_ID.save(newUUID);
-            updateUI();
-            fetchAndDisplayStats();
-            return true;
-        });
-        category.addPreference(privateUserId);
-
-        apiUrl = new Preference(context);
-        apiUrl.setTitle(str("revanced_sb_general_api_url"));
-        apiUrl.setSummary(Html.fromHtml(str("revanced_sb_general_api_url_sum")));
-        apiUrl.setOnPreferenceClickListener(preference1 -> {
-            EditText editText = new EditText(context);
-            editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI);
-            editText.setText(Settings.SB_API_URL.get());
-
-            DialogInterface.OnClickListener urlChangeListener = (dialog, buttonPressed) -> {
-                if (buttonPressed == DialogInterface.BUTTON_NEUTRAL) {
-                    Settings.SB_API_URL.resetToDefault();
-                    Utils.showToastLong(str("revanced_sb_api_url_reset"));
-                } else if (buttonPressed == DialogInterface.BUTTON_POSITIVE) {
-                    String serverAddress = editText.getText().toString();
-                    if (!SponsorBlockSettings.isValidSBServerAddress(serverAddress)) {
-                        Utils.showToastLong(str("revanced_sb_api_url_invalid"));
-                    } else if (!serverAddress.equals(Settings.SB_API_URL.get())) {
-                        Settings.SB_API_URL.save(serverAddress);
-                        Utils.showToastLong(str("revanced_sb_api_url_changed"));
-                    }
-                }
-            };
-            new AlertDialog.Builder(context)
-                    .setTitle(apiUrl.getTitle())
-                    .setView(editText)
-                    .setNegativeButton(android.R.string.cancel, null)
-                    .setNeutralButton(str("revanced_sb_reset"), urlChangeListener)
-                    .setPositiveButton(android.R.string.ok, urlChangeListener)
-                    .show();
-            return true;
-        });
-        category.addPreference(apiUrl);
-
-        importExport = 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());
-                });
-            }
-        };
-        importExport.setTitle(str("revanced_sb_settings_ie"));
-        // Summary is set in updateUI()
-        importExport.getEditText().setInputType(InputType.TYPE_CLASS_TEXT
-                | InputType.TYPE_TEXT_FLAG_MULTI_LINE
-                | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
-        importExport.getEditText().setAutofillHints((String) null);
-        importExport.getEditText().setTextSize(TypedValue.COMPLEX_UNIT_PT, 8);
-        importExport.setOnPreferenceClickListener(preference1 -> {
-            importExport.getEditText().setText(SponsorBlockSettings.exportDesktopSettings());
-            return true;
-        });
-        importExport.setOnPreferenceChangeListener((preference1, newValue) -> {
-            SponsorBlockSettings.importDesktopSettings((String) newValue);
-            updateSegmentCategories();
-            fetchAndDisplayStats();
-            updateUI();
-            return true;
-        });
-        category.addPreference(importExport);
-    }
-
-    private void updateSegmentCategories() {
-        try {
-            segmentCategory.removeAll();
-
-            Activity activity = getActivity();
-            for (SegmentCategory category : SegmentCategory.categoriesWithoutUnsubmitted()) {
-                segmentCategory.addPreference(new SegmentCategoryListPreference(activity, category));
-            }
-        } catch (Exception ex) {
-            Logger.printException(() -> "updateSegmentCategories failure", ex);
-        }
-    }
-
-    private void addAboutCategory(Context context, PreferenceScreen screen) {
-        PreferenceCategory category = new PreferenceCategory(context);
-        screen.addPreference(category);
-        category.setTitle(str("revanced_sb_about"));
-
-        {
-            Preference preference = new Preference(context);
-            category.addPreference(preference);
-            preference.setTitle(str("revanced_sb_about_api"));
-            preference.setSummary(str("revanced_sb_about_api_sum"));
-            preference.setOnPreferenceClickListener(preference1 -> {
-                Intent i = new Intent(Intent.ACTION_VIEW);
-                i.setData(Uri.parse("https://sponsor.ajay.app"));
-                preference1.getContext().startActivity(i);
-                return false;
-            });
-        }
-    }
-
-    private void openGuidelines() {
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setData(Uri.parse("https://wiki.sponsor.ajay.app/w/Guidelines"));
-        getActivity().startActivity(intent);
-    }
-
-    private void fetchAndDisplayStats() {
-        try {
-            statsCategory.removeAll();
-            if (!SponsorBlockSettings.userHasSBPrivateId()) {
-                // User has never voted or created any segments.  No stats to show.
-                addLocalUserStats();
-                return;
-            }
-
-            Preference loadingPlaceholderPreference = new Preference(this.getActivity());
-            loadingPlaceholderPreference.setEnabled(false);
-            statsCategory.addPreference(loadingPlaceholderPreference);
-            if (Settings.SB_ENABLED.get()) {
-                loadingPlaceholderPreference.setTitle(str("revanced_sb_stats_loading"));
-                Utils.runOnBackgroundThread(() -> {
-                    UserStats stats = SBRequester.retrieveUserStats();
-                    Utils.runOnMainThread(() -> { // get back on main thread to modify UI elements
-                        addUserStats(loadingPlaceholderPreference, stats);
-                        addLocalUserStats();
-                    });
-                });
-            } else {
-                loadingPlaceholderPreference.setTitle(str("revanced_sb_stats_sb_disabled"));
-            }
-        } catch (Exception ex) {
-            Logger.printException(() -> "fetchAndDisplayStats failure", ex);
-        }
-    }
-
-    private void addUserStats(@NonNull Preference loadingPlaceholder, @Nullable UserStats stats) {
-        Utils.verifyOnMainThread();
-        try {
-            if (stats == null) {
-                loadingPlaceholder.setTitle(str("revanced_sb_stats_connection_failure"));
-                return;
-            }
-            statsCategory.removeAll();
-            Context context = statsCategory.getContext();
-
-            if (stats.totalSegmentCountIncludingIgnored > 0) {
-                // If user has not created any segments, there's no reason to set a username.
-                EditTextPreference preference = new ResettableEditTextPreference(context);
-                statsCategory.addPreference(preference);
-                String userName = stats.userName;
-                preference.setTitle(fromHtml(str("revanced_sb_stats_username", userName)));
-                preference.setSummary(str("revanced_sb_stats_username_change"));
-                preference.setText(userName);
-                preference.setOnPreferenceChangeListener((preference1, value) -> {
-                    Utils.runOnBackgroundThread(() -> {
-                        String newUserName = (String) value;
-                        String errorMessage = SBRequester.setUsername(newUserName);
-                        Utils.runOnMainThread(() -> {
-                            if (errorMessage == null) {
-                                preference.setTitle(fromHtml(str("revanced_sb_stats_username", newUserName)));
-                                preference.setText(newUserName);
-                                Utils.showToastLong(str("revanced_sb_stats_username_changed"));
-                            } else {
-                                preference.setText(userName); // revert to previous
-                                SponsorBlockUtils.showErrorDialog(errorMessage);
-                            }
-                        });
-                    });
-                    return true;
-                });
-            }
-
-            {
-                // number of segment submissions (does not include ignored segments)
-                Preference preference = new Preference(context);
-                statsCategory.addPreference(preference);
-                String formatted = SponsorBlockUtils.getNumberOfSkipsString(stats.segmentCount);
-                preference.setTitle(fromHtml(str("revanced_sb_stats_submissions", formatted)));
-                preference.setSummary(str("revanced_sb_stats_submissions_sum"));
-                if (stats.totalSegmentCountIncludingIgnored == 0) {
-                    preference.setSelectable(false);
-                } else {
-                    preference.setOnPreferenceClickListener(preference1 -> {
-                        Intent i = new Intent(Intent.ACTION_VIEW);
-                        i.setData(Uri.parse("https://sb.ltn.fi/userid/" + stats.publicUserId));
-                        preference1.getContext().startActivity(i);
-                        return true;
-                    });
-                }
-            }
-
-            {
-                // "user reputation".  Usually not useful, since it appears most users have zero reputation.
-                // But if there is a reputation, then show it here
-                Preference preference = new Preference(context);
-                preference.setTitle(fromHtml(str("revanced_sb_stats_reputation", stats.reputation)));
-                preference.setSelectable(false);
-                if (stats.reputation != 0) {
-                    statsCategory.addPreference(preference);
-                }
-            }
-
-            {
-                // time saved for other users
-                Preference preference = new Preference(context);
-                statsCategory.addPreference(preference);
-
-                String stats_saved;
-                String stats_saved_sum;
-                if (stats.totalSegmentCountIncludingIgnored == 0) {
-                    stats_saved = str("revanced_sb_stats_saved_zero");
-                    stats_saved_sum = str("revanced_sb_stats_saved_sum_zero");
-                } else {
-                    stats_saved = str("revanced_sb_stats_saved",
-                            SponsorBlockUtils.getNumberOfSkipsString(stats.viewCount));
-                    stats_saved_sum = str("revanced_sb_stats_saved_sum", SponsorBlockUtils.getTimeSavedString((long) (60 * stats.minutesSaved)));
-                }
-                preference.setTitle(fromHtml(stats_saved));
-                preference.setSummary(fromHtml(stats_saved_sum));
-                preference.setOnPreferenceClickListener(preference1 -> {
-                    Intent i = new Intent(Intent.ACTION_VIEW);
-                    i.setData(Uri.parse("https://sponsor.ajay.app/stats/"));
-                    preference1.getContext().startActivity(i);
-                    return false;
-                });
-            }
-        } catch (Exception ex) {
-            Logger.printException(() -> "addUserStats failure", ex);
-        }
-    }
-
-    private void addLocalUserStats() {
-        // time the user saved by using SB
-        Preference preference = new Preference(statsCategory.getContext());
-        statsCategory.addPreference(preference);
-
-        Runnable updateStatsSelfSaved = () -> {
-            String formatted = SponsorBlockUtils.getNumberOfSkipsString(Settings.SB_LOCAL_TIME_SAVED_NUMBER_SEGMENTS.get());
-            preference.setTitle(fromHtml(str("revanced_sb_stats_self_saved", formatted)));
-            String formattedSaved = SponsorBlockUtils.getTimeSavedString(Settings.SB_LOCAL_TIME_SAVED_MILLISECONDS.get() / 1000);
-            preference.setSummary(fromHtml(str("revanced_sb_stats_self_saved_sum", formattedSaved)));
-        };
-        updateStatsSelfSaved.run();
-        preference.setOnPreferenceClickListener(preference1 -> {
-            new AlertDialog.Builder(preference1.getContext())
-                    .setTitle(str("revanced_sb_stats_self_saved_reset_title"))
-                    .setPositiveButton(android.R.string.yes, (dialog, whichButton) -> {
-                        Settings.SB_LOCAL_TIME_SAVED_NUMBER_SEGMENTS.resetToDefault();
-                        Settings.SB_LOCAL_TIME_SAVED_MILLISECONDS.resetToDefault();
-                        updateStatsSelfSaved.run();
-                    })
-                    .setNegativeButton(android.R.string.no, null).show();
-            return true;
-        });
-    }
-
-}

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

@@ -0,0 +1,44 @@
+package app.revanced.extension.youtube.settings.preference;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.preference.Preference;
+import android.util.AttributeSet;
+
+import app.revanced.extension.shared.Logger;
+
+/**
+ * Simple preference that opens a url when clicked.
+ */
+@SuppressWarnings("deprecation")
+public class UrlLinkPreference extends Preference {
+
+    protected String externalUrl;
+
+    {
+        setOnPreferenceClickListener(pref -> {
+            if (externalUrl == null) {
+                Logger.printException(() -> "URL not set " + getClass().getSimpleName());
+                return false;
+            }
+            Intent i = new Intent(Intent.ACTION_VIEW);
+            i.setData(Uri.parse(externalUrl));
+            pref.getContext().startActivity(i);
+            return true;
+        });
+    }
+
+    public UrlLinkPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+    public UrlLinkPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+    public UrlLinkPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+    public UrlLinkPreference(Context context) {
+        super(context);
+    }
+}

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

@@ -18,6 +18,7 @@ import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.youtube.sponsorblock.ui.SponsorBlockPreferenceGroup;
 import app.revanced.extension.youtube.sponsorblock.objects.CategoryBehaviour;
 import app.revanced.extension.youtube.sponsorblock.objects.SegmentCategory;
 
@@ -31,6 +32,7 @@ public class SponsorBlockSettings {
         @Override
         public void settingsImported(@Nullable Context context) {
             SegmentCategory.loadAllCategoriesFromSettings();
+            SponsorBlockPreferenceGroup.settingsImported = true;
         }
         @Override
         public void settingsExported(@Nullable Context context) {

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

@@ -55,7 +55,7 @@ public class SegmentCategoryListPreference extends ListPreference {
                 : CategoryBehaviour.getBehaviorKeyValues());
         setSummary(category.description.toString());
 
-        updateTitleFromCategory();
+        updateUI();
     }
 
     @Override
@@ -202,7 +202,7 @@ public class SegmentCategoryListPreference extends ListPreference {
             builder.setNeutralButton(str("revanced_sb_reset_color"), (dialog, which) -> {
                 try {
                     category.resetColorAndOpacity();
-                    updateTitleFromCategory();
+                    updateUI();
                     Utils.showToastShort(str("revanced_sb_color_reset"));
                 } catch (Exception ex) {
                     Logger.printException(() -> "setNeutralButton failure", ex);
@@ -240,7 +240,7 @@ public class SegmentCategoryListPreference extends ListPreference {
                     Utils.showToastShort(str("revanced_sb_color_invalid"));
                 }
 
-                updateTitleFromCategory();
+                updateUI();
             }
         } catch (Exception ex) {
             Logger.printException(() -> "onDialogClosed failure", ex);
@@ -251,7 +251,7 @@ public class SegmentCategoryListPreference extends ListPreference {
         categoryColor = applyOpacityToColor(categoryColor, categoryOpacity);
     }
 
-    private void updateTitleFromCategory() {
+    public void updateUI() {
         categoryColor = category.getColorNoOpacity();
         categoryOpacity = category.getOpacity();
         applyOpacityToCategoryColor();

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

@@ -5,13 +5,19 @@ import androidx.annotation.NonNull;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import app.revanced.extension.youtube.sponsorblock.SponsorBlockSettings;
+
 /**
  * SponsorBlock user stats
  */
 public class UserStats {
-    @NonNull
+    /**
+     * How long to cache user stats objects.
+     */
+    private static final long STATS_EXPIRATION_MILLISECONDS = 60 * 60 * 1000; // 60 minutes.
+
+    private final String privateUserId;
     public final String publicUserId;
-    @NonNull
     public final String userName;
     /**
      * "User reputation".  Unclear how SB determines this value.
@@ -26,7 +32,13 @@ public class UserStats {
     public final int viewCount;
     public final double minutesSaved;
 
-    public UserStats(@NonNull JSONObject json) throws JSONException {
+    /**
+     * When this stat was fetched.
+     */
+    public final long fetchTime;
+
+    public UserStats(String privateSbId, @NonNull JSONObject json) throws JSONException {
+        privateUserId = privateSbId;
         publicUserId = json.getString("userID");
         userName = json.getString("userName");
         reputation = (float)json.getDouble("reputation");
@@ -35,11 +47,23 @@ public class UserStats {
         totalSegmentCountIncludingIgnored = segmentCount + ignoredSegmentCount;
         viewCount = json.getInt("viewCount");
         minutesSaved = json.getDouble("minutesSaved");
+        fetchTime = System.currentTimeMillis();
+    }
+
+    public boolean isExpired() {
+        if (STATS_EXPIRATION_MILLISECONDS < System.currentTimeMillis() - fetchTime) {
+            return true;
+        }
+
+        // User changed their SB private user id.
+        return !SponsorBlockSettings.userHasSBPrivateId()
+                || !SponsorBlockSettings.getSBPrivateUserID().equals(privateUserId);
     }
 
     @NonNull
     @Override
     public String toString() {
+        // Do not include private user id in toString().
         return "UserStats{"
                 + "publicUserId='" + publicUserId + '\''
                 + ", userName='" + userName + '\''

extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRequester.java

@@ -47,6 +47,9 @@ public class SBRequester {
      */
     private static final int HTTP_STATUS_CODE_SUCCESS = 200;
 
+    @Nullable
+    private static volatile UserStats lastFetchedStats;
+
     private SBRequester() {
     }
 
@@ -181,6 +184,8 @@ public class SBRequester {
             Utils.showToastLong(str("revanced_sb_submit_failed_unknown_error", 0, ex.getMessage()));
         } catch (Exception ex) {
             Logger.printException(() -> "failed to submit segments", ex); // Should never happen.
+        } finally {
+            lastFetchedStats = null; // Fetch updated stats if needed.
         }
     }
 
@@ -252,9 +257,17 @@ public class SBRequester {
     public static UserStats retrieveUserStats() {
         Utils.verifyOffMainThread();
         try {
-            UserStats stats = new UserStats(getJSONObject(SBRoutes.GET_USER_STATS, SponsorBlockSettings.getSBPrivateUserID()));
-            Logger.printDebug(() -> "user stats: " + stats);
-            return stats;
+            UserStats stats = lastFetchedStats;
+            if (stats != null && !stats.isExpired()) {
+                return stats;
+            }
+
+            String privateUserID = SponsorBlockSettings.getSBPrivateUserID();
+            UserStats fetchedStats = new UserStats(privateUserID,
+                    getJSONObject(SBRoutes.GET_USER_STATS, privateUserID));
+            Logger.printDebug(() -> "user stats: " + fetchedStats);
+            lastFetchedStats = fetchedStats;
+            return fetchedStats;
         } catch (IOException ex) {
             Logger.printInfo(() -> "failed to retrieve user stats", ex); // info level, do not show a toast
         } catch (Exception ex) {

extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockAboutPreference.java

@@ -0,0 +1,26 @@
+package app.revanced.extension.youtube.sponsorblock.ui;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import app.revanced.extension.youtube.settings.preference.UrlLinkPreference;
+
+@SuppressWarnings("unused")
+public class SponsorBlockAboutPreference extends UrlLinkPreference {
+    {
+        externalUrl = "https://sponsor.ajay.app";
+    }
+
+    public SponsorBlockAboutPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+    public SponsorBlockAboutPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+    public SponsorBlockAboutPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+    public SponsorBlockAboutPreference(Context context) {
+        super(context);
+    }
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockPreferenceGroup.java

@@ -0,0 +1,471 @@
+package app.revanced.extension.youtube.sponsorblock.ui;
+
+import static app.revanced.extension.shared.StringRef.str;
+
+import android.annotation.SuppressLint;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+import android.preference.*;
+import android.text.Html;
+import android.text.InputType;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+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;
+import app.revanced.extension.youtube.sponsorblock.objects.SegmentCategory;
+import app.revanced.extension.youtube.sponsorblock.objects.SegmentCategoryListPreference;
+
+/**
+ * Lots of old code that could be converted to a half dozen custom preferences,
+ * but instead it's wrapped in this group container and all logic is handled here.
+ */
+@SuppressWarnings({"unused", "deprecation"})
+public class SponsorBlockPreferenceGroup extends PreferenceGroup {
+
+    /**
+     * ReVanced settings were recently imported and the UI needs to be updated.
+     */
+    public static boolean settingsImported;
+
+    /**
+     * If the preferences have been created and added to this group.
+     */
+    private boolean preferencesInitialized;
+
+    private SwitchPreference sbEnabled;
+    private SwitchPreference addNewSegment;
+    private SwitchPreference votingEnabled;
+    private SwitchPreference autoHideSkipSegmentButton;
+    private SwitchPreference compactSkipButton;
+    private SwitchPreference squareLayout;
+    private SwitchPreference showSkipToast;
+    private SwitchPreference trackSkips;
+    private SwitchPreference showTimeWithoutSegments;
+    private SwitchPreference toastOnConnectionError;
+
+    private ResettableEditTextPreference newSegmentStep;
+    private ResettableEditTextPreference minSegmentDuration;
+    private EditTextPreference privateUserId;
+    private EditTextPreference importExport;
+    private Preference apiUrl;
+
+    private final List<SegmentCategoryListPreference> segmentCategories = new ArrayList<>();
+    private PreferenceCategory segmentCategory;
+
+    public SponsorBlockPreferenceGroup(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public SponsorBlockPreferenceGroup(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public SponsorBlockPreferenceGroup(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    @SuppressLint("MissingSuperCall")
+    protected View onCreateView(ViewGroup parent) {
+        // Title is not shown.
+        return new View(getContext());
+    }
+
+    private void updateUI() {
+        try {
+            Logger.printDebug(() -> "updateUI");
+
+            final boolean enabled = Settings.SB_ENABLED.get();
+            if (!enabled) {
+                SponsorBlockViewController.hideAll();
+                SegmentPlaybackController.setCurrentVideoId(null);
+            } else if (!Settings.SB_CREATE_NEW_SEGMENT.get()) {
+                SponsorBlockViewController.hideNewSegmentLayout();
+            }
+            // Voting and add new segment buttons automatically show/hide themselves.
+
+            SponsorBlockViewController.updateLayout();
+
+            sbEnabled.setChecked(enabled);
+
+            addNewSegment.setChecked(Settings.SB_CREATE_NEW_SEGMENT.get());
+            addNewSegment.setEnabled(enabled);
+
+            votingEnabled.setChecked(Settings.SB_VOTING_BUTTON.get());
+            votingEnabled.setEnabled(enabled);
+
+            autoHideSkipSegmentButton.setEnabled(enabled);
+            autoHideSkipSegmentButton.setChecked(Settings.SB_AUTO_HIDE_SKIP_BUTTON.get());
+
+            compactSkipButton.setChecked(Settings.SB_COMPACT_SKIP_BUTTON.get());
+            compactSkipButton.setEnabled(enabled);
+
+            squareLayout.setChecked(Settings.SB_SQUARE_LAYOUT.get());
+            squareLayout.setEnabled(enabled);
+
+            showSkipToast.setChecked(Settings.SB_TOAST_ON_SKIP.get());
+            showSkipToast.setEnabled(enabled);
+
+            toastOnConnectionError.setChecked(Settings.SB_TOAST_ON_CONNECTION_ERROR.get());
+            toastOnConnectionError.setEnabled(enabled);
+
+            trackSkips.setChecked(Settings.SB_TRACK_SKIP_COUNT.get());
+            trackSkips.setEnabled(enabled);
+
+            showTimeWithoutSegments.setChecked(Settings.SB_VIDEO_LENGTH_WITHOUT_SEGMENTS.get());
+            showTimeWithoutSegments.setEnabled(enabled);
+
+            newSegmentStep.setText((Settings.SB_CREATE_NEW_SEGMENT_STEP.get()).toString());
+            newSegmentStep.setEnabled(enabled);
+
+            minSegmentDuration.setText((Settings.SB_SEGMENT_MIN_DURATION.get()).toString());
+            minSegmentDuration.setEnabled(enabled);
+
+            privateUserId.setText(Settings.SB_PRIVATE_USER_ID.get());
+            privateUserId.setEnabled(enabled);
+
+            // If the user has a private user id, then include a subtext that mentions not to share it.
+            String importExportSummary = SponsorBlockSettings.userHasSBPrivateId()
+                    ? str("revanced_sb_settings_ie_sum_warning")
+                    : str("revanced_sb_settings_ie_sum");
+            importExport.setSummary(importExportSummary);
+
+            apiUrl.setEnabled(enabled);
+            importExport.setEnabled(enabled);
+            segmentCategory.setEnabled(enabled);
+
+            for (SegmentCategoryListPreference category : segmentCategories) {
+                category.updateUI();
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "updateUI failure", ex);
+        }
+    }
+
+    protected void onAttachedToActivity() {
+        try {
+            super.onAttachedToActivity();
+
+             if (preferencesInitialized) {
+                if (settingsImported) {
+                    settingsImported = false;
+                    updateUI();
+                }
+                return;
+            }
+
+            preferencesInitialized = true;
+
+            Logger.printDebug(() -> "Creating settings preferences");
+            Context context = getContext();
+            SponsorBlockSettings.initialize();
+
+            sbEnabled = new SwitchPreference(context);
+            sbEnabled.setTitle(str("revanced_sb_enable_sb"));
+            sbEnabled.setSummary(str("revanced_sb_enable_sb_sum"));
+            addPreference(sbEnabled);
+            sbEnabled.setOnPreferenceChangeListener((preference1, newValue) -> {
+                Settings.SB_ENABLED.save((Boolean) newValue);
+                updateUI();
+                return true;
+            });
+
+            PreferenceCategory appearanceCategory = new PreferenceCategory(context);
+            appearanceCategory.setTitle(str("revanced_sb_appearance_category"));
+            addPreference(appearanceCategory);
+
+            votingEnabled = new SwitchPreference(context);
+            votingEnabled.setTitle(str("revanced_sb_enable_voting"));
+            votingEnabled.setSummaryOn(str("revanced_sb_enable_voting_sum_on"));
+            votingEnabled.setSummaryOff(str("revanced_sb_enable_voting_sum_off"));
+            votingEnabled.setOnPreferenceChangeListener((preference1, newValue) -> {
+                Settings.SB_VOTING_BUTTON.save((Boolean) newValue);
+                updateUI();
+                return true;
+            });
+            appearanceCategory.addPreference(votingEnabled);
+
+            autoHideSkipSegmentButton = new SwitchPreference(context);
+            autoHideSkipSegmentButton.setTitle(str("revanced_sb_enable_auto_hide_skip_segment_button"));
+            autoHideSkipSegmentButton.setSummaryOn(str("revanced_sb_enable_auto_hide_skip_segment_button_sum_on"));
+            autoHideSkipSegmentButton.setSummaryOff(str("revanced_sb_enable_auto_hide_skip_segment_button_sum_off"));
+            autoHideSkipSegmentButton.setOnPreferenceChangeListener((preference1, newValue) -> {
+                Settings.SB_AUTO_HIDE_SKIP_BUTTON.save((Boolean) newValue);
+                updateUI();
+                return true;
+            });
+            appearanceCategory.addPreference(autoHideSkipSegmentButton);
+
+            compactSkipButton = new SwitchPreference(context);
+            compactSkipButton.setTitle(str("revanced_sb_enable_compact_skip_button"));
+            compactSkipButton.setSummaryOn(str("revanced_sb_enable_compact_skip_button_sum_on"));
+            compactSkipButton.setSummaryOff(str("revanced_sb_enable_compact_skip_button_sum_off"));
+            compactSkipButton.setOnPreferenceChangeListener((preference1, newValue) -> {
+                Settings.SB_COMPACT_SKIP_BUTTON.save((Boolean) newValue);
+                updateUI();
+                return true;
+            });
+            appearanceCategory.addPreference(compactSkipButton);
+
+            squareLayout = new SwitchPreference(context);
+            squareLayout.setTitle(str("revanced_sb_square_layout"));
+            squareLayout.setSummaryOn(str("revanced_sb_square_layout_sum_on"));
+            squareLayout.setSummaryOff(str("revanced_sb_square_layout_sum_off"));
+            squareLayout.setOnPreferenceChangeListener((preference1, newValue) -> {
+                Settings.SB_SQUARE_LAYOUT.save((Boolean) newValue);
+                updateUI();
+                return true;
+            });
+            appearanceCategory.addPreference(squareLayout);
+
+            showSkipToast = new SwitchPreference(context);
+            showSkipToast.setTitle(str("revanced_sb_general_skiptoast"));
+            showSkipToast.setSummaryOn(str("revanced_sb_general_skiptoast_sum_on"));
+            showSkipToast.setSummaryOff(str("revanced_sb_general_skiptoast_sum_off"));
+            showSkipToast.setOnPreferenceClickListener(preference1 -> {
+                Utils.showToastShort(str("revanced_sb_skipped_sponsor"));
+                return false;
+            });
+            showSkipToast.setOnPreferenceChangeListener((preference1, newValue) -> {
+                Settings.SB_TOAST_ON_SKIP.save((Boolean) newValue);
+                updateUI();
+                return true;
+            });
+            appearanceCategory.addPreference(showSkipToast);
+
+            showTimeWithoutSegments = new SwitchPreference(context);
+            showTimeWithoutSegments.setTitle(str("revanced_sb_general_time_without"));
+            showTimeWithoutSegments.setSummaryOn(str("revanced_sb_general_time_without_sum_on"));
+            showTimeWithoutSegments.setSummaryOff(str("revanced_sb_general_time_without_sum_off"));
+            showTimeWithoutSegments.setOnPreferenceChangeListener((preference1, newValue) -> {
+                Settings.SB_VIDEO_LENGTH_WITHOUT_SEGMENTS.save((Boolean) newValue);
+                updateUI();
+                return true;
+            });
+            appearanceCategory.addPreference(showTimeWithoutSegments);
+
+            segmentCategory = new PreferenceCategory(context);
+            segmentCategory.setTitle(str("revanced_sb_diff_segments"));
+            addPreference(segmentCategory);
+
+            for (SegmentCategory category : SegmentCategory.categoriesWithoutUnsubmitted()) {
+                SegmentCategoryListPreference categoryPreference = new SegmentCategoryListPreference(context, category);
+                segmentCategories.add(categoryPreference);
+                segmentCategory.addPreference(categoryPreference);
+            }
+
+            PreferenceCategory createSegmentCategory = new PreferenceCategory(context);
+            createSegmentCategory.setTitle(str("revanced_sb_create_segment_category"));
+            addPreference(createSegmentCategory);
+
+            addNewSegment = new SwitchPreference(context);
+            addNewSegment.setTitle(str("revanced_sb_enable_create_segment"));
+            addNewSegment.setSummaryOn(str("revanced_sb_enable_create_segment_sum_on"));
+            addNewSegment.setSummaryOff(str("revanced_sb_enable_create_segment_sum_off"));
+            addNewSegment.setOnPreferenceChangeListener((preference1, o) -> {
+                Boolean newValue = (Boolean) o;
+                if (newValue && !Settings.SB_SEEN_GUIDELINES.get()) {
+                    new AlertDialog.Builder(preference1.getContext())
+                            .setTitle(str("revanced_sb_guidelines_popup_title"))
+                            .setMessage(str("revanced_sb_guidelines_popup_content"))
+                            .setNegativeButton(str("revanced_sb_guidelines_popup_already_read"), null)
+                            .setPositiveButton(str("revanced_sb_guidelines_popup_open"), (dialogInterface, i) -> openGuidelines())
+                            .setOnDismissListener(dialog -> Settings.SB_SEEN_GUIDELINES.save(true))
+                            .setCancelable(false)
+                            .show();
+                }
+                Settings.SB_CREATE_NEW_SEGMENT.save(newValue);
+                updateUI();
+                return true;
+            });
+            createSegmentCategory.addPreference(addNewSegment);
+
+            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);
+            newSegmentStep.setOnPreferenceChangeListener((preference1, newValue) -> {
+                try {
+                    final int newAdjustmentValue = Integer.parseInt(newValue.toString());
+                    if (newAdjustmentValue != 0) {
+                        Settings.SB_CREATE_NEW_SEGMENT_STEP.save(newAdjustmentValue);
+                        return true;
+                    }
+                } catch (NumberFormatException ex) {
+                    Logger.printInfo(() -> "Invalid new segment step", ex);
+                }
+
+                Utils.showToastLong(str("revanced_sb_general_adjusting_invalid"));
+                updateUI();
+                return false;
+            });
+            createSegmentCategory.addPreference(newSegmentStep);
+
+            Preference guidelinePreferences = new Preference(context);
+            guidelinePreferences.setTitle(str("revanced_sb_guidelines_preference_title"));
+            guidelinePreferences.setSummary(str("revanced_sb_guidelines_preference_sum"));
+            guidelinePreferences.setOnPreferenceClickListener(preference1 -> {
+                openGuidelines();
+                return true;
+            });
+            createSegmentCategory.addPreference(guidelinePreferences);
+
+            PreferenceCategory generalCategory = new PreferenceCategory(context);
+            generalCategory.setTitle(str("revanced_sb_general"));
+            addPreference(generalCategory);
+
+            toastOnConnectionError = new SwitchPreference(context);
+            toastOnConnectionError.setTitle(str("revanced_sb_toast_on_connection_error_title"));
+            toastOnConnectionError.setSummaryOn(str("revanced_sb_toast_on_connection_error_summary_on"));
+            toastOnConnectionError.setSummaryOff(str("revanced_sb_toast_on_connection_error_summary_off"));
+            toastOnConnectionError.setOnPreferenceChangeListener((preference1, newValue) -> {
+                Settings.SB_TOAST_ON_CONNECTION_ERROR.save((Boolean) newValue);
+                updateUI();
+                return true;
+            });
+            generalCategory.addPreference(toastOnConnectionError);
+
+            trackSkips = new SwitchPreference(context);
+            trackSkips.setTitle(str("revanced_sb_general_skipcount"));
+            trackSkips.setSummaryOn(str("revanced_sb_general_skipcount_sum_on"));
+            trackSkips.setSummaryOff(str("revanced_sb_general_skipcount_sum_off"));
+            trackSkips.setOnPreferenceChangeListener((preference1, newValue) -> {
+                Settings.SB_TRACK_SKIP_COUNT.save((Boolean) newValue);
+                updateUI();
+                return true;
+            });
+            generalCategory.addPreference(trackSkips);
+
+            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);
+            minSegmentDuration.setOnPreferenceChangeListener((preference1, newValue) -> {
+                try {
+                    Float minTimeDuration = Float.valueOf(newValue.toString());
+                    Settings.SB_SEGMENT_MIN_DURATION.save(minTimeDuration);
+                    return true;
+                } catch (NumberFormatException ex) {
+                    Logger.printInfo(() -> "Invalid minimum segment duration", ex);
+                }
+
+                Utils.showToastLong(str("revanced_sb_general_min_duration_invalid"));
+                updateUI();
+                return false;
+            });
+            generalCategory.addPreference(minSegmentDuration);
+
+            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) -> {
+                String newUUID = newValue.toString();
+                if (!SponsorBlockSettings.isValidSBUserId(newUUID)) {
+                    Utils.showToastLong(str("revanced_sb_general_uuid_invalid"));
+                    return false;
+                }
+
+                Settings.SB_PRIVATE_USER_ID.save(newUUID);
+                updateUI();
+                return true;
+            });
+            generalCategory.addPreference(privateUserId);
+
+            apiUrl = new Preference(context);
+            apiUrl.setTitle(str("revanced_sb_general_api_url"));
+            apiUrl.setSummary(Html.fromHtml(str("revanced_sb_general_api_url_sum")));
+            apiUrl.setOnPreferenceClickListener(preference1 -> {
+                EditText editText = new EditText(context);
+                editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI);
+                editText.setText(Settings.SB_API_URL.get());
+
+                DialogInterface.OnClickListener urlChangeListener = (dialog, buttonPressed) -> {
+                    if (buttonPressed == DialogInterface.BUTTON_NEUTRAL) {
+                        Settings.SB_API_URL.resetToDefault();
+                        Utils.showToastLong(str("revanced_sb_api_url_reset"));
+                    } else if (buttonPressed == DialogInterface.BUTTON_POSITIVE) {
+                        String serverAddress = editText.getText().toString();
+                        if (!SponsorBlockSettings.isValidSBServerAddress(serverAddress)) {
+                            Utils.showToastLong(str("revanced_sb_api_url_invalid"));
+                        } else if (!serverAddress.equals(Settings.SB_API_URL.get())) {
+                            Settings.SB_API_URL.save(serverAddress);
+                            Utils.showToastLong(str("revanced_sb_api_url_changed"));
+                        }
+                    }
+                };
+                new AlertDialog.Builder(context)
+                        .setTitle(apiUrl.getTitle())
+                        .setView(editText)
+                        .setNegativeButton(android.R.string.cancel, null)
+                        .setNeutralButton(str("revanced_sb_reset"), urlChangeListener)
+                        .setPositiveButton(android.R.string.ok, urlChangeListener)
+                        .show();
+                return true;
+            });
+            generalCategory.addPreference(apiUrl);
+
+            importExport = 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());
+                    });
+                }
+            };
+            importExport.setTitle(str("revanced_sb_settings_ie"));
+            // Summary is set in updateUI()
+            importExport.getEditText().setInputType(InputType.TYPE_CLASS_TEXT
+                    | InputType.TYPE_TEXT_FLAG_MULTI_LINE
+                    | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+            importExport.getEditText().setAutofillHints((String) null);
+            importExport.getEditText().setTextSize(TypedValue.COMPLEX_UNIT_PT, 8);
+            importExport.setOnPreferenceClickListener(preference1 -> {
+                importExport.getEditText().setText(SponsorBlockSettings.exportDesktopSettings());
+                return true;
+            });
+            importExport.setOnPreferenceChangeListener((preference1, newValue) -> {
+                SponsorBlockSettings.importDesktopSettings((String) newValue);
+                updateUI();
+                return true;
+            });
+            generalCategory.addPreference(importExport);
+
+            Utils.setPreferenceTitlesToMultiLineIfNeeded(this);
+
+            updateUI();
+        } catch (Exception ex) {
+            Logger.printException(() -> "onAttachedToActivity failure", ex);
+        }
+    }
+
+    private void openGuidelines() {
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setData(Uri.parse("https://wiki.sponsor.ajay.app/w/Guidelines"));
+        getContext().startActivity(intent);
+    }
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockStatsPreferenceCategory.java

@@ -0,0 +1,210 @@
+package app.revanced.extension.youtube.sponsorblock.ui;
+
+import static android.text.Html.fromHtml;
+import static app.revanced.extension.shared.StringRef.str;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.preference.EditTextPreference;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.util.AttributeSet;
+
+import androidx.annotation.Nullable;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.preference.ResettableEditTextPreference;
+import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.youtube.sponsorblock.SponsorBlockSettings;
+import app.revanced.extension.youtube.sponsorblock.SponsorBlockUtils;
+import app.revanced.extension.youtube.sponsorblock.objects.UserStats;
+import app.revanced.extension.youtube.sponsorblock.requests.SBRequester;
+
+/**
+ * User skip stats.
+ *
+ * None of the preferences here show up in search results because
+ * a category cannot be added to another category for the search results.
+ * Additionally the stats must load remotely on a background thread which means the
+ * preferences are not available to collect for search when the settings first load.
+ */
+@SuppressWarnings({"unused", "deprecation"})
+public class SponsorBlockStatsPreferenceCategory extends PreferenceCategory {
+
+    public SponsorBlockStatsPreferenceCategory(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public SponsorBlockStatsPreferenceCategory(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public SponsorBlockStatsPreferenceCategory(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    protected void onAttachedToActivity() {
+        try {
+            super.onAttachedToActivity();
+
+            Logger.printDebug(() -> "Updating SB stats UI");
+            final boolean enabled = Settings.SB_ENABLED.get();
+            setEnabled(enabled);
+            removeAll();
+
+            if (!SponsorBlockSettings.userHasSBPrivateId()) {
+                // User has never voted or created any segments. Only local stats exist.
+                addLocalUserStats();
+                return;
+            }
+
+            Preference loadingPlaceholderPreference = new Preference(getContext());
+            loadingPlaceholderPreference.setEnabled(false);
+            addPreference(loadingPlaceholderPreference);
+
+            if (enabled) {
+                loadingPlaceholderPreference.setTitle(str("revanced_sb_stats_loading"));
+                Utils.runOnBackgroundThread(() -> {
+                    UserStats stats = SBRequester.retrieveUserStats();
+                    Utils.runOnMainThread(() -> { // get back on main thread to modify UI elements
+                        addUserStats(loadingPlaceholderPreference, stats);
+                        addLocalUserStats();
+                    });
+                });
+            } else {
+                loadingPlaceholderPreference.setTitle(str("revanced_sb_stats_sb_disabled"));
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "onAttachedToActivity failure", ex);
+        }
+    }
+
+    private void addUserStats(Preference loadingPlaceholder, @Nullable UserStats stats) {
+        Utils.verifyOnMainThread();
+        try {
+            if (stats == null) {
+                loadingPlaceholder.setTitle(str("revanced_sb_stats_connection_failure"));
+                return;
+            }
+            removeAll();
+            Context context = getContext();
+
+            if (stats.totalSegmentCountIncludingIgnored > 0) {
+                // If user has not created any segments, there's no reason to set a username.
+                String userName = stats.userName;
+                EditTextPreference preference = new ResettableEditTextPreference(context);
+                preference.setTitle(fromHtml(str("revanced_sb_stats_username", userName)));
+                preference.setSummary(str("revanced_sb_stats_username_change"));
+                preference.setText(userName);
+                preference.setOnPreferenceChangeListener((preference1, value) -> {
+                    Utils.runOnBackgroundThread(() -> {
+                        String newUserName = (String) value;
+                        String errorMessage = SBRequester.setUsername(newUserName);
+                        Utils.runOnMainThread(() -> {
+                            if (errorMessage == null) {
+                                preference.setTitle(fromHtml(str("revanced_sb_stats_username", newUserName)));
+                                preference.setText(newUserName);
+                                Utils.showToastLong(str("revanced_sb_stats_username_changed"));
+                            } else {
+                                preference.setText(userName); // revert to previous
+                                SponsorBlockUtils.showErrorDialog(errorMessage);
+                            }
+                        });
+                    });
+                    return true;
+                });
+                addPreference(preference);
+            }
+
+            {
+                // Number of segment submissions (does not include ignored segments).
+                Preference preference = new Preference(context);
+                String formatted = SponsorBlockUtils.getNumberOfSkipsString(stats.segmentCount);
+                preference.setTitle(fromHtml(str("revanced_sb_stats_submissions", formatted)));
+                preference.setSummary(str("revanced_sb_stats_submissions_sum"));
+                if (stats.totalSegmentCountIncludingIgnored == 0) {
+                    preference.setSelectable(false);
+                } else {
+                    preference.setOnPreferenceClickListener(preference1 -> {
+                        Intent i = new Intent(Intent.ACTION_VIEW);
+                        i.setData(Uri.parse("https://sb.ltn.fi/userid/" + stats.publicUserId));
+                        preference1.getContext().startActivity(i);
+                        return true;
+                    });
+                }
+                addPreference(preference);
+            }
+
+            {
+                // "user reputation".  Usually not useful since it appears most users have zero reputation.
+                // But if there is a reputation then show it here.
+                Preference preference = new Preference(context);
+                preference.setTitle(fromHtml(str("revanced_sb_stats_reputation", stats.reputation)));
+                preference.setSelectable(false);
+                if (stats.reputation != 0) {
+                    addPreference(preference);
+                }
+            }
+
+            {
+                // Time saved for other users.
+                Preference preference = new Preference(context);
+
+                String stats_saved;
+                String stats_saved_sum;
+                if (stats.totalSegmentCountIncludingIgnored == 0) {
+                    stats_saved = str("revanced_sb_stats_saved_zero");
+                    stats_saved_sum = str("revanced_sb_stats_saved_sum_zero");
+                } else {
+                    stats_saved = str("revanced_sb_stats_saved",
+                            SponsorBlockUtils.getNumberOfSkipsString(stats.viewCount));
+                    stats_saved_sum = str("revanced_sb_stats_saved_sum",
+                            SponsorBlockUtils.getTimeSavedString((long) (60 * stats.minutesSaved)));
+                }
+                preference.setTitle(fromHtml(stats_saved));
+                preference.setSummary(fromHtml(stats_saved_sum));
+                preference.setOnPreferenceClickListener(preference1 -> {
+                    Intent i = new Intent(Intent.ACTION_VIEW);
+                    i.setData(Uri.parse("https://sponsor.ajay.app/stats/"));
+                    preference1.getContext().startActivity(i);
+                    return false;
+                });
+                addPreference(preference);
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "addUserStats failure", ex);
+        }
+    }
+
+    private void addLocalUserStats() {
+        // Time the user saved by using SB.
+        Preference preference = new Preference(getContext());
+        Runnable updateStatsSelfSaved = () -> {
+            String formatted = SponsorBlockUtils.getNumberOfSkipsString(
+                    Settings.SB_LOCAL_TIME_SAVED_NUMBER_SEGMENTS.get());
+            preference.setTitle(fromHtml(str("revanced_sb_stats_self_saved", formatted)));
+
+            String formattedSaved = SponsorBlockUtils.getTimeSavedString(
+                    Settings.SB_LOCAL_TIME_SAVED_MILLISECONDS.get() / 1000);
+            preference.setSummary(fromHtml(str("revanced_sb_stats_self_saved_sum", formattedSaved)));
+        };
+        updateStatsSelfSaved.run();
+
+        preference.setOnPreferenceClickListener(preference1 -> {
+            new AlertDialog.Builder(preference1.getContext())
+                    .setTitle(str("revanced_sb_stats_self_saved_reset_title"))
+                    .setPositiveButton(android.R.string.yes, (dialog, whichButton) -> {
+                        Settings.SB_LOCAL_TIME_SAVED_NUMBER_SEGMENTS.resetToDefault();
+                        Settings.SB_LOCAL_TIME_SAVED_MILLISECONDS.resetToDefault();
+                        updateStatsSelfSaved.run();
+                    })
+                    .setNegativeButton(android.R.string.no, null).show();
+            return true;
+        });
+
+        addPreference(preference);
+    }
+}

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

@@ -1,83 +1,98 @@
 package app.revanced.extension.youtube.swipecontrols
 
-import android.content.Context
+import android.annotation.SuppressLint
 import android.graphics.Color
+import app.revanced.extension.shared.Logger
 import app.revanced.extension.shared.StringRef.str
 import app.revanced.extension.shared.Utils
 import app.revanced.extension.youtube.settings.Settings
 import app.revanced.extension.youtube.shared.PlayerType
 
 /**
- * provider for configuration for volume and brightness swipe controls
- *
- * @param context the context to create in
+ * Provides configuration settings for volume and brightness swipe controls in the YouTube player.
+ * Manages enabling/disabling gestures, overlay appearance, and behavior preferences.
  */
-class SwipeControlsConfigurationProvider(
-    private val context: Context,
-) {
-//region swipe enable
+class SwipeControlsConfigurationProvider {
+    //region swipe enable
     /**
-     * should swipe controls be enabled? (global setting)
+     * Indicates whether swipe controls are enabled globally.
+     * Returns true if either volume or brightness controls are enabled and the video is in fullscreen mode.
      */
     val enableSwipeControls: Boolean
         get() = (enableVolumeControls || enableBrightnessControl) && isFullscreenVideo
 
     /**
-     * should swipe controls for volume be enabled?
+     * Indicates whether swipe controls for adjusting volume are enabled.
      */
     val enableVolumeControls = Settings.SWIPE_VOLUME.get()
 
     /**
-     * should swipe controls for volume be enabled?
+     * Indicates whether swipe controls for adjusting brightness are enabled.
      */
     val enableBrightnessControl = Settings.SWIPE_BRIGHTNESS.get()
 
     /**
-     * is the video player currently in fullscreen mode?
+     * Checks if the video player is currently in fullscreen mode.
      */
     private val isFullscreenVideo: Boolean
         get() = PlayerType.current == PlayerType.WATCH_WHILE_FULLSCREEN
-//endregion
+    //endregion
 
-//region keys enable
+    //region keys enable
     /**
-     * should volume key controls be overwritten? (global setting)
+     * Indicates whether volume key controls should be overridden by swipe controls.
+     * Returns true if volume controls are enabled and the video is in fullscreen mode.
      */
     val overwriteVolumeKeyControls: Boolean
         get() = enableVolumeControls && isFullscreenVideo
-//endregion
+    //endregion
 
-//region gesture adjustments
+    //region gesture adjustments
     /**
-     * should press-to-swipe be enabled?
+     * Indicates whether press-to-swipe mode is enabled, requiring a press before swiping to activate controls.
      */
     val shouldEnablePressToSwipe: Boolean
         get() = Settings.SWIPE_PRESS_TO_ENGAGE.get()
 
     /**
-     * threshold for swipe detection
-     * this may be called rapidly in onScroll, so we have to load it once and then leave it constant
+     * The threshold for detecting swipe gestures, in pixels.
+     * Loaded once to ensure consistent behavior during rapid scroll events.
      */
     val swipeMagnitudeThreshold: Int
         get() = Settings.SWIPE_MAGNITUDE_THRESHOLD.get()
-//endregion
 
-//region overlay adjustments
     /**
-     * should the overlay enable haptic feedback?
+     * The sensitivity of volume swipe gestures, determining how much volume changes per swipe.
+     * Resets to default if set to 0, as it would disable swiping.
+     */
+    val volumeSwipeSensitivity: Int
+        get() {
+            val sensitivity = Settings.SWIPE_VOLUME_SENSITIVITY.get()
+
+            if (sensitivity < 1) {
+                return Settings.SWIPE_VOLUME_SENSITIVITY.resetToDefault()
+            }
+
+            return sensitivity
+        }
+    //endregion
+
+    //region overlay adjustments
+    /**
+     * Indicates whether haptic feedback should be enabled for swipe control interactions.
      */
     val shouldEnableHapticFeedback: Boolean
         get() = Settings.SWIPE_HAPTIC_FEEDBACK.get()
 
     /**
-     * how long the overlay should be shown on changes
+     * The duration in milliseconds that the overlay should remain visible after a change.
      */
     val overlayShowTimeoutMillis: Long
         get() = Settings.SWIPE_OVERLAY_TIMEOUT.get()
 
     /**
-     * Gets the opacity value (0-100%) is converted to an alpha value (0-255) for transparency.
-     * If the opacity value is out of range, it resets to the default and displays a warning message.
+     * The background opacity of the overlay, converted from a percentage (0-100) to an alpha value (0-255).
+     * Resets to default and shows a toast if the value is out of range.
      */
     val overlayBackgroundOpacity: Int
         get() {
@@ -85,8 +100,7 @@ class SwipeControlsConfigurationProvider(
 
             if (opacity < 0 || opacity > 100) {
                 Utils.showToastLong(str("revanced_swipe_overlay_background_opacity_invalid_toast"))
-                Settings.SWIPE_OVERLAY_OPACITY.resetToDefault()
-                opacity = Settings.SWIPE_OVERLAY_OPACITY.get()
+                opacity = Settings.SWIPE_OVERLAY_OPACITY.resetToDefault()
             }
 
             opacity = opacity * 255 / 100
@@ -94,55 +108,125 @@ class SwipeControlsConfigurationProvider(
         }
 
     /**
-     * The color of the progress overlay.
+     * The color of the progress bar in the overlay.
+     * Resets to default and shows a toast if the color string is invalid or empty.
      */
     val overlayProgressColor: Int
-        get() = 0xBFFFFFFF.toInt()
+        get() {
+            try {
+                @SuppressLint("UseKtx")
+                val color = Color.parseColor(Settings.SWIPE_OVERLAY_PROGRESS_COLOR.get())
+                return (0xBF000000.toInt() or (color and 0xFFFFFF))
+            } catch (ex: IllegalArgumentException) {
+                Logger.printDebug({ "Could not parse color" }, ex)
+                Utils.showToastLong(str("revanced_swipe_overlay_progress_color_invalid_toast"))
+                Settings.SWIPE_OVERLAY_PROGRESS_COLOR.resetToDefault()
+                return overlayProgressColor // Recursively return.
+            }
+        }
 
     /**
-     * The color used for the background of the progress overlay fill.
+     * The background color used for the filled portion of the progress bar in the overlay.
      */
     val overlayFillBackgroundPaint: Int
         get() = 0x80D3D3D3.toInt()
 
     /**
-     * The color used for the text and icons in the overlay.
+     * The color used for text and icons in the overlay.
      */
     val overlayTextColor: Int
         get() = Color.WHITE
 
     /**
-     * A flag that determines if the overlay should only show the icon.
+     * The text size in the overlay, in density-independent pixels (dp).
+     * Must be between 1 and 30 dp; resets to default and shows a toast if invalid.
      */
-    val overlayShowOverlayMinimalStyle: Boolean
-        get() = Settings.SWIPE_OVERLAY_MINIMAL_STYLE.get()
+    val overlayTextSize: Int
+        get() {
+            val size = Settings.SWIPE_OVERLAY_TEXT_SIZE.get()
+            if (size < 1 || size > 30) {
+                Utils.showToastLong(str("revanced_swipe_text_overlay_size_invalid_toast"))
+                return Settings.SWIPE_OVERLAY_TEXT_SIZE.resetToDefault()
+            }
+            return size
+        }
 
     /**
-     * A flag that determines if the progress bar should be circular.
+     * Defines the style of the swipe controls overlay, determining its layout and appearance.
+     *
+     * @property isMinimal Indicates whether the style is minimalistic, omitting detailed progress indicators.
+     * @property isHorizontalMinimalCenter Indicates whether the style is a minimal horizontal bar centered vertically.
+     * @property isCircular Indicates whether the style uses a circular progress bar.
+     * @property isVertical Indicates whether the style uses a vertical progress bar.
      */
-    val isCircularProgressBar: Boolean
-        get() = Settings.SWIPE_SHOW_CIRCULAR_OVERLAY.get()
-//endregion
+    @Suppress("unused")
+    enum class SwipeOverlayStyle(
+        val isMinimal: Boolean = false,
+        val isHorizontalMinimalCenter: Boolean = false,
+        val isCircular: Boolean = false,
+        val isVertical: Boolean = false
+    ) {
+        /**
+         * A full horizontal progress bar with detailed indicators.
+         */
+        HORIZONTAL,
 
-//region behaviour
+        /**
+         * A minimal horizontal progress bar positioned at the top.
+         */
+        HORIZONTAL_MINIMAL_TOP(isMinimal = true),
+
+        /**
+         * A minimal horizontal progress bar centered vertically.
+         */
+        HORIZONTAL_MINIMAL_CENTER(isMinimal = true, isHorizontalMinimalCenter = true),
+
+        /**
+         * A full circular progress bar with detailed indicators.
+         */
+        CIRCULAR(isCircular = true),
+
+        /**
+         * A minimal circular progress bar.
+         */
+        CIRCULAR_MINIMAL(isMinimal = true, isCircular = true),
+
+        /**
+         * A full vertical progress bar with detailed indicators.
+         */
+        VERTICAL(isVertical = true),
+
+        /**
+         * A minimal vertical progress bar.
+         */
+        VERTICAL_MINIMAL(isMinimal =  true, isVertical = true)
+    }
 
     /**
-     * should the brightness be saved and restored when exiting or entering fullscreen
+     * The current style of the overlay, determining its layout and appearance.
+     */
+    val overlayStyle: SwipeOverlayStyle
+        get() = Settings.SWIPE_OVERLAY_STYLE.get()
+    //endregion
+
+    //region behaviour
+    /**
+     * Indicates whether the brightness level should be saved and restored when entering or exiting fullscreen mode.
      */
     val shouldSaveAndRestoreBrightness: Boolean
         get() = Settings.SWIPE_SAVE_AND_RESTORE_BRIGHTNESS.get()
 
     /**
-     * should auto-brightness be enabled at the lowest value of the brightness gesture
+     * Indicates whether auto-brightness should be enabled when the brightness gesture reaches its lowest value.
      */
     val shouldLowestValueEnableAutoBrightness: Boolean
         get() = Settings.SWIPE_LOWEST_VALUE_ENABLE_AUTO_BRIGHTNESS.get()
 
     /**
-     * variable that stores the brightness gesture value in the settings
+     * The saved brightness value for the swipe gesture, used to restore brightness in fullscreen mode.
      */
     var savedScreenBrightnessValue: Float
         get() = Settings.SWIPE_BRIGHTNESS_VALUE.get()
         set(value) = Settings.SWIPE_BRIGHTNESS_VALUE.save(value)
-//endregion
-}
+    //endregion
+}

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

@@ -23,9 +23,7 @@ import java.lang.ref.WeakReference
 
 /**
  * The main controller for volume and brightness swipe controls.
- * note that the superclass is overwritten to the superclass of the MainActivity at patch time
- *
- * @smali Lapp/revanced/extension/swipecontrols/SwipeControlsHostActivity;
+ * note that the superclass is overwritten to the superclass of the MainActivity at patch time.
  */
 class SwipeControlsHostActivity : Activity() {
     /**
@@ -127,7 +125,7 @@ class SwipeControlsHostActivity : Activity() {
     private fun initialize() {
         // create controllers
         printDebug { "initializing swipe controls controllers" }
-        config = SwipeControlsConfigurationProvider(this)
+        config = SwipeControlsConfigurationProvider()
         keys = VolumeKeysController(this)
         audio = createAudioController()
         screen = createScreenController()

extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/VolumeKeysController.kt

@@ -41,7 +41,7 @@ class VolumeKeysController(
     private fun handleVolumeKeyEvent(event: KeyEvent, volumeUp: Boolean): Boolean {
         if (event.action == KeyEvent.ACTION_DOWN) {
             controller.audio?.apply {
-                volume += if (volumeUp) 1 else -1
+                volume += controller.config.volumeSwipeSensitivity * if (volumeUp) 1 else -1
                 controller.overlay.onVolumeChanged(volume, maxVolume)
             }
         }

extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/BaseGestureController.kt

@@ -24,6 +24,7 @@ abstract class BaseGestureController(
         controller.overlay,
         10,
         1,
+        controller.config.volumeSwipeSensitivity,
     ) {
 
     /**

extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/VolumeAndBrightnessScroller.kt

@@ -41,6 +41,7 @@ interface VolumeAndBrightnessScroller {
  * @param overlayController overlay controller instance
  * @param volumeDistance unit distance for volume scrolling, in dp
  * @param brightnessDistance unit distance for brightness scrolling, in dp
+ * @param volumeSwipeSensitivity how much volume will change by single swipe
  */
 class VolumeAndBrightnessScrollerImpl(
     context: Context,
@@ -49,6 +50,7 @@ class VolumeAndBrightnessScrollerImpl(
     private val overlayController: SwipeControlsOverlay,
     volumeDistance: Int = 10,
     brightnessDistance: Int = 1,
+    private val volumeSwipeSensitivity: Int,
 ) : VolumeAndBrightnessScroller {
 
     // region volume
@@ -60,7 +62,7 @@ class VolumeAndBrightnessScrollerImpl(
             ),
         ) { _, _, direction ->
             volumeController?.run {
-                volume += direction
+                volume += direction * volumeSwipeSensitivity
                 overlayController.onVolumeChanged(volume, maxVolume)
             }
         }

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

@@ -1,8 +1,11 @@
 package app.revanced.extension.youtube.swipecontrols.views
 
+import android.annotation.SuppressLint
 import android.content.Context
+import android.content.res.Resources
 import android.graphics.Canvas
 import android.graphics.Paint
+import android.graphics.Rect
 import android.graphics.RectF
 import android.graphics.drawable.Drawable
 import android.os.Handler
@@ -11,21 +14,30 @@ import android.util.AttributeSet
 import android.view.HapticFeedbackConstants
 import android.view.View
 import android.widget.RelativeLayout
+import app.revanced.extension.shared.StringRef.str
 import app.revanced.extension.shared.Utils
 import app.revanced.extension.youtube.swipecontrols.SwipeControlsConfigurationProvider
 import app.revanced.extension.youtube.swipecontrols.misc.SwipeControlsOverlay
 import kotlin.math.min
+import kotlin.math.max
 import kotlin.math.round
 
 /**
- * Main overlay layout for displaying volume and brightness level with both circular and horizontal progress bars.
+ * Convert dp to pixels based on system display density.
+ */
+fun Float.toDisplayPixels(): Float {
+    return this * Resources.getSystem().displayMetrics.density
+}
+
+/**
+ * Main overlay layout for displaying volume and brightness level with circular, horizontal and vertical progress bars.
  */
 class SwipeControlsOverlayLayout(
     context: Context,
     private val config: SwipeControlsConfigurationProvider,
 ) : RelativeLayout(context), SwipeControlsOverlay {
 
-    constructor(context: Context) : this(context, SwipeControlsConfigurationProvider(context))
+    constructor(context: Context) : this(context, SwipeControlsConfigurationProvider())
 
     // Drawable icons for brightness and volume
     private val autoBrightnessIcon: Drawable = getDrawable("revanced_ic_sc_brightness_auto")
@@ -51,18 +63,21 @@ class SwipeControlsOverlayLayout(
     // Initialize progress bars
     private val circularProgressView: CircularProgressView
     private val horizontalProgressView: HorizontalProgressView
+    private val verticalBrightnessProgressView: VerticalProgressView
+    private val verticalVolumeProgressView: VerticalProgressView
 
     init {
         // Initialize circular progress bar
         circularProgressView = CircularProgressView(
             context,
             config.overlayBackgroundOpacity,
-            config.overlayShowOverlayMinimalStyle,
+            config.overlayStyle.isMinimal,
             config.overlayProgressColor,
             config.overlayFillBackgroundPaint,
-            config.overlayTextColor
+            config.overlayTextColor,
+            config.overlayTextSize
         ).apply {
-            layoutParams = LayoutParams(300, 300).apply {
+            layoutParams = LayoutParams(100f.toDisplayPixels().toInt(), 100f.toDisplayPixels().toInt()).apply {
                 addRule(CENTER_IN_PARENT, TRUE)
             }
             visibility = GONE // Initially hidden
@@ -71,22 +86,65 @@ class SwipeControlsOverlayLayout(
 
         // Initialize horizontal progress bar
         val screenWidth = resources.displayMetrics.widthPixels
-        val layoutWidth = (screenWidth * 2 / 3).toInt() // 2/3 of screen width
+        val layoutWidth = (screenWidth * 4 / 5).toInt() // Cap at ~360dp
         horizontalProgressView = HorizontalProgressView(
             context,
             config.overlayBackgroundOpacity,
-            config.overlayShowOverlayMinimalStyle,
+            config.overlayStyle.isMinimal,
             config.overlayProgressColor,
             config.overlayFillBackgroundPaint,
-            config.overlayTextColor
+            config.overlayTextColor,
+            config.overlayTextSize
         ).apply {
-            layoutParams = LayoutParams(layoutWidth, 100).apply {
+            layoutParams = LayoutParams(layoutWidth, 32f.toDisplayPixels().toInt()).apply {
                 addRule(CENTER_HORIZONTAL)
-                topMargin = 40 // Top margin
+                if (config.overlayStyle.isHorizontalMinimalCenter) {
+                    addRule(CENTER_VERTICAL)
+                } else {
+                    topMargin = 20f.toDisplayPixels().toInt()
+                }
             }
             visibility = GONE // Initially hidden
         }
         addView(horizontalProgressView)
+
+        // Initialize vertical progress bar for brightness (right side)
+        verticalBrightnessProgressView = VerticalProgressView(
+            context,
+            config.overlayBackgroundOpacity,
+            config.overlayStyle.isMinimal,
+            config.overlayProgressColor,
+            config.overlayFillBackgroundPaint,
+            config.overlayTextColor,
+            config.overlayTextSize
+        ).apply {
+            layoutParams = LayoutParams(40f.toDisplayPixels().toInt(), 150f.toDisplayPixels().toInt()).apply {
+                addRule(ALIGN_PARENT_RIGHT)
+                rightMargin = 40f.toDisplayPixels().toInt()
+                addRule(CENTER_VERTICAL)
+            }
+            visibility = GONE // Initially hidden
+        }
+        addView(verticalBrightnessProgressView)
+
+        // Initialize vertical progress bar for volume (left side)
+        verticalVolumeProgressView = VerticalProgressView(
+            context,
+            config.overlayBackgroundOpacity,
+            config.overlayStyle.isMinimal,
+            config.overlayProgressColor,
+            config.overlayFillBackgroundPaint,
+            config.overlayTextColor,
+            config.overlayTextSize
+        ).apply {
+            layoutParams = LayoutParams(40f.toDisplayPixels().toInt(), 150f.toDisplayPixels().toInt()).apply {
+                addRule(ALIGN_PARENT_LEFT)
+                leftMargin = 40f.toDisplayPixels().toInt()
+                addRule(CENTER_VERTICAL)
+            }
+            visibility = GONE // Initially hidden
+        }
+        addView(verticalVolumeProgressView)
     }
 
     // Handler and callback for hiding progress bars
@@ -94,6 +152,8 @@ class SwipeControlsOverlayLayout(
     private val feedbackHideCallback = Runnable {
         circularProgressView.visibility = GONE
         horizontalProgressView.visibility = GONE
+        verticalBrightnessProgressView.visibility = GONE
+        verticalVolumeProgressView.visibility = GONE
     }
 
     /**
@@ -103,7 +163,11 @@ class SwipeControlsOverlayLayout(
         feedbackHideHandler.removeCallbacks(feedbackHideCallback)
         feedbackHideHandler.postDelayed(feedbackHideCallback, config.overlayShowTimeoutMillis)
 
-        val viewToShow = if (config.isCircularProgressBar) circularProgressView else horizontalProgressView
+        val viewToShow = when {
+            config.overlayStyle.isCircular -> circularProgressView
+            config.overlayStyle.isVertical -> if (isBrightness) verticalBrightnessProgressView else verticalVolumeProgressView
+            else -> horizontalProgressView
+        }
         viewToShow.apply {
             setProgress(progress, max, value, isBrightness)
             this.icon = icon
@@ -126,7 +190,9 @@ class SwipeControlsOverlayLayout(
     // Handle brightness change
     override fun onBrightnessChanged(brightness: Double) {
         if (config.shouldLowestValueEnableAutoBrightness && brightness <= 0) {
-            showFeedbackView("Auto", 0, 100, autoBrightnessIcon, isBrightness = true)
+            val displayText = if (config.overlayStyle.isVertical) "А"
+            else str("revanced_swipe_lowest_value_enable_auto_brightness_overlay_text")
+            showFeedbackView(displayText, 0, 100, autoBrightnessIcon, isBrightness = true)
         } else {
             val brightnessValue = round(brightness).toInt()
             val icon = when {
@@ -135,7 +201,8 @@ class SwipeControlsOverlayLayout(
                 brightnessValue < 75 -> highBrightnessIcon
                 else -> fullBrightnessIcon
             }
-            showFeedbackView("$brightnessValue%", brightnessValue, 100, icon, isBrightness = true)
+            val displayText = if (config.overlayStyle.isVertical) "$brightnessValue" else "$brightnessValue%"
+            showFeedbackView(displayText, brightnessValue, 100, icon, isBrightness = true)
         }
     }
 
@@ -156,11 +223,12 @@ class SwipeControlsOverlayLayout(
  */
 abstract class AbstractProgressView(
     context: Context,
-    protected val overlayBackgroundOpacity: Int,
-    protected val overlayShowOverlayMinimalStyle: Boolean,
-    protected val overlayProgressColor: Int,
-    protected val overlayFillBackgroundPaint: Int,
-    protected val overlayTextColor: Int,
+    overlayBackgroundOpacity: Int,
+    protected val isMinimalStyle: Boolean,
+    overlayProgressColor: Int,
+    overlayFillBackgroundPaint: Int,
+    private val overlayTextColor: Int,
+    protected val overlayTextSize: Int,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
 ) : View(context, attrs, defStyleAttr) {
@@ -174,26 +242,25 @@ abstract class AbstractProgressView(
     }
 
     // Initialize paints
-    public val backgroundPaint     = createPaint(overlayBackgroundOpacity,   style = Paint.Style.FILL)
-    public val progressPaint       = createPaint(overlayProgressColor,       style = Paint.Style.STROKE, strokeCap = Paint.Cap.ROUND, strokeWidth = 20f)
-    public val fillBackgroundPaint = createPaint(overlayFillBackgroundPaint, style = Paint.Style.FILL)
-    public val textPaint           = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+    val backgroundPaint     = createPaint(overlayBackgroundOpacity,   style = Paint.Style.FILL)
+    val progressPaint       = createPaint(overlayProgressColor,       style = Paint.Style.STROKE, strokeCap = Paint.Cap.ROUND, strokeWidth = 6f.toDisplayPixels())
+    val fillBackgroundPaint = createPaint(overlayFillBackgroundPaint, style = Paint.Style.FILL)
+    val textPaint           = Paint(Paint.ANTI_ALIAS_FLAG).apply {
         color     = overlayTextColor
         textAlign = Paint.Align.CENTER
-        textSize  = 40f // Can adjust based on need
+        textSize  = overlayTextSize.toFloat().toDisplayPixels()
     }
 
+    // Rect for text measurement
+    protected val textBounds = Rect()
+
     protected var progress = 0
     protected var maxProgress = 100
     protected var displayText: String = "0"
     protected var isBrightness = true
-    public var icon: Drawable? = null
+    var icon: Drawable? = null
 
-    init {
-        // Stroke widths are now set in createPaint for progressPaint and fillBackgroundPaint
-    }
-
-    fun setProgress(value: Int, max: Int, text: String, isBrightnessMode: Boolean) {
+    open fun setProgress(value: Int, max: Int, text: String, isBrightnessMode: Boolean) {
         progress = value
         maxProgress = max
         displayText = text
@@ -201,6 +268,11 @@ abstract class AbstractProgressView(
         invalidate()
     }
 
+    protected fun measureTextWidth(text: String, paint: Paint): Int {
+        paint.getTextBounds(text, 0, text.length, textBounds)
+        return textBounds.width()
+    }
+
     override fun onDraw(canvas: Canvas) {
         // Base class implementation can be empty
     }
@@ -209,34 +281,36 @@ abstract class AbstractProgressView(
 /**
  * Custom view for rendering a circular progress indicator with icons and text.
  */
+@SuppressLint("ViewConstructor")
 class CircularProgressView(
     context: Context,
     overlayBackgroundOpacity: Int,
-    overlayShowOverlayMinimalStyle: Boolean,
+    isMinimalStyle: Boolean,
     overlayProgressColor: Int,
     overlayFillBackgroundPaint: Int,
     overlayTextColor: Int,
+    overlayTextSize: Int,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
 ) : AbstractProgressView(
     context,
     overlayBackgroundOpacity,
-    overlayShowOverlayMinimalStyle,
+    isMinimalStyle,
     overlayProgressColor,
     overlayFillBackgroundPaint,
     overlayTextColor,
+    overlayTextSize,
     attrs,
     defStyleAttr
 ) {
     private val rectF = RectF()
 
     init {
-        textPaint.textSize = 40f // Override default text size for circular view
-        progressPaint.strokeWidth       = 20f
-        fillBackgroundPaint.strokeWidth = 20f
-        progressPaint.strokeCap       = Paint.Cap.ROUND
+        progressPaint.strokeWidth = 6f.toDisplayPixels()
+        fillBackgroundPaint.strokeWidth = 6f.toDisplayPixels()
+        progressPaint.strokeCap = Paint.Cap.ROUND
         fillBackgroundPaint.strokeCap = Paint.Cap.BUTT
-        progressPaint.style       = Paint.Style.STROKE
+        progressPaint.style = Paint.Style.STROKE
         fillBackgroundPaint.style = Paint.Style.STROKE
     }
 
@@ -244,7 +318,8 @@ class CircularProgressView(
         super.onDraw(canvas)
 
         val size = min(width, height).toFloat()
-        rectF.set(20f, 20f, size - 20f, size - 20f)
+        val inset = 6f.toDisplayPixels()
+        rectF.set(inset, inset, size - inset, size - inset)
 
         canvas.drawOval(rectF, fillBackgroundPaint) // Draw the outer ring.
         canvas.drawCircle(width / 2f, height / 2f, size / 3, backgroundPaint) // Draw the inner circle.
@@ -255,124 +330,307 @@ class CircularProgressView(
 
         // Draw the icon in the center.
         icon?.let {
-            val iconSize = if (overlayShowOverlayMinimalStyle) 100 else 80
+            val iconSize = (if (isMinimalStyle) 36f else 24f).toDisplayPixels().toInt()
             val iconX = (width - iconSize) / 2
-            val iconY = (height / 2) - if (overlayShowOverlayMinimalStyle) 50 else 80
+            val iconY = if (isMinimalStyle) {
+                (height - iconSize) / 2
+            } else {
+                (height / 2) - 24f.toDisplayPixels().toInt()
+            }
             it.setBounds(iconX, iconY, iconX + iconSize, iconY + iconSize)
             it.draw(canvas)
         }
 
         // If not a minimal style mode, draw the text inside the ring.
-        if (!overlayShowOverlayMinimalStyle) {
-            canvas.drawText(displayText, width / 2f, height / 2f + 60f, textPaint)
+        if (!isMinimalStyle) {
+            canvas.drawText(displayText, width / 2f, height / 2f + 20f.toDisplayPixels(), textPaint)
         }
     }
+
+    override fun setProgress(value: Int, max: Int, text: String, isBrightnessMode: Boolean) {
+        super.setProgress(value, max, text, isBrightnessMode)
+        requestLayout()
+    }
 }
 
 /**
  * Custom view for rendering a rectangular progress bar with icons and text.
  */
+@SuppressLint("ViewConstructor")
 class HorizontalProgressView(
     context: Context,
     overlayBackgroundOpacity: Int,
-    overlayShowOverlayMinimalStyle: Boolean,
+    isMinimalStyle: Boolean,
     overlayProgressColor: Int,
     overlayFillBackgroundPaint: Int,
     overlayTextColor: Int,
+    overlayTextSize: Int,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
 ) : AbstractProgressView(
     context,
     overlayBackgroundOpacity,
-    overlayShowOverlayMinimalStyle,
+    isMinimalStyle,
     overlayProgressColor,
     overlayFillBackgroundPaint,
     overlayTextColor,
+    overlayTextSize,
     attrs,
     defStyleAttr
 ) {
 
-    private val iconSize = 60f
-    private val padding  = 40f
+    private val iconSize = 20f.toDisplayPixels()
+    private val padding = 12f.toDisplayPixels()
+    private var textWidth = 0f
+    private val progressBarHeight = 3f.toDisplayPixels()
+    private val progressBarWidth: Float = resources.displayMetrics.widthPixels / 4f
 
     init {
-        textPaint.textSize        = 36f // Override default text size for horizontal view
         progressPaint.strokeWidth = 0f
-        progressPaint.strokeCap   = Paint.Cap.BUTT
-        progressPaint.style       = Paint.Style.FILL
+        progressPaint.strokeCap = Paint.Cap.BUTT
+        progressPaint.style = Paint.Style.FILL
         fillBackgroundPaint.style = Paint.Style.FILL
     }
 
+    /**
+     * Calculate required width based on content
+     * @return Required width to display all elements
+     */
+    private fun calculateRequiredWidth(): Float {
+        textWidth = measureTextWidth(displayText, textPaint).toFloat()
+
+        return if (!isMinimalStyle) {
+            padding + iconSize + padding + progressBarWidth + padding + textWidth + padding
+        } else {
+            padding + iconSize + padding + textWidth + padding
+        }
+    }
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+
+        val suggestedWidth = MeasureSpec.getSize(widthMeasureSpec)
+        val suggestedHeight = MeasureSpec.getSize(heightMeasureSpec)
+
+        val height = suggestedHeight
+        val requiredWidth = calculateRequiredWidth().toInt()
+        val width = min(max(100, requiredWidth), suggestedWidth)
+
+        setMeasuredDimension(width, height)
+    }
+
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
 
-        val width = width.toFloat()
-        val height = height.toFloat()
+        val viewWidth = width.toFloat()
+        val viewHeight = height.toFloat()
+        val viewHeightHalf = viewHeight / 2
 
-        // Radius for rounded corners
-        val cornerRadius = min(width, height) / 2
+        textWidth = measureTextWidth(displayText, textPaint).toFloat()
 
-        // Calculate the total width for the elements
-        val minimalElementWidth = 5 * padding + iconSize
+        val cornerRadius = viewHeightHalf
 
-        // Calculate the starting point (X) to center the elements
-        val minimalStartX = (width - minimalElementWidth) / 2
+        val startX = padding
+        val iconEndX = startX + iconSize
 
-        // Draw the background
-        if (!overlayShowOverlayMinimalStyle) {
-            canvas.drawRoundRect(0f, 0f, width, height, cornerRadius, cornerRadius, backgroundPaint)
-        } else {
-            canvas.drawRoundRect(minimalStartX, 0f, minimalStartX + minimalElementWidth, height, cornerRadius, cornerRadius, backgroundPaint)
-        }
+        val textStartX = (viewWidth - 1.5f * padding - textWidth)
 
-        if (!overlayShowOverlayMinimalStyle) {
-            // Draw the fill background
-            val startX = 2 * padding + iconSize
-            val endX = width - 4 * padding
-            val fillWidth = endX - startX
+        canvas.drawRoundRect(
+            0f, 0f, viewWidth, viewHeight,
+            cornerRadius, cornerRadius, backgroundPaint
+        )
 
-            canvas.drawRoundRect(
-                startX,
-                height / 2 - 5f,
-                endX,
-                height / 2 + 5f,
-                10f, 10f,
-                fillBackgroundPaint
-            )
-
-            // Draw the progress
-            val progressWidth = (progress.toFloat() / maxProgress) * fillWidth
-            canvas.drawRoundRect(
-                startX,
-                height / 2 - 5f,
-                startX + progressWidth,
-                height / 2 + 5f,
-                10f, 10f,
-                progressPaint
-            )
-        }
-
-        // Draw the icon
         icon?.let {
-            val iconX = if (!overlayShowOverlayMinimalStyle) {
-                padding
-            } else {
-                padding + minimalStartX
-            }
-            val iconY = height / 2 - iconSize / 2
-            it.setBounds(iconX.toInt(), iconY.toInt(), (iconX + iconSize).toInt(), (iconY + iconSize).toInt())
+            val iconY = viewHeightHalf - iconSize / 2
+            it.setBounds(
+                startX.toInt(),
+                iconY.toInt(),
+                (startX + iconSize).toInt(),
+                (iconY + iconSize).toInt()
+            )
             it.draw(canvas)
         }
 
-        // Draw the text on the right
-        val textX = if (!overlayShowOverlayMinimalStyle) {
-            width - 2 * padding
-        } else {
-            minimalStartX + minimalElementWidth - 2 * padding
-        }
-        val textY = height / 2 + textPaint.textSize / 3
+        val textY = viewHeightHalf + textPaint.textSize / 3
+        textPaint.textAlign = Paint.Align.LEFT
 
-        // Draw the text
-        canvas.drawText(displayText, textX, textY, textPaint)
+        if (isMinimalStyle) {
+            canvas.drawText(displayText, textStartX, textY, textPaint)
+        } else {
+            val progressStartX = iconEndX + padding
+            val progressEndX = textStartX - padding
+            val progressWidth = progressEndX - progressStartX
+
+            if (progressWidth > 50) {
+                val progressBarHeightHalf = progressBarHeight / 2.0f
+                val viewHeightHalfMinusProgressBarHeightHalf = viewHeightHalf - progressBarHeightHalf
+                val viewHeightHalfPlusProgressBarHeightHalf = viewHeightHalf + progressBarHeightHalf
+
+                canvas.drawRoundRect(
+                    progressStartX,
+                    viewHeightHalfMinusProgressBarHeightHalf,
+                    progressEndX,
+                    viewHeightHalfPlusProgressBarHeightHalf,
+                    progressBarHeightHalf,
+                    progressBarHeightHalf,
+                    fillBackgroundPaint
+                )
+
+                val progressValue = (progress.toFloat() / maxProgress) * progressWidth
+                canvas.drawRoundRect(
+                    progressStartX,
+                    viewHeightHalfMinusProgressBarHeightHalf,
+                    progressStartX + progressValue,
+                    viewHeightHalfPlusProgressBarHeightHalf,
+                    progressBarHeightHalf,
+                    progressBarHeightHalf,
+                    progressPaint
+                )
+            }
+
+            canvas.drawText(displayText, textStartX, textY, textPaint)
+        }
+    }
+
+    override fun setProgress(value: Int, max: Int, text: String, isBrightnessMode: Boolean) {
+        super.setProgress(value, max, text, isBrightnessMode)
+        requestLayout()
     }
 }
+
+/**
+ * Custom view for rendering a vertical progress bar with icons and text.
+ */
+@SuppressLint("ViewConstructor")
+class VerticalProgressView(
+    context: Context,
+    overlayBackgroundOpacity: Int,
+    isMinimalStyle: Boolean,
+    overlayProgressColor: Int,
+    overlayFillBackgroundPaint: Int,
+    overlayTextColor: Int,
+    overlayTextSize: Int,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : AbstractProgressView(
+    context,
+    overlayBackgroundOpacity,
+    isMinimalStyle,
+    overlayProgressColor,
+    overlayFillBackgroundPaint,
+    overlayTextColor,
+    overlayTextSize,
+    attrs,
+    defStyleAttr
+) {
+
+    private val iconSize = 20f.toDisplayPixels()
+    private val padding = 12f.toDisplayPixels()
+    private val progressBarWidth = 3f.toDisplayPixels()
+    private val progressBarHeight: Float = resources.displayMetrics.widthPixels / 3f
+
+    init {
+        progressPaint.strokeWidth = 0f
+        progressPaint.strokeCap = Paint.Cap.BUTT
+        progressPaint.style = Paint.Style.FILL
+        fillBackgroundPaint.style = Paint.Style.FILL
+    }
+
+    /**
+     * Calculate required height based on content
+     * @return Required height to display all elements
+     */
+    private fun calculateRequiredHeight(): Float {
+        return if (!isMinimalStyle) {
+            padding + iconSize + padding + progressBarHeight + padding + textPaint.textSize + padding
+        } else {
+            padding + iconSize + padding + textPaint.textSize + padding
+        }
+    }
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+
+        val suggestedWidth = MeasureSpec.getSize(widthMeasureSpec)
+        val suggestedHeight = MeasureSpec.getSize(heightMeasureSpec)
+
+        val requiredHeight = calculateRequiredHeight().toInt()
+        val height = min(max(100, requiredHeight), suggestedHeight)
+
+        setMeasuredDimension(suggestedWidth, height)
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+
+        val viewWidth = width.toFloat()
+        val viewHeight = height.toFloat()
+        val viewWidthHalf = viewWidth / 2
+        val cornerRadius = viewWidthHalf
+
+        val startY = padding
+        val iconEndY = startY + iconSize
+
+        val textStartY = viewHeight - padding - textPaint.textSize / 2
+
+        canvas.drawRoundRect(
+            0f, 0f, viewWidth, viewHeight,
+            cornerRadius, cornerRadius, backgroundPaint
+        )
+
+        icon?.let {
+            val iconX = viewWidthHalf - iconSize / 2
+            it.setBounds(
+                iconX.toInt(),
+                startY.toInt(),
+                (iconX + iconSize).toInt(),
+                (startY + iconSize).toInt()
+            )
+            it.draw(canvas)
+        }
+
+        val textX = viewWidthHalf
+        textPaint.textAlign = Paint.Align.CENTER
+
+        if (isMinimalStyle) {
+            canvas.drawText(displayText, textX, textStartY, textPaint)
+        } else {
+            val progressStartY = (iconEndY + padding).toFloat()
+            val progressEndY = textStartY - textPaint.textSize - padding
+            val progressHeight = progressEndY - progressStartY
+
+            if (progressHeight > 50) {
+                val progressBarWidthHalf = progressBarWidth / 2
+                val viewHeightHalfMinusProgressBarHeightHalf = viewWidthHalf - progressBarWidthHalf
+                val viewHeightHalfPlusProgressBarHeightHalf = viewWidthHalf + progressBarWidthHalf
+
+                canvas.drawRoundRect(
+                    viewHeightHalfMinusProgressBarHeightHalf,
+                    progressStartY,
+                    viewHeightHalfPlusProgressBarHeightHalf,
+                    progressEndY,
+                    progressBarWidthHalf,
+                    progressBarWidthHalf,
+                    fillBackgroundPaint
+                )
+
+                val progressValue = (progress.toFloat() / maxProgress) * progressHeight
+                canvas.drawRoundRect(
+                    viewHeightHalfMinusProgressBarHeightHalf,
+                    progressEndY - progressValue,
+                    viewHeightHalfPlusProgressBarHeightHalf,
+                    progressEndY,
+                    progressBarWidthHalf,
+                    progressBarWidthHalf,
+                    progressPaint
+                )
+            }
+            canvas.drawText(displayText, textX, textStartY, textPaint)
+        }
+    }
+
+    override fun setProgress(value: Int, max: Int, text: String, isBrightnessMode: Boolean) {
+        super.setProgress(value, max, text, isBrightnessMode)
+        requestLayout()
+    }
+}

gradle.properties

@@ -3,4 +3,4 @@ org.gradle.jvmargs = -Xms512M -Xmx2048M
 org.gradle.parallel = true
 android.useAndroidX = true
 kotlin.code.style = official
-version = 5.20.0-dev.4
+version = 5.24.0-dev.5

patches/api/patches.api

@@ -2,6 +2,10 @@ public final class app/revanced/patches/all/misc/activity/exportall/ExportAllAct
 	public static final fun getExportAllActivitiesPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
 }
 
+public final class app/revanced/patches/all/misc/adb/HideAdbPatchKt {
+	public static final fun getHideAdbStatusPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/all/misc/build/BaseSpoofBuildInfoPatchKt {
 	public static final fun baseSpoofBuildInfoPatch (Lkotlin/jvm/functions/Function0;)Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -236,6 +240,10 @@ public final class app/revanced/patches/instagram/ads/HideAdsPatchKt {
 	public static final fun getHideAdsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/instagram/misc/signature/SignatureCheckPatchKt {
+	public static final fun getSignatureCheckPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/irplus/ad/RemoveAdsPatchKt {
 	public static final fun getRemoveAdsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -376,6 +384,14 @@ public final class app/revanced/patches/openinghours/misc/fix/crash/FixCrashPatc
 	public static final fun getFixCrashPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/pandora/ads/DisableAudioAdsPatchKt {
+	public static final fun getDisableAudioAdsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
+public final class app/revanced/patches/pandora/misc/EnableUnlimitedSkipsPatchKt {
+	public static final fun getEnableUnlimitedSkipsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/photomath/detection/deviceid/SpoofDeviceIdPatchKt {
 	public static final fun getGetDeviceIdPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -408,6 +424,14 @@ public final class app/revanced/patches/pixiv/ads/HideAdsPatchKt {
 	public static final fun getHideAdsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/primevideo/ads/SkipAdsPatchKt {
+	public static final fun getSkipAdsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
+public final class app/revanced/patches/primevideo/misc/extension/ExtensionPatchKt {
+	public static final fun getSharedExtensionPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/protonmail/signature/RemoveSentFromSignaturePatchKt {
 	public static final fun getRemoveSentFromSignaturePatch ()Lapp/revanced/patcher/patch/ResourcePatch;
 }
@@ -638,14 +662,12 @@ public abstract class app/revanced/patches/shared/misc/settings/preference/BaseP
 	public static final field Companion Lapp/revanced/patches/shared/misc/settings/preference/BasePreference$Companion;
 	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun equals (Ljava/lang/Object;)Z
 	public final fun getIcon ()Ljava/lang/String;
 	public final fun getKey ()Ljava/lang/String;
 	public final fun getLayout ()Ljava/lang/String;
 	public final fun getSummaryKey ()Ljava/lang/String;
 	public final fun getTag ()Ljava/lang/String;
 	public final fun getTitleKey ()Ljava/lang/String;
-	public fun hashCode ()I
 	public fun serialize (Lorg/w3c/dom/Document;Lkotlin/jvm/functions/Function1;)Lorg/w3c/dom/Element;
 }
 
@@ -842,10 +864,22 @@ 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/SpoofPackageInfoPatchKt {
+	public static final fun getSpoofPackageInfoPatch ()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/misc/privacy/SanitizeSharingLinksPatchKt {
+	public static final fun getSanitizeSharingLinksPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
+public final class app/revanced/patches/spotify/misc/widgets/FixThirdPartyLaunchersWidgetsKt {
+	public static final fun getFixThirdPartyLaunchersWidgets ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/spotify/navbar/PremiumNavbarTabPatchKt {
 	public static final fun getPremiumNavbarTabPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1190,6 +1224,10 @@ public final class app/revanced/patches/youtube/layout/hide/player/flyoutmenupan
 	public static final fun getHidePlayerFlyoutMenuPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/youtube/layout/hide/relatedvideooverlay/HideRelatedVideoOverlayPatchKt {
+	public static final fun getHideRelatedVideoOverlayPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatchKt {
 	public static final fun getDisableRollingNumberAnimationPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1412,6 +1450,8 @@ public final class app/revanced/patches/youtube/misc/playservice/VersionCheckPat
 	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 static final fun is_20_14_or_greater ()Z
+	public static final fun is_20_15_or_greater ()Z
 }
 
 public final class app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatchKt {
@@ -1432,8 +1472,10 @@ public final class app/revanced/patches/youtube/misc/settings/PreferenceScreen :
 	public final fun getGENERAL_LAYOUT ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
 	public final fun getMISC ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
 	public final fun getPLAYER ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
+	public final fun getRETURN_YOUTUBE_DISLIKE ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
 	public final fun getSEEKBAR ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
 	public final fun getSHORTS ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
+	public final fun getSPONSORBLOCK ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
 	public final fun getSWIPE_CONTROLS ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
 	public final fun getVIDEO ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
 }
@@ -1526,6 +1568,7 @@ public final class app/revanced/patches/yuka/misc/unlockpremium/UnlockPremiumPat
 
 public final class app/revanced/util/BytecodeUtilsKt {
 	public static final fun addInstructionsAtControlFlowLabel (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/lang/String;)V
+	public static final fun addInstructionsAtControlFlowLabel (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/lang/String;[Lapp/revanced/patcher/util/smali/ExternalLabel;)V
 	public static final fun containsLiteralInstruction (Lcom/android/tools/smali/dexlib2/iface/Method;D)Z
 	public static final fun containsLiteralInstruction (Lcom/android/tools/smali/dexlib2/iface/Method;F)Z
 	public static final fun containsLiteralInstruction (Lcom/android/tools/smali/dexlib2/iface/Method;J)Z

patches/src/main/kotlin/app/revanced/patches/all/misc/adb/HideAdbPatch.kt

@@ -0,0 +1,75 @@
+package app.revanced.patches.all.misc.adb
+
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.all.misc.transformation.transformInstructionsPatch
+import app.revanced.util.getReference
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+import com.android.tools.smali.dexlib2.immutable.reference.ImmutableMethodReference
+import com.android.tools.smali.dexlib2.util.MethodUtil
+
+private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/all/misc/hide/adb/HideAdbPatch;"
+
+private val SETTINGS_GLOBAL_GET_INT_OR_THROW_METHOD_REFERENCE = ImmutableMethodReference(
+    "Landroid/provider/Settings\$Global;",
+    "getInt",
+    listOf("Landroid/content/ContentResolver;", "Ljava/lang/String;"),
+    "I"
+)
+
+private val SETTINGS_GLOBAL_GET_INT_OR_DEFAULT_METHOD_REFERENCE = ImmutableMethodReference(
+    "Landroid/provider/Settings\$Global;",
+    "getInt",
+    listOf("Landroid/content/ContentResolver;", "Ljava/lang/String;", "I"),
+    "I"
+)
+
+private fun MethodReference.anyMethodSignatureMatches(vararg anyOf: MethodReference): Boolean {
+    return anyOf.any {
+        MethodUtil.methodSignaturesMatch(it, this)
+    }
+}
+
+@Suppress("unused")
+val hideAdbStatusPatch = bytecodePatch(
+    name = "Hide ADB status",
+    description = "Hides enabled development settings and/or ADB.",
+    use = false,
+) {
+    extendWith("extensions/all/misc/adb/hide-adb.rve")
+
+    dependsOn(
+        transformInstructionsPatch(
+            filterMap = filterMap@{ classDef, method, instruction, instructionIndex ->
+                val reference = instruction
+                    .takeIf { it.opcode == Opcode.INVOKE_STATIC }
+                    ?.getReference<MethodReference>()
+                    ?.takeIf {
+                        it.anyMethodSignatureMatches(it,
+                            SETTINGS_GLOBAL_GET_INT_OR_THROW_METHOD_REFERENCE,
+                            SETTINGS_GLOBAL_GET_INT_OR_DEFAULT_METHOD_REFERENCE
+                        )
+                    }
+                    ?: return@filterMap null
+
+                Triple(instruction as Instruction35c, instructionIndex, reference.parameterTypes)
+            },
+            transform = { method, entry ->
+                val (instruction, index, parameterTypes) = entry
+                val parameterString = parameterTypes.joinToString(separator = "")
+
+                val registerString = when (parameterTypes.size) {
+                    2 -> "v${instruction.registerC}, v${instruction.registerD}"
+                    else -> "v${instruction.registerC}, v${instruction.registerD}, v${instruction.registerE}"
+                }
+
+                method.replaceInstruction(
+                    index,
+                    "invoke-static { $registerString }, $EXTENSION_CLASS_DESCRIPTOR->getInt($parameterString)I"
+                )
+            }
+        )
+    )
+}

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

@@ -6,7 +6,7 @@ import app.revanced.patches.all.misc.transformation.filterMapInstruction35c
 import app.revanced.patches.all.misc.transformation.transformInstructionsPatch
 
 private const val EXTENSION_CLASS_DESCRIPTOR_PREFIX =
-    "Lapp/revanced/extension/all/connectivity/wifi/spoof/SpoofWifiPatch"
+    "Lapp/revanced/extension/all/misc/connectivity/wifi/spoof/SpoofWifiPatch"
 
 private const val EXTENSION_CLASS_DESCRIPTOR = "$EXTENSION_CLASS_DESCRIPTOR_PREFIX;"
 

patches/src/main/kotlin/app/revanced/patches/all/misc/screencapture/RemoveScreenCaptureRestrictionPatch.kt

@@ -25,7 +25,7 @@ private val removeCaptureRestrictionResourcePatch = resourcePatch(
 }
 
 private const val EXTENSION_CLASS_DESCRIPTOR_PREFIX =
-    "Lapp/revanced/extension/all/screencapture/removerestriction/RemoveScreenCaptureRestrictionPatch"
+    "Lapp/revanced/extension/all/misc/screencapture/removerestriction/RemoveScreenCaptureRestrictionPatch"
 private const val EXTENSION_CLASS_DESCRIPTOR = "$EXTENSION_CLASS_DESCRIPTOR_PREFIX;"
 
 @Suppress("unused")

patches/src/main/kotlin/app/revanced/patches/all/misc/screenshot/RemoveScreenshotRestrictionPatch.kt

@@ -10,7 +10,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction22c
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 
 private const val EXTENSION_CLASS_DESCRIPTOR_PREFIX =
-    "Lapp/revanced/extension/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch"
+    "Lapp/revanced/extension/all/misc/screenshot/removerestriction/RemoveScreenshotRestrictionPatch"
 private const val EXTENSION_CLASS_DESCRIPTOR = "$EXTENSION_CLASS_DESCRIPTOR_PREFIX;"
 
 @Suppress("unused")

patches/src/main/kotlin/app/revanced/patches/duolingo/ad/Fingerprints.kt

@@ -12,7 +12,8 @@ internal val initializeMonetizationDebugSettingsFingerprint = fingerprint {
         "Z", // useDebugBilling
         "Z", // showManageSubscriptions
         "Z", // alwaysShowSuperAds
-        "Lcom/duolingo/debug/FamilyQuestOverride;",
+        // matches "Lcom/duolingo/debug/FamilyQuestOverride;" or "Lcom/duolingo/data/debug/monetization/FamilyQuestOverride;"
+        "Lcom/duolingo/",
     )
     opcodes(Opcode.IPUT_BOOLEAN)
 }

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

@@ -9,6 +9,5 @@ internal val adInjectorFingerprint = fingerprint {
     parameters("L", "L")
     strings(
         "SponsoredContentController.insertItem",
-        "SponsoredContentController::Delivery",
     )
 }

patches/src/main/kotlin/app/revanced/patches/instagram/misc/signature/Fingerprints.kt

@@ -0,0 +1,20 @@
+package app.revanced.patches.instagram.misc.signature
+
+import app.revanced.patcher.fingerprint
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+
+internal val isValidSignatureClassFingerprint = fingerprint {
+    strings("The provider for uri '", "' is not trusted: ")
+}
+
+internal val isValidSignatureMethodFingerprint = fingerprint {
+    parameters("L", "Z")
+    returns("Z")
+    custom { method, _ ->
+        method.indexOfFirstInstruction {
+            getReference<MethodReference>()?.name == "keySet"
+        } >= 0
+    }
+}

patches/src/main/kotlin/app/revanced/patches/instagram/misc/signature/SignatureCheckPatch.kt

@@ -0,0 +1,19 @@
+package app.revanced.patches.instagram.misc.signature
+
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.returnEarly
+
+@Suppress("unused")
+val signatureCheckPatch = bytecodePatch(
+    name = "Disable signature check",
+    description = "Disables the signature check that causes the app to crash on startup."
+) {
+    compatibleWith("com.instagram.android"("378.0.0.52.68"))
+
+    execute {
+        isValidSignatureMethodFingerprint
+            .match(isValidSignatureClassFingerprint.classDef)
+            .method
+            .returnEarly(true)
+    }
+}

patches/src/main/kotlin/app/revanced/patches/lightroom/misc/login/DisableMandatoryLoginPatch.kt

@@ -7,7 +7,7 @@ import app.revanced.patcher.patch.bytecodePatch
 val disableMandatoryLoginPatch = bytecodePatch(
     name = "Disable mandatory login",
 ) {
-    compatibleWith("com.adobe.lrmobile")
+    compatibleWith("com.adobe.lrmobile"("10.0.2"))
 
     execute {
         isLoggedInFingerprint.method.apply {

patches/src/main/kotlin/app/revanced/patches/lightroom/misc/premium/UnlockPremiumPatch.kt

@@ -7,7 +7,7 @@ import app.revanced.patcher.patch.bytecodePatch
 val unlockPremiumPatch = bytecodePatch(
     name = "Unlock premium",
 ) {
-    compatibleWith("com.adobe.lrmobile")
+    compatibleWith("com.adobe.lrmobile"("10.0.2"))
 
     execute {
         // Set hasPremium = true.

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

@@ -4,10 +4,10 @@ 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)
+internal val jwPlayerConfigFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC)
     custom { methodDef, classDef ->
-        classDef.type == "Lnl/sanomamedia/android/nu/video/util/JWUtil;" && methodDef.name == "createAdvertising"
+        classDef.type == "Lcom/jwplayer/pub/api/configuration/PlayerConfig${'$'}Builder;" && methodDef.name == "advertisingConfig"
     }
 }
 

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

@@ -2,8 +2,11 @@ package app.revanced.patches.nunl.ads
 
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patches.shared.misc.extension.sharedExtensionPatch
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Suppress("unused")
@@ -11,23 +14,15 @@ 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"))
+    compatibleWith("nl.sanomamedia.android.nu"("11.3.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
-            """,
-        )
+        // Whenever the app tries to define the advertising config for JWPlayer, don't set the advertising config and directly return.
+        val iputInstructionIndex = jwPlayerConfigFingerprint.method.indexOfFirstInstructionOrThrow(Opcode.IPUT_OBJECT)
+        jwPlayerConfigFingerprint.method.removeInstructions(iputInstructionIndex, 1)
 
         // Filter injected content from API calls out of lists.
         arrayOf(screenMapperFingerprint, nextPageRepositoryImplFingerprint).forEach {

patches/src/main/kotlin/app/revanced/patches/pandora/ads/DisableAudioAdsPatch.kt

@@ -0,0 +1,30 @@
+package app.revanced.patches.pandora.ads
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.pandora.shared.constructUserDataFingerprint
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Suppress("unused")
+val disableAudioAdsPatch = bytecodePatch(
+    name = "Disable audio ads",
+) {
+    compatibleWith("com.pandora.android")
+
+    execute {
+        constructUserDataFingerprint.method.apply {
+            // First match is "hasAudioAds".
+            val hasAudioAdsStringIndex = constructUserDataFingerprint.stringMatches!!.first().index
+            val moveResultIndex = indexOfFirstInstructionOrThrow(hasAudioAdsStringIndex, Opcode.MOVE_RESULT)
+            val hasAudioAdsRegister = getInstruction<OneRegisterInstruction>(moveResultIndex).registerA
+
+            addInstruction(
+                moveResultIndex + 1,
+                "const/4 v$hasAudioAdsRegister, 0"
+            )
+        }
+    }
+}