chore: Release v5.10.0-dev.10 [skip ci]

# [5.10.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v5.10.0-dev.9...v5.10.0-dev.10) (2025-01-29)

### Bug Fixes

* **YouTube - Hide ads:** Hide new types of tablet ads ([f844a1c](f844a1cd76))

.github/workflows/pull_strings.yml

@@ -16,8 +16,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0
           ref: dev
+          fetch-depth: 0
+          clean: true
 
       - name: Pull strings
         uses: crowdin/github-action@v2

CHANGELOG.md

@@ -1,3 +1,301 @@
+# [5.10.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v5.10.0-dev.9...v5.10.0-dev.10) (2025-01-29)
+
+
+### Bug Fixes
+
+* **YouTube - Hide ads:** Hide new types of tablet ads ([574bcc8](https://github.com/ReVanced/revanced-patches/commit/574bcc844746b7445ec3e93b47daceafefad85e7))
+
+# [5.10.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v5.10.0-dev.8...v5.10.0-dev.9) (2025-01-29)
+
+
+### Bug Fixes
+
+* **SwissId - Play integrity Removal:** Add recommended app version ([#4370](https://github.com/ReVanced/revanced-patches/issues/4370)) ([d8ed474](https://github.com/ReVanced/revanced-patches/commit/d8ed474b165f094fdedc32caaae1f82ebc99eb3d))
+
+# [5.10.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v5.10.0-dev.7...v5.10.0-dev.8) (2025-01-29)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Update settings side effects summary text ([#4369](https://github.com/ReVanced/revanced-patches/issues/4369)) ([e5b3aa1](https://github.com/ReVanced/revanced-patches/commit/e5b3aa1cc6a2465cb006487d528de888bc7cd430))
+
+# [5.10.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v5.10.0-dev.6...v5.10.0-dev.7) (2025-01-29)
+
+
+### Bug Fixes
+
+* **YouTube - Hide ads:** fix 'Hide the Visit store button on channel pages' not working ([#4364](https://github.com/ReVanced/revanced-patches/issues/4364)) ([9d63ea9](https://github.com/ReVanced/revanced-patches/commit/9d63ea9a10ab5128ce18a1f53a946e84550da258))
+
+# [5.10.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.10.0-dev.5...v5.10.0-dev.6) (2025-01-29)
+
+
+### Bug Fixes
+
+* **YouTube - Hide Ads:** Hide end screen store banner without leaving empty space ([#4367](https://github.com/ReVanced/revanced-patches/issues/4367)) ([7e68390](https://github.com/ReVanced/revanced-patches/commit/7e683906418434dd4e2104337d73a2292415c615))
+
+# [5.10.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.10.0-dev.4...v5.10.0-dev.5) (2025-01-27)
+
+
+### Bug Fixes
+
+* **YouTube - Hide video description components:** Use correct string key names ([0f28c2b](https://github.com/ReVanced/revanced-patches/commit/0f28c2b44c0051ea7ab3136433b84c73321cf5bd))
+
+# [5.10.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.10.0-dev.3...v5.10.0-dev.4) (2025-01-27)
+
+
+### Features
+
+* **YouTube - Hide video description components:** Add `Hide How this content was made section` ([#4355](https://github.com/ReVanced/revanced-patches/issues/4355)) ([68ec54e](https://github.com/ReVanced/revanced-patches/commit/68ec54ef850ae8d6461dd0ef2846e6efbb59e482))
+
+# [5.10.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.10.0-dev.2...v5.10.0-dev.3) (2025-01-27)
+
+
+### Features
+
+* **YouTube - Hide ads:** Add `Hide end screen store banner` ([#4351](https://github.com/ReVanced/revanced-patches/issues/4351)) ([5505087](https://github.com/ReVanced/revanced-patches/commit/55050878028fed82b0f583a9f7ba06b8f267f8ec))
+
+# [5.10.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.10.0-dev.1...v5.10.0-dev.2) (2025-01-25)
+
+
+### Features
+
+* **YouTube:** Add patch `Disable HDR video` ([#4347](https://github.com/ReVanced/revanced-patches/issues/4347)) ([0528f7c](https://github.com/ReVanced/revanced-patches/commit/0528f7cad856a2b1347e41944167b0583fc4a3d9))
+
+# [5.10.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.9.1-dev.4...v5.10.0-dev.1) (2025-01-23)
+
+
+### Features
+
+* **YouTube - Theme:** Add option to use custom seekbar accent color ([#4337](https://github.com/ReVanced/revanced-patches/issues/4337)) ([952b4fc](https://github.com/ReVanced/revanced-patches/commit/952b4fc4c9291e1a3e71437b503857763c973dd4))
+
+## [5.9.1-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.9.1-dev.3...v5.9.1-dev.4) (2025-01-22)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Hide new kind of community post ([#4341](https://github.com/ReVanced/revanced-patches/issues/4341)) ([02685c4](https://github.com/ReVanced/revanced-patches/commit/02685c4567aca55f22d45dc238a7d1f0ea264143))
+
+## [5.9.1-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.9.1-dev.2...v5.9.1-dev.3) (2025-01-22)
+
+
+### Bug Fixes
+
+* **YouTube - Hide seekbar:** Do not hide player seekbar if hide feed seekbar is enabled ([#4333](https://github.com/ReVanced/revanced-patches/issues/4333)) ([f5cf6f2](https://github.com/ReVanced/revanced-patches/commit/f5cf6f2a445492d33815a9772f49deac2d70eba9))
+
+## [5.9.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.9.1-dev.1...v5.9.1-dev.2) (2025-01-22)
+
+
+### Bug Fixes
+
+* **YouTube - Theme:** Fix 19.25 - 19.45 patch error ([5b47a5f](https://github.com/ReVanced/revanced-patches/commit/5b47a5f0f6299daaae209341064fd85f16ca18a6))
+
+## [5.9.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.9.0...v5.9.1-dev.1) (2025-01-21)
+
+
+### Bug Fixes
+
+* **YouTube - Theme:** Replace custom seekbar gradient colors instead of disabling ([#4329](https://github.com/ReVanced/revanced-patches/issues/4329)) ([f03da98](https://github.com/ReVanced/revanced-patches/commit/f03da983051021e0c372557a5354d5d967409564))
+
+# [5.9.0](https://github.com/ReVanced/revanced-patches/compare/v5.8.1...v5.9.0) (2025-01-20)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Resolve playback issues after changing from cellular to wifi ([#4277](https://github.com/ReVanced/revanced-patches/issues/4277)) ([e93e1c8](https://github.com/ReVanced/revanced-patches/commit/e93e1c8ec3367e941034e9c4e3725ec1db429a60))
+* **YouTube - Spoof video streams:** Update client user-agent ([#4304](https://github.com/ReVanced/revanced-patches/issues/4304)) ([7917871](https://github.com/ReVanced/revanced-patches/commit/7917871f510b6b805370ef98a0cf8a4e2df0e900))
+
+
+### Features
+
+* **YouTube - Hide feed components:** Handle new type of surveys ([#4295](https://github.com/ReVanced/revanced-patches/issues/4295)) ([c770e03](https://github.com/ReVanced/revanced-patches/commit/c770e03f3801367cb531af860fbdfa43dca89af0))
+* **YouTube - Playback speed:** Add option to change 2x tap and hold speed ([#4307](https://github.com/ReVanced/revanced-patches/issues/4307)) ([02fb26e](https://github.com/ReVanced/revanced-patches/commit/02fb26e9458fb8635d497e6e78f964055244d738))
+* **YouTube - Settings:** Add option to use new Cairo settings menus ([#4305](https://github.com/ReVanced/revanced-patches/issues/4305)) ([7b8a2a2](https://github.com/ReVanced/revanced-patches/commit/7b8a2a2721ab5351f8c0251401aceddf0c5327df))
+
+# [5.9.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.9.0-dev.3...v5.9.0-dev.4) (2025-01-20)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Update client user-agent ([#4304](https://github.com/ReVanced/revanced-patches/issues/4304)) ([7917871](https://github.com/ReVanced/revanced-patches/commit/7917871f510b6b805370ef98a0cf8a4e2df0e900))
+
+# [5.9.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.9.0-dev.2...v5.9.0-dev.3) (2025-01-19)
+
+
+### Features
+
+* **YouTube - Settings:** Add option to use new Cairo settings menus ([#4305](https://github.com/ReVanced/revanced-patches/issues/4305)) ([7b8a2a2](https://github.com/ReVanced/revanced-patches/commit/7b8a2a2721ab5351f8c0251401aceddf0c5327df))
+
+# [5.9.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.9.0-dev.1...v5.9.0-dev.2) (2025-01-18)
+
+
+### Features
+
+* **YouTube - Playback speed:** Add option to change 2x tap and hold speed ([#4307](https://github.com/ReVanced/revanced-patches/issues/4307)) ([02fb26e](https://github.com/ReVanced/revanced-patches/commit/02fb26e9458fb8635d497e6e78f964055244d738))
+
+# [5.9.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.8.2-dev.1...v5.9.0-dev.1) (2025-01-17)
+
+
+### Features
+
+* **YouTube - Hide feed components:** Handle new type of surveys ([#4295](https://github.com/ReVanced/revanced-patches/issues/4295)) ([c770e03](https://github.com/ReVanced/revanced-patches/commit/c770e03f3801367cb531af860fbdfa43dca89af0))
+
+## [5.8.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.8.1...v5.8.2-dev.1) (2025-01-09)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Resolve playback issues after changing from cellular to wifi ([#4277](https://github.com/ReVanced/revanced-patches/issues/4277)) ([e93e1c8](https://github.com/ReVanced/revanced-patches/commit/e93e1c8ec3367e941034e9c4e3725ec1db429a60))
+
+## [5.8.1](https://github.com/ReVanced/revanced-patches/compare/v5.8.0...v5.8.1) (2025-01-07)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Add 'Android Creator' ([#4262](https://github.com/ReVanced/revanced-patches/issues/4262)) ([0479dd2](https://github.com/ReVanced/revanced-patches/commit/0479dd265e09b0accdf6ff6b00c8e938dc5b96c7))
+
+## [5.8.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.8.0...v5.8.1-dev.1) (2025-01-06)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Add 'Android Creator' ([#4262](https://github.com/ReVanced/revanced-patches/issues/4262)) ([0479dd2](https://github.com/ReVanced/revanced-patches/commit/0479dd265e09b0accdf6ff6b00c8e938dc5b96c7))
+
+# [5.8.0](https://github.com/ReVanced/revanced-patches/compare/v5.7.2...v5.8.0) (2024-12-30)
+
+
+### Bug Fixes
+
+* **GmsCore support:** Do not show battery optimization error on Android Automotive devices (Google built-in) ([#4218](https://github.com/ReVanced/revanced-patches/issues/4218)) ([d6e389c](https://github.com/ReVanced/revanced-patches/commit/d6e389cc43bc40724f032b230f70048276349a19))
+* **YouTube - Exit fullscreen mode:** Exit fullscreen mode of first video opened after cold start ([be5cf2e](https://github.com/ReVanced/revanced-patches/commit/be5cf2e834d87d51b5d3061d46bd7154d6306787))
+* **YouTube - Force original audio:** If stream spoofing to Android then show a summary text why force audio is not available ([#4220](https://github.com/ReVanced/revanced-patches/issues/4220)) ([029aee8](https://github.com/ReVanced/revanced-patches/commit/029aee8023f096413fc80a2c583b4fe55ecb10ac))
+* **YouTube - Spoof video streams:** Ignore harmless error toast if hide ads is disabled ([c3423bb](https://github.com/ReVanced/revanced-patches/commit/c3423bb9e531cfa52f6d28e0b98bbe8ab8684c30))
+
+
+### Features
+
+* **Swipe controls:** Add option to enable/disable fullscreen swipe to next video ([#4222](https://github.com/ReVanced/revanced-patches/issues/4222)) ([119092f](https://github.com/ReVanced/revanced-patches/commit/119092fafa4129849246df15fe8076ed3b491b85))
+* **YouTube - Hide Shorts components:** Add option to hide Shorts in watch history ([#4214](https://github.com/ReVanced/revanced-patches/issues/4214)) ([19c2742](https://github.com/ReVanced/revanced-patches/commit/19c2742aa367367c77bb50ddad6f8a20fef8ea0a))
+* **YouTube - Spoof app version:** Add 'Restore old navigation and toolbar icons' ([f84e459](https://github.com/ReVanced/revanced-patches/commit/f84e459d3d54b3001586796ab4e114ebadf09043))
+* **YouTube:** Add `Change form factor` patch ([#4217](https://github.com/ReVanced/revanced-patches/issues/4217)) ([644ac5b](https://github.com/ReVanced/revanced-patches/commit/644ac5baa68b209a32300149a2efa009b776f9a7))
+* **YouTube:** Add `Exit fullscreen mode` patch ([#4223](https://github.com/ReVanced/revanced-patches/issues/4223)) ([bb5d03b](https://github.com/ReVanced/revanced-patches/commit/bb5d03bd89a3f932c77e4e9de90174c374933688))
+* **YouTube:** Add in app option to select a preferred language for ReVanced specific text ([#4231](https://github.com/ReVanced/revanced-patches/issues/4231)) ([3932af3](https://github.com/ReVanced/revanced-patches/commit/3932af397ae89a0b30191cd870bd6cddb7a078db))
+
+# [5.8.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v5.8.0-dev.7...v5.8.0-dev.8) (2024-12-28)
+
+
+### Features
+
+* **YouTube:** Add in app option to select a preferred language for ReVanced specific text ([#4231](https://github.com/ReVanced/revanced-patches/issues/4231)) ([3932af3](https://github.com/ReVanced/revanced-patches/commit/3932af397ae89a0b30191cd870bd6cddb7a078db))
+
+# [5.8.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v5.8.0-dev.6...v5.8.0-dev.7) (2024-12-27)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Ignore harmless error toast if hide ads is disabled ([c3423bb](https://github.com/ReVanced/revanced-patches/commit/c3423bb9e531cfa52f6d28e0b98bbe8ab8684c30))
+
+# [5.8.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.8.0-dev.5...v5.8.0-dev.6) (2024-12-27)
+
+
+### Bug Fixes
+
+* **YouTube - Exit fullscreen mode:** Exit fullscreen mode of first video opened after cold start ([be5cf2e](https://github.com/ReVanced/revanced-patches/commit/be5cf2e834d87d51b5d3061d46bd7154d6306787))
+
+# [5.8.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.8.0-dev.4...v5.8.0-dev.5) (2024-12-27)
+
+
+### Features
+
+* **YouTube:** Add `Change form factor` patch ([#4217](https://github.com/ReVanced/revanced-patches/issues/4217)) ([644ac5b](https://github.com/ReVanced/revanced-patches/commit/644ac5baa68b209a32300149a2efa009b776f9a7))
+
+# [5.8.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.8.0-dev.3...v5.8.0-dev.4) (2024-12-27)
+
+
+### Bug Fixes
+
+* **GmsCore support:** Do not show battery optimization error on Android Automotive devices (Google built-in) ([#4218](https://github.com/ReVanced/revanced-patches/issues/4218)) ([d6e389c](https://github.com/ReVanced/revanced-patches/commit/d6e389cc43bc40724f032b230f70048276349a19))
+
+
+### Features
+
+* **Swipe controls:** Add option to enable/disable fullscreen swipe to next video ([#4222](https://github.com/ReVanced/revanced-patches/issues/4222)) ([119092f](https://github.com/ReVanced/revanced-patches/commit/119092fafa4129849246df15fe8076ed3b491b85))
+* **YouTube:** Add `Exit fullscreen mode` patch ([#4223](https://github.com/ReVanced/revanced-patches/issues/4223)) ([bb5d03b](https://github.com/ReVanced/revanced-patches/commit/bb5d03bd89a3f932c77e4e9de90174c374933688))
+
+# [5.8.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.8.0-dev.2...v5.8.0-dev.3) (2024-12-26)
+
+
+### Bug Fixes
+
+* **YouTube - Force original audio:** If stream spoofing to Android then show a summary text why force audio is not available ([#4220](https://github.com/ReVanced/revanced-patches/issues/4220)) ([029aee8](https://github.com/ReVanced/revanced-patches/commit/029aee8023f096413fc80a2c583b4fe55ecb10ac))
+
+# [5.8.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.8.0-dev.1...v5.8.0-dev.2) (2024-12-24)
+
+
+### Features
+
+* **YouTube - Spoof app version:** Add 'Restore old navigation and toolbar icons' ([f84e459](https://github.com/ReVanced/revanced-patches/commit/f84e459d3d54b3001586796ab4e114ebadf09043))
+
+# [5.8.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.7.2...v5.8.0-dev.1) (2024-12-24)
+
+
+### Features
+
+* **YouTube - Hide Shorts components:** Add option to hide Shorts in watch history ([#4214](https://github.com/ReVanced/revanced-patches/issues/4214)) ([19c2742](https://github.com/ReVanced/revanced-patches/commit/19c2742aa367367c77bb50ddad6f8a20fef8ea0a))
+
+## [5.7.2](https://github.com/ReVanced/revanced-patches/compare/v5.7.1...v5.7.2) (2024-12-24)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Don't hide Shorts channel bar when toggling for video player ([9af6412](https://github.com/ReVanced/revanced-patches/commit/9af6412d92ec31e612eaabba6578453da0fc61d6))
+* **YouTube - Spoof video streams:** Add iOS TV client, restore iOS 'force AVC', show client type in stats for nerds ([#4202](https://github.com/ReVanced/revanced-patches/issues/4202)) ([ab29f80](https://github.com/ReVanced/revanced-patches/commit/ab29f808a9f55b5ab0055533c1a6de549b0631a6))
+
+## [5.7.2-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.7.2-dev.1...v5.7.2-dev.2) (2024-12-23)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Don't hide Shorts channel bar when toggling for video player ([9af6412](https://github.com/ReVanced/revanced-patches/commit/9af6412d92ec31e612eaabba6578453da0fc61d6))
+
+## [5.7.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.7.1...v5.7.2-dev.1) (2024-12-23)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Add iOS TV client, restore iOS 'force AVC', show client type in stats for nerds ([#4202](https://github.com/ReVanced/revanced-patches/issues/4202)) ([ab29f80](https://github.com/ReVanced/revanced-patches/commit/ab29f808a9f55b5ab0055533c1a6de549b0631a6))
+
+## [5.7.1](https://github.com/ReVanced/revanced-patches/compare/v5.7.0...v5.7.1) (2024-12-23)
+
+
+### Bug Fixes
+
+* **YouTube - SponsorBlock:** Show a toast and not a dialog if segment submitted successfully ([134b189](https://github.com/ReVanced/revanced-patches/commit/134b189791113dcf1a1cb7c87b8a0954f432730c))
+* **YouTube - Spoof video streams:** Use 2 letter device language code ([33ff997](https://github.com/ReVanced/revanced-patches/commit/33ff9972000581aca92262f984efb114eeeb9537))
+* **YouTube - Spoof video streams:** Use Android VR authentication if using default audio language ([#4191](https://github.com/ReVanced/revanced-patches/issues/4191)) ([98773cc](https://github.com/ReVanced/revanced-patches/commit/98773cc7d46e5c9c7715b82c8006f1ccbcc5443c))
+* **YouTube - Theme:** Use dark theme color for status and navigation bar ([0240efe](https://github.com/ReVanced/revanced-patches/commit/0240efe33e5444625ca2b760c861c9046d3dc836))
+* **YouTube:** Do not reset playback speed to 1.0x after closing comment thread (Fixes stock YouTube bug) ([#4195](https://github.com/ReVanced/revanced-patches/issues/4195)) ([dda788c](https://github.com/ReVanced/revanced-patches/commit/dda788c58c789d4f91646ea8e8a8077f590ab6b3))
+
+## [5.7.1-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.7.1-dev.4...v5.7.1-dev.5) (2024-12-22)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Use 2 letter device language code ([33ff997](https://github.com/ReVanced/revanced-patches/commit/33ff9972000581aca92262f984efb114eeeb9537))
+
+## [5.7.1-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.7.1-dev.3...v5.7.1-dev.4) (2024-12-22)
+
+
+### Bug Fixes
+
+* **YouTube:** Do not reset playback speed to 1.0x after closing comment thread (Fixes stock YouTube bug) ([#4195](https://github.com/ReVanced/revanced-patches/issues/4195)) ([dda788c](https://github.com/ReVanced/revanced-patches/commit/dda788c58c789d4f91646ea8e8a8077f590ab6b3))
+
+## [5.7.1-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.7.1-dev.2...v5.7.1-dev.3) (2024-12-22)
+
+
+### Bug Fixes
+
+* **YouTube - SponsorBlock:** Show a toast and not a dialog if segment submitted successfully ([134b189](https://github.com/ReVanced/revanced-patches/commit/134b189791113dcf1a1cb7c87b8a0954f432730c))
+
 ## [5.7.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.7.1-dev.1...v5.7.1-dev.2) (2024-12-22)
 
 

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

@@ -106,7 +106,11 @@ public class GmsCoreSupport {
             }
 
             // Check if GmsCore is whitelisted from battery optimizations.
-            if (batteryOptimizationsEnabled(context)) {
+            if (isAndroidAutomotive(context)) {
+                // Ignore Android Automotive devices (Google built-in),
+                // as there is no way to disable battery optimizations.
+                Logger.printDebug(() -> "Device is Android Automotive");
+            } else if (batteryOptimizationsEnabled(context)) {
                 Logger.printInfo(() -> "GmsCore is not whitelisted from battery optimizations");
 
                 showBatteryOptimizationDialog(context,
@@ -147,6 +151,10 @@ public class GmsCoreSupport {
         return !powerManager.isIgnoringBatteryOptimizations(GMS_CORE_PACKAGE_NAME);
     }
 
+    private static boolean isAndroidAutomotive(Context context) {
+        return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
+    }
+
     private static String getGmsCoreDownload() {
         final var vendorGroupId = getGmsCoreVendorGroupId();
         //noinspection SwitchStatementWithTooFewBranches

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

@@ -40,13 +40,15 @@ import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import app.revanced.extension.shared.settings.AppLanguage;
+import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.settings.BooleanSetting;
 import app.revanced.extension.shared.settings.preference.ReVancedAboutPreference;
 
 public class Utils {
 
     @SuppressLint("StaticFieldLeak")
-    private static Context context;
+    private static volatile Context context;
 
     private static String versionName;
     private static String applicationLabel;
@@ -360,7 +362,17 @@ public class Utils {
     }
 
     public static void setContext(Context appContext) {
+        // Must initially set context as the language settings needs it.
         context = appContext;
+
+        AppLanguage language = BaseSettings.REVANCED_LANGUAGE.get();
+        if (language != AppLanguage.DEFAULT) {
+            // Create a new context with the desired language.
+            Configuration config = appContext.getResources().getConfiguration();
+            config.setLocale(language.getLocale());
+            context = appContext.createConfigurationContext(config);
+        }
+
         // In some apps like TikTok, the Setting classes can load in weird orders due to cyclic class dependencies.
         // Calling the regular printDebug method here can cause a Settings context null pointer exception,
         // even though the context is already set before the call.
@@ -523,6 +535,11 @@ public class Utils {
         return currentNightMode == Configuration.UI_MODE_NIGHT_YES;
     }
 
+    public static boolean isLandscapeOrientation() {
+        final int orientation = context.getResources().getConfiguration().orientation;
+        return orientation == Configuration.ORIENTATION_LANDSCAPE;
+    }
+
     /**
      * Automatically logs any exceptions the runnable throws.
      *
@@ -595,7 +612,7 @@ public class Utils {
                 || networkType == NetworkType.OTHER;
     }
 
-    @SuppressLint("MissingPermission") // permission already included in YouTube
+    @SuppressLint({"MissingPermission", "deprecation"}) // Permission already included in YouTube.
     public static NetworkType getNetworkType() {
         Context networkContext = getContext();
         if (networkContext == null) {
@@ -705,8 +722,8 @@ public class Utils {
             Preference preference = group.getPreference(i);
 
             final Sort preferenceSort;
-            if (preference instanceof PreferenceGroup) {
-                sortPreferenceGroups((PreferenceGroup) preference);
+            if (preference instanceof PreferenceGroup subGroup) {
+                sortPreferenceGroups(subGroup);
                 preferenceSort = groupSort; // Sort value for groups is for it's content, not itself.
             } else {
                 // Allow individual preferences to set a key sorting.
@@ -760,8 +777,8 @@ public class Utils {
             return;
         }
 
-        String deviceLanguage = Utils.getContext().getResources().getConfiguration().locale.getLanguage();
-        if (deviceLanguage.equals("en")) {
+        String revancedLocale = Utils.getContext().getResources().getConfiguration().locale.getLanguage();
+        if (revancedLocale.equals(Locale.ENGLISH.getLanguage())) {
             return;
         }
 
@@ -769,8 +786,8 @@ public class Utils {
             Preference pref = group.getPreference(i);
             pref.setSingleLineTitle(false);
 
-            if (pref instanceof PreferenceGroup) {
-                setPreferenceTitlesToMultiLineIfNeeded((PreferenceGroup) pref);
+            if (pref instanceof PreferenceGroup subGroup) {
+                setPreferenceTitlesToMultiLineIfNeeded(subGroup);
             }
         }
     }

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

@@ -0,0 +1,114 @@
+package app.revanced.extension.shared.settings;
+
+import java.util.Locale;
+
+public enum AppLanguage {
+    /**
+     * The current app language.
+     */
+    DEFAULT,
+
+    // Language codes found in locale_config.xml
+    // All region specific variants have been removed.
+    AF,
+    AM,
+    AR,
+    AS,
+    AZ,
+    BE,
+    BG,
+    BN,
+    BS,
+    CA,
+    CS,
+    DA,
+    DE,
+    EL,
+    EN,
+    ES,
+    ET,
+    EU,
+    FA,
+    FI,
+    FR,
+    GL,
+    GU,
+    HI,
+    HE, // App uses obsolete 'IW' and not the modern 'HE' ISO code.
+    HR,
+    HU,
+    HY,
+    ID,
+    IS,
+    IT,
+    JA,
+    KA,
+    KK,
+    KM,
+    KN,
+    KO,
+    KY,
+    LO,
+    LT,
+    LV,
+    MK,
+    ML,
+    MN,
+    MR,
+    MS,
+    MY,
+    NE,
+    NL,
+    NB,
+    OR,
+    PA,
+    PL,
+    PT,
+    RO,
+    RU,
+    SI,
+    SK,
+    SL,
+    SQ,
+    SR,
+    SV,
+    SW,
+    TA,
+    TE,
+    TH,
+    TL,
+    TR,
+    UK,
+    UR,
+    UZ,
+    VI,
+    ZH,
+    ZU;
+
+    private final String language;
+
+    AppLanguage() {
+        language = name().toLowerCase(Locale.US);
+    }
+
+    /**
+     * @return The 2 letter ISO 639_1 language code.
+     */
+    public String getLanguage() {
+        // Changing the app language does not force the app to completely restart,
+        // so the default needs to be the current language and not a static field.
+        if (this == DEFAULT) {
+            return Locale.getDefault().getLanguage();
+        }
+
+        return language;
+    }
+
+    public Locale getLocale() {
+        if (this == DEFAULT) {
+            return Locale.getDefault();
+        }
+
+        return Locale.forLanguageTag(language);
+    }
+}

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

@@ -3,8 +3,10 @@ package app.revanced.extension.shared.settings;
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
 import static app.revanced.extension.shared.settings.Setting.parent;
+import static app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch.AudioStreamLanguageOverrideAvailability;
+import static app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch.SpoofiOSAvailability;
 
-import app.revanced.extension.shared.spoof.AudioStreamLanguage;
+import app.revanced.extension.shared.spoof.ClientType;
 
 /**
  * Settings shared across multiple apps.
@@ -19,6 +21,14 @@ public class BaseSettings {
 
     public static final IntegerSetting CHECK_ENVIRONMENT_WARNINGS_ISSUED = new IntegerSetting("revanced_check_environment_warnings_issued", 0, true, false);
 
+    public static final EnumSetting<AppLanguage> REVANCED_LANGUAGE = new EnumSetting<>("revanced_language", AppLanguage.DEFAULT, true, "revanced_language_user_dialog_message");
+
     public static final BooleanSetting SPOOF_VIDEO_STREAMS = new BooleanSetting("revanced_spoof_video_streams", TRUE, true, "revanced_spoof_video_streams_user_dialog_message");
-    public static final EnumSetting<AudioStreamLanguage> SPOOF_VIDEO_STREAMS_LANGUAGE = new EnumSetting<>("revanced_spoof_video_streams_language", AudioStreamLanguage.DEFAULT, parent(SPOOF_VIDEO_STREAMS));
+    public static final EnumSetting<AppLanguage> SPOOF_VIDEO_STREAMS_LANGUAGE = new EnumSetting<>("revanced_spoof_video_streams_language", AppLanguage.DEFAULT, new AudioStreamLanguageOverrideAvailability());
+    public static final BooleanSetting SPOOF_STREAMING_DATA_STATS_FOR_NERDS = new BooleanSetting("revanced_spoof_streaming_data_stats_for_nerds", TRUE, parent(SPOOF_VIDEO_STREAMS));
+    public static final BooleanSetting SPOOF_VIDEO_STREAMS_IOS_FORCE_AVC = new BooleanSetting("revanced_spoof_video_streams_ios_force_avc", FALSE, true,
+            "revanced_spoof_video_streams_ios_force_avc_user_dialog_message", new SpoofiOSAvailability());
+    // Client type must be last spoof setting due to cyclic references.
+    public static final EnumSetting<ClientType> SPOOF_VIDEO_STREAMS_CLIENT_TYPE = new EnumSetting<>("revanced_spoof_video_streams_client_type", ClientType.ANDROID_VR, true, parent(SPOOF_VIDEO_STREAMS));
+
 }

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

@@ -153,7 +153,6 @@ public abstract class Setting<T> {
 
     /**
      * Confirmation message to display, if the user tries to change the setting from the default value.
-     * Currently this works only for Boolean setting types.
      */
     @Nullable
     public final StringRef userDialogMessage;
@@ -244,6 +243,7 @@ public abstract class Setting<T> {
      *
      * This method will be deleted in the future.
      */
+    @SuppressWarnings("rawtypes")
     public static void migrateFromOldPreferences(@NonNull SharedPrefCategory oldPrefs, @NonNull Setting setting, String settingKey) {
         if (!oldPrefs.preferences.contains(settingKey)) {
             return; // Nothing to do.
@@ -419,6 +419,7 @@ public abstract class Setting<T> {
 
             boolean rebootSettingChanged = false;
             int numberOfSettingsImported = 0;
+            //noinspection rawtypes
             for (Setting setting : SETTINGS) {
                 String key = setting.getImportExportKey();
                 if (json.has(key)) {

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

@@ -42,7 +42,7 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
 
     private final SharedPreferences.OnSharedPreferenceChangeListener listener = (sharedPreferences, str) -> {
         try {
-            Setting<?> setting = Setting.getSettingFromPath(str);
+            Setting<?> setting = Setting.getSettingFromPath(Objects.requireNonNull(str));
             if (setting == null) {
                 return;
             }
@@ -52,23 +52,21 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
             }
             Logger.printDebug(() -> "Preference changed: " + setting.key);
 
-            // Apply 'Setting <- Preference', unless during importing when it needs to be 'Setting -> Preference'.
-            updatePreference(pref, setting, true, settingImportInProgress);
-            // Update any other preference availability that may now be different.
-            updateUIAvailability();
-
-            if (settingImportInProgress) {
-                return;
-            }
-
-            if (!showingUserDialogMessage) {
-                if (setting.userDialogMessage != null && ((SwitchPreference) pref).isChecked() != (Boolean) setting.defaultValue) {
-                    showSettingUserDialogConfirmation((SwitchPreference) pref, (BooleanSetting) setting);
+            if (!settingImportInProgress && !showingUserDialogMessage) {
+                if (setting.userDialogMessage != null && !prefIsSetToDefault(pref, setting)) {
+                    // Do not change the setting yet, to allow preserving whatever
+                    // list/text value was previously set if it needs to be reverted.
+                    showSettingUserDialogConfirmation(pref, setting);
+                    return;
                 } else if (setting.rebootApp) {
                     showRestartDialog(getContext());
                 }
             }
 
+            // Apply 'Setting <- Preference', unless during importing when it needs to be 'Setting -> Preference'.
+            updatePreference(pref, setting, true, settingImportInProgress);
+            // Update any other preference availability that may now be different.
+            updateUIAvailability();
         } catch (Exception ex) {
             Logger.printException(() -> "OnSharedPreferenceChangeListener failure", ex);
         }
@@ -92,7 +90,7 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
         Utils.setPreferenceTitlesToMultiLineIfNeeded(screen);
     }
 
-    private void showSettingUserDialogConfirmation(SwitchPreference switchPref, BooleanSetting setting) {
+    private void showSettingUserDialogConfirmation(Preference pref, Setting<?> setting) {
         Utils.verifyOnMainThread();
 
         final var context = getContext();
@@ -104,12 +102,19 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
                 .setTitle(confirmDialogTitle)
                 .setMessage(Objects.requireNonNull(setting.userDialogMessage).toString())
                 .setPositiveButton(android.R.string.ok, (dialog, id) -> {
+                    // User confirmed, save to the Setting.
+                    updatePreference(pref, setting, true, false);
+
+                    // Update availability of other preferences that may be changed.
+                    updateUIAvailability();
+
                     if (setting.rebootApp) {
                         showRestartDialog(context);
                     }
                 })
                 .setNegativeButton(android.R.string.cancel, (dialog, id) -> {
-                    switchPref.setChecked(setting.defaultValue); // Recursive call that resets the Setting value.
+                    // Restore whatever the setting was before the change.
+                    updatePreference(pref, setting, true, true);
                 })
                 .setOnDismissListener(dialog -> {
                     showingUserDialogMessage = false;
@@ -132,6 +137,24 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
         updatePreferenceScreen(getPreferenceScreen(), false, false);
     }
 
+    /**
+     * @return If the preference is currently set to the default value of the Setting.
+     */
+    protected boolean prefIsSetToDefault(Preference pref, Setting<?> setting) {
+        if (pref instanceof SwitchPreference switchPref) {
+            return switchPref.isChecked() == (Boolean) setting.defaultValue;
+        }
+        if (pref instanceof EditTextPreference editPreference) {
+            return editPreference.getText().equals(setting.defaultValue.toString());
+        }
+        if (pref instanceof ListPreference listPref) {
+            return listPref.getValue().equals(setting.defaultValue.toString());
+        }
+
+        throw new IllegalStateException("Must override method to handle "
+                + "preference type: " + pref.getClass());
+    }
+
     /**
      * Syncs all UI Preferences to any {@link Setting} they represent.
      */
@@ -170,23 +193,20 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
     protected void syncSettingWithPreference(@NonNull Preference pref,
                                              @NonNull Setting<?> setting,
                                              boolean applySettingToPreference) {
-        if (pref instanceof SwitchPreference) {
-            SwitchPreference switchPref = (SwitchPreference) pref;
+        if (pref instanceof SwitchPreference switchPref) {
             BooleanSetting boolSetting = (BooleanSetting) setting;
             if (applySettingToPreference) {
                 switchPref.setChecked(boolSetting.get());
             } else {
                 BooleanSetting.privateSetValue(boolSetting, switchPref.isChecked());
             }
-        } else if (pref instanceof EditTextPreference) {
-            EditTextPreference editPreference = (EditTextPreference) pref;
+        } else if (pref instanceof EditTextPreference editPreference) {
             if (applySettingToPreference) {
                 editPreference.setText(setting.get().toString());
             } else {
                 Setting.privateSetValueFromString(setting, editPreference.getText());
             }
-        } else if (pref instanceof ListPreference) {
-            ListPreference listPref = (ListPreference) pref;
+        } else if (pref instanceof ListPreference listPref) {
             if (applySettingToPreference) {
                 listPref.setValue(setting.get().toString());
             } else {

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

@@ -1,113 +0,0 @@
-package app.revanced.extension.shared.spoof;
-
-import java.util.Locale;
-
-public enum AudioStreamLanguage {
-    /**
-     * YouTube default.
-     * Can be the original language or can be app language,
-     * depending on what YouTube decides to pick as the default.
-     */
-    DEFAULT,
-
-    // Language codes found in locale_config.xml
-    // Region specific variants of Chinese/English/Spanish/French have been removed.
-    AF,
-    AM,
-    AR,
-    AS,
-    AZ,
-    BE,
-    BG,
-    BN,
-    BS,
-    CA,
-    CS,
-    DA,
-    DE,
-    EL,
-    EN,
-    ES,
-    ET,
-    EU,
-    FA,
-    FI,
-    FR,
-    GL,
-    GU,
-    HI,
-    HE, // App uses obsolete 'IW' and 'HE' is modern ISO code.
-    HR,
-    HU,
-    HY,
-    ID,
-    IS,
-    IT,
-    JA,
-    KA,
-    KK,
-    KM,
-    KN,
-    KO,
-    KY,
-    LO,
-    LT,
-    LV,
-    MK,
-    ML,
-    MN,
-    MR,
-    MS,
-    MY,
-    NE,
-    NL,
-    NB,
-    OR,
-    PA,
-    PL,
-    PT_BR,
-    PT_PT,
-    RO,
-    RU,
-    SI,
-    SK,
-    SL,
-    SQ,
-    SR,
-    SV,
-    SW,
-    TA,
-    TE,
-    TH,
-    TL,
-    TR,
-    UK,
-    UR,
-    UZ,
-    VI,
-    ZH,
-    ZU;
-
-    private final String iso639_1;
-
-    AudioStreamLanguage() {
-        String name = name();
-        final int regionSeparatorIndex = name.indexOf('_');
-        if (regionSeparatorIndex >= 0) {
-            iso639_1 = name.substring(0, regionSeparatorIndex).toLowerCase(Locale.US)
-                    + name.substring(regionSeparatorIndex);
-        } else {
-            iso639_1 = name().toLowerCase(Locale.US);
-        }
-    }
-
-    public String getIso639_1() {
-        // Changing the app language does not force the app to completely restart,
-        // so the default needs to be the current language and not a static field.
-        if (this == DEFAULT) {
-            return Locale.getDefault().toLanguageTag();
-        }
-
-        return iso639_1;
-    }
-}

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

@@ -4,36 +4,119 @@ import android.os.Build;
 
 import androidx.annotation.Nullable;
 
+import java.util.Locale;
+import java.util.Objects;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.settings.BaseSettings;
+
 public enum ClientType {
     // https://dumps.tadiphone.dev/dumps/oculus/eureka
-    ANDROID_VR_NO_AUTH( // Must be first so a default audio language can be set.
+    ANDROID_VR_NO_AUTH(
             28,
             "ANDROID_VR",
+            "com.google.android.apps.youtube.vr.oculus",
+            "Oculus",
             "Quest 3",
+            "Android",
             "12",
-            "com.google.android.apps.youtube.vr.oculus/1.56.21 (Linux; U; Android 12; GB) gzip",
-            "32", // Android 12.1
-            "1.56.21",
-            false),
-    // Fall over to authenticated ('hl' is ignored and audio is same as language set in users Google account).
-    ANDROID_VR(
-            ANDROID_VR_NO_AUTH.id,
-            ANDROID_VR_NO_AUTH.clientName,
-            ANDROID_VR_NO_AUTH.deviceModel,
-            ANDROID_VR_NO_AUTH.osVersion,
-            ANDROID_VR_NO_AUTH.userAgent,
-            ANDROID_VR_NO_AUTH.androidSdkVersion,
-            ANDROID_VR_NO_AUTH.clientVersion,
-            true),
+            // Android 12.1
+            "32",
+            "SQ3A.220605.009.A1",
+            "132.0.6808.3",
+            "1.61.48",
+            false,
+            false,
+            "Android VR No auth"
+    ),
+    // Chromecast with Google TV 4K.
+    // https://dumps.tadiphone.dev/dumps/google/kirkwood
     ANDROID_UNPLUGGED(
             29,
             "ANDROID_UNPLUGGED",
+            "com.google.android.apps.youtube.unplugged",
+            "Google",
             "Google TV Streamer",
+            "Android",
             "14",
-            "com.google.android.apps.youtube.unplugged/8.49.0 (Linux; U; Android 14; GB) gzip",
             "34",
+            "UTT3.240625.001.K5",
+            "132.0.6808.3",
             "8.49.0",
-            true); // Requires login.
+            true,
+            true,
+            "Android TV"
+    ),
+    // Cannot play livestreams and lacks HDR, but can play videos with music and labeled "for children".
+    // Google Pixel 9 Pro Fold
+    // https://dumps.tadiphone.dev/dumps/google/barbet
+    ANDROID_CREATOR(
+            14,
+            "ANDROID_CREATOR",
+            "com.google.android.apps.youtube.creator",
+            "Google",
+            "Pixel 9 Pro Fold",
+            "Android",
+            "15",
+            "35",
+            "AP3A.241005.015.A2",
+            "132.0.6779.0",
+            "23.47.101",
+            true,
+            true,
+            "Android Creator"
+    ),
+    ANDROID_VR(
+            ANDROID_VR_NO_AUTH.id,
+            ANDROID_VR_NO_AUTH.clientName,
+            ANDROID_VR_NO_AUTH.packageName,
+            ANDROID_VR_NO_AUTH.deviceMake,
+            ANDROID_VR_NO_AUTH.deviceModel,
+            ANDROID_VR_NO_AUTH.osName,
+            ANDROID_VR_NO_AUTH.osVersion,
+            ANDROID_VR_NO_AUTH.androidSdkVersion,
+            ANDROID_VR_NO_AUTH.buildId,
+            ANDROID_VR_NO_AUTH.cronetVersion,
+            ANDROID_VR_NO_AUTH.clientVersion,
+            ANDROID_VR_NO_AUTH.requiresAuth,
+            true,
+            "Android VR"
+    ),
+    IOS_UNPLUGGED(
+            33,
+            "IOS_UNPLUGGED",
+            "com.google.ios.youtubeunplugged",
+            "Apple",
+            forceAVC()
+                    // 11 Pro Max (last device with iOS 13)
+                    ? "iPhone12,5"
+                    // 15 Pro Max
+                    : "iPhone16,2",
+            "iOS",
+            forceAVC()
+                    // iOS 13 and earlier uses only AVC. 14+ adds VP9 and AV1.
+                    ? "13.7.17H35"
+                    : "18.2.22C152",
+            null,
+            null,
+            null,
+            // Version number should be a valid iOS release.
+            // https://www.ipa4fun.com/history/152043/
+            forceAVC()
+                    // Some newer versions can also force AVC,
+                    // but 6.45 is the last version that supports iOS 13.
+                    ? "6.45"
+                    : "8.49",
+            true,
+            true,
+            forceAVC()
+                    ? "iOS TV Force AVC"
+                    : "iOS TV"
+    );
+
+    private static boolean forceAVC() {
+        return BaseSettings.SPOOF_VIDEO_STREAMS_IOS_FORCE_AVC.get();
+    }
 
     /**
      * YouTube
@@ -44,20 +127,35 @@ public enum ClientType {
     public final String clientName;
 
     /**
-     * Device model, equivalent to {@link Build#MODEL} (System property: ro.product.model)
+     * App package name.
      */
-    public final String deviceModel;
-
-    /**
-     * Device OS version.
-     */
-    public final String osVersion;
+    private final String packageName;
 
     /**
      * Player user-agent.
      */
     public final String userAgent;
 
+    /**
+     * Device model, equivalent to {@link Build#MANUFACTURER} (System property: ro.product.vendor.manufacturer)
+     */
+    public final String deviceMake;
+
+    /**
+     * Device model, equivalent to {@link Build#MODEL} (System property: ro.product.vendor.model)
+     */
+    public final String deviceModel;
+
+    /**
+     * Device OS name.
+     */
+    public final String osName;
+
+    /**
+     * Device OS version.
+     */
+    public final String osVersion;
+
     /**
      * Android SDK version, equivalent to {@link Build.VERSION#SDK} (System property: ro.build.version.sdk)
      * Field is null if not applicable.
@@ -65,31 +163,97 @@ public enum ClientType {
     @Nullable
     public final String androidSdkVersion;
 
+    /**
+     * Android build id, equivalent to {@link Build#ID}.
+     * Field is null if not applicable.
+     */
+    @Nullable
+    private final String buildId;
+
+    /**
+     * Cronet release version, as found in decompiled client apk.
+     * Field is null if not applicable.
+     */
+    @Nullable
+    private final String cronetVersion;
+
     /**
      * App version.
      */
     public final String clientVersion;
 
     /**
-     * If the client can access the API logged in.
+     * If this client requires authentication and does not work
+     * if logged out or in incognito mode.
      */
-    public final boolean canLogin;
+    public final boolean requiresAuth;
 
+    /**
+     * If the client should use authentication if available.
+     */
+    public final boolean useAuth;
+
+    /**
+     * Friendly name displayed in stats for nerds.
+     */
+    public final String friendlyName;
+
+    @SuppressWarnings("ConstantLocale")
     ClientType(int id,
                String clientName,
+               String packageName,
+               String deviceMake,
                String deviceModel,
+               String osName,
                String osVersion,
-               String userAgent,
                @Nullable String androidSdkVersion,
+               @Nullable String buildId,
+               @Nullable String cronetVersion,
                String clientVersion,
-               boolean canLogin) {
+               boolean requiresAuth,
+               boolean useAuth,
+               String friendlyName) {
         this.id = id;
         this.clientName = clientName;
+        this.packageName = packageName;
+        this.deviceMake = deviceMake;
         this.deviceModel = deviceModel;
+        this.osName = osName;
         this.osVersion = osVersion;
-        this.userAgent = userAgent;
         this.androidSdkVersion = androidSdkVersion;
+        this.buildId = buildId;
+        this.cronetVersion = cronetVersion;
         this.clientVersion = clientVersion;
-        this.canLogin = canLogin;
+        this.requiresAuth = requiresAuth;
+        this.useAuth = useAuth;
+        this.friendlyName = friendlyName;
+
+        Locale defaultLocale = Locale.getDefault();
+        if (androidSdkVersion == null) {
+            // Convert version from '18.2.22C152' into '18_2_22'
+            String userAgentOsVersion = osVersion
+                    .replaceAll("(\\d+\\.\\d+\\.\\d+).*", "$1")
+                    .replace(".", "_");
+            // https://github.com/mitmproxy/mitmproxy/issues/4836
+            this.userAgent = String.format("%s/%s (%s; U; CPU iOS %s like Mac OS X; %s)",
+                    packageName,
+                    clientVersion,
+                    deviceModel,
+                    userAgentOsVersion,
+                    defaultLocale
+            );
+        } else {
+            this.userAgent = String.format("%s/%s (Linux; U; Android %s; %s; %s; Build/%s; Cronet/%s)",
+                    packageName,
+                    clientVersion,
+                    osVersion,
+                    defaultLocale,
+                    deviceModel,
+                    Objects.requireNonNull(buildId),
+                    Objects.requireNonNull(cronetVersion)
+            );
+        }
+        Logger.printDebug(() -> "userAgent: " + this.userAgent);
     }
+
 }

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

@@ -1,6 +1,7 @@
 package app.revanced.extension.shared.spoof;
 
 import android.net.Uri;
+import android.text.TextUtils;
 
 import androidx.annotation.Nullable;
 
@@ -17,6 +18,9 @@ import app.revanced.extension.shared.spoof.requests.StreamingDataRequest;
 public class SpoofVideoStreamsPatch {
     private static final boolean SPOOF_STREAMING_DATA = BaseSettings.SPOOF_VIDEO_STREAMS.get();
 
+    private static final boolean FIX_HLS_CURRENT_TIME = SPOOF_STREAMING_DATA
+            && BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.IOS_UNPLUGGED;
+
     /**
      * Any unreachable ip address.  Used to intentionally fail requests.
      */
@@ -30,15 +34,10 @@ public class SpoofVideoStreamsPatch {
         return false; // Modified during patching.
     }
 
-    public static final class NotSpoofingAndroidAvailability implements Setting.Availability {
-        @Override
-        public boolean isAvailable() {
-            if (SpoofVideoStreamsPatch.isPatchIncluded()) {
-                return !BaseSettings.SPOOF_VIDEO_STREAMS.get();
-            }
-
-            return true;
-        }
+    public static boolean notSpoofingToAndroid() {
+        return !isPatchIncluded()
+                || !BaseSettings.SPOOF_VIDEO_STREAMS.get()
+                || BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.IOS_UNPLUGGED;
     }
 
     /**
@@ -78,9 +77,9 @@ public class SpoofVideoStreamsPatch {
                 String path = originalUri.getPath();
 
                 if (path != null && path.contains("initplayback")) {
-                    Logger.printDebug(() -> "Blocking 'initplayback' by returning unreachable url");
+                    Logger.printDebug(() -> "Blocking 'initplayback' by clearing query");
 
-                    return UNREACHABLE_HOST_URI_STRING;
+                    return originalUri.buildUpon().clearQuery().build().toString();
                 }
             } catch (Exception ex) {
                 Logger.printException(() -> "blockInitPlaybackRequest failure", ex);
@@ -97,6 +96,17 @@ public class SpoofVideoStreamsPatch {
         return SPOOF_STREAMING_DATA;
     }
 
+    /**
+     * Injection point.
+     * Only invoked when playing a livestream on an iOS client.
+     */
+    public static boolean fixHLSCurrentTime(boolean original) {
+        if (!SPOOF_STREAMING_DATA) {
+            return original;
+        }
+        return false;
+    }
+
     /**
      * Injection point.
      */
@@ -105,20 +115,27 @@ public class SpoofVideoStreamsPatch {
             try {
                 Uri uri = Uri.parse(url);
                 String path = uri.getPath();
+                if (path == null || !path.contains("player")) {
+                    return;
+                }
 
+                // 'get_drm_license' has no video id and appears to happen when waiting for a paid video to start.
                 // 'heartbeat' has no video id and appears to be only after playback has started.
                 // 'refresh' has no video id and appears to happen when waiting for a livestream to start.
-                if (path != null && path.contains("player") && !path.contains("heartbeat")
-                        && !path.contains("refresh")) {
-                    String id = uri.getQueryParameter("id");
-                    if (id == null) {
-                        Logger.printException(() -> "Ignoring request that has no video id." +
-                                " Url: " + url + " headers: " + requestHeaders);
-                        return;
-                    }
-
-                    StreamingDataRequest.fetchRequest(id, requestHeaders);
+                // 'ad_break' has no video id.
+                if (path.contains("get_drm_license") || path.contains("heartbeat")
+                        || path.contains("refresh") || path.contains("ad_break")) {
+                    Logger.printDebug(() -> "Ignoring path: " + path);
+                    return;
                 }
+
+                String id = uri.getQueryParameter("id");
+                if (id == null) {
+                    Logger.printException(() -> "Ignoring request with no id: " + url);
+                    return;
+                }
+
+                StreamingDataRequest.fetchRequest(id, requestHeaders);
             } catch (Exception ex) {
                 Logger.printException(() -> "buildRequest failure", ex);
             }
@@ -183,4 +200,38 @@ public class SpoofVideoStreamsPatch {
 
         return postData;
     }
+
+    /**
+     * Injection point.
+     */
+    public static String appendSpoofedClient(String videoFormat) {
+        try {
+            if (SPOOF_STREAMING_DATA && BaseSettings.SPOOF_STREAMING_DATA_STATS_FOR_NERDS.get()
+                    && !TextUtils.isEmpty(videoFormat)) {
+                // Force LTR layout, to match the same LTR video time/length layout YouTube uses for all languages.
+                return "\u202D" + videoFormat + "\u2009(" // u202D = left to right override
+                        + StreamingDataRequest.getLastSpoofedClientName() + ")";
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "appendSpoofedClient failure", ex);
+        }
+
+        return videoFormat;
+    }
+
+    public static final class AudioStreamLanguageOverrideAvailability implements Setting.Availability {
+        @Override
+        public boolean isAvailable() {
+            return BaseSettings.SPOOF_VIDEO_STREAMS.get()
+                    && BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.ANDROID_VR_NO_AUTH;
+        }
+    }
+
+    public static final class SpoofiOSAvailability implements Setting.Availability {
+        @Override
+        public boolean isAvailable() {
+            return BaseSettings.SPOOF_VIDEO_STREAMS.get()
+                    && BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.IOS_UNPLUGGED;
+        }
+    }
 }

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

@@ -5,6 +5,7 @@ import org.json.JSONObject;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
+import java.util.Locale;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.requests.Requester;
@@ -30,27 +31,39 @@ final class PlayerRoutes {
     private PlayerRoutes() {
     }
 
-    static String createInnertubeBody(ClientType clientType) {
+    static String createInnertubeBody(ClientType clientType, String videoId) {
         JSONObject innerTubeBody = new JSONObject();
 
         try {
             JSONObject context = new JSONObject();
 
+            // Can override default language only if no login is used.
+            // Could use preferred audio for all clients that do not login,
+            // but if this is a fall over client it will set the language even though
+            // the audio language is not selectable in the UI.
+            ClientType userSelectedClient = BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get();
+            Locale streamLocale = userSelectedClient == ClientType.ANDROID_VR_NO_AUTH
+                    ? BaseSettings.SPOOF_VIDEO_STREAMS_LANGUAGE.get().getLocale()
+                    : Locale.getDefault();
+
             JSONObject client = new JSONObject();
-            client.put("hl", BaseSettings.SPOOF_VIDEO_STREAMS_LANGUAGE.get().getIso639_1());
+            client.put("deviceMake", clientType.deviceMake);
+            client.put("deviceModel", clientType.deviceModel);
             client.put("clientName", clientType.clientName);
             client.put("clientVersion", clientType.clientVersion);
-            client.put("deviceModel", clientType.deviceModel);
+            client.put("osName", clientType.osName);
             client.put("osVersion", clientType.osVersion);
             if (clientType.androidSdkVersion != null) {
                 client.put("androidSdkVersion", clientType.androidSdkVersion);
             }
+            client.put("hl", streamLocale.getLanguage());
+            client.put("gl", streamLocale.getCountry());
             context.put("client", client);
 
             innerTubeBody.put("context", context);
             innerTubeBody.put("contentCheckOk", true);
             innerTubeBody.put("racyCheckOk", true);
-            innerTubeBody.put("videoId", "%s");
+            innerTubeBody.put("videoId", videoId);
         } catch (JSONException e) {
             Logger.printException(() -> "Failed to create innerTubeBody", e);
         }
@@ -66,6 +79,9 @@ final class PlayerRoutes {
 
         connection.setRequestProperty("Content-Type", "application/json");
         connection.setRequestProperty("User-Agent", clientType.userAgent);
+        // Not a typo. "Client-Name" uses the client type id.
+        connection.setRequestProperty("X-YouTube-Client-Name", String.valueOf(clientType.id));
+        connection.setRequestProperty("X-YouTube-Client-Version", clientType.clientVersion);
 
         connection.setUseCaches(false);
         connection.setDoOutput(true);

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

@@ -22,7 +22,6 @@ import java.util.concurrent.TimeoutException;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.BaseSettings;
-import app.revanced.extension.shared.spoof.AudioStreamLanguage;
 import app.revanced.extension.shared.spoof.ClientType;
 
 /**
@@ -36,7 +35,22 @@ import app.revanced.extension.shared.spoof.ClientType;
  */
 public class StreamingDataRequest {
 
-    private static final ClientType[] CLIENT_ORDER_TO_USE = ClientType.values();
+    private static final ClientType[] CLIENT_ORDER_TO_USE;
+
+    static {
+        ClientType[] allClientTypes = ClientType.values();
+        ClientType preferredClient = BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get();
+
+        CLIENT_ORDER_TO_USE = new ClientType[allClientTypes.length];
+        CLIENT_ORDER_TO_USE[0] = preferredClient;
+
+        int i = 1;
+        for (ClientType c : allClientTypes) {
+            if (c != preferredClient) {
+                CLIENT_ORDER_TO_USE[i++] = c;
+            }
+        }
+    }
 
     private static final String AUTHORIZATION_HEADER = "Authorization";
 
@@ -73,6 +87,13 @@ public class StreamingDataRequest {
                 }
             });
 
+    private static volatile ClientType lastSpoofedClientType;
+
+    public static String getLastSpoofedClientName() {
+        ClientType client = lastSpoofedClientType;
+        return client == null ? "Unknown" : client.friendlyName;
+    }
+
     private final String videoId;
 
     private final Future<ByteBuffer> future;
@@ -99,7 +120,8 @@ public class StreamingDataRequest {
     }
 
     @Nullable
-    private static HttpURLConnection send(ClientType clientType, String videoId,
+    private static HttpURLConnection send(ClientType clientType,
+                                          String videoId,
                                           Map<String, String> playerHeaders,
                                           boolean showErrorToasts) {
         Objects.requireNonNull(clientType);
@@ -107,21 +129,24 @@ public class StreamingDataRequest {
         Objects.requireNonNull(playerHeaders);
 
         final long startTime = System.currentTimeMillis();
-        Logger.printDebug(() -> "Fetching video streams for: " + videoId + " using client: " + clientType);
 
         try {
             HttpURLConnection connection = PlayerRoutes.getPlayerResponseConnectionFromRoute(GET_STREAMING_DATA, clientType);
             connection.setConnectTimeout(HTTP_TIMEOUT_MILLISECONDS);
             connection.setReadTimeout(HTTP_TIMEOUT_MILLISECONDS);
 
+            boolean authHeadersIncludes = false;
+
             for (String key : REQUEST_HEADER_KEYS) {
                 String value = playerHeaders.get(key);
+
                 if (value != null) {
                     if (key.equals(AUTHORIZATION_HEADER)) {
-                        if (!clientType.canLogin) {
+                        if (!clientType.useAuth) {
                             Logger.printDebug(() -> "Not including request header: " + key);
                             continue;
                         }
+                        authHeadersIncludes = true;
                     }
 
                     Logger.printDebug(() -> "Including request header: " + key);
@@ -129,7 +154,15 @@ public class StreamingDataRequest {
                 }
             }
 
-            String innerTubeBody = String.format(PlayerRoutes.createInnertubeBody(clientType), videoId);
+            if (!authHeadersIncludes && clientType.requiresAuth) {
+                Logger.printDebug(() -> "Skipping client since user is not logged in: " + clientType
+                        + " videoId: " + videoId);
+                return null;
+            }
+
+            Logger.printDebug(() -> "Fetching video streams for: " + videoId + " using client: " + clientType);
+
+            String innerTubeBody = PlayerRoutes.createInnertubeBody(clientType, videoId);
             byte[] requestBody = innerTubeBody.getBytes(StandardCharsets.UTF_8);
             connection.setFixedLengthStreamingMode(requestBody.length);
             connection.getOutputStream().write(requestBody);
@@ -161,23 +194,17 @@ public class StreamingDataRequest {
         // Retry with different client if empty response body is received.
         int i = 0;
         for (ClientType clientType : CLIENT_ORDER_TO_USE) {
-            // Show an error if the last client type fails, or if the debug is enabled then show for all attempts.
+            // Show an error if the last client type fails, or if debug is enabled then show for all attempts.
             final boolean showErrorToast = (++i == CLIENT_ORDER_TO_USE.length) || debugEnabled;
 
-            if (clientType == ClientType.ANDROID_VR_NO_AUTH
-                    && BaseSettings.SPOOF_VIDEO_STREAMS_LANGUAGE.get() == AudioStreamLanguage.DEFAULT) {
-                // Only use no auth Android VR if a non default audio language is selected.
-                continue;
-            }
-
             HttpURLConnection connection = send(clientType, videoId, playerHeaders, showErrorToast);
             if (connection != null) {
                 try {
                     // gzip encoding doesn't response with content length (-1),
                     // but empty response body does.
                     if (connection.getContentLength() == 0) {
-                        if (BaseSettings.DEBUG.get()) {
-                            Logger.printException(() -> "Ignoring empty client response: " + clientType);
+                        if (BaseSettings.DEBUG.get() && BaseSettings.DEBUG_TOAST_ON_ERROR.get()) {
+                            Utils.showToastShort("Ignoring empty spoof stream client: " + clientType);
                         }
                     } else {
                         try (InputStream inputStream = new BufferedInputStream(connection.getInputStream());
@@ -188,6 +215,7 @@ public class StreamingDataRequest {
                             while ((bytesRead = inputStream.read(buffer)) >= 0) {
                                 baos.write(buffer, 0, bytesRead);
                             }
+                            lastSpoofedClientType = clientType;
 
                             return ByteBuffer.wrap(baos.toByteArray());
                         }
@@ -198,7 +226,8 @@ public class StreamingDataRequest {
             }
         }
 
-        handleConnectionError("Could not fetch any client streams", null, debugEnabled);
+        lastSpoofedClientType = null;
+        handleConnectionError("Could not fetch any client streams", null, true);
         return null;
     }
 

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

@@ -90,4 +90,12 @@ public class ThemeHelper {
     public static int getForegroundColor() {
         return isDarkTheme() ? getLightThemeColor() : getDarkThemeColor();
     }
+
+    public static int getToolbarBackgroundColor() {
+        final String colorName = isDarkTheme()
+                ? "yt_black3"
+                : "yt_white1";
+
+        return getColorInt(colorName);
+    }
 }

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

@@ -176,14 +176,13 @@ public final class AlternativeThumbnailsPatch {
             // Unknown tab, treat as the home tab;
             return homeOption;
         }
-        if (selectedNavButton == NavigationButton.HOME) {
-            return homeOption;
-        }
-        if (selectedNavButton == NavigationButton.SUBSCRIPTIONS || selectedNavButton == NavigationButton.NOTIFICATIONS) {
-            return subscriptionsOption;
-        }
-        // A library tab variant is active.
-        return libraryOption;
+
+        return switch (selectedNavButton) {
+            case SUBSCRIPTIONS, NOTIFICATIONS -> subscriptionsOption;
+            case LIBRARY -> libraryOption;
+            // Home or explore tab.
+            default -> homeOption;
+        };
     }
 
     /**

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

@@ -0,0 +1,54 @@
+package app.revanced.extension.youtube.patches;
+
+import androidx.annotation.Nullable;
+
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.youtube.settings.Settings;
+
+@SuppressWarnings("unused")
+public class ChangeFormFactorPatch {
+
+    public enum FormFactor {
+        /**
+         * Unmodified, and same as un-patched.
+         */
+        DEFAULT(null),
+        /**
+         * <pre>
+         * Some changes include:
+         * - Explore tab is present.
+         * - watch history is missing.
+         * - feed thumbnails fade in.
+         */
+        UNKNOWN(0),
+        SMALL(1),
+        LARGE(2),
+        /**
+         * Cars with 'Google built-in'.
+         * Layout seems identical to {@link #UNKNOWN}
+         * even when using an Android Automotive device.
+         */
+        AUTOMOTIVE(3),
+        WEARABLE(4);
+
+        @Nullable
+        final Integer formFactorType;
+
+        FormFactor(@Nullable Integer formFactorType) {
+            this.formFactorType = formFactorType;
+        }
+    }
+
+    @Nullable
+    private static final Integer FORM_FACTOR_TYPE = Settings.CHANGE_FORM_FACTOR.get().formFactorType;
+
+    /**
+     * Injection point.
+     */
+    public static int getFormFactor(int original) {
+        return FORM_FACTOR_TYPE == null
+                ? original
+                : FORM_FACTOR_TYPE;
+    }
+
+}

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

@@ -0,0 +1,15 @@
+package app.revanced.extension.youtube.patches;
+
+import app.revanced.extension.youtube.settings.Settings;
+
+@SuppressWarnings("unused")
+public class DisableHdrPatch {
+
+    /**
+     * Injection point.
+     */
+    public static boolean disableHDRVideo() {
+        return !Settings.DISABLE_HDR_VIDEO.get();
+    }
+}
+

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

@@ -9,14 +9,23 @@ import app.revanced.extension.shared.settings.BaseSettings;
 @SuppressWarnings("unused")
 public final class EnableDebuggingPatch {
 
-    private static final ConcurrentMap<Long, Boolean> featureFlags
-            = new ConcurrentHashMap<>(300, 0.75f, 1);
+    /**
+     * Only log if debugging is enabled on startup.
+     * This prevents enabling debugging
+     * while the app is running then failing to restart
+     * resulting in an incomplete log.
+     */
+    private static final boolean LOG_FEATURE_FLAGS = BaseSettings.DEBUG.get();
+
+    private static final ConcurrentMap<Long, Boolean> featureFlags = LOG_FEATURE_FLAGS
+            ? new ConcurrentHashMap<>(800, 0.5f, 1)
+            : null;
 
     /**
      * Injection point.
      */
     public static boolean isBooleanFeatureFlagEnabled(boolean value, long flag) {
-        if (value && BaseSettings.DEBUG.get()) {
+        if (LOG_FEATURE_FLAGS && value) {
             if (featureFlags.putIfAbsent(flag, true) == null) {
                 Logger.printDebug(() -> "boolean feature is enabled: " + flag);
             }
@@ -29,7 +38,7 @@ public final class EnableDebuggingPatch {
      * Injection point.
      */
     public static double isDoubleFeatureFlagEnabled(double value, long flag, double defaultValue) {
-        if (defaultValue != value && BaseSettings.DEBUG.get()) {
+        if (LOG_FEATURE_FLAGS && defaultValue != value) {
             if (featureFlags.putIfAbsent(flag, true) == null) {
                 // Align the log outputs to make post processing easier.
                 Logger.printDebug(() -> " double feature is enabled: " + flag
@@ -44,7 +53,7 @@ public final class EnableDebuggingPatch {
      * Injection point.
      */
     public static long isLongFeatureFlagEnabled(long value, long flag, long defaultValue) {
-        if (defaultValue != value && BaseSettings.DEBUG.get()) {
+        if (LOG_FEATURE_FLAGS && defaultValue != value) {
             if (featureFlags.putIfAbsent(flag, true) == null) {
                 Logger.printDebug(() -> "   long feature is enabled: " + flag
                         + " value: " + value + (defaultValue == 0 ? "" : " default: " + defaultValue));
@@ -58,7 +67,7 @@ public final class EnableDebuggingPatch {
      * Injection point.
      */
     public static String isStringFeatureFlagEnabled(String value, long flag, String defaultValue) {
-        if (BaseSettings.DEBUG.get() && !defaultValue.equals(value)) {
+        if (LOG_FEATURE_FLAGS && !defaultValue.equals(value)) {
             if (featureFlags.putIfAbsent(flag, true) == null) {
                 Logger.printDebug(() -> " string feature is enabled: " + flag
                         + " value: " + value +  (defaultValue.isEmpty() ? "" : " default: " + defaultValue));

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

@@ -0,0 +1,63 @@
+package app.revanced.extension.youtube.patches;
+
+import android.widget.ImageView;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.youtube.shared.PlayerType;
+
+@SuppressWarnings("unused")
+public class ExitFullscreenPatch {
+
+    public enum FullscreenMode {
+        DISABLED,
+        PORTRAIT,
+        LANDSCAPE,
+        PORTRAIT_LANDSCAPE,
+    }
+
+    /**
+     * Injection point.
+     */
+    public static void endOfVideoReached() {
+        try {
+            FullscreenMode mode = Settings.EXIT_FULLSCREEN.get();
+            if (mode == FullscreenMode.DISABLED) {
+                return;
+            }
+
+            if (PlayerType.getCurrent() == PlayerType.WATCH_WHILE_FULLSCREEN) {
+                if (mode != FullscreenMode.PORTRAIT_LANDSCAPE) {
+                    if (Utils.isLandscapeOrientation()) {
+                        if (mode == FullscreenMode.PORTRAIT) {
+                            return;
+                        }
+                    } else if (mode == FullscreenMode.LANDSCAPE) {
+                        return;
+                    }
+                }
+
+                // If the user cold launches the app and plays a video but does not
+                // tap to show the overlay controls, the fullscreen button is not
+                // set because the overlay controls are not attached.
+                // To fix this, push the perform click to the back fo the main thread,
+                // and by then the overlay controls will be visible since the video is now finished.
+                Utils.runOnMainThread(() -> {
+                    ImageView button = PlayerControlsPatch.fullscreenButtonRef.get();
+                    if (button == null) {
+                        Logger.printDebug(() -> "Fullscreen button is null, cannot click");
+                    } else {
+                        Logger.printDebug(() -> "Clicking fullscreen button");
+                        final boolean soundEffectsEnabled = button.isSoundEffectsEnabled();
+                        button.setSoundEffectsEnabled(false);
+                        button.performClick();
+                        button.setSoundEffectsEnabled(soundEffectsEnabled);
+                    }
+                });
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "endOfVideoReached failure", ex);
+        }
+    }
+}

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

@@ -0,0 +1,24 @@
+package app.revanced.extension.youtube.patches;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.youtube.shared.PlayerType;
+
+@SuppressWarnings("unused")
+public class FixPlaybackSpeedWhilePlayingPatch {
+
+    private static final float DEFAULT_YOUTUBE_PLAYBACK_SPEED = 1.0f;
+
+    public static boolean playbackSpeedChanged(float playbackSpeed) {
+        if (playbackSpeed == DEFAULT_YOUTUBE_PLAYBACK_SPEED &&
+                PlayerType.getCurrent().isMaximizedOrFullscreen()) {
+
+            Logger.printDebug(() -> "Blocking call to change playback speed to 1.0x");
+
+            return true;
+        }
+
+        return false;
+    }
+
+}
+

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

@@ -1,6 +1,8 @@
 package app.revanced.extension.youtube.patches;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.settings.Setting;
+import app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch;
 import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings("unused")
@@ -8,6 +10,20 @@ public class ForceOriginalAudioPatch {
 
     private static final String DEFAULT_AUDIO_TRACKS_SUFFIX = ".4";
 
+    /**
+     * If the conditions to use this patch were present when the app launched.
+     */
+    public static boolean PATCH_AVAILABLE = SpoofVideoStreamsPatch.notSpoofingToAndroid();
+
+    public static final class ForceOriginalAudioAvailability implements Setting.Availability {
+        @Override
+        public boolean isAvailable() {
+            // Check conditions of launch and now. Otherwise if spoofing is changed
+            // without a restart the setting will show as available when it's not.
+            return PATCH_AVAILABLE && SpoofVideoStreamsPatch.notSpoofingToAndroid();
+        }
+    }
+
     /**
      * Injection point.
      */

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

@@ -4,15 +4,30 @@ import android.view.View;
 import android.view.ViewTreeObserver;
 import android.widget.ImageView;
 
+import java.lang.ref.WeakReference;
+
 import app.revanced.extension.shared.Logger;
 
 @SuppressWarnings("unused")
 public class PlayerControlsPatch {
 
+    public static WeakReference<ImageView> fullscreenButtonRef = new WeakReference<>(null);
+
+    private static boolean fullscreenButtonVisibilityCallbacksExist() {
+        return false; // Modified during patching if needed.
+    }
+
     /**
      * Injection point.
      */
     public static void setFullscreenCloseButton(ImageView imageButton) {
+        fullscreenButtonRef = new WeakReference<>(imageButton);
+        Logger.printDebug(() -> "Fullscreen button set");
+
+        if (!fullscreenButtonVisibilityCallbacksExist()) {
+            return;
+        }
+
         // Add a global listener, since the protected method
         // View#onVisibilityChanged() does not have any call backs.
         imageButton.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@@ -39,7 +54,7 @@ public class PlayerControlsPatch {
     }
 
     // noinspection EmptyMethod
-    public static void fullscreenButtonVisibilityChanged(boolean isVisible) {
+    private static void fullscreenButtonVisibilityChanged(boolean isVisible) {
         // Code added during patching.
     }
 

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

@@ -1,16 +0,0 @@
-package app.revanced.extension.youtube.patches;
-
-import app.revanced.extension.youtube.settings.Settings;
-
-@SuppressWarnings("unused")
-public final class TabletLayoutPatch {
-
-    private static final boolean TABLET_LAYOUT_ENABLED = Settings.TABLET_LAYOUT.get();
-
-    /**
-     * Injection point.
-     */
-    public static boolean getTabletLayoutEnabled() {
-        return TABLET_LAYOUT_ENABLED;
-    }
-}

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

@@ -5,10 +5,13 @@ import app.revanced.extension.youtube.settings.Settings;
 @SuppressWarnings("unused")
 public class VideoAdsPatch {
 
-    // Used by app.revanced.patches.youtube.ad.general.video.patch.VideoAdsPatch
-    // depends on Whitelist patch (still needs to be written)
+    private static final boolean SHOW_VIDEO_ADS = !Settings.HIDE_VIDEO_ADS.get();
+
+    /**
+     * Injection point.
+     */
     public static boolean shouldShowAds() {
-        return !Settings.HIDE_VIDEO_ADS.get(); // TODO && Whitelist.shouldShowAds();
+        return SHOW_VIDEO_ADS;
     }
 
 }

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

@@ -8,10 +8,12 @@ import android.view.View;
 
 import androidx.annotation.Nullable;
 
-import app.revanced.extension.youtube.settings.Settings;
+import java.util.List;
+
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.youtube.StringTrieSearch;
+import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings("unused")
 public final class AdsFilter extends Filter {
@@ -22,6 +24,11 @@ public final class AdsFilter extends Filter {
 
     // endregion
 
+    // https://encrypted-tbn0.gstatic.com/shopping?q=abc
+    private static final String STORE_BANNER_DOMAIN = "gstatic.com/shopping";
+    private static final boolean HIDE_END_SCREEN_STORE_BANNER =
+            Settings.HIDE_END_SCREEN_STORE_BANNER.get();
+
     private final StringTrieSearch exceptions = new StringTrieSearch();
 
     private final StringFilterGroup playerShoppingShelf;
@@ -66,7 +73,9 @@ public final class AdsFilter extends Filter {
                 "full_width_square_image_layout",
                 "video_display_button_group_layout",
                 "landscape_image_wide_button_layout",
-                "video_display_carousel_button_group_layout"
+                "video_display_carousel_button_group_layout",
+                "compact_landscape_image_layout", // Tablet layout search results.
+                "text_image_no_button_layout" // Tablet layout search results.
         );
 
         final var generalAds = new StringFilterGroup(
@@ -112,23 +121,24 @@ public final class AdsFilter extends Filter {
                 "expandable_list"
         );
 
-        channelProfile = new StringFilterGroup(
-                null,
-                "channel_profile.eml"
-        );
-
         playerShoppingShelf = new StringFilterGroup(
-                null,
+                Settings.HIDE_PLAYER_STORE_SHELF,
                 "horizontal_shelf.eml"
         );
 
         playerShoppingShelfBuffer = new ByteArrayFilterGroup(
-                Settings.HIDE_PLAYER_STORE_SHELF,
+                null,
                 "shopping_item_card_list.eml"
         );
 
-        visitStoreButton = new ByteArrayFilterGroup(
+        channelProfile = new StringFilterGroup(
                 Settings.HIDE_VISIT_STORE_BUTTON,
+                "channel_profile.eml",
+                "page_header.eml"
+        );
+
+        visitStoreButton = new ByteArrayFilterGroup(
+                null,
                 "header_store_button"
         );
 
@@ -172,6 +182,11 @@ public final class AdsFilter extends Filter {
             return false;
         }
 
+        // Check for the index because of likelihood of false positives.
+        if (matchedGroup == shoppingLinks && contentIndex != 0) {
+            return false;
+        }
+
         if (exceptions.matches(path))
             return false;
 
@@ -188,13 +203,25 @@ public final class AdsFilter extends Filter {
             return false;
         }
 
-        // Check for the index because of likelihood of false positives.
-        if (matchedGroup == shoppingLinks && contentIndex != 0)
-            return false;
-
         return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
     }
 
+    /**
+     * Injection point.
+     *
+     * @param elementsList List of components of the end screen container.
+     * @param protobufList Component (ProtobufList).
+     */
+    public static void hideEndScreenStoreBanner(List<Object> elementsList, Object protobufList) {
+        if (HIDE_END_SCREEN_STORE_BANNER && protobufList.toString().contains(STORE_BANNER_DOMAIN)) {
+            Logger.printDebug(() -> "Hiding store banner");
+            return;
+        }
+
+        elementsList.add(protobufList);
+    }
+
+
     /**
      * Hide the view, which shows ads in the homepage.
      *

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

@@ -45,6 +45,11 @@ final class DescriptionComponentsFilter extends Filter {
                 "transcript_section"
         );
 
+        final StringFilterGroup howThisWasMadeSection = new StringFilterGroup(
+                Settings.HIDE_HOW_THIS_WAS_MADE_SECTION,
+                "how_this_was_made_section"
+        );
+
         macroMarkersCarousel = new StringFilterGroup(
                 null,
                 "macro_markers_carousel.eml"
@@ -64,6 +69,7 @@ final class DescriptionComponentsFilter extends Filter {
         addPathCallbacks(
                 attributesSection,
                 infoCardsSection,
+                howThisWasMadeSection,
                 podcastSection,
                 transcriptSection,
                 macroMarkersCarousel

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

@@ -528,14 +528,13 @@ final class KeywordContentFilter extends Filter {
         if (selectedNavButton == null) {
             return hideHome; // Unknown tab, treat the same as home.
         }
-        if (selectedNavButton == NavigationButton.HOME) {
-            return hideHome;
-        }
-        if (selectedNavButton == NavigationButton.SUBSCRIPTIONS) {
-            return hideSubscriptions;
-        }
-        // User is in the Library or Notifications tab.
-        return false;
+
+        return switch (selectedNavButton) {
+            case HOME, EXPLORE -> hideHome;
+            case SUBSCRIPTIONS -> hideSubscriptions;
+            // User is in the Library or notifications.
+            default -> false;
+        };
     }
 
     private void updateStats(boolean videoWasHidden, @Nullable String keyword) {

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

@@ -80,7 +80,8 @@ public final class LayoutComponentsFilter extends Filter {
                 "images_post_root_slim.eml",
                 "text_post_root_slim.eml",
                 "post_base_wrapper_slim.eml",
-                "poll_post_root.eml"
+                "poll_post_root.eml",
+                "videos_post_root.eml"
         );
 
         final var communityGuidelines = new StringFilterGroup(
@@ -106,7 +107,8 @@ public final class LayoutComponentsFilter extends Filter {
         inFeedSurvey = new StringFilterGroup(
                 Settings.HIDE_FEED_SURVEY,
                 "in_feed_survey",
-                "slimline_survey"
+                "slimline_survey",
+                "feed_nudge"
         );
 
         final var medicalPanel = new StringFilterGroup(
@@ -161,9 +163,9 @@ public final class LayoutComponentsFilter extends Filter {
                 "inline_expander"
         );
 
-        final var channelBar = new StringFilterGroup(
+        final var compactChannelBar = new StringFilterGroup(
                 Settings.HIDE_CHANNEL_BAR,
-                "channel_bar"
+                "compact_channel_bar"
         );
 
         final var relatedVideos = new StringFilterGroup(
@@ -252,7 +254,7 @@ public final class LayoutComponentsFilter extends Filter {
                 inFeedSurvey,
                 notifyMe,
                 likeSubscribeGlow,
-                channelBar,
+                compactChannelBar,
                 communityPosts,
                 paidPromotion,
                 searchResultVideo,

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

@@ -297,7 +297,7 @@ public final class ShortsFilter extends Filter {
             if (matchedGroup == suggestedAction) {
                 // Skip searching the buffer if all suggested actions are set to hidden.
                 // This has a secondary effect of hiding all new un-identified actions
-                // under the assumption that the user wants all actions hidden.
+                // under the assumption that the user wants all suggestions hidden.
                 if (isEverySuggestedActionFilterEnabled()) {
                     return super.isFiltered(path, identifier, protobufBufferArray, matchedGroup, contentType, contentIndex);
                 }
@@ -324,19 +324,22 @@ public final class ShortsFilter extends Filter {
     }
 
     private static boolean shouldHideShortsFeedItems() {
+        // Known issue if hide home is on but at least one other hide is off:
+        //
+        // Shorts suggestions will load in the background if a video is opened and
+        // immediately minimized before any suggestions are loaded.
+        // In this state the player type will show minimized, which cannot
+        // distinguish between Shorts suggestions loading in the player and between
+        // scrolling thru search/home/subscription tabs while a player is minimized.
         final boolean hideHome = Settings.HIDE_SHORTS_HOME.get();
         final boolean hideSubscriptions = Settings.HIDE_SHORTS_SUBSCRIPTIONS.get();
         final boolean hideSearch = Settings.HIDE_SHORTS_SEARCH.get();
+        final boolean hideHistory = Settings.HIDE_SHORTS_HISTORY.get();
 
-        if (hideHome && hideSubscriptions && hideSearch) {
-            // Shorts suggestions can load in the background if a video is opened and
-            // then immediately minimized before any suggestions are loaded.
-            // In this state the player type will show minimized, which makes it not possible to
-            // distinguish between Shorts suggestions loading in the player and between
-            // scrolling thru search/home/subscription tabs while a player is minimized.
-            //
-            // To avoid this situation for users that never want to show Shorts (all hide Shorts options are enabled)
-            // then hide all Shorts everywhere including the Library history and Library playlists.
+        if (!hideHome && !hideSubscriptions && !hideSearch && !hideHistory) {
+            return false;
+        }
+        if (hideHome && hideSubscriptions && hideSearch && hideHistory) {
             return true;
         }
 
@@ -352,24 +355,29 @@ public final class ShortsFilter extends Filter {
         }
 
         // Avoid checking navigation button status if all other Shorts should show.
-        if (!hideHome && !hideSubscriptions) {
+        if (!hideHome && !hideSubscriptions && !hideHistory) {
             return false;
         }
 
+        // Check navigation absolutely last since the check may block this thread.
         NavigationButton selectedNavButton = NavigationButton.getSelectedNavigationButton();
         if (selectedNavButton == null) {
             return hideHome; // Unknown tab, treat the same as home.
         }
-        if (selectedNavButton == NavigationButton.HOME) {
-            return hideHome;
-        }
-        if (selectedNavButton == NavigationButton.SUBSCRIPTIONS) {
-            return hideSubscriptions;
-        }
-        // User must be in the library tab.  Don't hide the history or any playlists here.
-        return false;
+
+        return switch (selectedNavButton) {
+            case HOME, EXPLORE -> hideHome;
+            case SUBSCRIPTIONS -> hideSubscriptions;
+            case LIBRARY -> hideHistory;
+            default -> false;
+        };
     }
 
+    /**
+     * Injection point.  Only used if patching older than 19.03.
+     * This hook may be obsolete even for old versions
+     * as they now use a litho layout like newer versions.
+     */
     public static void hideShortsShelf(final View shortsShelfView) {
         if (shouldHideShortsFeedItems()) {
             Utils.hideViewByLayoutParams(shortsShelfView);

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

@@ -32,6 +32,11 @@ public class CustomPlaybackSpeedPatch {
      */
     public static final float PLAYBACK_SPEED_MAXIMUM = 8;
 
+    /**
+     * Tap and hold speed.
+     */
+    private static final float TAP_AND_HOLD_SPEED;
+
     /**
      * Custom playback speeds.
      */
@@ -48,12 +53,27 @@ public class CustomPlaybackSpeedPatch {
     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();
+        }
+
         loadCustomSpeeds();
     }
 
-    private static void resetCustomSpeeds(@NonNull String toastMessage) {
-        Utils.showToastLong(toastMessage);
-        Settings.CUSTOM_PLAYBACK_SPEEDS.resetToDefault();
+    /**
+     * Injection point.
+     */
+    public static float tapAndHoldSpeed() {
+        return TAP_AND_HOLD_SPEED;
+    }
+
+    private static void showInvalidCustomSpeedToast() {
+        Utils.showToastLong(str("revanced_custom_playback_speeds_invalid", PLAYBACK_SPEED_MAXIMUM));
     }
 
     private static void loadCustomSpeeds() {
@@ -74,17 +94,18 @@ public class CustomPlaybackSpeedPatch {
                 }
 
                 if (speedFloat >= PLAYBACK_SPEED_MAXIMUM) {
-                    resetCustomSpeeds(str("revanced_custom_playback_speeds_invalid", PLAYBACK_SPEED_MAXIMUM));
+                    showInvalidCustomSpeedToast();
+                    Settings.CUSTOM_PLAYBACK_SPEEDS.resetToDefault();
                     loadCustomSpeeds();
                     return;
                 }
 
-                customPlaybackSpeeds[i] = speedFloat;
-                i++;
+                customPlaybackSpeeds[i++] = speedFloat;
             }
         } catch (Exception ex) {
             Logger.printInfo(() -> "parse error", ex);
-            resetCustomSpeeds(str("revanced_custom_playback_speeds_parse_exception"));
+            Utils.showToastLong(str("revanced_custom_playback_speeds_parse_exception"));
+            Settings.CUSTOM_PLAYBACK_SPEEDS.resetToDefault();
             loadCustomSpeeds();
         }
     }

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

@@ -18,6 +18,8 @@ public final class SeekbarColorPatch {
 
     private static final boolean SEEKBAR_CUSTOM_COLOR_ENABLED = Settings.SEEKBAR_CUSTOM_COLOR.get();
 
+    private static final boolean HIDE_SEEKBAR_THUMBNAIL_ENABLED = Settings.HIDE_SEEKBAR_THUMBNAIL.get();
+
     /**
      * Default color of the litho seekbar.
      * Differs slightly from the default custom seekbar color setting.
@@ -25,14 +27,19 @@ public final class SeekbarColorPatch {
     private static final int ORIGINAL_SEEKBAR_COLOR = 0xFFFF0000;
 
     /**
-     * Default colors of the gradient seekbar.
+     * Feed default colors of the gradient seekbar.
      */
-    private static final int[] ORIGINAL_SEEKBAR_GRADIENT_COLORS = { 0xFFFF0033, 0xFFFF2791 };
+    private static final int[] FEED_ORIGINAL_SEEKBAR_GRADIENT_COLORS = { 0xFFFF0033, 0xFFFF2791 };
 
     /**
-     * Default positions of the gradient seekbar.
+     * Feed default positions of the gradient seekbar.
      */
-    private static final float[] ORIGINAL_SEEKBAR_GRADIENT_POSITIONS = { 0.8f, 1.0f };
+    private static final float[] FEED_ORIGINAL_SEEKBAR_GRADIENT_POSITIONS = { 0.8f, 1.0f };
+
+    /**
+     * Empty seekbar gradient, if hide seekbar in feed is enabled.
+     */
+    private static final int[] HIDDEN_SEEKBAR_GRADIENT_COLORS = { 0x0, 0x0 };
 
     /**
      * Default YouTube seekbar color brightness.
@@ -41,16 +48,21 @@ public final class SeekbarColorPatch {
 
     /**
      * If {@link Settings#SEEKBAR_CUSTOM_COLOR} is enabled,
-     * this is the color value of {@link Settings#SEEKBAR_CUSTOM_COLOR_VALUE}.
+     * this is the color value of {@link Settings#SEEKBAR_CUSTOM_COLOR_PRIMARY}.
      * Otherwise this is {@link #ORIGINAL_SEEKBAR_COLOR}.
      */
-    private static int seekbarColor = ORIGINAL_SEEKBAR_COLOR;
+    private static int customSeekbarColor = ORIGINAL_SEEKBAR_COLOR;
 
     /**
      * Custom seekbar hue, saturation, and brightness values.
      */
     private static final float[] customSeekbarColorHSV = new float[3];
 
+    /**
+     * Custom seekbar color, used for linear gradient replacements.
+     */
+    private static final int[] customSeekbarColorGradient = new int[2];
+
     static {
         float[] hsv = new float[3];
         Color.colorToHSV(ORIGINAL_SEEKBAR_COLOR, hsv);
@@ -63,26 +75,22 @@ public final class SeekbarColorPatch {
 
     private static void loadCustomSeekbarColor() {
         try {
-            seekbarColor = Color.parseColor(Settings.SEEKBAR_CUSTOM_COLOR_VALUE.get());
-            Color.colorToHSV(seekbarColor, customSeekbarColorHSV);
+            customSeekbarColor = Color.parseColor(Settings.SEEKBAR_CUSTOM_COLOR_PRIMARY.get());
+            Color.colorToHSV(customSeekbarColor, customSeekbarColorHSV);
+
+            customSeekbarColorGradient[0] = customSeekbarColor;
+            customSeekbarColorGradient[1] = Color.parseColor(Settings.SEEKBAR_CUSTOM_COLOR_ACCENT.get());
         } catch (Exception ex) {
             Utils.showToastShort(str("revanced_seekbar_custom_color_invalid"));
-            Settings.SEEKBAR_CUSTOM_COLOR_VALUE.resetToDefault();
+            Settings.SEEKBAR_CUSTOM_COLOR_PRIMARY.resetToDefault();
+            Settings.SEEKBAR_CUSTOM_COLOR_ACCENT.resetToDefault();
+
             loadCustomSeekbarColor();
         }
     }
 
     public static int getSeekbarColor() {
-        return seekbarColor;
-    }
-
-    /**
-     * Injection point
-     */
-    public static boolean playerSeekbarGradientEnabled(boolean original) {
-        if (SEEKBAR_CUSTOM_COLOR_ENABLED) return false;
-
-        return original;
+        return customSeekbarColor;
     }
 
     /**
@@ -126,7 +134,7 @@ public final class SeekbarColorPatch {
         // Even if the seekbar color xml value is changed to a completely different color (such as green),
         // a color filter still cannot be selectively applied when the drawable has more than 1 color.
         try {
-            String seekbarStyle = get9BitStyleIdentifier(seekbarColor);
+            String seekbarStyle = get9BitStyleIdentifier(customSeekbarColor);
             Logger.printDebug(() -> "Using splash seekbar style: " + seekbarStyle);
 
             final int styleIdentifierDefault = Utils.getResourceIdentifier(
@@ -146,6 +154,13 @@ public final class SeekbarColorPatch {
         }
     }
 
+    /**
+     * Injection point.
+     */
+    public static boolean showWatchHistoryProgressDrawable(boolean original) {
+        return !HIDE_SEEKBAR_THUMBNAIL_ENABLED && original;
+    }
+
     /**
      * Injection point.
      *
@@ -156,35 +171,61 @@ public final class SeekbarColorPatch {
      */
     public static int getLithoColor(int colorValue) {
         if (colorValue == ORIGINAL_SEEKBAR_COLOR) {
-            if (Settings.HIDE_SEEKBAR_THUMBNAIL.get()) {
-                return 0x00000000;
+            if (HIDE_SEEKBAR_THUMBNAIL_ENABLED) {
+                return 0x0;
             }
 
-            return getSeekbarColorValue(ORIGINAL_SEEKBAR_COLOR);
+            return customSeekbarColor;
         }
+
         return colorValue;
     }
 
+    private static String colorArrayToHex(int[] colors) {
+        final int length = colors.length;
+        StringBuilder builder = new StringBuilder(length * 12);
+        builder.append("[");
+
+        int i = 0;
+        for (int color : colors) {
+            builder.append(String.format("#%X", color));
+            if (++i < length) {
+                builder.append(", ");
+            }
+        }
+
+        builder.append("]");
+        return builder.toString();
+    }
+
     /**
      * Injection point.
      */
-    public static void setLinearGradient(int[] colors, float[] positions) {
-        final boolean hideSeekbar = Settings.HIDE_SEEKBAR_THUMBNAIL.get();
+    public static int[] getPlayerLinearGradient(int[] original) {
+        return SEEKBAR_CUSTOM_COLOR_ENABLED
+                ? customSeekbarColorGradient
+                : original;
+    }
 
-        if (SEEKBAR_CUSTOM_COLOR_ENABLED || hideSeekbar) {
+    /**
+     * Injection point.
+     */
+    public static int[] getLithoLinearGradient(int[] colors, float[] positions) {
+        if (SEEKBAR_CUSTOM_COLOR_ENABLED || HIDE_SEEKBAR_THUMBNAIL_ENABLED) {
             // Most litho usage of linear gradients is hooked here,
             // so must only change if the values are those for the seekbar.
-            if (Arrays.equals(ORIGINAL_SEEKBAR_GRADIENT_COLORS, colors)
-                    && Arrays.equals(ORIGINAL_SEEKBAR_GRADIENT_POSITIONS, positions)) {
-                Arrays.fill(colors, hideSeekbar
-                        ? 0x00000000
-                        : seekbarColor);
-                return;
+            if ((Arrays.equals(FEED_ORIGINAL_SEEKBAR_GRADIENT_COLORS, colors)
+                    && Arrays.equals(FEED_ORIGINAL_SEEKBAR_GRADIENT_POSITIONS, positions))) {
+                return HIDE_SEEKBAR_THUMBNAIL_ENABLED
+                        ? HIDDEN_SEEKBAR_GRADIENT_COLORS
+                        : customSeekbarColorGradient;
             }
 
-            Logger.printDebug(() -> "Ignoring gradient colors: " + Arrays.toString(colors)
+            Logger.printDebug(() -> "Ignoring gradient colors: " + colorArrayToHex(colors)
                     + " positions: " + Arrays.toString(positions));
         }
+
+        return colors;
     }
 
     /**
@@ -198,7 +239,7 @@ public final class SeekbarColorPatch {
         }
 
         return colorValue == ORIGINAL_SEEKBAR_COLOR
-                ? getSeekbarColorValue(ORIGINAL_SEEKBAR_COLOR)
+                ? customSeekbarColor
                 : colorValue;
     }
 
@@ -208,11 +249,9 @@ public final class SeekbarColorPatch {
      * Overrides color used for the video player seekbar.
      */
     public static int getVideoPlayerSeekbarColor(int originalColor) {
-        if (!SEEKBAR_CUSTOM_COLOR_ENABLED) {
-            return originalColor;
-        }
-
-        return getSeekbarColorValue(originalColor);
+        return SEEKBAR_CUSTOM_COLOR_ENABLED
+                ? getSeekbarColorValue(originalColor)
+                : originalColor;
     }
 
     /**
@@ -221,10 +260,6 @@ public final class SeekbarColorPatch {
      */
     private static int getSeekbarColorValue(int originalColor) {
         try {
-            if (!SEEKBAR_CUSTOM_COLOR_ENABLED || originalColor == seekbarColor) {
-                return originalColor; // nothing to do
-            }
-
             final int alphaDifference = Color.alpha(originalColor) - Color.alpha(ORIGINAL_SEEKBAR_COLOR);
 
             // The seekbar uses the same color but different brightness for different situations.
@@ -237,7 +272,7 @@ public final class SeekbarColorPatch {
             hsv[1] = customSeekbarColorHSV[1];
             hsv[2] = clamp(customSeekbarColorHSV[2] + brightnessDifference, 0, 1);
 
-            final int replacementAlpha = clamp(Color.alpha(seekbarColor) + alphaDifference, 0, 255);
+            final int replacementAlpha = clamp(Color.alpha(customSeekbarColor) + alphaDifference, 0, 255);
             final int replacementColor = Color.HSVToColor(replacementAlpha, hsv);
             Logger.printDebug(() -> String.format("Original color: #%08X  replacement color: #%08X",
                             originalColor, replacementColor));

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

@@ -1,21 +1,30 @@
 package app.revanced.extension.youtube.settings;
 
+import static app.revanced.extension.shared.Utils.getResourceIdentifier;
+
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.Context;
+import android.os.Build;
 import android.preference.PreferenceFragment;
+import android.util.TypedValue;
 import android.view.ViewGroup;
-import android.widget.ImageButton;
 import android.widget.TextView;
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.youtube.ThemeHelper;
-import app.revanced.extension.youtube.settings.preference.ReVancedPreferenceFragment;
-import app.revanced.extension.youtube.settings.preference.ReturnYouTubeDislikePreferenceFragment;
-import app.revanced.extension.youtube.settings.preference.SponsorBlockPreferenceFragment;
+import android.widget.Toolbar;
+
+import androidx.annotation.RequiresApi;
 
 import java.util.Objects;
 
-import static app.revanced.extension.shared.Utils.getChildView;
-import static app.revanced.extension.shared.Utils.getResourceIdentifier;
+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.youtube.ThemeHelper;
+import app.revanced.extension.youtube.patches.VersionCheckPatch;
+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.
@@ -25,17 +34,57 @@ import static app.revanced.extension.shared.Utils.getResourceIdentifier;
 @SuppressWarnings("unused")
 public class LicenseActivityHook {
 
+    private static ViewGroup.LayoutParams toolbarLayoutParams;
+
+    public static void setToolbarLayoutParams(Toolbar toolbar) {
+        if (toolbarLayoutParams != null) {
+            toolbar.setLayoutParams(toolbarLayoutParams);
+        }
+    }
+
+    /**
+     * Injection point.
+     * Overrides the ReVanced settings language.
+     */
+    public static Context getAttachBaseContext(Context original) {
+        AppLanguage language = BaseSettings.REVANCED_LANGUAGE.get();
+        if (language == AppLanguage.DEFAULT) {
+            return original;
+        }
+
+        return Utils.getContext();
+    }
+
+    /**
+     * Injection point.
+     */
+    public static boolean useCairoSettingsFragment(boolean original) {
+        // Early targets have layout issues and it's better to always force off.
+        if (!VersionCheckPatch.IS_19_34_OR_GREATER) {
+            return false;
+        }
+        if (Settings.RESTORE_OLD_SETTINGS_MENUS.get()) {
+            return false;
+        }
+
+        // On the first launch of a clean install, forcing the cairo menu can give a
+        // half broken appearance because all the preference icons may not be available yet.
+        // 19.34+ cairo settings are always on, so it doesn't need to be forced anyway.
+        // Cairo setting will show on the next launch of the app.
+        return original;
+    }
+
     /**
      * Injection point.
      * <p>
      * Hooks LicenseActivity#onCreate in order to inject our own fragment.
      */
+    @RequiresApi(api = Build.VERSION_CODES.N)
     public static void initialize(Activity licenseActivity) {
         try {
             ThemeHelper.setActivityTheme(licenseActivity);
-            licenseActivity.setContentView(
-                    getResourceIdentifier("revanced_settings_with_toolbar", "layout"));
-            setBackButton(licenseActivity);
+            licenseActivity.setContentView(getResourceIdentifier(
+                    "revanced_settings_with_toolbar", "layout"));
 
             PreferenceFragment fragment;
             String toolbarTitleResourceName;
@@ -58,7 +107,7 @@ public class LicenseActivityHook {
                     return;
             }
 
-            setToolbarTitle(licenseActivity, toolbarTitleResourceName);
+            createToolbar(licenseActivity, toolbarTitleResourceName);
 
             //noinspection deprecation
             licenseActivity.getFragmentManager()
@@ -70,28 +119,36 @@ public class LicenseActivityHook {
         }
     }
 
-    private static void setToolbarTitle(Activity activity, String toolbarTitleResourceName) {
-        ViewGroup toolbar = activity.findViewById(getToolbarResourceId());
-        TextView toolbarTextView = Objects.requireNonNull(getChildView(toolbar, false,
-                view -> view instanceof TextView));
-        toolbarTextView.setText(getResourceIdentifier(toolbarTitleResourceName, "string"));
-    }
-
+    @RequiresApi(api = Build.VERSION_CODES.N)
     @SuppressLint("UseCompatLoadingForDrawables")
-    private static void setBackButton(Activity activity) {
-        ViewGroup toolbar = activity.findViewById(getToolbarResourceId());
-        ImageButton imageButton = Objects.requireNonNull(getChildView(toolbar, false,
-                view -> view instanceof ImageButton));
-        imageButton.setImageDrawable(ReVancedPreferenceFragment.getBackButtonDrawable());
-        imageButton.setOnClickListener(view -> activity.onBackPressed());
-    }
+    private static void createToolbar(Activity activity, String toolbarTitleResourceName) {
+        // 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 = toolBarParent.findViewById(getResourceIdentifier(
+                "revanced_toolbar", "id"));
+        toolbarLayoutParams = dummyToolbar.getLayoutParams();
+        toolBarParent.removeView(dummyToolbar);
 
-    private static int getToolbarResourceId() {
-        final int toolbarResourceId = getResourceIdentifier("revanced_toolbar", "id");
-        if (toolbarResourceId == 0) {
-            throw new IllegalStateException("Could not find back button resource");
+        Toolbar toolbar = new Toolbar(toolBarParent.getContext());
+        toolbar.setBackgroundColor(ThemeHelper.getToolbarBackgroundColor());
+        toolbar.setNavigationIcon(ReVancedPreferenceFragment.getBackButtonDrawable());
+        toolbar.setNavigationOnClickListener(view -> activity.onBackPressed());
+        toolbar.setTitle(getResourceIdentifier(toolbarTitleResourceName, "string"));
+
+        final int margin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16,
+                Utils.getContext().getResources().getDisplayMetrics());
+        toolbar.setTitleMarginStart(margin);
+        toolbar.setTitleMarginEnd(margin);
+        TextView toolbarTextView = Utils.getChildView(toolbar, false,
+                view -> view instanceof TextView);
+        if (toolbarTextView != null) {
+            toolbarTextView.setTextColor(ThemeHelper.getForegroundColor());
         }
-        return toolbarResourceId;
+        setToolbarLayoutParams(toolbar);
+
+        toolBarParent.addView(toolbar, 0);
     }
 
 }

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

@@ -7,8 +7,10 @@ import static app.revanced.extension.shared.settings.Setting.migrateFromOldPrefe
 import static app.revanced.extension.shared.settings.Setting.migrateOldSettingToNew;
 import static app.revanced.extension.shared.settings.Setting.parent;
 import static app.revanced.extension.shared.settings.Setting.parentsAny;
-import static app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch.NotSpoofingAndroidAvailability;
+import static app.revanced.extension.youtube.patches.ChangeFormFactorPatch.FormFactor;
 import static app.revanced.extension.youtube.patches.ChangeStartPagePatch.StartPage;
+import static app.revanced.extension.youtube.patches.ExitFullscreenPatch.FullscreenMode;
+import static app.revanced.extension.youtube.patches.ForceOriginalAudioPatch.ForceOriginalAudioAvailability;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerHideExpandCloseAvailability;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerHorizontalDragAvailability;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType;
@@ -25,6 +27,8 @@ 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 android.graphics.Color;
+
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.settings.BooleanSetting;
@@ -43,21 +47,24 @@ import app.revanced.extension.youtube.sponsorblock.SponsorBlockSettings;
 
 public class Settings extends BaseSettings {
     // Video
+    public static final BooleanSetting DISABLE_HDR_VIDEO = new BooleanSetting("revanced_disable_hdr_video", FALSE);
     public static final BooleanSetting RESTORE_OLD_VIDEO_QUALITY_MENU = new BooleanSetting("revanced_restore_old_video_quality_menu", TRUE);
     public static final BooleanSetting REMEMBER_VIDEO_QUALITY_LAST_SELECTED = new BooleanSetting("revanced_remember_video_quality_last_selected", FALSE);
     public static final IntegerSetting VIDEO_QUALITY_DEFAULT_WIFI = new IntegerSetting("revanced_video_quality_default_wifi", -2);
     public static final IntegerSetting VIDEO_QUALITY_DEFAULT_MOBILE = new IntegerSetting("revanced_video_quality_default_mobile", -2);
     // Speed
+    public static final FloatSetting SPEED_TAP_AND_HOLD = new FloatSetting("revanced_speed_tap_and_hold", 2.0f, true);
     public static final BooleanSetting REMEMBER_PLAYBACK_SPEED_LAST_SELECTED = new BooleanSetting("revanced_remember_playback_speed_last_selected", FALSE);
     public static final BooleanSetting CUSTOM_SPEED_MENU = new BooleanSetting("revanced_custom_speed_menu", TRUE);
     public static final FloatSetting PLAYBACK_SPEED_DEFAULT = new FloatSetting("revanced_playback_speed_default", -2.0f);
     public static final StringSetting CUSTOM_PLAYBACK_SPEEDS = new StringSetting("revanced_custom_playback_speeds",
             "0.25\n0.5\n0.75\n0.9\n0.95\n1.0\n1.05\n1.1\n1.25\n1.5\n1.75\n2.0\n3.0\n4.0\n5.0", true);
     // Audio
-    public static final BooleanSetting FORCE_ORIGINAL_AUDIO = new BooleanSetting("revanced_force_original_audio", FALSE, new NotSpoofingAndroidAvailability());
+    public static final BooleanSetting FORCE_ORIGINAL_AUDIO = new BooleanSetting("revanced_force_original_audio", FALSE, new ForceOriginalAudioAvailability());
 
     // Ads
     public static final BooleanSetting HIDE_BUTTONED_ADS = new BooleanSetting("revanced_hide_buttoned_ads", TRUE);
+    public static final BooleanSetting HIDE_END_SCREEN_STORE_BANNER = new BooleanSetting("revanced_hide_end_screen_store_banner", TRUE, true);
     public static final BooleanSetting HIDE_FULLSCREEN_ADS = new BooleanSetting("revanced_hide_fullscreen_ads", TRUE);
     public static final BooleanSetting HIDE_GENERAL_ADS = new BooleanSetting("revanced_hide_general_ads", TRUE);
     public static final BooleanSetting HIDE_GET_PREMIUM = new BooleanSetting("revanced_hide_get_premium", TRUE);
@@ -120,6 +127,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting DISABLE_LIKE_SUBSCRIBE_GLOW = new BooleanSetting("revanced_disable_like_subscribe_glow", FALSE);
     public static final BooleanSetting DISABLE_ROLLING_NUMBER_ANIMATIONS = new BooleanSetting("revanced_disable_rolling_number_animations", FALSE);
     public static final BooleanSetting DISABLE_SUGGESTED_VIDEO_END_SCREEN = new BooleanSetting("revanced_disable_suggested_video_end_screen", FALSE, true);
+    public static final EnumSetting<FullscreenMode> EXIT_FULLSCREEN = new EnumSetting<>("revanced_exit_fullscreen", FullscreenMode.DISABLED);
     public static final BooleanSetting HIDE_AUTOPLAY_BUTTON = new BooleanSetting("revanced_hide_autoplay_button", TRUE, true);
     public static final BooleanSetting HIDE_CAPTIONS_BUTTON = new BooleanSetting("revanced_hide_captions_button", FALSE);
     public static final BooleanSetting HIDE_CAST_BUTTON = new BooleanSetting("revanced_hide_cast_button", TRUE, true);
@@ -139,10 +147,10 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_SUBSCRIBERS_COMMUNITY_GUIDELINES = new BooleanSetting("revanced_hide_subscribers_community_guidelines", TRUE);
     public static final BooleanSetting HIDE_TIMED_REACTIONS = new BooleanSetting("revanced_hide_timed_reactions", TRUE);
     public static final BooleanSetting HIDE_VIDEO_CHANNEL_WATERMARK = new BooleanSetting("revanced_hide_channel_watermark", TRUE);
-    public static final BooleanSetting PLAYBACK_SPEED_DIALOG_BUTTON = new BooleanSetting("revanced_playback_speed_dialog_button", FALSE);
-    public static final BooleanSetting PLAYER_POPUP_PANELS = new BooleanSetting("revanced_hide_player_popup_panels", FALSE);
-    public static final IntegerSetting PLAYER_OVERLAY_OPACITY = new IntegerSetting("revanced_player_overlay_opacity", 100, true);
     public static final BooleanSetting OPEN_VIDEOS_FULLSCREEN_PORTRAIT = new BooleanSetting("revanced_open_videos_fullscreen_portrait", FALSE);
+    public static final BooleanSetting PLAYBACK_SPEED_DIALOG_BUTTON = new BooleanSetting("revanced_playback_speed_dialog_button", FALSE);
+    public static final IntegerSetting PLAYER_OVERLAY_OPACITY = new IntegerSetting("revanced_player_overlay_opacity", 100, true);
+    public static final BooleanSetting PLAYER_POPUP_PANELS = new BooleanSetting("revanced_hide_player_popup_panels", FALSE);
     // Miniplayer
     public static final EnumSetting<MiniplayerType> MINIPLAYER_TYPE = new EnumSetting<>("revanced_miniplayer_type", MiniplayerType.DEFAULT, true);
     private static final Availability MINIPLAYER_ANY_MODERN = MINIPLAYER_TYPE.availability(MODERN_1, MODERN_2, MODERN_3, MODERN_4);
@@ -171,6 +179,7 @@ public class Settings extends BaseSettings {
     // Description
     public static final BooleanSetting HIDE_ATTRIBUTES_SECTION = new BooleanSetting("revanced_hide_attributes_section", FALSE);
     public static final BooleanSetting HIDE_CHAPTERS_SECTION = new BooleanSetting("revanced_hide_chapters_section", TRUE);
+    public static final BooleanSetting HIDE_HOW_THIS_WAS_MADE_SECTION = new BooleanSetting("revanced_hide_how_this_was_made_section", FALSE);
     public static final BooleanSetting HIDE_INFO_CARDS_SECTION = new BooleanSetting("revanced_hide_info_cards_section", TRUE);
     public static final BooleanSetting HIDE_KEY_CONCEPTS_SECTION = new BooleanSetting("revanced_hide_key_concepts_section", FALSE);
     public static final BooleanSetting HIDE_PODCAST_SECTION = new BooleanSetting("revanced_hide_podcast_section", TRUE);
@@ -200,15 +209,16 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_PLAYER_FLYOUT_WATCH_IN_VR = new BooleanSetting("revanced_hide_player_flyout_watch_in_vr", TRUE);
 
     // General layout
+    public static final BooleanSetting RESTORE_OLD_SETTINGS_MENUS = new BooleanSetting("revanced_restore_old_settings_menus", FALSE, 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);
     public static final BooleanSetting REMOVE_VIEWER_DISCRETION_DIALOG = new BooleanSetting("revanced_remove_viewer_discretion_dialog", FALSE,
             "revanced_remove_viewer_discretion_dialog_user_dialog_message");
     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 TABLET_LAYOUT = new BooleanSetting("revanced_tablet_layout", FALSE, true, "revanced_tablet_layout_user_dialog_message");
     public static final BooleanSetting WIDE_SEARCHBAR = new BooleanSetting("revanced_wide_searchbar", FALSE, true);
     public static final EnumSetting<StartPage> CHANGE_START_PAGE = new EnumSetting<>("revanced_change_start_page", StartPage.DEFAULT, true);
-    public static final StringSetting SPOOF_APP_VERSION_TARGET = new StringSetting("revanced_spoof_app_version_target", IS_19_17_OR_GREATER ? "19.35.36" : "17.33.42", true, parent(SPOOF_APP_VERSION));
+    public static final StringSetting SPOOF_APP_VERSION_TARGET = new StringSetting("revanced_spoof_app_version_target", IS_19_17_OR_GREATER ? "19.26.42" : "17.33.42", true, parent(SPOOF_APP_VERSION));
     // Custom filter
     public static final BooleanSetting CUSTOM_FILTER = new BooleanSetting("revanced_custom_filter", FALSE);
     public static final StringSetting CUSTOM_FILTER_STRINGS = new StringSetting("revanced_custom_filter_strings", "", true, parent(CUSTOM_FILTER));
@@ -233,6 +243,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_SHORTS_FULL_VIDEO_LINK_LABEL = new BooleanSetting("revanced_hide_shorts_full_video_link_label", FALSE);
     public static final BooleanSetting HIDE_SHORTS_GREEN_SCREEN_BUTTON = new BooleanSetting("revanced_hide_shorts_green_screen_button", TRUE);
     public static final BooleanSetting HIDE_SHORTS_HASHTAG_BUTTON = new BooleanSetting("revanced_hide_shorts_hashtag_button", TRUE);
+    public static final BooleanSetting HIDE_SHORTS_HISTORY = new BooleanSetting("revanced_hide_shorts_history", FALSE);
     public static final BooleanSetting HIDE_SHORTS_HOME = new BooleanSetting("revanced_hide_shorts_home", FALSE);
     public static final BooleanSetting HIDE_SHORTS_INFO_PANEL = new BooleanSetting("revanced_hide_shorts_info_panel", TRUE);
     public static final BooleanSetting HIDE_SHORTS_JOIN_BUTTON = new BooleanSetting("revanced_hide_shorts_join_button", TRUE);
@@ -261,18 +272,19 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting SHORTS_AUTOPLAY_BACKGROUND = new BooleanSetting("revanced_shorts_autoplay_background", TRUE);
 
     // Seekbar
-
-    public static final BooleanSetting DISABLE_PRECISE_SEEKING_GESTURE = new BooleanSetting("revanced_disable_precise_seeking_gesture", TRUE);
+    public static final BooleanSetting DISABLE_PRECISE_SEEKING_GESTURE = new BooleanSetting("revanced_disable_precise_seeking_gesture", FALSE);
     public static final BooleanSetting HIDE_SEEKBAR = new BooleanSetting("revanced_hide_seekbar", FALSE, true);
-    public static final BooleanSetting HIDE_SEEKBAR_THUMBNAIL = new BooleanSetting("revanced_hide_seekbar_thumbnail", FALSE);
+    public static final BooleanSetting HIDE_SEEKBAR_THUMBNAIL = new BooleanSetting("revanced_hide_seekbar_thumbnail", FALSE, true);
     public static final BooleanSetting HIDE_TIMESTAMP = new BooleanSetting("revanced_hide_timestamp", FALSE);
     public static final BooleanSetting RESTORE_OLD_SEEKBAR_THUMBNAILS = new BooleanSetting("revanced_restore_old_seekbar_thumbnails", TRUE);
-    public static final BooleanSetting SEEKBAR_CUSTOM_COLOR = new BooleanSetting("revanced_seekbar_custom_color", FALSE, true);
-    public static final BooleanSetting SEEKBAR_TAPPING = new BooleanSetting("revanced_seekbar_tapping", TRUE);
+    public static final BooleanSetting SEEKBAR_TAPPING = new BooleanSetting("revanced_seekbar_tapping", FALSE);
     public static final BooleanSetting SEEKBAR_THUMBNAILS_HIGH_QUALITY = new BooleanSetting("revanced_seekbar_thumbnails_high_quality", FALSE, true,
             "revanced_seekbar_thumbnails_high_quality_dialog_message", new SeekbarThumbnailsHighQualityAvailability());
     public static final BooleanSetting SLIDE_TO_SEEK = new BooleanSetting("revanced_slide_to_seek", FALSE, true);
-    public static final StringSetting SEEKBAR_CUSTOM_COLOR_VALUE = new StringSetting("revanced_seekbar_custom_color_value", "#FF0033", true, parent(SEEKBAR_CUSTOM_COLOR));
+    public static final BooleanSetting SEEKBAR_CUSTOM_COLOR = new BooleanSetting("revanced_seekbar_custom_color", FALSE, true);
+    private static final StringSetting DEPRECATED_SEEKBAR_CUSTOM_COLOR_PRIMARY = new StringSetting("revanced_seekbar_custom_color_value", "#FF0033");
+    public static final StringSetting SEEKBAR_CUSTOM_COLOR_PRIMARY = new StringSetting("revanced_seekbar_custom_color_primary", "#FF0033", true, parent(SEEKBAR_CUSTOM_COLOR));
+    public static final StringSetting SEEKBAR_CUSTOM_COLOR_ACCENT = new StringSetting("revanced_seekbar_custom_color_accent", "#FF2791", true, parent(SEEKBAR_CUSTOM_COLOR));
 
     // Misc
     public static final BooleanSetting ANNOUNCEMENTS = new BooleanSetting("revanced_announcements", TRUE);
@@ -293,8 +305,9 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting DEBUG_PROTOBUFFER = new BooleanSetting("revanced_debug_protobuffer", FALSE, parent(BaseSettings.DEBUG));
 
     // Swipe controls
-    public static final BooleanSetting SWIPE_BRIGHTNESS = new BooleanSetting("revanced_swipe_brightness", TRUE);
-    public static final BooleanSetting SWIPE_VOLUME = new BooleanSetting("revanced_swipe_volume", TRUE);
+    public static final BooleanSetting SWIPE_CHANGE_VIDEO = new BooleanSetting("revanced_swipe_change_video", FALSE, true);
+    public static final BooleanSetting SWIPE_BRIGHTNESS = new BooleanSetting("revanced_swipe_brightness", FALSE);
+    public static final BooleanSetting SWIPE_VOLUME = new BooleanSetting("revanced_swipe_volume", FALSE);
     public static final BooleanSetting SWIPE_PRESS_TO_ENGAGE = new BooleanSetting("revanced_swipe_press_to_engage", FALSE, true,
             parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
     public static final BooleanSetting SWIPE_HAPTIC_FEEDBACK = new BooleanSetting("revanced_swipe_haptic_feedback", TRUE, true,
@@ -399,6 +412,30 @@ public class Settings extends BaseSettings {
             MINIPLAYER_TYPE.save(MINIMAL);
         }
 
+        // Migrate old single color seekbar with a slightly brighter accent color based on the primary.
+        // Eventually delete this logic.
+        if (!DEPRECATED_SEEKBAR_CUSTOM_COLOR_PRIMARY.isSetToDefault()) {
+            try {
+                String oldPrimaryColorString = DEPRECATED_SEEKBAR_CUSTOM_COLOR_PRIMARY.get();
+                final int oldPrimaryColor = Color.parseColor(oldPrimaryColorString);
+                SEEKBAR_CUSTOM_COLOR_PRIMARY.save(oldPrimaryColorString);
+
+                final float brightnessScale = 1.3f;
+                final int accentColor = Color.argb(
+                        0, // Save without alpha channel.
+                        Math.min(255, (int) (brightnessScale * Color.red(oldPrimaryColor))),
+                        Math.min(255, (int) (brightnessScale * Color.green(oldPrimaryColor))),
+                        Math.min(255, (int) (brightnessScale * Color.blue(oldPrimaryColor)))
+                );
+
+                SEEKBAR_CUSTOM_COLOR_ACCENT.save(String.format("#%06X", accentColor));
+            } catch (Exception ex) {
+                Logger.printException(() -> "Could not parse old seekbar color", ex);
+            }
+
+            DEPRECATED_SEEKBAR_CUSTOM_COLOR_PRIMARY.resetToDefault();
+        }
+
         // endregion
 
         // region SB import/export callbacks

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

@@ -0,0 +1,36 @@
+package app.revanced.extension.youtube.settings.preference;
+
+import static app.revanced.extension.shared.StringRef.str;
+
+import android.content.Context;
+import android.preference.SwitchPreference;
+import android.util.AttributeSet;
+
+import app.revanced.extension.youtube.patches.ForceOriginalAudioPatch;
+
+@SuppressWarnings({"deprecation", "unused"})
+public class ForceOriginalAudioSwitchPreference extends SwitchPreference {
+
+    {
+        if (!ForceOriginalAudioPatch.PATCH_AVAILABLE) {
+            // Show why force audio is not available.
+            String summary = str("revanced_force_original_audio_not_available");
+            setSummary(summary);
+            setSummaryOn(summary);
+            setSummaryOff(summary);
+        }
+    }
+
+    public ForceOriginalAudioSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+    public ForceOriginalAudioSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+    public ForceOriginalAudioSwitchPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+    public ForceOriginalAudioSwitchPreference(Context context) {
+        super(context);
+    }
+}

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

@@ -25,9 +25,12 @@ import java.util.List;
 
 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.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;
 
 /**
@@ -109,15 +112,20 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
                 CustomPlaybackSpeedPatch.initializeListPreference(playbackPreference);
             }
 
-            preference = findPreference(Settings.SPOOF_VIDEO_STREAMS_LANGUAGE.key);
-            if (preference instanceof ListPreference languagePreference) {
-                sortListPreferenceByValues(languagePreference, 1);
-            }
+            sortPreferenceListMenu(Settings.SPOOF_VIDEO_STREAMS_LANGUAGE);
+            sortPreferenceListMenu(BaseSettings.REVANCED_LANGUAGE);
         } 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);
+        }
+    }
+
     private void setPreferenceScreenToolbar(PreferenceScreen parentScreen) {
         for (int i = 0, preferenceCount = parentScreen.getPreferenceCount(); i < preferenceCount; i++) {
             Preference childPreference = parentScreen.getPreference(i);
@@ -133,9 +141,6 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
                                     .getParent();
 
                             // Fix required for Android 15 and YT 19.45+
-                            // FIXME:
-                            // On Android 15 the text layout is not aligned the same as the parent
-                            // screen and it looks a little off.  Otherwise this works.
                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                                 rootView.setOnApplyWindowInsetsListener((v, insets) -> {
                                     Insets statusInsets = insets.getInsets(WindowInsets.Type.statusBars());
@@ -162,6 +167,8 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
                                 toolbarTextView.setTextColor(ThemeHelper.getForegroundColor());
                             }
 
+                            LicenseActivityHook.setToolbarLayoutParams(toolbar);
+
                             rootView.addView(toolbar, 0);
                             return false;
                         }

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

@@ -0,0 +1,97 @@
+package app.revanced.extension.youtube.settings.preference;
+
+import static app.revanced.extension.shared.StringRef.str;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.Preference;
+import android.preference.PreferenceManager;
+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.BaseSettings;
+import app.revanced.extension.shared.settings.Setting;
+import app.revanced.extension.shared.spoof.ClientType;
+
+@SuppressWarnings({"deprecation", "unused"})
+public class SpoofStreamingDataSideEffectsPreference extends Preference {
+
+    @Nullable
+    private ClientType currentClientType;
+
+    private final SharedPreferences.OnSharedPreferenceChangeListener listener = (sharedPreferences, str) -> {
+        // Because this listener may run before the ReVanced settings fragment updates Settings,
+        // this could show the prior config and not the current.
+        //
+        // Push this call to the end of the main run queue,
+        // so all other listeners are done and Settings is up to date.
+        Utils.runOnMainThread(this::updateUI);
+    };
+
+    public SpoofStreamingDataSideEffectsPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public SpoofStreamingDataSideEffectsPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public SpoofStreamingDataSideEffectsPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SpoofStreamingDataSideEffectsPreference(Context context) {
+        super(context);
+    }
+
+    private void addChangeListener() {
+        Setting.preferences.preferences.registerOnSharedPreferenceChangeListener(listener);
+    }
+
+    private void removeChangeListener() {
+        Setting.preferences.preferences.unregisterOnSharedPreferenceChangeListener(listener);
+    }
+
+    @Override
+    protected void onAttachedToHierarchy(PreferenceManager preferenceManager) {
+        super.onAttachedToHierarchy(preferenceManager);
+        updateUI();
+        addChangeListener();
+    }
+
+    @Override
+    protected void onPrepareForRemoval() {
+        super.onPrepareForRemoval();
+        removeChangeListener();
+    }
+
+    private void updateUI() {
+        ClientType clientType = BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get();
+        if (currentClientType == clientType) {
+            return;
+        }
+
+        Logger.printDebug(() -> "Updating spoof stream side effects preference");
+        setEnabled(BaseSettings.SPOOF_VIDEO_STREAMS.get());
+
+        String key = "revanced_spoof_video_streams_about_" +
+                (clientType == ClientType.IOS_UNPLUGGED
+                        ? "ios_tv"
+                        : "android");
+        String title = str(key + "_title");
+        String summary = str(key + "_summary");
+
+        // Android VR supports AV1 but all other clients do not.
+        if (clientType != ClientType.ANDROID_VR && clientType != ClientType.ANDROID_VR_NO_AUTH) {
+            summary += '\n' + str("revanced_spoof_video_streams_about_no_av1");
+        }
+
+        summary += '\n' + str("revanced_spoof_video_streams_about_kids_videos");
+
+        setTitle(title);
+        setSummary(summary);
+    }
+}

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

@@ -3,12 +3,15 @@ package app.revanced.extension.youtube.shared;
 import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButton.CREATE;
 
 import android.app.Activity;
+import android.os.Build;
 import android.view.View;
 
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 
 import java.lang.ref.WeakReference;
 import java.util.Arrays;
+import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 import java.util.WeakHashMap;
@@ -54,20 +57,21 @@ public final class NavigationBar {
      * How long to wait for the set nav button latch to be released.  Maximum wait time must
      * be as small as possible while still allowing enough time for the nav bar to update.
      *
-     * YT calls it's back button handlers out of order,
-     * and litho starts filtering before the navigation bar is updated.
+     * YT calls it's back button handlers out of order, and litho starts filtering before the
+     * navigation bar is updated. Fixing this situation and not needlessly waiting requires
+     * somehow detecting if a back button key/gesture will not change the active tab.
      *
-     * Fixing this situation and not needlessly waiting requires somehow
-     * detecting if a back button key-press will cause a tab change.
+     * On average the time between pressing the back button and the first litho event is
+     * about 10-20ms.  Waiting up to 75-150ms should be enough time to handle normal use cases
+     * and not be noticeable, since YT typically takes 100-200ms (or more) to update the view.
      *
-     * Typically after pressing the back button, the time between the first litho event and
-     * when the nav button is updated is about 10-20ms. Using 50-100ms here should be enough time
-     * and not noticeable, since YT typically takes 100-200ms (or more) to update the view anyways.
+     * This delay is only noticeable when the device back button/gesture will not
+     * change the current navigation tab, such as backing out of the watch history.
      *
      * This issue can also be avoided on a patch by patch basis, by avoiding calls to
      * {@link NavigationButton#getSelectedNavigationButton()} unless absolutely necessary.
      */
-    private static final long LATCH_AWAIT_TIMEOUT_MILLISECONDS = 75;
+    private static final long LATCH_AWAIT_TIMEOUT_MILLISECONDS = 120;
 
     /**
      * Used as a workaround to fix the issue of YT calling back button handlers out of order.
@@ -113,7 +117,8 @@ public final class NavigationBar {
             // The latch is released from the main thread, and waiting from the main thread will always timeout.
             // This situation has only been observed when navigating out of a submenu and not changing tabs.
             // and for that use case the nav bar does not change so it's safe to return here.
-            Logger.printDebug(() -> "Cannot block main thread waiting for nav button. Using last known navbar button status.");
+            Logger.printDebug(() -> "Cannot block main thread waiting for nav button. " +
+                    "Using last known navbar button status.");
             return;
         }
 
@@ -131,7 +136,9 @@ public final class NavigationBar {
             Logger.printDebug(() -> "Latch wait timed out");
 
         } catch (InterruptedException ex) {
-            Logger.printException(() -> "Latch wait interrupted failure", ex); // Will never happen.
+            // Calling YouTube thread was interrupted.
+            Logger.printException(() -> "Latch wait interrupted", ex);
+            Thread.currentThread().interrupt(); // Restore interrupt status flag.
         }
     }
 
@@ -238,6 +245,30 @@ public final class NavigationBar {
         // Code is added during patching.
     }
 
+    /**
+     * Use the bundled non cairo filled icon instead of a custom icon.
+     * Use the old non cairo filled icon, which is almost identical to
+     * the what would be the filled cairo icon.
+     */
+    private static final int fillBellCairoBlack = Utils.getResourceIdentifier(
+            "yt_fill_bell_black_24", "drawable");
+
+    /**
+     * Injection point.
+     * Fixes missing drawable.
+     */
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public static void setCairoNotificationFilledIcon(EnumMap enumMap, Enum tabActivityCairo) {
+        if (fillBellCairoBlack != 0) {
+            // Show a popup informing this fix is no longer needed to those who might care.
+            if (BaseSettings.DEBUG.get() && enumMap.containsKey(tabActivityCairo)) {
+                Logger.printException(() -> "YouTube fixed the cairo notification icons");
+            }
+            enumMap.putIfAbsent(tabActivityCairo, fillBellCairoBlack);
+        }
+    }
+
     public enum NavigationButton {
         HOME("PIVOT_HOME", "TAB_HOME_CAIRO"),
         SHORTS("TAB_SHORTS", "TAB_SHORTS_CAIRO"),
@@ -246,6 +277,10 @@ public final class NavigationBar {
          * This tab will never be in a selected state, even if the create video UI is on screen.
          */
         CREATE("CREATION_TAB_LARGE", "CREATION_TAB_LARGE_CAIRO"),
+        /**
+         * Only shown to automotive layout.
+         */
+        EXPLORE("TAB_EXPLORE"),
         SUBSCRIPTIONS("PIVOT_SUBSCRIPTIONS", "TAB_SUBSCRIPTIONS_CAIRO"),
         /**
          * Notifications tab.  Only present when
@@ -283,8 +318,8 @@ public final class NavigationBar {
          *
          * All code calling this method should handle a null return value.
          *
-         * <b>Due to issues with how YT processes physical back button events,
-         * this patch uses workarounds that can cause this method to take up to 75ms
+         * <b>Due to issues with how YT processes physical back button/gesture events,
+         * this patch uses workarounds that can cause this method to take up to 120ms
          * if the device back button was recently pressed.</b>
          *
          * @return The active navigation tab.

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

@@ -73,7 +73,7 @@ enum class PlayerType {
                 onChange(currentPlayerType)
             }
 
-        @Volatile // value is read/write from different threads
+        @Volatile // Read/write from different threads.
         private var currentPlayerType = NONE
 
         /**

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

@@ -46,6 +46,7 @@ enum class VideoState {
                 currentVideoState = value
             }
 
+        @Volatile // Read/write from different threads.
         private var currentVideoState: VideoState? = null
     }
 }

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

@@ -150,11 +150,16 @@ public class SBRequester {
             String end = String.format(Locale.US, TIME_TEMPLATE, endTime / 1000f);
             String duration = String.format(Locale.US, TIME_TEMPLATE, videoLength / 1000f);
 
-            HttpURLConnection connection = getConnectionFromRoute(SBRoutes.SUBMIT_SEGMENTS, privateUserId, videoId, category, start, end, duration);
+            HttpURLConnection connection = getConnectionFromRoute(SBRoutes.SUBMIT_SEGMENTS,
+                    privateUserId, videoId, category, start, end, duration);
             final int responseCode = connection.getResponseCode();
 
-            String userMessage = switch (responseCode) {
-                case HTTP_STATUS_CODE_SUCCESS -> str("revanced_sb_submit_succeeded");
+            if (responseCode == HTTP_STATUS_CODE_SUCCESS) {
+                Utils.showToastLong(str("revanced_sb_submit_succeeded"));
+                return;
+            }
+
+            String userErrorMessage = switch (responseCode) {
                 case 409 -> str("revanced_sb_submit_failed_duplicate");
                 case 403 -> str("revanced_sb_submit_failed_forbidden",
                         Requester.parseErrorStringAndDisconnect(connection));
@@ -167,7 +172,7 @@ public class SBRequester {
 
             // Message might be about the users account or an error too large to show in a toast.
             // Use a dialog instead.
-            SponsorBlockUtils.showErrorDialog(userMessage);
+            SponsorBlockUtils.showErrorDialog(userErrorMessage);
         } catch (SocketTimeoutException ex) {
             Logger.printDebug(() -> "Timeout", ex);
             Utils.showToastLong(str("revanced_sb_submit_failed_timeout"));

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

@@ -8,6 +8,7 @@ import android.view.MotionEvent
 import android.view.ViewGroup
 import app.revanced.extension.shared.Logger.printDebug
 import app.revanced.extension.shared.Logger.printException
+import app.revanced.extension.youtube.settings.Settings
 import app.revanced.extension.youtube.shared.PlayerType
 import app.revanced.extension.youtube.swipecontrols.controller.AudioVolumeController
 import app.revanced.extension.youtube.swipecontrols.controller.ScreenBrightnessController
@@ -232,5 +233,12 @@ class SwipeControlsHostActivity : Activity() {
         @JvmStatic
         var currentHost: WeakReference<SwipeControlsHostActivity> = WeakReference(null)
             private set
+
+        /**
+         * Injection point.
+         */
+        @Suppress("unused")
+        @JvmStatic
+        fun allowSwipeChangeVideo(original: Boolean): Boolean = Settings.SWIPE_CHANGE_VIDEO.get()
     }
 }

extensions/youtube/stub/src/main/java/com/google/protos/youtube/api/innertube/InnertubeContext$ClientInfo.java

@@ -1,5 +0,0 @@
-package com.google.protos.youtube.api.innertube;
-
-public class InnertubeContext$ClientInfo {
-    public int r;
-}

gradle.properties

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

patches/api/patches.api

@@ -461,10 +461,6 @@ public final class app/revanced/patches/reddit/customclients/joeyforreddit/detec
 	public static final fun getDisablePiracyDetectionPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
-public final class app/revanced/patches/reddit/customclients/redditisfun/api/FingerprintsKt {
-	public static final fun baseClientIdFingerprint (Ljava/lang/String;)Lapp/revanced/patcher/Fingerprint;
-}
-
 public final class app/revanced/patches/reddit/customclients/redditisfun/api/SpoofClientPatchKt {
 	public static final fun getSpoofClientPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -548,7 +544,6 @@ public final class app/revanced/patches/shared/misc/checks/BaseCheckEnvironmentP
 }
 
 public final class app/revanced/patches/shared/misc/extension/ExtensionHook {
-	public final fun getFingerprint ()Lapp/revanced/patcher/Fingerprint;
 	public final fun invoke (Lapp/revanced/patcher/patch/BytecodePatchContext;Ljava/lang/String;)V
 }
 
@@ -608,16 +603,19 @@ public final class app/revanced/patches/shared/misc/mapping/ResourceMappingPatch
 }
 
 public final class app/revanced/patches/shared/misc/settings/SettingsPatchKt {
+	public static final fun settingsPatch (Ljava/util/List;Ljava/util/Set;)Lapp/revanced/patcher/patch/ResourcePatch;
 	public static final fun settingsPatch (Lkotlin/Pair;Ljava/util/Set;)Lapp/revanced/patcher/patch/ResourcePatch;
-	public static synthetic fun settingsPatch$default (Lkotlin/Pair;Ljava/util/Set;ILjava/lang/Object;)Lapp/revanced/patcher/patch/ResourcePatch;
+	public static synthetic fun settingsPatch$default (Ljava/util/List;Ljava/util/Set;ILjava/lang/Object;)Lapp/revanced/patcher/patch/ResourcePatch;
 }
 
 public abstract class app/revanced/patches/shared/misc/settings/preference/BasePreference {
 	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;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	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;
@@ -640,17 +638,19 @@ public abstract class app/revanced/patches/shared/misc/settings/preference/BaseP
 
 public abstract class app/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$BasePreferenceCollection {
 	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getIcon ()Ljava/lang/String;
 	public final fun getKey ()Ljava/lang/String;
+	public final fun getLayout ()Ljava/lang/String;
 	public final fun getPreferences ()Ljava/util/Set;
 	public final fun getTitleKey ()Ljava/lang/String;
 	public abstract fun transform ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreference;
 }
 
 public class app/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen : app/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$BasePreferenceCollection {
-	public fun <init> (Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreenPreference$Sorting;)V
-	public synthetic fun <init> (Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreenPreference$Sorting;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreenPreference$Sorting;)V
+	public synthetic fun <init> (Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreenPreference$Sorting;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun addPreferences ([Lapp/revanced/patches/shared/misc/settings/preference/BasePreference;)V
 	public final fun getCategories ()Ljava/util/Set;
 	public synthetic fun transform ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreference;
@@ -658,8 +658,8 @@ public class app/revanced/patches/shared/misc/settings/preference/BasePreference
 }
 
 public class app/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen$Category : app/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$BasePreferenceCollection {
-	public fun <init> (Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;)V
-	public synthetic fun <init> (Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;)V
+	public synthetic fun <init> (Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun addPreferences ([Lapp/revanced/patches/shared/misc/settings/preference/BasePreference;)V
 	public synthetic fun transform ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreference;
 	public fun transform ()Lapp/revanced/patches/shared/misc/settings/preference/PreferenceCategory;
@@ -667,6 +667,7 @@ public class app/revanced/patches/shared/misc/settings/preference/BasePreference
 
 public final class app/revanced/patches/shared/misc/settings/preference/InputType : java/lang/Enum {
 	public static final field NUMBER Lapp/revanced/patches/shared/misc/settings/preference/InputType;
+	public static final field NUMBER_DECIMAL Lapp/revanced/patches/shared/misc/settings/preference/InputType;
 	public static final field TEXT Lapp/revanced/patches/shared/misc/settings/preference/InputType;
 	public static final field TEXT_CAP_CHARACTERS Lapp/revanced/patches/shared/misc/settings/preference/InputType;
 	public static final field TEXT_MULTI_LINE Lapp/revanced/patches/shared/misc/settings/preference/InputType;
@@ -677,8 +678,8 @@ public final class app/revanced/patches/shared/misc/settings/preference/InputTyp
 }
 
 public final class app/revanced/patches/shared/misc/settings/preference/IntentPreference : app/revanced/patches/shared/misc/settings/preference/BasePreference {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/misc/settings/preference/IntentPreference$Intent;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/misc/settings/preference/IntentPreference$Intent;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/misc/settings/preference/IntentPreference$Intent;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/misc/settings/preference/IntentPreference$Intent;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getIntent ()Lapp/revanced/patches/shared/misc/settings/preference/IntentPreference$Intent;
 	public fun hashCode ()I
@@ -698,8 +699,8 @@ public final class app/revanced/patches/shared/misc/settings/preference/ListPref
 	public fun <init> ()V
 	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/util/resource/ArrayResource;Lapp/revanced/util/resource/ArrayResource;)V
 	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/util/resource/ArrayResource;Lapp/revanced/util/resource/ArrayResource;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	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 <init> (Ljava/lang/String;Ljava/lang/String;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;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getEntries ()Lapp/revanced/util/resource/ArrayResource;
 	public final fun getEntriesKey ()Ljava/lang/String;
 	public final fun getEntryValues ()Lapp/revanced/util/resource/ArrayResource;
@@ -708,22 +709,22 @@ public final class app/revanced/patches/shared/misc/settings/preference/ListPref
 }
 
 public final class app/revanced/patches/shared/misc/settings/preference/NonInteractivePreference : app/revanced/patches/shared/misc/settings/preference/BasePreference {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getSelectable ()Z
 	public fun serialize (Lorg/w3c/dom/Document;Lkotlin/jvm/functions/Function1;)Lorg/w3c/dom/Element;
 }
 
 public class app/revanced/patches/shared/misc/settings/preference/PreferenceCategory : app/revanced/patches/shared/misc/settings/preference/BasePreference {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreenPreference$Sorting;Ljava/lang/String;Ljava/util/Set;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreenPreference$Sorting;Ljava/lang/String;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getPreferences ()Ljava/util/Set;
 	public fun serialize (Lorg/w3c/dom/Document;Lkotlin/jvm/functions/Function1;)Lorg/w3c/dom/Element;
 }
 
 public class app/revanced/patches/shared/misc/settings/preference/PreferenceScreenPreference : app/revanced/patches/shared/misc/settings/preference/BasePreference {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreenPreference$Sorting;Ljava/lang/String;Ljava/util/Set;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreenPreference$Sorting;Ljava/lang/String;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreenPreference$Sorting;Ljava/lang/String;Ljava/util/Set;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreenPreference$Sorting;Ljava/lang/String;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getPreferences ()Ljava/util/Set;
 	public fun serialize (Lorg/w3c/dom/Document;Lkotlin/jvm/functions/Function1;)Lorg/w3c/dom/Element;
 }
@@ -732,6 +733,7 @@ public final class app/revanced/patches/shared/misc/settings/preference/Preferen
 	public static final field BY_KEY Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreenPreference$Sorting;
 	public static final field BY_TITLE Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreenPreference$Sorting;
 	public static final field UNSORTED Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreenPreference$Sorting;
+	public final fun appendSortType (Ljava/lang/String;)Ljava/lang/String;
 	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public final fun getKeySuffix ()Ljava/lang/String;
 	public static fun valueOf (Ljava/lang/String;)Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreenPreference$Sorting;
@@ -750,8 +752,8 @@ public final class app/revanced/patches/shared/misc/settings/preference/SummaryT
 
 public final class app/revanced/patches/shared/misc/settings/preference/SwitchPreference : app/revanced/patches/shared/misc/settings/preference/BasePreference {
 	public fun <init> ()V
-	public fun <init> (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;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;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;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getSummaryOffKey ()Ljava/lang/String;
 	public final fun getSummaryOnKey ()Ljava/lang/String;
 	public fun serialize (Lorg/w3c/dom/Document;Lkotlin/jvm/functions/Function1;)Lorg/w3c/dom/Element;
@@ -759,8 +761,8 @@ public final class app/revanced/patches/shared/misc/settings/preference/SwitchPr
 
 public final class app/revanced/patches/shared/misc/settings/preference/TextPreference : app/revanced/patches/shared/misc/settings/preference/BasePreference {
 	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/misc/settings/preference/InputType;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/misc/settings/preference/InputType;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/misc/settings/preference/InputType;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/misc/settings/preference/InputType;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getInputType ()Lapp/revanced/patches/shared/misc/settings/preference/InputType;
 	public fun serialize (Lorg/w3c/dom/Document;Lkotlin/jvm/functions/Function1;)Lorg/w3c/dom/Element;
 }
@@ -1106,6 +1108,10 @@ public final class app/revanced/patches/youtube/layout/buttons/overlay/HidePlaye
 	public static final fun getHidePlayerOverlayButtonsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/youtube/layout/formfactor/ChangeFormFactorPatchKt {
+	public static final fun getChangeFormFactorPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatchKt {
 	public static final fun getHideEndscreenCardsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1235,7 +1241,6 @@ public final class app/revanced/patches/youtube/layout/startupshortsreset/Disabl
 }
 
 public final class app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatchKt {
-	public static final field EXTENSION_CLASS_DESCRIPTOR Ljava/lang/String;
 	public static final fun getEnableTabletLayoutPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
@@ -1268,10 +1273,6 @@ public final class app/revanced/patches/youtube/misc/backgroundplayback/Backgrou
 	public static final fun getBackgroundPlaybackPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
-public final class app/revanced/patches/youtube/misc/check/CheckEnvironmentPatchKt {
-	public static final fun getCheckEnvironmentPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
-}
-
 public final class app/revanced/patches/youtube/misc/debugging/EnableDebuggingPatchKt {
 	public static final fun getEnableDebuggingPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1296,6 +1297,10 @@ public final class app/revanced/patches/youtube/misc/fix/playback/UserAgentClien
 	public static final fun getUserAgentClientSpoofPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/youtube/misc/fix/playbackspeed/FIxPlaybackSpeedWhilePlayingPatchKt {
+	public static final fun getFixPlaybackSpeedWhilePlayingPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatchKt {
 	public static final fun getGmsCoreSupportPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1360,6 +1365,7 @@ public final class app/revanced/patches/youtube/misc/playservice/VersionCheckPat
 	public static final fun is_19_43_or_greater ()Z
 	public static final fun is_19_46_or_greater ()Z
 	public static final fun is_19_47_or_greater ()Z
+	public static final fun is_19_49_or_greater ()Z
 }
 
 public final class app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatchKt {
@@ -1404,14 +1410,14 @@ public final class app/revanced/patches/youtube/misc/zoomhaptics/ZoomHapticsPatc
 	public static final fun getZoomHapticsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
-public final class app/revanced/patches/youtube/shared/FingerprintsKt {
-	public static final fun getRollingNumberTextViewAnimationUpdateFingerprint ()Lapp/revanced/patcher/Fingerprint;
-}
-
 public final class app/revanced/patches/youtube/video/audio/ForceOriginalAudioPatchKt {
 	public static final fun getForceOriginalAudioPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/youtube/video/hdr/DisableHdrPatchKt {
+	public static final fun getDisableHdrPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/youtube/video/information/VideoInformationPatchKt {
 	public static final fun getVideoInformationPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 	public static final fun userSelectedPlaybackSpeedHook (Ljava/lang/String;Ljava/lang/String;)V
@@ -1453,10 +1459,6 @@ public final class app/revanced/patches/youtube/video/speed/button/PlaybackSpeed
 	public static final fun getPlaybackSpeedButtonPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
-public final class app/revanced/patches/youtube/video/speed/custom/CustomPlaybackSpeedPatchKt {
-	public static final fun getSpeedUnavailableId ()J
-}
-
 public final class app/revanced/patches/youtube/video/videoid/VideoIdPatchKt {
 	public static final fun getVideoIdPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 	public static final fun hookBackgroundPlayVideoId (Ljava/lang/String;)V

patches/src/main/kotlin/app/revanced/patches/reddit/customclients/redditisfun/api/Fingerprints.kt

@@ -4,7 +4,7 @@ import app.revanced.patcher.fingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
-fun baseClientIdFingerprint(string: String) = fingerprint {
+internal fun baseClientIdFingerprint(string: String) = fingerprint {
     strings("yyOCBp.RHJhDKd", string)
 }
 

patches/src/main/kotlin/app/revanced/patches/shared/misc/extension/SharedExtensionPatch.kt

@@ -92,7 +92,7 @@ fun sharedExtensionPatch(
 }
 
 class ExtensionHook internal constructor(
-    val fingerprint: Fingerprint,
+    private val fingerprint: Fingerprint,
     private val insertIndexResolver: ((Method) -> Int),
     private val contextRegisterResolver: (Method) -> String,
 ) {

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

@@ -1,5 +1,6 @@
 package app.revanced.patches.shared.misc.settings
 
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patches.all.misc.resources.addResource
 import app.revanced.patches.all.misc.resources.addResources
@@ -12,15 +13,22 @@ import app.revanced.util.getNode
 import app.revanced.util.insertFirst
 import org.w3c.dom.Node
 
+// TODO: Delete this on next major version bump.
+@Deprecated("Use non deprecated settings patch function")
+fun settingsPatch (
+    rootPreference: Pair<IntentPreference, String>,
+    preferences: Set<BasePreference>,
+) = settingsPatch(listOf(rootPreference), preferences)
+
 /**
  * A resource patch that adds settings to a settings fragment.
  *
- * @param rootPreference A pair of an intent preference and the name of the fragment file to add it to.
- * If null, no preference will be added.
+ * @param rootPreferences List of intent preferences and the name of the fragment file to add it to.
+ *                        File names that do not exist are ignored and not processed.
  * @param preferences A set of preferences to add to the ReVanced fragment.
  */
-fun settingsPatch(
-    rootPreference: Pair<IntentPreference, String>? = null,
+fun settingsPatch (
+    rootPreferences: List<Pair<BasePreference, String>>? = null,
     preferences: Set<BasePreference>,
 ) = resourcePatch {
     dependsOn(addResourcesPatch)
@@ -46,10 +54,20 @@ fun settingsPatch(
         }
 
         // Add the root preference to an existing fragment if needed.
-        rootPreference?.let { (intentPreference, fragment) ->
-            document("res/xml/$fragment.xml").use { document ->
-                document.getNode("PreferenceScreen").addPreference(intentPreference, true)
+        rootPreferences?.let {
+            var modified = false
+
+            it.forEach { (intent, fileName) ->
+                val preferenceFileName = "res/xml/$fileName.xml"
+                if (get(preferenceFileName).exists()) {
+                    document(preferenceFileName).use { document ->
+                        document.getNode("PreferenceScreen").addPreference(intent, true)
+                    }
+                    modified = true
+                }
             }
+
+            if (!modified) throw PatchException("No declared preference files exists: $rootPreferences")
         }
 
         // Add all preferences to the ReVanced fragment.

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

@@ -9,6 +9,8 @@ import org.w3c.dom.Element
  *
  * @param key The key of the preference. If null, other parameters must be specified.
  * @param titleKey The key of the preference title.
+ * @param icon The preference icon resource name.
+ * @param layout Layout declaration.
  * @param summaryKey The key of the preference summary.
  * @param tag The tag or full class name of the preference.
  */
@@ -17,6 +19,8 @@ abstract class BasePreference(
     val key: String? = null,
     val titleKey: String = "${key}_title",
     val summaryKey: String? = "${key}_summary",
+    val icon: String? = null,
+    val layout: String? = null,
     val tag: String
 ) {
     /**
@@ -33,6 +37,11 @@ abstract class BasePreference(
             key?.let { setAttribute("android:key", it) }
             setAttribute("android:title", "@string/${titleKey}")
             summaryKey?.let { addSummary(it) }
+            icon?.let {
+                setAttribute("android:icon", it)
+                setAttribute("app:iconSpaceReserved", "true")
+            }
+            layout?.let { setAttribute("android:layout", layout) }
         }
 
     override fun hashCode(): Int {

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

@@ -24,16 +24,20 @@ abstract class BasePreferenceScreen(
         key: String? = null,
         titleKey: String = "${key}_title",
         private val summaryKey: String? = "${key}_summary",
+        icon: String? = null,
+        layout: String? = null,
         preferences: MutableSet<BasePreference> = mutableSetOf(),
         val categories: MutableSet<Category> = mutableSetOf(),
         private val sorting: Sorting = Sorting.BY_TITLE,
-    ) : BasePreferenceCollection(key, titleKey, preferences) {
+    ) : BasePreferenceCollection(key, titleKey, icon, layout, preferences) {
 
         override fun transform(): PreferenceScreenPreference {
             return PreferenceScreenPreference(
                 key,
                 titleKey,
                 summaryKey,
+                icon,
+                layout,
                 sorting,
                 // Screens and preferences are sorted at runtime by extension code,
                 // so title sorting uses the localized language in use.
@@ -56,12 +60,17 @@ abstract class BasePreferenceScreen(
         open inner class Category(
             key: String? = null,
             titleKey: String = "${key}_title",
+            icon: String? = null,
+            layout: String? = null,
             preferences: MutableSet<BasePreference> = mutableSetOf(),
-        ) : BasePreferenceCollection(key, titleKey, preferences) {
+        ) : BasePreferenceCollection(key, titleKey, icon, layout, preferences) {
             override fun transform(): PreferenceCategory {
                 return PreferenceCategory(
                     key,
                     titleKey,
+                    icon,
+                    layout,
+                    sorting,
                     preferences = preferences,
                 )
             }
@@ -82,6 +91,8 @@ abstract class BasePreferenceScreen(
     abstract class BasePreferenceCollection(
         val key: String? = null,
         val titleKey: String = "${key}_title",
+        val icon: String? = null,
+        val layout: String? = null,
         val preferences: MutableSet<BasePreference> = mutableSetOf(),
     ) {
         abstract fun transform(): BasePreference

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

@@ -5,4 +5,5 @@ enum class InputType(val type: String) {
     TEXT_CAP_CHARACTERS("textCapCharacters"),
     TEXT_MULTI_LINE("textMultiLine"),
     NUMBER("number"),
+    NUMBER_DECIMAL("numberDecimal"),
 }

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

@@ -9,6 +9,8 @@ import org.w3c.dom.Document
  * @param key Optional preference key.
  * @param titleKey The preference title key.
  * @param summaryKey The preference summary key.
+ * @param icon The preference icon resource name.
+ * @param layout Layout declaration.
  * @param tag The preference tag.
  * @param intent The intent to open.
  */
@@ -16,9 +18,11 @@ class IntentPreference(
     key: String? = null,
     titleKey: String = "${key}_title",
     summaryKey: String? = "${key}_summary",
+    icon: String? = null,
+    layout: String? = null,
     tag: String = "Preference",
     val intent: Intent,
-) : BasePreference(key, titleKey, summaryKey, tag) {
+) : BasePreference(key, titleKey, summaryKey, icon, layout, tag) {
 
     override fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit) =
         super.serialize(ownerDocument, resourceCallback).apply {

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

@@ -10,6 +10,8 @@ import org.w3c.dom.Document
  * @param key The preference key. If null, other parameters must be specified.
  * @param titleKey The preference title key.
  * @param summaryKey The preference summary key.
+ * @param icon The preference icon resource name.
+ * @param layout Layout declaration.
  * @param tag The preference tag.
  * @param entriesKey The entries array key.
  * @param entryValuesKey The entry values array key.
@@ -19,10 +21,12 @@ class ListPreference(
     key: String? = null,
     titleKey: String = "${key}_title",
     summaryKey: String? = "${key}_summary",
+    icon: String? = null,
+    layout: String? = null,
     tag: String = "ListPreference",
     val entriesKey: String? = "${key}_entries",
     val entryValuesKey: String? = "${key}_entry_values"
-) : BasePreference(key, titleKey, summaryKey, tag) {
+) : BasePreference(key, titleKey, summaryKey, icon, layout, tag) {
     var entries: ArrayResource? = null
         private set
     var entryValues: ArrayResource? = null

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

@@ -10,6 +10,8 @@ import org.w3c.dom.Document
  *
  * @param key The preference key.
  * @param summaryKey The preference summary key.
+ * @param icon The preference icon resource name.
+ * @param layout Layout declaration.
  * @param tag The tag or full class name of the preference.
  * @param selectable If the preference is selectable and responds to tap events.
  */
@@ -18,9 +20,11 @@ class NonInteractivePreference(
     key: String,
     titleKey: String = "${key}_title",
     summaryKey: String? = "${key}_summary",
+    icon: String? = null,
+    layout: String? = null,
     tag: String = "Preference",
     val selectable: Boolean = false,
-) : BasePreference(key, titleKey, summaryKey, tag) {
+) : BasePreference(key, titleKey, summaryKey, icon, layout, tag) {
     override fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit) =
         super.serialize(ownerDocument, resourceCallback).apply {
             setAttribute("android:selectable", selectable.toString())

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

@@ -1,5 +1,6 @@
 package app.revanced.patches.shared.misc.settings.preference
 
+import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference.Sorting
 import app.revanced.util.resource.BaseResource
 import org.w3c.dom.Document
 
@@ -8,6 +9,8 @@ import org.w3c.dom.Document
  *
  * @param key The key of the preference. If null, other parameters must be specified.
  * @param titleKey The key of the preference title.
+ * @param icon The preference icon resource name.
+ * @param layout Layout declaration.
  * @param tag The tag or full class name of the preference.
  * @param preferences The preferences in this category.
  */
@@ -15,9 +18,12 @@ import org.w3c.dom.Document
 open class PreferenceCategory(
     key: String? = null,
     titleKey: String = "${key}_title",
+    icon: String? = null,
+    layout: String? = null,
+    sorting: Sorting = Sorting.BY_TITLE,
     tag: String = "PreferenceCategory",
     val preferences: Set<BasePreference>
-) : BasePreference(key, titleKey, null, tag) {
+) : BasePreference(sorting.appendSortType(key), titleKey, null, icon, layout, tag) {
 
     override fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit) =
         super.serialize(ownerDocument, resourceCallback).apply {

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

@@ -9,6 +9,8 @@ import org.w3c.dom.Document
  * @param key The key of the preference. If null, other parameters must be specified.
  * @param titleKey The key of the preference title.
  * @param summaryKey The key of the preference summary.
+ * @param icon The preference icon resource name.
+ * @param layout Layout declaration.
  * @param sorting Sorting to use. If the sorting is not [Sorting.UNSORTED],
  *                then the key parameter will be modified to include the sort type.
  * @param tag The tag or full class name of the preference.
@@ -19,6 +21,8 @@ open class PreferenceScreenPreference(
     key: String? = null,
     titleKey: String = "${key}_title",
     summaryKey: String? = "${key}_summary",
+    icon: String? = null,
+    layout: String? = null,
     sorting: Sorting = Sorting.BY_TITLE,
     tag: String = "PreferenceScreen",
     val preferences: Set<BasePreference>,
@@ -28,7 +32,7 @@ open class PreferenceScreenPreference(
     // or adding new attributes to the attrs.xml file.
     // Since the key value is not currently used by the extensions,
     // for now it's much simpler to modify the key to include the sort parameter.
-) : BasePreference(if (sorting == Sorting.UNSORTED) key else (key + sorting.keySuffix), titleKey, summaryKey, tag) {
+) : BasePreference(sorting.appendSortType(key), titleKey, summaryKey, icon, layout, tag) {
     override fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit) =
         super.serialize(ownerDocument, resourceCallback).apply {
             preferences.forEach {
@@ -53,6 +57,16 @@ open class PreferenceScreenPreference(
         /**
          * Unspecified sorting.
          */
-        UNSORTED("_sort_by_unsorted"),
+        UNSORTED("_sort_by_unsorted");
+
+        /**
+         * @return The key with this sort type appended to to the end,
+         *         or if key is null then null is returned.
+         */
+        fun appendSortType(key: String?): String? {
+            if (key == null) return null
+            if (this == UNSORTED) return key
+            return key + keySuffix
+        }
     }
 }

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

@@ -8,6 +8,8 @@ import org.w3c.dom.Document
  *
  * @param key The preference key. If null, other parameters must be specified.
  * @param titleKey The preference title key.
+ * @param icon The preference icon resource name.
+ * @param layout Layout declaration.
  * @param tag The preference tag.
  * @param summaryOnKey The preference summary-on key.
  * @param summaryOffKey The preference summary-off key.
@@ -17,9 +19,11 @@ class SwitchPreference(
     key: String? = null,
     titleKey: String = "${key}_title",
     tag: String = "SwitchPreference",
+    icon: String? = null,
+    layout: String? = null,
     val summaryOnKey: String = "${key}_summary_on",
     val summaryOffKey: String = "${key}_summary_off"
-) : BasePreference(key, titleKey, null, tag) {
+) : BasePreference(key, titleKey, null, icon, layout, tag) {
     override fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit) =
         super.serialize(ownerDocument, resourceCallback).apply {
             addSummary(summaryOnKey, SummaryType.ON)

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

@@ -9,6 +9,8 @@ import org.w3c.dom.Document
  * @param key The preference key. If null, other parameters must be specified.
  * @param titleKey The preference title key.
  * @param summaryKey The preference summary key.
+ * @param icon The preference icon resource name.
+ * @param layout Layout declaration.
  * @param tag The preference tag.
  * @param inputType The preference input type.
  */
@@ -17,9 +19,11 @@ class TextPreference(
     key: String? = null,
     titleKey: String = "${key}_title",
     summaryKey: String? = "${key}_summary",
+    icon: String? = null,
+    layout: String? = null,
     tag: String = "app.revanced.extension.shared.settings.preference.ResettableEditTextPreference",
     val inputType: InputType = InputType.TEXT
-) : BasePreference(key, titleKey, summaryKey, tag) {
+) : BasePreference(key, titleKey, summaryKey, icon, layout, tag) {
 
     override fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit) =
         super.serialize(ownerDocument, resourceCallback).apply {

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

@@ -1,6 +1,7 @@
 package app.revanced.patches.shared.misc.spoof
 
 import app.revanced.patcher.fingerprint
+import app.revanced.util.literal
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
@@ -111,6 +112,23 @@ internal val buildMediaDataSourceFingerprint = fingerprint {
     )
 }
 
+internal const val HLS_CURRENT_TIME_FEATURE_FLAG = 45355374L
+
+internal val hlsCurrentTimeFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    parameters("Z", "L")
+    literal {
+        HLS_CURRENT_TIME_FEATURE_FLAG
+    }
+}
+
+internal val nerdsStatsVideoFormatBuilderFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC)
+    returns("Ljava/lang/String;")
+    parameters("L")
+    strings("codecs=\"")
+}
+
 internal val patchIncludedExtensionMethodFingerprint = fingerprint {
     accessFlags(AccessFlags.PRIVATE, AccessFlags.STATIC)
     returns("Z")

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

@@ -10,8 +10,10 @@ import app.revanced.patcher.patch.BytecodePatchContext
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patches.all.misc.resources.addResourcesPatch
+import app.revanced.util.findInstructionIndicesReversedOrThrow
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.insertFeatureFlagBooleanOverride
 import app.revanced.util.returnEarly
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
@@ -206,6 +208,34 @@ fun spoofVideoStreamsPatch(
                     """,
             )
         }
+
+        // endregion
+
+        // region Append spoof info.
+
+        nerdsStatsVideoFormatBuilderFingerprint.method.apply {
+            findInstructionIndicesReversedOrThrow(Opcode.RETURN_OBJECT).forEach { index ->
+                val register = getInstruction<OneRegisterInstruction>(index).registerA
+
+                addInstructions(
+                    index,
+                    """
+                        invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->appendSpoofedClient(Ljava/lang/String;)Ljava/lang/String;
+                        move-result-object v$register
+                    """
+                )
+            }
+        }
+
+        // endregion
+
+        // region Fix iOS livestream current time.
+
+        hlsCurrentTimeFingerprint.method.insertFeatureFlagBooleanOverride(
+            HLS_CURRENT_TIME_FEATURE_FLAG,
+            "$EXTENSION_CLASS_DESCRIPTOR->fixHLSCurrentTime(Z)Z"
+        )
+
         // endregion
 
         executeBlock()

patches/src/main/kotlin/app/revanced/patches/swissid/integritycheck/RemoveGooglePlayIntegrityCheckPatch.kt

@@ -15,7 +15,7 @@ val removeGooglePlayIntegrityCheckPatch = bytecodePatch(
     description = "Removes the Google Play Integrity check. With this it's possible to use SwissID on custom ROMS." +
         "If the device is rooted, root permissions must be hidden from the app.",
 ) {
-    compatibleWith("com.swisssign.swissid.mobile")
+    compatibleWith("com.swisssign.swissid.mobile"("5.2.9"))
 
     execute {
         checkIntegrityFingerprint.method.addInstructions(

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

@@ -0,0 +1,25 @@
+package app.revanced.patches.youtube.ad.general
+
+import app.revanced.patcher.fingerprint
+import app.revanced.util.containsLiteralInstruction
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionReversed
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+
+internal val fullScreenEngagementAdContainerFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("V")
+    parameters()
+    custom { method, _ ->
+        method.containsLiteralInstruction(fullScreenEngagementAdContainer)
+                && indexOfAddListInstruction(method) >= 0
+    }
+}
+
+internal fun indexOfAddListInstruction(method: Method) =
+    method.indexOfFirstInstructionReversed {
+        getReference<MethodReference>()?.name == "add"
+    }
+

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

@@ -1,5 +1,7 @@
 package app.revanced.patches.youtube.ad.general
 
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patches.all.misc.resources.addResources
@@ -18,11 +20,16 @@ import app.revanced.patches.youtube.misc.settings.settingsPatch
 import app.revanced.util.findMutableMethodOf
 import app.revanced.util.injectHideViewCall
 import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction31i
 import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
 
 internal var adAttributionId = -1L
     private set
+internal var fullScreenEngagementAdContainer = -1L
+    private set
+
+private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/youtube/patches/components/AdsFilter;"
 
 private val hideAdsResourcePatch = resourcePatch {
     dependsOn(
@@ -37,6 +44,7 @@ private val hideAdsResourcePatch = resourcePatch {
 
         PreferenceScreen.ADS.addPreferences(
             SwitchPreference("revanced_hide_general_ads"),
+            SwitchPreference("revanced_hide_end_screen_store_banner"),
             SwitchPreference("revanced_hide_fullscreen_ads"),
             SwitchPreference("revanced_hide_buttoned_ads"),
             SwitchPreference("revanced_hide_paid_promotion_label"),
@@ -52,6 +60,7 @@ private val hideAdsResourcePatch = resourcePatch {
         addLithoFilter("Lapp/revanced/extension/youtube/patches/components/AdsFilter;")
 
         adAttributionId = resourceMappings["id", "ad_attribution"]
+        fullScreenEngagementAdContainer = resourceMappings["id", "fullscreen_engagement_ad_container"]
     }
 }
 
@@ -82,6 +91,23 @@ val hideAdsPatch = bytecodePatch(
     )
 
     execute {
+        // Hide end screen store banner
+
+        fullScreenEngagementAdContainerFingerprint.method.apply {
+            val addListIndex = indexOfAddListInstruction(this)
+            val addListInstruction = getInstruction<FiveRegisterInstruction>(addListIndex)
+            val listRegister = addListInstruction.registerC
+            val objectRegister = addListInstruction.registerD
+
+            replaceInstruction(
+                addListIndex,
+                "invoke-static { v$listRegister, v$objectRegister }, $EXTENSION_CLASS_DESCRIPTOR" +
+                        "->hideEndScreenStoreBanner(Ljava/util/List;Ljava/lang/Object;)V"
+            )
+        }
+
+        // Hide ad views
+
         classes.forEach { classDef ->
             classDef.methods.forEach { method ->
                 with(method.implementation) {
@@ -110,7 +136,7 @@ val hideAdsPatch = bytecodePatch(
                                 .injectHideViewCall(
                                     insertIndex,
                                     viewRegister,
-                                    "Lapp/revanced/extension/youtube/patches/components/AdsFilter;",
+                                    EXTENSION_CLASS_DESCRIPTOR,
                                     "hideAdAttributionView",
                                 )
                         }

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

@@ -1,12 +1,23 @@
 package app.revanced.patches.youtube.interaction.swipecontrols
 
 import app.revanced.patcher.fingerprint
+import app.revanced.util.literal
 import com.android.tools.smali.dexlib2.AccessFlags
 
 internal val swipeControlsHostActivityFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
     parameters()
     custom { method, _ ->
-        method.definingClass == "Lapp/revanced/extension/youtube/swipecontrols/SwipeControlsHostActivity;"
+        method.definingClass == EXTENSION_CLASS_DESCRIPTOR
+    }
+}
+
+internal const val SWIPE_CHANGE_VIDEO_FEATURE_FLAG = 45631116L
+
+internal val swipeChangeVideoFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
+    parameters("L")
+    literal {
+        SWIPE_CHANGE_VIDEO_FEATURE_FLAG
     }
 }

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

@@ -10,6 +10,7 @@ import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
 import app.revanced.patches.shared.misc.settings.preference.TextPreference
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.playertype.playerTypeHookPatch
+import app.revanced.patches.youtube.misc.playservice.is_19_43_or_greater
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
 import app.revanced.patches.youtube.shared.mainActivityFingerprint
@@ -17,6 +18,8 @@ import app.revanced.util.*
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
 
+internal const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/youtube/swipecontrols/SwipeControlsHostActivity;"
+
 private val swipeControlsResourcePatch = resourcePatch {
     dependsOn(
         settingsPatch,
@@ -26,6 +29,12 @@ private val swipeControlsResourcePatch = resourcePatch {
     execute {
         addResources("youtube", "interaction.swipecontrols.swipeControlsResourcePatch")
 
+        if (is_19_43_or_greater) {
+            PreferenceScreen.SWIPE_CONTROLS.addPreferences(
+                SwitchPreference("revanced_swipe_change_video")
+            )
+        }
+
         PreferenceScreen.SWIPE_CONTROLS.addPreferences(
             SwitchPreference("revanced_swipe_brightness"),
             SwitchPreference("revanced_swipe_volume"),
@@ -101,5 +110,16 @@ val swipeControlsPatch = bytecodePatch(
                 ).toMutable()
             }
         }
+
+        // region patch to enable/disable swipe to change video.
+
+        if (is_19_43_or_greater) {
+            swipeChangeVideoFingerprint.method.insertFeatureFlagBooleanOverride(
+                SWIPE_CHANGE_VIDEO_FEATURE_FLAG,
+                "$EXTENSION_CLASS_DESCRIPTOR->allowSwipeChangeVideo(Z)Z"
+            )
+        }
+
+        // endregion
     }
 }

patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt

@@ -65,9 +65,12 @@ val navigationButtonsPatch = bytecodePatch(
         )
 
         if (is_19_25_or_greater) {
-            preferences += SwitchPreference("revanced_disable_translucent_status_bar")
             preferences += SwitchPreference("revanced_disable_translucent_navigation_bar_light")
             preferences += SwitchPreference("revanced_disable_translucent_navigation_bar_dark")
+
+            PreferenceScreen.GENERAL_LAYOUT.addPreferences(
+                SwitchPreference("revanced_disable_translucent_status_bar")
+            )
         }
 
         PreferenceScreen.GENERAL_LAYOUT.addPreferences(

patches/src/main/kotlin/app/revanced/patches/youtube/layout/formfactor/ChangeFormFactorPatch.kt

@@ -0,0 +1,75 @@
+package app.revanced.patches.youtube.layout.formfactor
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.all.misc.resources.addResources
+import app.revanced.patches.all.misc.resources.addResourcesPatch
+import app.revanced.patches.shared.misc.settings.preference.ListPreference
+import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
+import app.revanced.patches.youtube.misc.settings.PreferenceScreen
+import app.revanced.patches.youtube.misc.settings.settingsPatch
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference
+
+internal const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/youtube/patches/ChangeFormFactorPatch;"
+
+@Suppress("unused")
+val changeFormFactorPatch = bytecodePatch(
+    name = "Change form factor",
+    description = "Adds an option to change the UI appearance to a phone, tablet, or automotive device.",
+) {
+    dependsOn(
+        sharedExtensionPatch,
+        settingsPatch,
+        addResourcesPatch,
+    )
+
+    compatibleWith(
+        "com.google.android.youtube"(
+            "18.38.44",
+            "18.49.37",
+            "19.16.39",
+            "19.25.37",
+            "19.34.42",
+            "19.43.41",
+            "19.45.38",
+            "19.46.42",
+            "19.47.53",
+        ),
+    )
+
+    execute {
+        addResources("youtube", "layout.formfactor.changeFormFactorPatch")
+
+        PreferenceScreen.GENERAL_LAYOUT.addPreferences(
+            ListPreference(
+                "revanced_change_form_factor",
+                summaryKey = null,
+            )
+        )
+
+        createPlayerRequestBodyWithModelFingerprint.method.apply {
+            val formFactorEnumClass = formFactorEnumConstructorFingerprint.originalClassDef.type
+
+            val index = indexOfFirstInstructionOrThrow {
+                val reference = getReference<FieldReference>()
+                opcode == Opcode.IGET &&
+                        reference?.definingClass == formFactorEnumClass &&
+                        reference.type == "I"
+            }
+            val register = getInstruction<TwoRegisterInstruction>(index).registerA
+
+            addInstructions(
+                index + 1,
+                """
+                    invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->getFormFactor(I)I
+                    move-result v$register
+                """
+            )
+        }
+    }
+}

patches/src/main/kotlin/app/revanced/patches/youtube/layout/formfactor/Fingerprints.kt

@@ -0,0 +1,49 @@
+package app.revanced.patches.youtube.layout.formfactor
+
+import app.revanced.patcher.fingerprint
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstruction
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference
+
+internal val formFactorEnumConstructorFingerprint = fingerprint {
+    accessFlags(AccessFlags.STATIC, AccessFlags.CONSTRUCTOR)
+    strings(
+        "UNKNOWN_FORM_FACTOR",
+        "SMALL_FORM_FACTOR",
+        "LARGE_FORM_FACTOR",
+        "AUTOMOTIVE_FORM_FACTOR"
+    )
+}
+
+internal val createPlayerRequestBodyWithModelFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("L")
+    parameters()
+    opcodes(Opcode.OR_INT_LIT16)
+    custom { method, _ ->
+        method.indexOfModelInstruction() >= 0 &&
+                method.indexOfReleaseInstruction() >= 0
+    }
+}
+
+private fun Method.indexOfModelInstruction() =
+    indexOfFirstInstruction {
+        val reference = getReference<FieldReference>()
+
+        reference?.definingClass == "Landroid/os/Build;" &&
+                reference.name == "MODEL" &&
+                reference.type == "Ljava/lang/String;"
+    }
+
+internal fun Method.indexOfReleaseInstruction(): Int =
+    indexOfFirstInstruction {
+        val reference = getReference<FieldReference>()
+
+        reference?.definingClass == "Landroid/os/Build${'$'}VERSION;" &&
+                reference.name == "RELEASE" &&
+                reference.type == "Ljava/lang/String;"
+    }
+

patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt

@@ -147,6 +147,7 @@ val hideLayoutComponentsPatch = bytecodePatch(
                     SwitchPreference("revanced_hide_attributes_section"),
                     SwitchPreference("revanced_hide_chapters_section"),
                     SwitchPreference("revanced_hide_info_cards_section"),
+                    SwitchPreference("revanced_hide_how_this_was_made_section"),
                     SwitchPreference("revanced_hide_key_concepts_section"),
                     SwitchPreference("revanced_hide_podcast_section"),
                     SwitchPreference("revanced_hide_transcript_section"),

patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt

@@ -71,6 +71,7 @@ private val hideShortsComponentsResourcePatch = resourcePatch {
             SwitchPreference("revanced_hide_shorts_home"),
             SwitchPreference("revanced_hide_shorts_subscriptions"),
             SwitchPreference("revanced_hide_shorts_search"),
+            SwitchPreference("revanced_hide_shorts_history"),
 
             PreferenceScreenPreference(
                 key = "revanced_shorts_player_screen",

patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/ExitFullscreenPatch.kt

@@ -0,0 +1,67 @@
+package app.revanced.patches.youtube.layout.player.fullscreen
+
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.all.misc.resources.addResources
+import app.revanced.patches.all.misc.resources.addResourcesPatch
+import app.revanced.patches.shared.misc.settings.preference.ListPreference
+import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
+import app.revanced.patches.youtube.misc.playercontrols.playerControlsPatch
+import app.revanced.patches.youtube.misc.playertype.playerTypeHookPatch
+import app.revanced.patches.youtube.misc.settings.PreferenceScreen
+import app.revanced.patches.youtube.misc.settings.settingsPatch
+import app.revanced.patches.youtube.shared.autoRepeatFingerprint
+import app.revanced.patches.youtube.shared.autoRepeatParentFingerprint
+import app.revanced.util.addInstructionsAtControlFlowLabel
+
+@Suppress("unused")
+internal val exitFullscreenPatch = bytecodePatch(
+    name = "Exit fullscreen mode",
+    description = "Adds options to automatically exit fullscreen mode when a video reaches the end."
+) {
+
+    compatibleWith(
+        "com.google.android.youtube"(
+            "18.38.44",
+            "18.49.37",
+            "19.16.39",
+            "19.25.37",
+            "19.34.42",
+            "19.43.41",
+            "19.45.38",
+            "19.46.42",
+            "19.47.53",
+        )
+    )
+
+    dependsOn(
+        sharedExtensionPatch,
+        settingsPatch,
+        addResourcesPatch,
+        playerTypeHookPatch,
+        playerControlsPatch
+    )
+
+    // Cannot declare as top level since this patch is in the same package as
+    // other patches that declare same constant name with internal visibility.
+    @Suppress("LocalVariableName")
+    val EXTENSION_CLASS_DESCRIPTOR =
+        "Lapp/revanced/extension/youtube/patches/ExitFullscreenPatch;"
+
+    execute {
+        addResources("youtube", "layout.player.fullscreen.exitFullscreenPatch")
+
+        PreferenceScreen.PLAYER.addPreferences(
+            ListPreference(
+                "revanced_exit_fullscreen",
+                summaryKey = null,
+            )
+        )
+
+        autoRepeatFingerprint.match(autoRepeatParentFingerprint.originalClassDef).method.apply {
+            addInstructionsAtControlFlowLabel(
+                implementation!!.instructions.lastIndex,
+                "invoke-static {}, $EXTENSION_CLASS_DESCRIPTOR->endOfVideoReached()V",
+            )
+        }
+    }
+}

patches/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/Fingerprints.kt

@@ -34,13 +34,17 @@ internal val shortsSeekbarColorFingerprint = fingerprint {
     literal { reelTimeBarPlayedColorId }
 }
 
-internal const val PLAYER_SEEKBAR_GRADIENT_FEATURE_FLAG = 45617850L
+internal val playerSeekbarHandleColorFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
+    parameters("Landroid/content/Context;")
+    literal { ytStaticBrandRedId }
+}
 
-internal val playerSeekbarGradientConfigFingerprint = fingerprint {
+internal val watchHistoryMenuUseProgressDrawableFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("Z")
-    parameters()
-    literal { PLAYER_SEEKBAR_GRADIENT_FEATURE_FLAG }
+    returns("V")
+    parameters("L")
+    literal { -1712394514 }
 }
 
 internal val lithoLinearGradientFingerprint = fingerprint {
@@ -49,6 +53,49 @@ internal val lithoLinearGradientFingerprint = fingerprint {
     parameters("F", "F", "F", "F", "[I", "[F")
 }
 
+/**
+ * 19.49+
+ */
+internal val playerLinearGradientFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC)
+    parameters("I", "I", "I", "I", "Landroid/content/Context;", "I")
+    returns("Landroid/graphics/LinearGradient;")
+    opcodes(
+        Opcode.FILLED_NEW_ARRAY,
+        Opcode.MOVE_RESULT_OBJECT
+    )
+    literal { ytYoutubeMagentaColorId }
+}
+
+/**
+ * 19.46 - 19.47
+ */
+internal val playerLinearGradientLegacy1946Fingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    parameters("I", "I", "I", "I")
+    returns("V")
+    opcodes(
+        Opcode.FILLED_NEW_ARRAY,
+        Opcode.MOVE_RESULT_OBJECT
+    )
+    custom { method, _ ->
+        method.name == "setBounds" && method.containsLiteralInstruction(ytYoutubeMagentaColorId)
+    }
+}
+
+/**
+ * 19.25 - 19.45
+ */
+internal val playerLinearGradientLegacy1925Fingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
+    parameters("Landroid/content/Context;")
+    opcodes(
+        Opcode.FILLED_NEW_ARRAY,
+        Opcode.MOVE_RESULT_OBJECT
+    )
+    literal { ytYoutubeMagentaColorId }
+}
+
 internal const val launchScreenLayoutTypeLotteFeatureFlag = 268507948L
 
 internal val launchScreenLayoutTypeFingerprint = fingerprint {

patches/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/SeekbarColorPatch.kt

@@ -14,7 +14,9 @@ import app.revanced.patches.youtube.layout.theme.lithoColorHookPatch
 import app.revanced.patches.youtube.layout.theme.lithoColorOverrideHook
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.playservice.is_19_25_or_greater
+import app.revanced.patches.youtube.misc.playservice.is_19_34_or_greater
 import app.revanced.patches.youtube.misc.playservice.is_19_46_or_greater
+import app.revanced.patches.youtube.misc.playservice.is_19_49_or_greater
 import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
 import app.revanced.patches.youtube.misc.settings.settingsPatch
 import app.revanced.patches.youtube.shared.mainActivityOnCreateFingerprint
@@ -39,6 +41,10 @@ internal var inlineTimeBarColorizedBarPlayedColorDarkId = -1L
     private set
 internal var inlineTimeBarPlayedNotHighlightedColorId = -1L
     private set
+internal var ytYoutubeMagentaColorId = -1L
+    private set
+internal var ytStaticBrandRedId = -1L
+    private set
 
 internal const val splashSeekbarColorAttributeName = "splash_custom_seekbar_color"
 
@@ -83,6 +89,15 @@ private val seekbarColorResourcePatch = resourcePatch {
             return@execute
         }
 
+        ytYoutubeMagentaColorId = resourceMappings[
+            "color",
+            "yt_youtube_magenta",
+        ]
+        ytStaticBrandRedId = resourceMappings[
+            "attr",
+            "ytStaticBrandRed",
+        ]
+
         // Add attribute and styles for splash screen custom color.
         // Using a style is the only way to selectively change just the seekbar fill color.
         //
@@ -182,28 +197,31 @@ val seekbarColorPatch = bytecodePatch(
         sharedExtensionPatch,
         lithoColorHookPatch,
         seekbarColorResourcePatch,
+        versionCheckPatch
     )
 
     execute {
-        fun MutableMethod.addColorChangeInstructions(resourceId: Long) {
-            val registerIndex = indexOfFirstLiteralInstructionOrThrow(resourceId) + 2
-            val colorRegister = getInstruction<OneRegisterInstruction>(registerIndex).registerA
+        fun MutableMethod.addColorChangeInstructions(resourceId: Long, methodName: String) {
+            val index = indexOfFirstLiteralInstructionOrThrow(resourceId)
+            val insertIndex = indexOfFirstInstructionOrThrow(index, Opcode.MOVE_RESULT)
+            val register = getInstruction<OneRegisterInstruction>(insertIndex).registerA
+
             addInstructions(
-                registerIndex + 1,
+                insertIndex + 1,
+                """
+                    invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->$methodName(I)I
+                    move-result v$register
                 """
-                    invoke-static { v$colorRegister }, $EXTENSION_CLASS_DESCRIPTOR->getVideoPlayerSeekbarColor(I)I
-                    move-result v$colorRegister
-                """,
             )
         }
 
         playerSeekbarColorFingerprint.method.apply {
-            addColorChangeInstructions(inlineTimeBarColorizedBarPlayedColorDarkId)
-            addColorChangeInstructions(inlineTimeBarPlayedNotHighlightedColorId)
+            addColorChangeInstructions(inlineTimeBarColorizedBarPlayedColorDarkId, "getVideoPlayerSeekbarColor")
+            addColorChangeInstructions(inlineTimeBarPlayedNotHighlightedColorId, "getVideoPlayerSeekbarColor")
         }
 
         shortsSeekbarColorFingerprint.method.apply {
-            addColorChangeInstructions(reelTimeBarPlayedColorId)
+            addColorChangeInstructions(reelTimeBarPlayedColorId, "getVideoPlayerSeekbarColor")
         }
 
         setSeekbarClickedColorFingerprint.originalMethod.let {
@@ -229,16 +247,63 @@ val seekbarColorPatch = bytecodePatch(
 
         // 19.25+ changes
 
-        playerSeekbarGradientConfigFingerprint.method.insertFeatureFlagBooleanOverride(
-            PLAYER_SEEKBAR_GRADIENT_FEATURE_FLAG,
-            "$EXTENSION_CLASS_DESCRIPTOR->playerSeekbarGradientEnabled(Z)Z"
-        )
+        playerSeekbarHandleColorFingerprint.method.apply {
+            addColorChangeInstructions(ytStaticBrandRedId, "getVideoPlayerSeekbarColor")
+        }
 
-        lithoLinearGradientFingerprint.method.addInstruction(
+        // If hiding feed seekbar thumbnails, then turn off the cairo gradient
+        // of the watch history menu items as they use the same gradient as the
+        // player and there is no easy way to distinguish which to use a transparent color.
+        if (is_19_34_or_greater) {
+            watchHistoryMenuUseProgressDrawableFingerprint.method.apply {
+                val progressIndex = indexOfFirstInstructionOrThrow {
+                    val reference = getReference<MethodReference>()
+                    reference?.definingClass == "Landroid/widget/ProgressBar;" && reference.name == "setMax"
+                }
+                val index = indexOfFirstInstructionOrThrow(progressIndex, Opcode.MOVE_RESULT)
+                val register = getInstruction<OneRegisterInstruction>(index).registerA
+
+                addInstructions(
+                    index + 1,
+                    """
+                        invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->showWatchHistoryProgressDrawable(Z)Z
+                        move-result v$register            
+                    """
+                )
+            }
+        }
+
+        lithoLinearGradientFingerprint.method.addInstructions(
             0,
-            "invoke-static/range { p4 .. p5 },  $EXTENSION_CLASS_DESCRIPTOR->setLinearGradient([I[F)V"
+            """
+                invoke-static/range { p4 .. p5 },  $EXTENSION_CLASS_DESCRIPTOR->getLithoLinearGradient([I[F)[I
+                move-result-object p4   
+            """
         )
 
+        val playerFingerprint =
+            if (is_19_49_or_greater) {
+                playerLinearGradientFingerprint
+            } else if (is_19_46_or_greater) {
+                playerLinearGradientLegacy1946Fingerprint
+            } else {
+                playerLinearGradientLegacy1925Fingerprint
+            }
+
+        playerFingerprint.let {
+            it.method.apply {
+                val index = it.patternMatch!!.endIndex
+                val register = getInstruction<OneRegisterInstruction>(index).registerA
+
+                addInstructions(
+                    index + 1,
+                    """
+                       invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->getPlayerLinearGradient([I)[I
+                       move-result-object v$register
+                    """
+                )
+            }
+        }
 
         // region apply seekbar custom color to splash screen animation.
 

patches/src/main/kotlin/app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch.kt

@@ -1,66 +1,9 @@
 package app.revanced.patches.youtube.layout.tablet
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.instructions
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.all.misc.resources.addResources
-import app.revanced.patches.all.misc.resources.addResourcesPatch
-import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
-import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
-import app.revanced.patches.youtube.misc.settings.PreferenceScreen
-import app.revanced.patches.youtube.misc.settings.settingsPatch
+import app.revanced.patches.youtube.layout.formfactor.changeFormFactorPatch
 
-const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/youtube/patches/TabletLayoutPatch;"
-
-val enableTabletLayoutPatch = bytecodePatch(
-    name = "Enable tablet layout",
-    description = "Adds an option to enable tablet layout.",
-) {
-    dependsOn(
-        sharedExtensionPatch,
-        settingsPatch,
-        addResourcesPatch,
-    )
-
-    compatibleWith(
-        "com.google.android.youtube"(
-            "18.38.44",
-            "18.49.37",
-            "19.16.39",
-            "19.25.37",
-            "19.34.42",
-            "19.43.41",
-            "19.45.38",
-            "19.46.42",
-            "19.47.53",
-        ),
-    )
-
-    execute {
-        addResources("youtube", "layout.tablet.enableTabletLayoutPatch")
-
-        PreferenceScreen.GENERAL_LAYOUT.addPreferences(
-            SwitchPreference("revanced_tablet_layout"),
-        )
-
-        getFormFactorFingerprint.method.apply {
-            val returnIsLargeFormFactorIndex = instructions.lastIndex - 4
-            val returnIsLargeFormFactorLabel = getInstruction(returnIsLargeFormFactorIndex)
-
-            addInstructionsWithLabels(
-                0,
-                """
-                      invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->getTabletLayoutEnabled()Z
-                      move-result v0
-                      if-nez v0, :is_large_form_factor
-                """,
-                ExternalLabel(
-                    "is_large_form_factor",
-                    returnIsLargeFormFactorLabel,
-                ),
-            )
-        }
-    }
-}
+@Deprecated("Use 'Change form factor' instead.")
+val enableTabletLayoutPatch = bytecodePatch {
+    dependsOn(changeFormFactorPatch)
+}

patches/src/main/kotlin/app/revanced/patches/youtube/layout/tablet/Fingerprints.kt

@@ -1,25 +0,0 @@
-package app.revanced.patches.youtube.layout.tablet
-
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.AccessFlags
-import app.revanced.patcher.fingerprint
-
-internal val getFormFactorFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC)
-    returns("L")
-    parameters("Landroid/content/Context;", "Ljava/util/List;")
-    opcodes(
-        Opcode.SGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.SGET_OBJECT,
-        Opcode.RETURN_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.RETURN_OBJECT,
-    )
-    strings("")
-}

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

@@ -13,6 +13,8 @@ import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
 import app.revanced.patches.shared.misc.settings.preference.TextPreference
 import app.revanced.patches.youtube.layout.seekbar.seekbarColorPatch
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
+import app.revanced.patches.youtube.misc.playservice.is_19_25_or_greater
+import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
 import app.revanced.util.forEachChildElement
@@ -71,6 +73,7 @@ val themePatch = bytecodePatch(
     dependsOn(
         lithoColorHookPatch,
         seekbarColorPatch,
+        versionCheckPatch,
         resourcePatch {
             dependsOn(
                 settingsPatch,
@@ -83,9 +86,15 @@ val themePatch = bytecodePatch(
 
                 PreferenceScreen.SEEKBAR.addPreferences(
                     SwitchPreference("revanced_seekbar_custom_color"),
-                    TextPreference("revanced_seekbar_custom_color_value", inputType = InputType.TEXT_CAP_CHARACTERS),
+                    TextPreference("revanced_seekbar_custom_color_primary", inputType = InputType.TEXT_CAP_CHARACTERS),
                 )
 
+                if (is_19_25_or_greater) {
+                    PreferenceScreen.SEEKBAR.addPreferences(
+                        TextPreference("revanced_seekbar_custom_color_accent", inputType = InputType.TEXT_CAP_CHARACTERS),
+                    )
+                }
+
                 // Edit theme colors via resources.
                 document("res/values/colors.xml").use { document ->
 

patches/src/main/kotlin/app/revanced/patches/youtube/misc/check/CheckEnvironmentPatch.kt

@@ -4,7 +4,7 @@ import app.revanced.patches.shared.misc.checks.checkEnvironmentPatch
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.shared.mainActivityOnCreateFingerprint
 
-val checkEnvironmentPatch = checkEnvironmentPatch(
+internal val checkEnvironmentPatch = checkEnvironmentPatch(
     mainActivityOnCreateFingerprint = mainActivityOnCreateFingerprint,
     extensionPatch = sharedExtensionPatch,
     "com.google.android.youtube",

patches/src/main/kotlin/app/revanced/patches/youtube/misc/dns/CheckWatchHistoryDomainNameResolutionPatch.kt

@@ -4,6 +4,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patches.all.misc.resources.addResources
 import app.revanced.patches.all.misc.resources.addResourcesPatch
+import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.shared.mainActivityOnCreateFingerprint
 
 private const val EXTENSION_CLASS_DESCRIPTOR =
@@ -13,7 +14,10 @@ val checkWatchHistoryDomainNameResolutionPatch = bytecodePatch(
     name = "Check watch history domain name resolution",
     description = "Checks if the device DNS server is preventing user watch history from being saved.",
 ) {
-    dependsOn(addResourcesPatch)
+    dependsOn(
+        sharedExtensionPatch,
+        addResourcesPatch
+    )
 
     compatibleWith(
         "com.google.android.youtube"(

patches/src/main/kotlin/app/revanced/patches/youtube/misc/fix/cairo/DisableCairoSettingsPatch.kt

@@ -1,47 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.cairo
-
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patches.youtube.misc.backgroundplayback.backgroundPlaybackPatch
-import app.revanced.patches.youtube.misc.playservice.is_19_04_or_greater
-import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
-import app.revanced.util.indexOfFirstInstructionOrThrow
-import app.revanced.util.indexOfFirstLiteralInstructionOrThrow
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
-
-internal val disableCairoSettingsPatch = bytecodePatch(
-    description = "Disables Cairo Fragment from being used.",
-) {
-    dependsOn(versionCheckPatch)
-
-    execute {
-        if (!is_19_04_or_greater) {
-            return@execute
-        }
-
-        /**
-         * <pre>
-         * Cairo Fragment was added since YouTube v19.04.38.
-         *
-         * Disable this for the following reasons:
-         * 1. [backgroundPlaybackPatch] does not activate the Minimized playback setting of Cairo Fragment.
-         * 2. Some patches do not yet support Cairo Fragments (ie: custom Seekbar color).
-         * 3. Settings preferences added by ReVanced are missing.
-         *
-         * Screenshots of the Cairo Fragment:
-         * <a href="https://github.com/qnblackcat/uYouPlus/issues/1468">uYouPlus#1468</a>.
-         */
-        cairoFragmentConfigFingerprint.method.apply {
-            val literalIndex = indexOfFirstLiteralInstructionOrThrow(CAIRO_CONFIG_LITERAL_VALUE)
-            val resultIndex = indexOfFirstInstructionOrThrow(literalIndex, Opcode.MOVE_RESULT)
-            val register = getInstruction<OneRegisterInstruction>(resultIndex).registerA
-
-            addInstruction(
-                resultIndex + 1,
-                "const/16 v$register, 0x0",
-            )
-        }
-    }
-}

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

@@ -1,19 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.cairo
-
-import app.revanced.patcher.fingerprint
-import app.revanced.util.literal
-import com.android.tools.smali.dexlib2.AccessFlags
-
-/**
- * Added in YouTube v19.04.38.
- *
- * When this value is true, Cairo Fragment is used.
- * In this case, some of the patches may be broken, so set this value to FALSE.
- */
-internal const val CAIRO_CONFIG_LITERAL_VALUE = 45532100L
-
-internal val cairoFragmentConfigFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("Z")
-    literal { CAIRO_CONFIG_LITERAL_VALUE }
-}

patches/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playbackspeed/FIxPlaybackSpeedWhilePlayingPatch.kt

@@ -0,0 +1,61 @@
+package app.revanced.patches.youtube.misc.fix.playbackspeed
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patcher.util.smali.ExternalLabel
+import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
+import app.revanced.patches.youtube.misc.playertype.playerTypeHookPatch
+import app.revanced.patches.youtube.misc.playservice.is_19_34_or_greater
+import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
+
+private const val EXTENSION_CLASS_DESCRIPTOR =
+    "Lapp/revanced/extension/youtube/patches/FixPlaybackSpeedWhilePlayingPatch;"
+
+/**
+ * Fixes a bug in YouTube 19.34+ where the playback speed
+ * can incorrectly reset to 1.0x under certain conditions.
+ *
+ * Reproduction steps using 19.34+
+ * 1. Open a video and start playback
+ * 2. Change the speed to any value that is not 1.0x.
+ * 3. Open the comments panel.
+ * 4. Tap any "N more replies" link at the bottom of a comment, or tap on a timestamp of a comment.
+ * 5. Pause the video
+ * 6. Resume the video
+ * 7. Playback speed will incorrectly change to 1.0x.
+ */
+@Suppress("unused")
+val fixPlaybackSpeedWhilePlayingPatch = bytecodePatch{
+    dependsOn(
+        sharedExtensionPatch,
+        playerTypeHookPatch,
+        versionCheckPatch,
+    )
+
+    execute {
+        if (!is_19_34_or_greater) {
+            return@execute
+        }
+
+        playbackSpeedInFeedsFingerprint.method.apply {
+            val freeRegister = implementation!!.registerCount - parameters.size - 2
+            val playbackSpeedIndex = indexOfGetPlaybackSpeedInstruction(this)
+            val playbackSpeedRegister = getInstruction<TwoRegisterInstruction>(playbackSpeedIndex).registerA
+            val returnIndex = indexOfFirstInstructionOrThrow(playbackSpeedIndex, Opcode.RETURN_VOID)
+
+            addInstructionsWithLabels(
+                playbackSpeedIndex + 1,
+                """
+                    invoke-static { v$playbackSpeedRegister }, $EXTENSION_CLASS_DESCRIPTOR->playbackSpeedChanged(F)Z
+                    move-result v$freeRegister
+                    if-nez v$freeRegister, :do_not_change
+                """,
+                ExternalLabel("do_not_change", getInstruction(returnIndex))
+            )
+        }
+    }
+}

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

@@ -0,0 +1,38 @@
+package app.revanced.patches.youtube.misc.fix.playbackspeed
+
+import app.revanced.patcher.fingerprint
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionReversed
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference
+
+/**
+ * This method is usually used to set the initial speed (1.0x) when playback starts from the feed.
+ * For some reason, in the latest YouTube, it is invoked even after the video has already started.
+ */
+internal val playbackSpeedInFeedsFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("V")
+    parameters("L")
+    opcodes(
+        Opcode.IGET,
+        Opcode.MUL_INT_LIT16,
+        Opcode.IGET_WIDE,
+        Opcode.CONST_WIDE_16,
+        Opcode.CMP_LONG,
+        Opcode.IF_EQZ,
+        Opcode.IF_LEZ,
+        Opcode.SUB_LONG_2ADDR,
+    )
+    custom { method, _ ->
+        indexOfGetPlaybackSpeedInstruction(method) >= 0
+    }
+}
+
+internal fun indexOfGetPlaybackSpeedInstruction(method: Method) =
+    method.indexOfFirstInstructionReversed {
+        opcode == Opcode.IGET &&
+                getReference<FieldReference>()?.type == "F"
+    }

patches/src/main/kotlin/app/revanced/patches/youtube/misc/navigation/Fingerprints.kt

@@ -105,3 +105,15 @@ internal val pivotBarConstructorFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
     strings("com.google.android.apps.youtube.app.endpoint.flags")
 }
+
+internal val imageEnumConstructorFingerprint = fingerprint {
+    accessFlags(AccessFlags.STATIC, AccessFlags.CONSTRUCTOR)
+    strings("TAB_ACTIVITY_CAIRO")
+}
+
+internal val setEnumMapFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
+    literal {
+        ytFillBellId
+    }
+}

patches/src/main/kotlin/app/revanced/patches/youtube/misc/navigation/NavigationBarHookPatch.kt

@@ -1,6 +1,7 @@
 package app.revanced.patches.youtube.misc.navigation
 
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.instructions
 import app.revanced.patcher.patch.PatchException
@@ -12,13 +13,16 @@ import app.revanced.patches.shared.misc.mapping.resourceMappingPatch
 import app.revanced.patches.shared.misc.mapping.resourceMappings
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.playertype.playerTypeHookPatch
+import app.revanced.patches.youtube.misc.playservice.is_19_35_or_greater
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.indexOfFirstInstructionReversedOrThrow
 import app.revanced.util.indexOfFirstLiteralInstructionOrThrow
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.Instruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 import com.android.tools.smali.dexlib2.util.MethodUtil
 
@@ -26,6 +30,8 @@ internal var imageOnlyTabResourceId = -1L
     private set
 internal var actionBarSearchResultsViewMicId = -1L
     private set
+internal var ytFillBellId = -1L
+    private set
 
 private val navigationBarHookResourcePatch = resourcePatch {
     dependsOn(resourceMappingPatch)
@@ -33,6 +39,7 @@ private val navigationBarHookResourcePatch = resourcePatch {
     execute {
         imageOnlyTabResourceId = resourceMappings["layout", "image_only_tab"]
         actionBarSearchResultsViewMicId = resourceMappings["layout", "action_bar_search_results_view_mic"]
+        ytFillBellId = resourceMappings["drawable", "yt_fill_bell_black_24"]
     }
 }
 
@@ -144,6 +151,36 @@ val navigationBarHookPatch = bytecodePatch(description = "Hooks the active navig
                     "(${EXTENSION_NAVIGATION_BUTTON_DESCRIPTOR}Landroid/view/View;)V",
             )
         }
+
+        // Fix YT bug of notification tab missing the filled icon.
+        if (is_19_35_or_greater) {
+            val cairoNotificationEnumReference = with(imageEnumConstructorFingerprint) {
+                val stringIndex = stringMatches!!.first().index
+                val cairoNotificationEnumIndex = method.indexOfFirstInstructionOrThrow(stringIndex) {
+                    opcode == Opcode.SPUT_OBJECT
+                }
+                method.getInstruction<ReferenceInstruction>(cairoNotificationEnumIndex).reference
+            }
+
+            setEnumMapFingerprint.method.apply {
+                val enumMapIndex = indexOfFirstInstructionReversedOrThrow {
+                    val reference = getReference<MethodReference>()
+                    opcode == Opcode.INVOKE_VIRTUAL &&
+                            reference?.definingClass == "Ljava/util/EnumMap;" &&
+                            reference.name == "put" &&
+                            reference.parameterTypes.firstOrNull() == "Ljava/lang/Enum;"
+                }
+                val instruction = getInstruction<FiveRegisterInstruction>(enumMapIndex)
+
+                addInstructions(
+                    enumMapIndex + 1,
+                    """
+                        sget-object v${instruction.registerD}, $cairoNotificationEnumReference
+                        invoke-static { v${instruction.registerC}, v${instruction.registerD} }, $EXTENSION_CLASS_DESCRIPTOR->setCairoNotificationFilledIcon(Ljava/util/EnumMap;Ljava/lang/Enum;)V
+                    """
+                )
+            }
+        }
     }
 }
 

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

@@ -12,13 +12,23 @@ internal val playerTopControlsInflateFingerprint = fingerprint {
     literal { controlsLayoutStub }
 }
 
+internal val playerControlsExtensionHookListenersExistFingerprint = fingerprint {
+    accessFlags(AccessFlags.PRIVATE, AccessFlags.STATIC)
+    returns("Z")
+    parameters()
+    custom { methodDef, classDef ->
+        methodDef.name == "fullscreenButtonVisibilityCallbacksExist" &&
+                classDef.type == EXTENSION_CLASS_DESCRIPTOR
+    }
+}
+
 internal val playerControlsExtensionHookFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC)
+    accessFlags(AccessFlags.PRIVATE, AccessFlags.STATIC)
     returns("V")
     parameters("Z")
     custom { methodDef, classDef ->
         methodDef.name == "fullscreenButtonVisibilityChanged" &&
-            classDef.type == "Lapp/revanced/extension/youtube/patches/PlayerControlsPatch;"
+            classDef.type == EXTENSION_CLASS_DESCRIPTOR
     }
 }
 

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

@@ -189,13 +189,18 @@ fun injectVisibilityCheckCall(descriptor: String) {
         "invoke-static { p1 , p2 }, $descriptor->changeVisibility(ZZ)V",
     )
 
+    if (!visibilityImmediateCallbacksExistModified) {
+        visibilityImmediateCallbacksExistModified = true
+        visibilityImmediateCallbacksExistMethod.returnEarly(true)
+    }
+
     visibilityImmediateMethod.addInstruction(
         visibilityImmediateInsertIndex++,
         "invoke-static { p0 }, $descriptor->changeVisibilityImmediate(Z)V",
     )
 }
 
-private const val EXTENSION_CLASS_DESCRIPTOR =
+internal const val EXTENSION_CLASS_DESCRIPTOR =
     "Lapp/revanced/extension/youtube/patches/PlayerControlsPatch;"
 
 private lateinit var inflateTopControlMethod: MutableMethod
@@ -209,6 +214,9 @@ private var inflateBottomControlRegister: Int = -1
 private lateinit var visibilityMethod: MutableMethod
 private var visibilityInsertIndex: Int = 0
 
+private var visibilityImmediateCallbacksExistModified = false
+private lateinit var visibilityImmediateCallbacksExistMethod : MutableMethod
+
 private lateinit var visibilityImmediateMethod: MutableMethod
 private var visibilityImmediateInsertIndex: Int = 0
 
@@ -266,6 +274,7 @@ val playerControlsPatch = bytecodePatch(
             )
         }
 
+        visibilityImmediateCallbacksExistMethod = playerControlsExtensionHookListenersExistFingerprint.method
         visibilityImmediateMethod = playerControlsExtensionHookFingerprint.method
 
         // A/B test for a slightly different bottom overlay controls,

patches/src/main/kotlin/app/revanced/patches/youtube/misc/playservice/VersionCheckPatch.kt

@@ -41,6 +41,8 @@ var is_19_46_or_greater = false
     private set
 var is_19_47_or_greater = false
     private set
+var is_19_49_or_greater = false
+    private set
 
 val versionCheckPatch = resourcePatch(
     description = "Uses the Play Store service version to find the major/minor version of the YouTube target app.",
@@ -74,5 +76,6 @@ val versionCheckPatch = resourcePatch(
         is_19_43_or_greater = 244405000 <= playStoreServicesVersion
         is_19_46_or_greater = 244705000 <= playStoreServicesVersion
         is_19_47_or_greater = 244799000 <= playStoreServicesVersion
+        is_19_49_or_greater = 245005000 <= playStoreServicesVersion
     }
 }

patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/Fingerprints.kt

@@ -21,3 +21,14 @@ internal val setThemeFingerprint = fingerprint {
     opcodes(Opcode.RETURN_OBJECT)
     literal { appearanceStringId }
 }
+
+/**
+ * Added in YouTube v19.04.38.
+ */
+internal const val CAIRO_CONFIG_LITERAL_VALUE = 45532100L
+
+internal val cairoFragmentConfigFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("Z")
+    literal { CAIRO_CONFIG_LITERAL_VALUE }
+}

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

@@ -6,6 +6,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.resourcePatch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patches.all.misc.packagename.setOrGetFallbackPackageName
 import app.revanced.patches.all.misc.resources.addResources
 import app.revanced.patches.all.misc.resources.addResourcesPatch
@@ -17,10 +18,17 @@ import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPref
 import app.revanced.patches.shared.misc.settings.settingsPatch
 import app.revanced.patches.youtube.misc.check.checkEnvironmentPatch
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
-import app.revanced.patches.youtube.misc.fix.cairo.disableCairoSettingsPatch
+import app.revanced.patches.youtube.misc.fix.playbackspeed.fixPlaybackSpeedWhilePlayingPatch
+import app.revanced.patches.youtube.misc.playservice.is_19_04_or_greater
+import app.revanced.patches.youtube.misc.playservice.is_19_34_or_greater
+import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
 import app.revanced.util.*
+import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
+import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter
 import com.android.tools.smali.dexlib2.util.MethodUtil
 
 // Used by a fingerprint() from SettingsPatch.
@@ -37,13 +45,28 @@ private val settingsResourcePatch = resourcePatch {
     dependsOn(
         resourceMappingPatch,
         settingsPatch(
-            rootPreference = IntentPreference(
-                titleKey = "revanced_settings_title",
-                summaryKey = null,
-                intent = newIntent("revanced_settings_intent"),
-            ) to "settings_fragment",
-            preferences,
-        ),
+            listOf(
+                IntentPreference(
+                    titleKey = "revanced_settings_title",
+                    summaryKey = null,
+                    intent = newIntent("revanced_settings_intent"),
+                ) to "settings_fragment",
+                PreferenceCategory(
+                    titleKey = "revanced_settings_title",
+                    layout = "@layout/preference_group_title",
+                    preferences = setOf(
+                        IntentPreference(
+                            titleKey = "revanced_settings_submenu_title",
+                            summaryKey = null,
+                            icon = "@drawable/revanced_settings_icon",
+                            layout = "@layout/preference_with_icon",
+                            intent = newIntent("revanced_settings_intent"),
+                        )
+                    )
+                ) to "settings_fragment_cairo",
+            ),
+            preferences
+        )
     )
 
     execute {
@@ -51,6 +74,7 @@ private val settingsResourcePatch = resourcePatch {
         appearanceStringId = resourceMappings["string", "app_theme_appearance_dark"]
 
         arrayOf(
+            ResourceGroup("drawable", "revanced_settings_icon.xml"),
             ResourceGroup("layout", "revanced_settings_with_toolbar.xml"),
         ).forEach { resourceGroup ->
             copyResources("settings", resourceGroup)
@@ -73,7 +97,6 @@ private val settingsResourcePatch = resourcePatch {
         // Remove horizontal divider from the settings Preferences
         // To better match the appearance of the stock YouTube settings.
         document("res/values/styles.xml").use { document ->
-
             arrayOf(
                 "Theme.YouTube.Settings",
                 "Theme.YouTube.Settings.Dark",
@@ -93,7 +116,6 @@ private val settingsResourcePatch = resourcePatch {
         // Some devices freak out if undeclared data is passed to an intent,
         // and this change appears to fix the issue.
         document("AndroidManifest.xml").use { document ->
-
             val licenseElement = document.childNodes.findElementByAttributeValueOrThrow(
                 "android:name",
                 "com.google.android.libraries.social.licenses.LicenseActivity",
@@ -117,7 +139,8 @@ val settingsPatch = bytecodePatch(
         sharedExtensionPatch,
         settingsResourcePatch,
         addResourcesPatch,
-        disableCairoSettingsPatch,
+        versionCheckPatch,
+        fixPlaybackSpeedWhilePlayingPatch,
         // Currently there is no easy way to make a mandatory patch,
         // so for now this is a dependent of this patch.
         checkEnvironmentPatch,
@@ -140,6 +163,12 @@ val settingsPatch = bytecodePatch(
             selectable = true,
         )
 
+        if (is_19_34_or_greater) {
+            PreferenceScreen.GENERAL_LAYOUT.addPreferences(
+                SwitchPreference("revanced_restore_old_settings_menus")
+            )
+        }
+
         PreferenceScreen.MISC.addPreferences(
             TextPreference(
                 key = null,
@@ -148,6 +177,10 @@ val settingsPatch = bytecodePatch(
                 inputType = InputType.TEXT_MULTI_LINE,
                 tag = "app.revanced.extension.shared.settings.preference.ImportExportPreference",
             ),
+            ListPreference(
+                key = "revanced_language",
+                summaryKey = null
+            )
         )
 
         setThemeFingerprint.method.let { setThemeMethod ->
@@ -187,6 +220,40 @@ val settingsPatch = bytecodePatch(
         licenseActivityOnCreateFingerprint.classDef.apply {
             methods.removeIf { it.name != "onCreate" && !MethodUtil.isConstructor(it) }
         }
+
+        // Add context override to force a specific settings language.
+        licenseActivityOnCreateFingerprint.classDef.apply {
+            val attachBaseContext = ImmutableMethod(
+                type,
+                "attachBaseContext",
+                listOf(ImmutableMethodParameter("Landroid/content/Context;", null, null)),
+                "V",
+                AccessFlags.PROTECTED.value,
+                null,
+                null,
+                MutableMethodImplementation(3),
+            ).toMutable().apply {
+                addInstructions(
+                    """
+                        invoke-static { p1 }, $activityHookClassDescriptor->getAttachBaseContext(Landroid/content/Context;)Landroid/content/Context;
+                        move-result-object p1
+                        invoke-super { p0, p1 }, $superclass->attachBaseContext(Landroid/content/Context;)V
+                        return-void
+                    """
+                )
+            }
+
+            methods.add(attachBaseContext)
+        }
+
+        // Add setting to force cairo settings fragment on/off.
+        if (is_19_04_or_greater) {
+            cairoFragmentConfigFingerprint.method.insertFeatureFlagBooleanOverride(
+                CAIRO_CONFIG_LITERAL_VALUE,
+                "$activityHookClassDescriptor->useCairoSettingsFragment(Z)Z"
+            )
+        }
+
     }
 
     finalize {
@@ -222,17 +289,15 @@ object PreferenceScreen : BasePreferenceScreen() {
         key = "revanced_settings_screen_03_feed",
         summaryKey = null,
     )
-    val PLAYER = Screen(
-        key = "revanced_settings_screen_04_player",
+    val GENERAL_LAYOUT = Screen(
+        key = "revanced_settings_screen_04_general",
         summaryKey = null,
     )
-    val GENERAL_LAYOUT = Screen(
-        key = "revanced_settings_screen_05_general",
+    val PLAYER = Screen(
+        key = "revanced_settings_screen_05_player",
         summaryKey = null,
     )
 
-    // Don't sort, as related preferences are scattered apart.
-    // Can use title sorting after PreferenceCategory support is added.
     val SHORTS = Screen(
         key = "revanced_settings_screen_06_shorts",
         summaryKey = null,

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

@@ -38,10 +38,23 @@ val spoofVideoStreamsPatch = spoofVideoStreamsPatch({
             preferences = setOf(
                 SwitchPreference("revanced_spoof_video_streams"),
                 ListPreference(
-                    "revanced_spoof_video_streams_language",
-                    summaryKey = null
+                    "revanced_spoof_video_streams_client_type",
+                    summaryKey = null,
                 ),
-                NonInteractivePreference("revanced_spoof_video_streams_about")
+                NonInteractivePreference(
+                    // Requires a key and title but the actual text is chosen at runtime.
+                    key = "revanced_spoof_video_streams_about_android",
+                    tag = "app.revanced.extension.youtube.settings.preference.SpoofStreamingDataSideEffectsPreference"
+                ),
+                ListPreference(
+                    key = "revanced_spoof_video_streams_language",
+                    summaryKey = null,
+                    // Language strings are declared in Setting patch.
+                    entriesKey = "revanced_language_entries",
+                    entryValuesKey = "revanced_language_entry_values"
+                ),
+                SwitchPreference("revanced_spoof_video_streams_ios_force_avc"),
+                SwitchPreference("revanced_spoof_streaming_data_stats_for_nerds"),
             ),
         ),
     )

patches/src/main/kotlin/app/revanced/patches/youtube/shared/Fingerprints.kt

@@ -51,7 +51,7 @@ internal val mainActivityOnCreateFingerprint = fingerprint {
     }
 }
 
-val rollingNumberTextViewAnimationUpdateFingerprint = fingerprint {
+internal val rollingNumberTextViewAnimationUpdateFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
     returns("V")
     parameters("Landroid/graphics/Bitmap;")

patches/src/main/kotlin/app/revanced/patches/youtube/video/audio/ForceOriginalAudioPatch.kt

@@ -31,8 +31,7 @@ private const val EXTENSION_CLASS_DESCRIPTOR =
 @Suppress("unused")
 val forceOriginalAudioPatch = bytecodePatch(
     name = "Force original audio",
-    description = "Adds an option to always use the original audio track. " +
-            "This patch does nothing if 'Spoof video streams' is enabled.",
+    description = "Adds an option to always use the original audio track.",
 ) {
     dependsOn(
         sharedExtensionPatch,
@@ -58,7 +57,10 @@ val forceOriginalAudioPatch = bytecodePatch(
         addResources("youtube", "video.audio.forceOriginalAudioPatch")
 
         PreferenceScreen.VIDEO.addPreferences(
-            SwitchPreference("revanced_force_original_audio")
+            SwitchPreference(
+                key = "revanced_force_original_audio",
+                tag = "app.revanced.extension.youtube.settings.preference.ForceOriginalAudioSwitchPreference"
+            )
         )
 
         fun Method.firstFormatStreamingModelCall(

patches/src/main/kotlin/app/revanced/patches/youtube/video/hdr/DisableHdrPatch.kt

@@ -0,0 +1,74 @@
+package app.revanced.patches.youtube.video.hdr
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.all.misc.resources.addResources
+import app.revanced.patches.all.misc.resources.addResourcesPatch
+import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
+import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
+import app.revanced.patches.youtube.misc.settings.PreferenceScreen
+import app.revanced.patches.youtube.misc.settings.settingsPatch
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+
+private const val EXTENSION_CLASS_DESCRIPTOR =
+    "Lapp/revanced/extension/youtube/patches/DisableHdrPatch;"
+
+@Suppress("unused")
+val disableHdrPatch = bytecodePatch(
+    name = "Disable HDR video",
+    description = "Adds an option to disable video HDR.",
+) {
+    dependsOn(
+        sharedExtensionPatch,
+        settingsPatch,
+        addResourcesPatch,
+    )
+
+    compatibleWith(
+        "com.google.android.youtube"(
+            "18.38.44",
+            "18.49.37",
+            "19.16.39",
+            "19.25.37",
+            "19.34.42",
+            "19.43.41",
+            "19.45.38",
+            "19.46.42",
+            "19.47.53",
+        ),
+    )
+
+    execute {
+        addResources("youtube", "video.hdr.disableHdrPatch")
+
+        PreferenceScreen.VIDEO.addPreferences(
+            SwitchPreference("revanced_disable_hdr_video")
+        )
+
+        hdrCapabilityFingerprint.let {
+            it.originalMethod.apply {
+                val stringIndex = it.stringMatches!!.first().index
+                val navigateIndex = indexOfFirstInstructionOrThrow(stringIndex) {
+                    val reference = getReference<MethodReference>()
+                    reference?.parameterTypes == listOf("I", "Landroid/view/Display;") &&
+                            reference.returnType == "Z"
+                }
+
+                // Modify the HDR lookup method (Method is in the same class as the fingerprint).
+                navigate(this).to(navigateIndex).stop().addInstructionsWithLabels(
+                    0,
+                    """
+                        invoke-static {}, $EXTENSION_CLASS_DESCRIPTOR->disableHDRVideo()Z
+                        move-result v0
+                        if-nez v0, :useHdr
+                        return v0
+                        :useHdr
+                        nop 
+                     """
+                )
+            }
+        }
+    }
+}

patches/src/main/kotlin/app/revanced/patches/youtube/video/hdr/Fingerprints.kt

@@ -0,0 +1,12 @@
+package app.revanced.patches.youtube.video.hdr
+
+import app.revanced.patcher.fingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal val hdrCapabilityFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    strings(
+        "av1_profile_main_10_hdr_10_plus_supported",
+        "video/av01"
+    )
+}

patches/src/main/kotlin/app/revanced/patches/youtube/video/speed/custom/CustomPlaybackSpeedPatch.kt

@@ -17,22 +17,26 @@ import app.revanced.patches.shared.misc.mapping.resourceMappings
 import app.revanced.patches.shared.misc.settings.preference.InputType
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
 import app.revanced.patches.shared.misc.settings.preference.TextPreference
+import app.revanced.patches.youtube.interaction.seekbar.disableFastForwardNoticeFingerprint
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.litho.filter.addLithoFilter
 import app.revanced.patches.youtube.misc.litho.filter.lithoFilterPatch
+import app.revanced.patches.youtube.misc.playservice.is_19_25_or_greater
+import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
 import app.revanced.patches.youtube.misc.recyclerviewtree.hook.addRecyclerViewTreeHook
 import app.revanced.patches.youtube.misc.recyclerviewtree.hook.recyclerViewTreeHookPatch
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
 import app.revanced.util.*
 import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.iface.instruction.NarrowLiteralInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 import com.android.tools.smali.dexlib2.immutable.ImmutableField
 
-var speedUnavailableId = -1L
-    internal set
+internal var speedUnavailableId = -1L
+    private set
 
 private val customPlaybackSpeedResourcePatch = resourcePatch {
     dependsOn(resourceMappingPatch)
@@ -61,6 +65,7 @@ internal val customPlaybackSpeedPatch = bytecodePatch(
         recyclerViewTreeHookPatch,
         customPlaybackSpeedResourcePatch,
         addResourcesPatch,
+        versionCheckPatch
     )
 
     execute {
@@ -71,6 +76,12 @@ internal val customPlaybackSpeedPatch = bytecodePatch(
             TextPreference("revanced_custom_playback_speeds", inputType = InputType.TEXT_MULTI_LINE),
         )
 
+        if (is_19_25_or_greater) {
+            PreferenceScreen.VIDEO.addPreferences(
+                TextPreference("revanced_speed_tap_and_hold", inputType = InputType.NUMBER_DECIMAL),
+            )
+        }
+
         // Replace the speeds float array with custom speeds.
         speedArrayGeneratorFingerprint.method.apply {
             val sizeCallIndex = indexOfFirstInstructionOrThrow { getReference<MethodReference>()?.name == "size" }
@@ -166,5 +177,27 @@ internal val customPlaybackSpeedPatch = bytecodePatch(
         addLithoFilter(FILTER_CLASS_DESCRIPTOR)
 
         // endregion
+
+
+        // region Custom tap and hold 2x speed.
+
+        if (is_19_25_or_greater) {
+            disableFastForwardNoticeFingerprint.method.apply {
+                val index = indexOfFirstInstructionOrThrow {
+                    (this as? NarrowLiteralInstruction)?.narrowLiteral == 2.0f.toRawBits()
+                }
+                val register = getInstruction<OneRegisterInstruction>(index).registerA
+
+                addInstructions(
+                    index + 1,
+                    """
+                        invoke-static {}, $EXTENSION_CLASS_DESCRIPTOR->tapAndHoldSpeed()F
+                        move-result v$register
+                    """
+                )
+            }
+        }
+
+        // endregion
     }
 }

patches/src/main/kotlin/app/revanced/util/resource/StringResource.kt

@@ -24,31 +24,31 @@ class StringResource(
                 if (value.startsWith('"') && value.endsWith('"')) {
                     // Raw strings allow unescaped single quote but not double quote.
                     if (!value.substring(1, value.length - 1).contains(Regex("(?<!\\\\)[\"]"))) {
-                        return this;
+                        return this
                     }
                 } else {
                     if (value.contains('\n')) {
                         // Don't throw an exception, otherwise unnoticed mistakes
                         // in Crowdin can cause patching failures.
                         // Incorrectly escaped strings still work but do not display as intended.
-                        Logger.getLogger(StringResource.javaClass.name).severe(
+                        Logger.getLogger(StringResource.javaClass.name).warning(
                             "String $name is not raw but contains encoded new line characters: $value")
                     }
                     if (!value.contains(Regex("(?<!\\\\)['\"]"))) {
-                        return this;
+                        return this
                     }
                 }
 
-                Logger.getLogger(StringResource.javaClass.name).severe(
+                Logger.getLogger(StringResource.javaClass.name).warning(
                     "String $name cannot contain unescaped quotes in value: $value")
 
-                return this;
+                return this
             }
 
             // if the string is un-formatted, explicitly add the formatted attribute
             if (!formatted) setAttribute("formatted", "false")
 
-            textContent = value.validateAndroidStringEscaping();
+            textContent = value.validateAndroidStringEscaping()
         }
 
     companion object {

patches/src/main/resources/addresources/values-af-rZA/strings.xml

@@ -136,6 +136,8 @@ Second \"item\" text"</string>
   </patch>
   <patch id="layout.panels.popup.playerPopupPanelsPatch">
   </patch>
+  <patch id="layout.player.fullscreen.exitFullscreenPatch">
+  </patch>
   <patch id="layout.player.fullscreen.openVideosFullscreen">
   </patch>
   <patch id="layout.player.overlay.customPlayerOverlayOpacityResourcePatch">
@@ -155,6 +157,8 @@ Second \"item\" text"</string>
   <!-- Toast shown if network connection times out. Translations of this should not be longer than the original English or the text can be clipped and not entirely shown. -->
   <!-- Shown in the settings preferences, and translations can be any text length. -->
   </patch>
+  <patch id="layout.formfactor.changeFormFactorPatch">
+  </patch>
   <patch id="layout.spoofappversion.spoofAppVersionPatch">
   <!-- It is ideal, but not required, if the text here appears is alphabetically after the text used for 'revanced_spoof_app_version_title'.
                  This is because the 'General layout' menu uses alphabetic sorting, and it functionally works better if the spoof target selector appears below the 'Spoof app version' UI switch -->
@@ -168,8 +172,6 @@ Second \"item\" text"</string>
   </patch>
   <patch id="layout.shortsautoplay.shortsAutoplayPatch">
   </patch>
-  <patch id="layout.tablet.enableTabletLayoutPatch">
-  </patch>
   <patch id="layout.miniplayer.miniplayerPatch">
   </patch>
   <patch id="layout.theme.themePatch">
@@ -213,11 +215,14 @@ Second \"item\" text"</string>
   </patch>
   <patch id="video.speed.remember.rememberPlaybackSpeedPatch">
   </patch>
+  <patch id="video.hdr.disableHdrPatch">
+  </patch>
   <patch id="video.videoqualitymenu.restoreOldVideoQualityMenuResourcePatch">
   </patch>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- 'no auth' means no authentication -->
   </patch>
   </app>
   <app id="twitch">

patches/src/main/resources/addresources/values-am-rET/strings.xml

@@ -136,6 +136,8 @@ Second \"item\" text"</string>
   </patch>
   <patch id="layout.panels.popup.playerPopupPanelsPatch">
   </patch>
+  <patch id="layout.player.fullscreen.exitFullscreenPatch">
+  </patch>
   <patch id="layout.player.fullscreen.openVideosFullscreen">
   </patch>
   <patch id="layout.player.overlay.customPlayerOverlayOpacityResourcePatch">
@@ -155,6 +157,8 @@ Second \"item\" text"</string>
   <!-- Toast shown if network connection times out. Translations of this should not be longer than the original English or the text can be clipped and not entirely shown. -->
   <!-- Shown in the settings preferences, and translations can be any text length. -->
   </patch>
+  <patch id="layout.formfactor.changeFormFactorPatch">
+  </patch>
   <patch id="layout.spoofappversion.spoofAppVersionPatch">
   <!-- It is ideal, but not required, if the text here appears is alphabetically after the text used for 'revanced_spoof_app_version_title'.
                  This is because the 'General layout' menu uses alphabetic sorting, and it functionally works better if the spoof target selector appears below the 'Spoof app version' UI switch -->
@@ -168,8 +172,6 @@ Second \"item\" text"</string>
   </patch>
   <patch id="layout.shortsautoplay.shortsAutoplayPatch">
   </patch>
-  <patch id="layout.tablet.enableTabletLayoutPatch">
-  </patch>
   <patch id="layout.miniplayer.miniplayerPatch">
   </patch>
   <patch id="layout.theme.themePatch">
@@ -213,11 +215,14 @@ Second \"item\" text"</string>
   </patch>
   <patch id="video.speed.remember.rememberPlaybackSpeedPatch">
   </patch>
+  <patch id="video.hdr.disableHdrPatch">
+  </patch>
   <patch id="video.videoqualitymenu.restoreOldVideoQualityMenuResourcePatch">
   </patch>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- 'no auth' means no authentication -->
   </patch>
   </app>
   <app id="twitch">

patches/src/main/resources/addresources/values-ar-rSA/strings.xml

@@ -33,7 +33,7 @@ Second \"item\" text"</string>
   <string name="revanced_check_environment_not_near_patch_time_invalid">تاريخ إنشاء APK تالف</string>
   </patch>
   <patch id="misc.settings.settingsResourcePatch">
-  <string name="revanced_settings_title">ReVanced</string>
+  <string name="revanced_settings_submenu_title">الإعدادات</string>
   <string name="revanced_settings_confirm_user_dialog_title">هل ترغب في المتابعة؟</string>
   <string name="revanced_settings_reset">إعادة التعيين</string>
   <string name="revanced_settings_restart_title">تحديث وإعادة تشغيل</string>
@@ -43,6 +43,62 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">إعادة تعيين إعدادات ReVanced إلى الوضع الافتراضي</string>
   <string name="revanced_settings_import_success">تم استيراد %d إعدادات</string>
   <string name="revanced_settings_import_failure_parse">فشل الاستيراد: %s</string>
+  <string name="revanced_language_title">لغة ReVanced</string>
+  <string name="revanced_language_user_dialog_message">"قد تكون الترجمات لبعض اللغات مفقودة أو غير مكتملة.
+
+لترجمة لغات جديدة، تفضل بزيارة translate.revanced.app"</string>
+  <string name="revanced_language_DEFAULT">لغة التطبيق</string>
+  <string name="revanced_language_AR">العربية</string>
+  <string name="revanced_language_AZ">Azerbaijani</string>
+  <string name="revanced_language_BG">Bulgarian</string>
+  <string name="revanced_language_BN">Bengali</string>
+  <string name="revanced_language_CA">Catalan</string>
+  <string name="revanced_language_CS">Czech</string>
+  <string name="revanced_language_DA">Danish</string>
+  <string name="revanced_language_DE">German</string>
+  <string name="revanced_language_EL">Greek</string>
+  <string name="revanced_language_EN">English</string>
+  <string name="revanced_language_ES">Spanish</string>
+  <string name="revanced_language_ET">Estonian</string>
+  <string name="revanced_language_FA">فارسى</string>
+  <string name="revanced_language_FI">Finnish</string>
+  <string name="revanced_language_FR">French - Français</string>
+  <string name="revanced_language_GU">Gujarati</string>
+  <string name="revanced_language_HI">Hindi</string>
+  <string name="revanced_language_HR">Croatian</string>
+  <string name="revanced_language_HU">Hungarian</string>
+  <string name="revanced_language_ID">Indonesian</string>
+  <string name="revanced_language_IT">Italian</string>
+  <string name="revanced_language_JA">Japanese</string>
+  <string name="revanced_language_KK">Kazakh</string>
+  <string name="revanced_language_KO">Korean</string>
+  <string name="revanced_language_LT">Lithuanian</string>
+  <string name="revanced_language_LV">Latvian</string>
+  <string name="revanced_language_MK">Macedonian</string>
+  <string name="revanced_language_MN">Mongolian</string>
+  <string name="revanced_language_MR">Marathi</string>
+  <string name="revanced_language_MS">Malay</string>
+  <string name="revanced_language_MY">Burmese</string>
+  <string name="revanced_language_NL">Dutch</string>
+  <string name="revanced_language_OR">Odia</string>
+  <string name="revanced_language_PA">Punjabi</string>
+  <string name="revanced_language_PL">Polish</string>
+  <string name="revanced_language_PT">Portugese</string>
+  <string name="revanced_language_RO">Romanian</string>
+  <string name="revanced_language_RU">Russian - Русский</string>
+  <string name="revanced_language_SK">Slovak</string>
+  <string name="revanced_language_SL">Slovene</string>
+  <string name="revanced_language_SR">Serbian</string>
+  <string name="revanced_language_SV">Swedish</string>
+  <string name="revanced_language_SW">Swahili</string>
+  <string name="revanced_language_TA">Tamil</string>
+  <string name="revanced_language_TE">Telugu</string>
+  <string name="revanced_language_TH">Thai</string>
+  <string name="revanced_language_TR">Turkish</string>
+  <string name="revanced_language_UK">Ukrainian</string>
+  <string name="revanced_language_UR">Urdu</string>
+  <string name="revanced_language_VI">Vietnamese</string>
+  <string name="revanced_language_ZH">Chinese</string>
   <string name="revanced_pref_import_export_title">استيراد / تصدير</string>
   <string name="revanced_pref_import_export_summary">استيراد / تصدير إعدادات ReVanced</string>
   <!-- Settings about dialog. -->
@@ -77,12 +133,15 @@ Second \"item\" text"</string>
   <string name="revanced_settings_screen_01_ads_title">الإعلانات</string>
   <string name="revanced_settings_screen_02_alt_thumbnails_title">مُصغَّرات فيديو بديلة</string>
   <string name="revanced_settings_screen_03_feed_title">الموجز</string>
-  <string name="revanced_settings_screen_04_player_title">المشغل</string>
-  <string name="revanced_settings_screen_05_general_title">التصميم العام</string>
+  <string name="revanced_settings_screen_04_general_title">عام</string>
+  <string name="revanced_settings_screen_05_player_title">المشغل</string>
   <string name="revanced_settings_screen_07_seekbar_title">شريط تقدم الفيديو</string>
   <string name="revanced_settings_screen_08_swipe_controls_title">التحكم عن طريق إيماءة التمرير</string>
-  <string name="revanced_settings_screen_11_misc_title">إعدادات متنوعة</string>
+  <string name="revanced_settings_screen_11_misc_title">خيارات متنوعة</string>
   <string name="revanced_settings_screen_12_video_title">الفيديو</string>
+  <string name="revanced_restore_old_settings_menus_title">استعادة قوائم الإعدادات القديمة</string>
+  <string name="revanced_restore_old_settings_menus_summary_on">يتم عرض قوائم الإعدادات القديمة</string>
+  <string name="revanced_restore_old_settings_menus_summary_off">لا يتم عرض قوائم الإعدادات القديمة</string>
   </patch>
   <patch id="misc.backgroundplayback.backgroundPlaybackPatch">
   <string name="revanced_shorts_disable_background_playback_title">تعطيل تشغيل فيديوهات Shorts في الخلفية</string>
@@ -109,9 +168,9 @@ Second \"item\" text"</string>
 لن يتم إعلامك بأي أخطاء غير متوقعة."</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
-  <string name="revanced_disable_like_subscribe_glow_title">تعطيل توهج زر أعجبني / اشتراك</string>
-  <string name="revanced_disable_like_subscribe_glow_summary_on">لن يتوهج زر أعجبني واشتراك عند ذكره</string>
-  <string name="revanced_disable_like_subscribe_glow_summary_off">أعجبني واشتراك سوف يتوهج عند الإشارة</string>
+  <string name="revanced_disable_like_subscribe_glow_title">تعطيل توهُّج زِرّي أعجبني واشتراك</string>
+  <string name="revanced_disable_like_subscribe_glow_summary_on">لن يتوهَّج زرّي أعجبني واشتراك عند ذكرهما</string>
+  <string name="revanced_disable_like_subscribe_glow_summary_off">سيتوهَّج زرّي أعجبني واشتراك عند ذكرهما</string>
   <string name="revanced_hide_album_cards_title">إخفاء بطاقات الألبوم</string>
   <string name="revanced_hide_album_cards_summary_on">تم إخفاء بطاقات الألبوم</string>
   <string name="revanced_hide_album_cards_summary_off">يتم عرض بطاقات الألبوم</string>
@@ -138,12 +197,12 @@ Second \"item\" text"</string>
   <string name="revanced_hide_join_membership_button_summary_on">تم إخفاء الزر</string>
   <string name="revanced_hide_join_membership_button_summary_off">يتم عرض الزر</string>
   <!-- 'For you' should be translated using the same localized wording YouTube displays. -->
-  <string name="revanced_hide_for_you_shelf_title">إخفاء رف \"من أجلك\" في صفحة القناة</string>
+  <string name="revanced_hide_for_you_shelf_title">إخفاء رف \"لـك\" في صفحة القناة</string>
   <string name="revanced_hide_for_you_shelf_summary_on">تم إخفاء الرف</string>
   <string name="revanced_hide_for_you_shelf_summary_off">يتم عرض الرف</string>
   <!-- 'Notify me' should be translated using the same localized wording YouTube displays.
                  This item appear in the subscription feed for future livestreams or unreleased videos. -->
-  <string name="revanced_hide_notify_me_button_title">إخفاء زر \'نبهني\'</string>
+  <string name="revanced_hide_notify_me_button_title">إخفاء زر \'تنبيهي\'</string>
   <string name="revanced_hide_notify_me_button_summary_on">تم إخفاء الزر</string>
   <string name="revanced_hide_notify_me_button_summary_off">يتم عرض الزر</string>
   <!-- 'People also watch' should be translated using the same localized wording YouTube displays. -->
@@ -164,9 +223,9 @@ Second \"item\" text"</string>
   <string name="revanced_hide_chips_shelf_title">إخفاء رف الشرائح</string>
   <string name="revanced_hide_chips_shelf_summary_on">تم إخفاء رف الشرائح</string>
   <string name="revanced_hide_chips_shelf_summary_off">يتم عرض رف الشرائح</string>
-  <string name="revanced_hide_expandable_chip_title">إخفاء الشريحة القابلة للتوسيع تحت مقاطع الفيديو</string>
-  <string name="revanced_hide_expandable_chip_summary_on">تم إخفاء الرقائق القابلة للتوسيع</string>
-  <string name="revanced_hide_expandable_chip_summary_off">يتم عرض الرقائق القابلة للتوسيع</string>
+  <string name="revanced_hide_expandable_chip_title">إخفاء الشريحة القابلة للتوسيع تحت الفيديوهات</string>
+  <string name="revanced_hide_expandable_chip_summary_on">تم إخفاء الشرائح القابلة للتوسيع</string>
+  <string name="revanced_hide_expandable_chip_summary_off">يتم عرض الشرائح القابلة للتوسيع</string>
   <string name="revanced_hide_community_posts_title">إخفاء مشاركات المجتمع</string>
   <string name="revanced_hide_community_posts_summary_on">تم إخفاء مشاركات المجتمع</string>
   <string name="revanced_hide_community_posts_summary_off">يتم عرض مشاركات المجتمع</string>
@@ -207,8 +266,8 @@ Second \"item\" text"</string>
   <string name="revanced_hide_quick_actions_summary_on">تم إخفاء الإجراءات السريعة</string>
   <string name="revanced_hide_quick_actions_summary_off">يتم عرض الإجراءات السريعة</string>
   <string name="revanced_hide_related_videos_title">إخفاء الفيديوهات ذات الصلة في الإجراءات السريعة</string>
-  <string name="revanced_hide_related_videos_summary_on">تم إخفاء مقاطع الفيديو ذات الصلة</string>
-  <string name="revanced_hide_related_videos_summary_off">يتم عرض مقاطع الفيديو ذات الصلة</string>
+  <string name="revanced_hide_related_videos_summary_on">تم إخفاء الفيديوهات ذات الصلة</string>
+  <string name="revanced_hide_related_videos_summary_off">يتم عرض الفيديوهات ذات الصلة</string>
   <string name="revanced_hide_image_shelf_title">إخفاء رفوف الصور في نتائج البحث</string>
   <string name="revanced_hide_image_shelf_summary_on">تم إخفاء رفوف الصورة</string>
   <string name="revanced_hide_image_shelf_summary_off">يتم عرض رفوف الصورة</string>
@@ -227,6 +286,9 @@ Second \"item\" text"</string>
   <string name="revanced_hide_chapters_section_title">إخفاء قسم الفصول</string>
   <string name="revanced_hide_chapters_section_summary_on">تم إخفاء قسم الفصول</string>
   <string name="revanced_hide_chapters_section_summary_off">يتم عرض قسم الفصول</string>
+  <string name="revanced_hide_how_this_was_made_section_title">إخفاء قسم \"كيف تم إنشاء هذا المحتوى\"</string>
+  <string name="revanced_hide_how_this_was_made_section_summary_on">تم إخفاء قسم \"كيف تم إنشاء هذا المحتوى\"</string>
+  <string name="revanced_hide_how_this_was_made_section_summary_off">يتم عرض قسم \"كيف تم إنشاء هذا المحتوى\"</string>
   <string name="revanced_hide_podcast_section_title">إخفاء قسم \'استكشاف البودكاست\'</string>
   <string name="revanced_hide_podcast_section_summary_on">تم إخفاء قسم \"استكشاف البودكاست\"</string>
   <string name="revanced_hide_podcast_section_summary_off">يتم عرض قسم \"استكشاف البودكاست\"</string>
@@ -242,7 +304,7 @@ Second \"item\" text"</string>
   <string name="revanced_hide_description_components_screen_title">وصف الفيديو</string>
   <string name="revanced_hide_description_components_screen_summary">إخفاء أو عرض مكونات وصف الفيديو</string>
   <string name="revanced_hide_filter_bar_screen_title">شريط التصفية</string>
-  <string name="revanced_hide_filter_bar_screen_summary">إخفاء شريط التصفية أو عرضه في الموجز والبحث ومقاطع الفيديو ذات الصلة</string>
+  <string name="revanced_hide_filter_bar_screen_summary">إخفاء شريط التصفية أو عرضه في الموجز والبحث الفيديوهات ذات الصلة</string>
   <string name="revanced_hide_filter_bar_feed_in_feed_title">إخفاء في الموجز</string>
   <string name="revanced_hide_filter_bar_feed_in_feed_summary_on">مخفي في الموجز</string>
   <string name="revanced_hide_filter_bar_feed_in_feed_summary_off">يعرض في الموجز</string>
@@ -293,15 +355,15 @@ Second \"item\" text"</string>
   <string name="revanced_custom_filter_toast_invalid_syntax">فلتر مخصص غير صالح: %s</string>
   <string name="revanced_hide_keyword_content_screen_title">إخفاء محتوى الكلمات الرئيسية</string>
   <string name="revanced_hide_keyword_content_screen_summary">إخفاء فيديوهات البحث والموجز باستخدام فلاتر الكلمات المفتاحية</string>
-  <string name="revanced_hide_keyword_content_home_title">إخفاء مقاطع فيديو الصفحة الرئيسية بواسطة الكلمات المفتاحية</string>
-  <string name="revanced_hide_keyword_content_home_summary_on">تتم تصفية مقاطع الفيديو في علامة التبويب \"الصفحة الرئيسية\" حسب الكلمات المفتاحية</string>
-  <string name="revanced_hide_keyword_content_home_summary_off">لا تتم تصفية مقاطع الفيديو في علامة التبويب \"الصفحة الرئيسية\" حسب الكلمات المفتاحية</string>
-  <string name="revanced_hide_keyword_content_subscriptions_title">إخفاء مقاطع الفيديو الخاصة بالاشتراك عن طريق الكلمات المفتاحية</string>
-  <string name="revanced_hide_keyword_content_subscriptions_summary_on">يتم تصفية الفيديوهات في علامة التبويب الاشتراكات حسب الكلمات المفتاحية</string>
-  <string name="revanced_hide_keyword_content_subscriptions_summary_off">لا يتم تصفية الفيديوهات في علامة التبويب الاشتراكات حسب الكلمات المفتاحية</string>
+  <string name="revanced_hide_keyword_content_home_title">إخفاء فيديوهات الصفحة الرئيسية بواسطة الكلمات المفتاحية</string>
+  <string name="revanced_hide_keyword_content_home_summary_on">تتم تصفية الفيديوهات في علامة التبويب \"الصفحة الرئيسية\" حسب الكلمات المفتاحية</string>
+  <string name="revanced_hide_keyword_content_home_summary_off">لا تتم تصفية الفيديوهات في علامة التبويب \"الصفحة الرئيسية\" حسب الكلمات المفتاحية</string>
   <string name="revanced_hide_keyword_content_search_title">إخفاء نتائج البحث عن طريق الكلمات المفتاحية</string>
   <string name="revanced_hide_keyword_content_search_summary_on">يتم تصفية نتائج البحث حسب الكلمات المفتاحية</string>
   <string name="revanced_hide_keyword_content_search_summary_off">لا يتم تصفية نتائج البحث حسب الكلمات المفتاحية</string>
+  <string name="revanced_hide_keyword_content_subscriptions_title">إخفاء الفيديوهات الخاصة بالاشتراك عن طريق الكلمات المفتاحية</string>
+  <string name="revanced_hide_keyword_content_subscriptions_summary_on">يتم تصفية الفيديوهات في علامة التبويب الاشتراكات حسب الكلمات المفتاحية</string>
+  <string name="revanced_hide_keyword_content_subscriptions_summary_off">لا يتم تصفية الفيديوهات في علامة التبويب الاشتراكات حسب الكلمات المفتاحية</string>
   <string name="revanced_hide_keyword_content_phrases_title">الكلمات المفتاحية المراد إخفاؤها</string>
   <!-- For localization it is preferred, but not required, if 'LeBlanc' is replaced with a localized name or a familiar word that has upper case letters in the middle of the word.
                  This is because keywords can be in any language, and showing an example in the localized script helps convey this. -->
@@ -348,6 +410,9 @@ Second \"item\" text"</string>
   <string name="revanced_hide_products_banner_title">إخفاء لافتة لعرض المنتجات</string>
   <string name="revanced_hide_products_banner_summary_on">تم إخفاء البانر</string>
   <string name="revanced_hide_products_banner_summary_off">يتم عرض البانر</string>
+  <string name="revanced_hide_end_screen_store_banner_title">إخفاء لافتة شاشة المتجر النهائية</string>
+  <string name="revanced_hide_end_screen_store_banner_summary_on">تم إخفاء لافتة المتجر</string>
+  <string name="revanced_hide_end_screen_store_banner_summary_off">يتم عرض لافتة المتجر</string>
   <string name="revanced_hide_player_store_shelf_title">إخفاء رف مشغل التسوق</string>
   <string name="revanced_hide_player_store_shelf_summary_on">تم إخفاء رفوف التسوق</string>
   <string name="revanced_hide_player_store_shelf_summary_off">يتم عرض رفوف التسوق</string>
@@ -445,6 +510,9 @@ Second \"item\" text"</string>
   <string name="revanced_swipe_overlay_background_alpha_summary">قيمة شفافية خلفية واجهة التمرير</string>
   <string name="revanced_swipe_threshold_title">مقدار حد التمرير</string>
   <string name="revanced_swipe_threshold_summary">الحد الأدنى من التمرير قبل اكتشاف الإيماءة</string>
+  <string name="revanced_swipe_change_video_title">تمكين إيماءة التمرير لتغيير الفيديو</string>
+  <string name="revanced_swipe_change_video_summary_on">سيؤدي التمرير في وضع ملء الشاشة إلى التغيير للفيديو التالي/السابق</string>
+  <string name="revanced_swipe_change_video_summary_off">لن يؤدي التمرير في وضع ملء الشاشة إلى التغيير للفيديو التالي/السابق</string>
   </patch>
   <patch id="layout.autocaptions.autoCaptionsPatch">
   <string name="revanced_auto_captions_title">تعطيل التَّرْجَمَة التلقائية</string>
@@ -516,14 +584,14 @@ Second \"item\" text"</string>
   <string name="revanced_hide_navigation_button_labels_summary_on">تم إخفاء التسميات</string>
   <string name="revanced_hide_navigation_button_labels_summary_off">يتم عرض التسميات</string>
   <string name="revanced_disable_translucent_status_bar_title">تعطيل شريط الحالة الشفاف</string>
-  <string name="revanced_disable_translucent_status_bar_summary_on">شريط الحالة غير معتمة</string>
-  <string name="revanced_disable_translucent_status_bar_summary_off">شريط الحالة غير شفافة أو عميقة</string>
-  <string name="revanced_disable_translucent_navigation_bar_light_title">تعطيل شريط التنقل الشفاف الفاتح</string>
-  <string name="revanced_disable_translucent_navigation_bar_light_summary_on">شريط التنقل في الوضع الفاتح معتم</string>
-  <string name="revanced_disable_translucent_navigation_bar_light_summary_off">يكون شريط التنقل في الوضع الفاتح معتمًا أو نصف شفاف</string>
-  <string name="revanced_disable_translucent_navigation_bar_dark_title">تعطيل الشريط الداكنة</string>
-  <string name="revanced_disable_translucent_navigation_bar_dark_summary_on">شريط التنقل في الوضع الداكن معتم</string>
-  <string name="revanced_disable_translucent_navigation_bar_dark_summary_off">شريط التطبيق المصوري الشفاف غير عميقة أو عميقة</string>
+  <string name="revanced_disable_translucent_status_bar_summary_on">شريط الحالة غير شفاف</string>
+  <string name="revanced_disable_translucent_status_bar_summary_off">شريط الحالة معتم أو شفاف</string>
+  <string name="revanced_disable_translucent_navigation_bar_light_title">تعطيل الشريط الشفاف الفاتح</string>
+  <string name="revanced_disable_translucent_navigation_bar_light_summary_on">شريط التنقل في الوضع الفاتح غير شفاف</string>
+  <string name="revanced_disable_translucent_navigation_bar_light_summary_off">شريط التنقل في الوضع الفاتح معتم او شفاف</string>
+  <string name="revanced_disable_translucent_navigation_bar_dark_title">تعطيل الشريط الشفاف الداكن</string>
+  <string name="revanced_disable_translucent_navigation_bar_dark_summary_on">شريط التنقل في الوضع الداكن غير شفاف</string>
+  <string name="revanced_disable_translucent_navigation_bar_dark_summary_off">شريط التنقل في الوضع الداكن معتم او شفاف</string>
   </patch>
   <patch id="layout.hide.player.flyoutmenupanel.hidePlayerFlyoutMenuPatch">
   <string name="revanced_hide_player_flyout_title">القائمة المنبثقة</string>
@@ -628,15 +696,18 @@ Second \"item\" text"</string>
   <string name="revanced_shorts_player_screen_summary">إخفاء أو عرض المكونات في مشغل Shorts</string>
   <!-- 'home' should be translated using the same localized wording YouTube displays for the home tab. -->
   <string name="revanced_hide_shorts_home_title">إخفاء Shorts في موجز الصفحة الرئيسية</string>
-  <string name="revanced_hide_shorts_home_summary_on">تم إخفاء Shorts في موجز الصفحة الرئيسية</string>
-  <string name="revanced_hide_shorts_home_summary_off">يتم عرض Shorts في موجز الصفحة الرئيسية</string>
+  <string name="revanced_hide_shorts_home_summary_on">مخفية في الصفحة الرئيسية والفيديوهات ذات الصلة</string>
+  <string name="revanced_hide_shorts_home_summary_off">تعرض في الصفحة الرئيسية والفيديوهات ذات الصلة</string>
   <!-- 'subscription' should be translated using the same localized wording YouTube displays for the subscription tab. -->
   <string name="revanced_hide_shorts_subscriptions_title">إخفاء Shorts في موجز الاشتراكات</string>
-  <string name="revanced_hide_shorts_subscriptions_summary_on">تم إخفاء Shorts في موجز الاشتراكات</string>
-  <string name="revanced_hide_shorts_subscriptions_summary_off">يتم عرض Shorts في موجز الاشتراكات</string>
+  <string name="revanced_hide_shorts_subscriptions_summary_on">مخفية في موجز الاشتراكات</string>
+  <string name="revanced_hide_shorts_subscriptions_summary_off">تعرض في موجز الاشتراكات</string>
   <string name="revanced_hide_shorts_search_title">إخفاء Shorts في نتائج البحث</string>
-  <string name="revanced_hide_shorts_search_summary_on">تم إخفاء Shorts في نتائج البحث</string>
-  <string name="revanced_hide_shorts_search_summary_off">يتم عرض Shorts في نتائج البحث</string>
+  <string name="revanced_hide_shorts_search_summary_on">مخفية في نتائج البحث</string>
+  <string name="revanced_hide_shorts_search_summary_off">تعرض في نتائج البحث</string>
+  <string name="revanced_hide_shorts_history_title">إخفاء Shorts في سجل المشاهدة</string>
+  <string name="revanced_hide_shorts_history_summary_on">مخفية في سجل المشاهدة</string>
+  <string name="revanced_hide_shorts_history_summary_off">تعرض في سجل المشاهدة</string>
   <!-- 'join' should be translated using the same localized wording YouTube displays for the button. -->
   <string name="revanced_hide_shorts_join_button_title">إخفاء زر الانضمام</string>
   <string name="revanced_hide_shorts_join_button_summary_on">تم إخفاء زر الانضمام</string>
@@ -681,7 +752,7 @@ Second \"item\" text"</string>
   <string name="revanced_hide_shorts_stickers_title">إخفاء الملصقات</string>
   <string name="revanced_hide_shorts_stickers_summary_on">تم إخفاء الملصقات</string>
   <string name="revanced_hide_shorts_stickers_summary_off">يتم عرض الملصقات</string>
-  <string name="revanced_hide_shorts_like_fountain_title">إخفاء فوران أعجبني</string>
+  <string name="revanced_hide_shorts_like_fountain_title">إخفاء التأثير الفوّار لـزر أعجبني</string>
   <string name="revanced_hide_shorts_like_fountain_summary_on">تم إخفاء التأثير الفوّار لـزر أعجبني</string>
   <string name="revanced_hide_shorts_like_fountain_summary_off">يتم عرض التأثير الفوّار لـزر أعجبني</string>
   <string name="revanced_hide_shorts_like_button_title">إخفاء زر أعجبني</string>
@@ -738,8 +809,15 @@ Second \"item\" text"</string>
   <string name="revanced_hide_player_popup_panels_summary_on">تم إخفاء لوحات المشغل المنبثقة</string>
   <string name="revanced_hide_player_popup_panels_summary_off">يتم عرض لوحات المشغل المنبثقة</string>
   </patch>
+  <patch id="layout.player.fullscreen.exitFullscreenPatch">
+  <string name="revanced_exit_fullscreen_title">الخروج من وضع ملء الشاشة عند انتهاء الفيديو</string>
+  <string name="revanced_exit_fullscreen_entry_1">معطل</string>
+  <string name="revanced_exit_fullscreen_entry_2">بالطول</string>
+  <string name="revanced_exit_fullscreen_entry_3">بالعرض</string>
+  <string name="revanced_exit_fullscreen_entry_4">بالطول والعرض</string>
+  </patch>
   <patch id="layout.player.fullscreen.openVideosFullscreen">
-  <string name="revanced_open_videos_fullscreen_portrait_title">فتح مقاطع الفيديو في ملء الشاشة</string>
+  <string name="revanced_open_videos_fullscreen_portrait_title">فتح الفيديوهات في ملء الشاشة</string>
   <string name="revanced_open_videos_fullscreen_portrait_summary_on">يتم فتح الفيديوهات في وضع ملء الشاشة</string>
   <string name="revanced_open_videos_fullscreen_portrait_summary_off">لا يتم فتح الفيديوهات في وضع ملء الشاشة</string>
   </patch>
@@ -758,12 +836,12 @@ Second \"item\" text"</string>
   <string name="revanced_ryd_failure_ryd_enabled_while_playing_video_then_user_voted">أعد تحميل الفيديو للتصويت بـ Return YouTube Dislike</string>
   <string name="revanced_ryd_enable_summary_on">يتم عرض لم يعجبني</string>
   <string name="revanced_ryd_enable_summary_off">لا يتم عرض لم يعجبني</string>
-  <string name="revanced_ryd_shorts_title">عرض لم يعجني في مقاطع Shorts</string>
-  <string name="revanced_ryd_shorts_summary_on">يتم عرض لم يعجني في مقاطع Shorts</string>
+  <string name="revanced_ryd_shorts_title">عرض لم يعجني في فيديوهات Shorts</string>
+  <string name="revanced_ryd_shorts_summary_on">يتم عرض لم يعجني في فيديوهات Shorts</string>
   <string name="revanced_ryd_shorts_summary_on_disclaimer">"إبداءات لم يعجبني التي تظهر على فيديوهات Shorts
 
 التقييد: قد لا تظهر إبداءات لم يعجبني في وضع التصفح المتخفي"</string>
-  <string name="revanced_ryd_shorts_summary_off">تم إخفاء لم يعجني في مقاطع Shorts</string>
+  <string name="revanced_ryd_shorts_summary_off">تم إخفاء لم يعجني في فيديوهات Shorts</string>
   <string name="revanced_ryd_dislike_percentage_title">لم يعجبني كــ نسبة مئوية</string>
   <string name="revanced_ryd_dislike_percentage_summary_on">يعرض عدد لم يعجبني كـ نسبة مئوية</string>
   <string name="revanced_ryd_dislike_percentage_summary_off">يعرض عدد لم يعجبني كـ رَقَم</string>
@@ -816,7 +894,7 @@ Second \"item\" text"</string>
   </patch>
   <patch id="layout.sponsorblock.sponsorBlockResourcePatch">
   <string name="revanced_sb_enable_sb">تمكين SponsorBlock</string>
-  <string name="revanced_sb_enable_sb_sum">مانِع الرُعَاة هو نظام جماعي لتخطي الأجزاء المُمِلَّة في مقاطع YouTube</string>
+  <string name="revanced_sb_enable_sb_sum">SponsorBlock مانِع الرُعَاة هو نظام جماعي لتخطي الأجزاء المُمِلَّة في مقاطع YouTube</string>
   <string name="revanced_sb_appearance_category">المظهر</string>
   <string name="revanced_sb_enable_voting">عرض زر التصويت</string>
   <string name="revanced_sb_enable_voting_sum_on">يتم عرض زر التصويت على المقطع</string>
@@ -881,7 +959,7 @@ Second \"item\" text"</string>
   <string name="revanced_sb_segments_sponsor">الراعي</string>
   <string name="revanced_sb_segments_sponsor_sum">الترويج المدفوع الأجر، والإحالات المدفوعة الأجر والإعلانات المباشرة. ليس للترويج الذاتي أو لصراعات مجانية للقضايا/المبدعين/المواقع الإلكترونية/المنتجات التي يحبون الحصول عليها</string>
   <string name="revanced_sb_segments_selfpromo">ترويج شخصي/غير مدفوع الأجر</string>
-  <string name="revanced_sb_segments_selfpromo_sum">شبيهة بـ \"الراعي\" باستثناء ما يتعلق بالإعلانات غير المدفوعة الأجر أو الذاتية. ويشمل ذلك أقسام عن السلع أو التبرعات أو المعلومات المتعلقة بمن تعاونوا مع ناشر المحتوى</string>
+  <string name="revanced_sb_segments_selfpromo_sum">مشابهة لـ \"الراعي\" باستثناء ما يتعلق بالإعلانات غير المدفوعة الأجر أو الذاتية. ويشمل ذلك أقسام عن السلع أو التبرعات أو المعلومات المتعلقة بمن تعاونوا مع ناشر المحتوى</string>
   <string name="revanced_sb_segments_interaction">تذكير بالتفاعل (اشتراك)</string>
   <string name="revanced_sb_segments_interaction_sum">تذكير قصير للإعجاب أو الاشتراك أو المتابعة في منتصف المحتوى. إذا كانت طويلة أو تتعلق بشيء محدد، فيجب أن تكون خاضعة للترويج الشخصي بدلاً من ذلك</string>
   <string name="revanced_sb_segments_highlight">الأبرز</string>
@@ -895,7 +973,7 @@ Second \"item\" text"</string>
   <string name="revanced_sb_segments_filler">خارج الموضوع/النكات</string>
   <string name="revanced_sb_segments_filler_sum">تم إضافة مشاهد ملتقطة خارج الموضوع أو الفكاهة التي ليست مطلوبة لفهم المحتوى الرئيسي للفيديو. لا تتضمن مقاطع توفر تَعبِير أو تفاصيل الخلفية</string>
   <string name="revanced_sb_segments_nomusic">الموسيقى: مقطع غير موسيقي</string>
-  <string name="revanced_sb_segments_nomusic_sum">فقط للاستخدام في مقاطع الفيديو الموسيقية. أقسام مقاطع الفيديو الموسيقية بدون موسيقى، والتي لم يتم تغطيتها بالفعل من قبل فئة أخرى</string>
+  <string name="revanced_sb_segments_nomusic_sum">فقط للاستخدام في المقاطع الموسيقية. أقسام المقاطع الموسيقية بدون موسيقى، والتي لم يتم تغطيتها بالفعل من قبل فئة أخرى</string>
   <string name="revanced_sb_skip_button_compact">تخطي</string>
   <string name="revanced_sb_skip_button_compact_highlight">الأبرز</string>
   <string name="revanced_sb_skip_button_sponsor">تخطي الراعي</string>
@@ -1006,6 +1084,23 @@ Second \"item\" text"</string>
   <string name="revanced_sb_reset">إعادة التعيين</string>
   <string name="revanced_sb_about">لمحة</string>
   <string name="revanced_sb_about_api_sum">يتم توفير البيانات بواسطة SponsorBlock API. انقر هنا لمعرفة المزيد ومشاهدة التنزيلات لمنصات أخرى</string>
+  </patch>
+  <patch id="layout.formfactor.changeFormFactorPatch">
+  <string name="revanced_change_form_factor_title">شكل نموذج التخطيط</string>
+  <string name="revanced_change_form_factor_entry_1">الافتراضي</string>
+  <string name="revanced_change_form_factor_entry_2">الجوّال</string>
+  <string name="revanced_change_form_factor_entry_3">الجهاز اللوحي</string>
+  <string name="revanced_change_form_factor_entry_4">Automotive</string>
+  <string name="revanced_change_form_factor_user_dialog_message">"تتضمن التغييرات:
+
+تخطيط الجهاز اللوحي
+• إخفاء منشورات المجتمع
+
+تخطيط Automotive
+• إخفاء قائمة سجل المشاهدة
+• استعادة علامة التبويب \"استكشاف\"
+• فتح فيديوهات Shorts في المشغل العادي
+• تنظيم الخلاصة حسب الموضوعات والقناة"</string>
   </patch>
   <patch id="layout.spoofappversion.spoofAppVersionPatch">
   <string name="revanced_spoof_app_version_title">خِداع إصدار التطبيق</string>
@@ -1020,6 +1115,7 @@ Second \"item\" text"</string>
                  This is because the 'General layout' menu uses alphabetic sorting, and it functionally works better if the spoof target selector appears below the 'Spoof app version' UI switch -->
   <string name="revanced_spoof_app_version_target_title">الهدف من تغيير إصدار التطبيق</string>
   <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - استعادة أيقونات مشغل Shorts القديمة</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.26.42 - استعادة أيقونات التنقل وشريط الأدوات القديمة</string>
   <!-- 'RYD' is 'Return YouTube Dislike' -->
   <string name="revanced_spoof_app_version_target_legacy_entry_1">18.33.40 - استعادة RYD على Shorts بوضع التخفي</string>
   <string name="revanced_spoof_app_version_target_legacy_entry_2">18.20.39 - استعادة قائمة سرعة الفيديو العريضة &amp; الجودة</string>
@@ -1050,10 +1146,10 @@ Second \"item\" text"</string>
   <string name="revanced_disable_resuming_shorts_player_summary_off">سيتم استئناف تشغيل مشغل Shorts عند بدء تشغيل التطبيق</string>
   </patch>
   <patch id="layout.shortsplayer.shortsPlayerTypePatch">
-  <string name="revanced_shorts_player_type_title">فتح مقاطع الـShorts باستخدام</string>
+  <string name="revanced_shorts_player_type_title">فتح فيديوهات Shorts باستخدام</string>
   <string name="revanced_shorts_player_type_shorts">مشغل Shorts</string>
-  <string name="revanced_shorts_player_type_regular_player">مشغل عادي</string>
-  <string name="revanced_shorts_player_type_regular_player_fullscreen">شاشة كاملة - مشغل عادي</string>
+  <string name="revanced_shorts_player_type_regular_player">المشغل العادي</string>
+  <string name="revanced_shorts_player_type_regular_player_fullscreen">المشغل العادي في وضع ملء الشاشة</string>
   </patch>
   <patch id="layout.shortsautoplay.shortsAutoplayPatch">
   <string name="revanced_shorts_autoplay_title">التشغيل التلقائي لفيديوهات Shorts</string>
@@ -1063,12 +1159,6 @@ Second \"item\" text"</string>
   <string name="revanced_shorts_autoplay_background_summary_on">سيتم تشغيل فيديوهات Shorts تلقائيًا في الخلفية</string>
   <string name="revanced_shorts_autoplay_background_summary_off">سيتم تكرار فيديوهات Shorts في الخلفية</string>
   </patch>
-  <patch id="layout.tablet.enableTabletLayoutPatch">
-  <string name="revanced_tablet_layout_title">تمكين تصميم الجهاز اللوحي</string>
-  <string name="revanced_tablet_layout_summary_on">تم تمكين تصميم الجهاز اللوحي</string>
-  <string name="revanced_tablet_layout_summary_off">تم تعطيل تصميم الجهاز اللوحي</string>
-  <string name="revanced_tablet_layout_user_dialog_message">لا تظهر منشورات المجتمع على تخطيطات الجهاز اللوحي</string>
-  </patch>
   <patch id="layout.miniplayer.miniplayerPatch">
   <string name="revanced_miniplayer_screen_title">المشغل المصغر</string>
   <string name="revanced_miniplayer_screen_summary">تغيير نمط المشغل المصغر داخل التطبيق</string>
@@ -1129,8 +1219,10 @@ Second \"item\" text"</string>
   <string name="revanced_seekbar_custom_color_title">تمكين لون شريط تقدم الفيديو المخصص</string>
   <string name="revanced_seekbar_custom_color_summary_on">يتم عرض لون شريط تقدم الفيديو المخصص</string>
   <string name="revanced_seekbar_custom_color_summary_off">يتم عرض لون شريط تقدم الفيديو الاصلي</string>
-  <string name="revanced_seekbar_custom_color_value_title">لون شريط تقدم الفيديو المخصص</string>
-  <string name="revanced_seekbar_custom_color_value_summary">لون شريط التقدم</string>
+  <string name="revanced_seekbar_custom_color_primary_title">لون شريط تقدم الفيديو المخصص</string>
+  <string name="revanced_seekbar_custom_color_primary_summary">لون شريط التقدم</string>
+  <string name="revanced_seekbar_custom_color_accent_title">لون مميز لشريط التقدم المخصص</string>
+  <string name="revanced_seekbar_custom_color_accent_summary">اللون المميز لشريط التقدم</string>
   <string name="revanced_seekbar_custom_color_invalid">لون شريط التقدم غير صالح</string>
   </patch>
   <patch id="layout.thumbnails.bypassImageRegionRestrictionsPatch">
@@ -1166,7 +1258,7 @@ Second \"item\" text"</string>
   <string name="revanced_alt_thumbnail_stills_about_title">لقطات الفيديو الثابتة</string>
   <string name="revanced_alt_thumbnail_stills_about_summary">يتم التقاط اللقطات الثابتة من بداية/وسط/نهاية كل فيديو. هذه الصور مدمجة في YouTube ولا يتم استخدام أي واجهة برمجة تطبيقات خارجية</string>
   <string name="revanced_alt_thumbnail_stills_fast_title">استخدم اللقطات الثابتة السريعة</string>
-  <string name="revanced_alt_thumbnail_stills_fast_summary_on">استخدام اللقطات متوسطة الجودة. سيتم تحميل المُصغَّرات بشكل أسرع، ولكن البث المباشر و المقاطع التي لم يتم إصدارها أو القديمة جدًا قد تعرض مُصغَّرات فارغة</string>
+  <string name="revanced_alt_thumbnail_stills_fast_summary_on">استخدام اللقطات متوسطة الجودة. سيتم تحميل المُصغَّرات بشكل أسرع، ولكن البث المباشر و الفيديوهات التي لم يتم إصدارها أو القديمة جدًا قد تعرض مُصغَّرات فارغة</string>
   <string name="revanced_alt_thumbnail_stills_fast_summary_off">استخدام لقطات الفيديو الثابتة بجودة عالية</string>
   <string name="revanced_alt_thumbnail_stills_time_title">وقت الفيديو لأخذ اللقطات الثابتة منه</string>
   <string name="revanced_alt_thumbnail_stills_time_entry_1">بداية الفيديو</string>
@@ -1232,12 +1324,13 @@ Second \"item\" text"</string>
   <string name="revanced_force_original_audio_title">فرض الصوت الأصلي</string>
   <string name="revanced_force_original_audio_summary_on">استخدام الصوت الأصلي</string>
   <string name="revanced_force_original_audio_summary_off">استخدام الصوت الافتراضي</string>
+  <string name="revanced_force_original_audio_not_available">لاستخدام هذه الميزة، قم بتغيير محاكاة بث المحتوى إلى نوع العميل iOS</string>
   </patch>
   <patch id="video.quality.rememberVideoQualityPatch">
   <!-- Translations should use the same text as revanced_custom_playback_speeds_auto -->
   <string name="revanced_video_quality_default_entry_1">تلقائي</string>
   <string name="revanced_remember_video_quality_last_selected_title">تذكر تغييرات جودة الفيديو</string>
-  <string name="revanced_remember_video_quality_last_selected_summary_on">تنطبق تغييرات الجودة على جميع مقاطع الفيديو</string>
+  <string name="revanced_remember_video_quality_last_selected_summary_on">تنطبق تغييرات الجودة على جميع الفيديوهات</string>
   <string name="revanced_remember_video_quality_last_selected_summary_off">تنطبق تغييرات الجودة على الفيديو الحالي فقط</string>
   <string name="revanced_video_quality_default_wifi_title">جودة الفيديو الافتراضية على شبكة Wi-Fi</string>
   <string name="revanced_video_quality_default_mobile_title">جودة الفيديو الافتراضية على شبكة الجوَّال</string>
@@ -1259,6 +1352,8 @@ Second \"item\" text"</string>
   <string name="revanced_custom_playback_speeds_invalid">يجب أن تكون سرعات التشغيل المخصصة أقل من %s</string>
   <string name="revanced_custom_playback_speeds_parse_exception">سرعة التشغيل المخصصة غير صالحة</string>
   <string name="revanced_custom_playback_speeds_auto">تلقائي</string>
+  <string name="revanced_speed_tap_and_hold_title">سرعة النقر مع الاستمرار المخصصة</string>
+  <string name="revanced_speed_tap_and_hold_summary">سرعة التشغيل بين 0-8</string>
   </patch>
   <patch id="video.speed.remember.rememberPlaybackSpeedPatch">
   <string name="revanced_remember_playback_speed_last_selected_title">تذكر التغيرات في سرعة التشغيل</string>
@@ -1267,6 +1362,11 @@ Second \"item\" text"</string>
   <string name="revanced_playback_speed_default_title">سرعة التشغيل الافتراضية</string>
   <string name="revanced_remember_playback_speed_toast">تغيير السرعة الافتراضية إلى: %s</string>
   </patch>
+  <patch id="video.hdr.disableHdrPatch">
+  <string name="revanced_disable_hdr_video_title">تعطيل فيديو HDR</string>
+  <string name="revanced_disable_hdr_video_summary_on">تم تعطيل فيديو HDR</string>
+  <string name="revanced_disable_hdr_video_summary_off">تم تمكين فيديو HDR</string>
+  </patch>
   <patch id="video.videoqualitymenu.restoreOldVideoQualityMenuResourcePatch">
   <string name="revanced_restore_old_video_quality_menu_title">استعادة قائمة جودة الفيديو القديمة</string>
   <string name="revanced_restore_old_video_quality_menu_summary_on">يتم عرض قائمة جودة الفيديو القديمة</string>
@@ -1287,65 +1387,28 @@ Second \"item\" text"</string>
 قد لا يعمل تشغيل الفيديو"</string>
   <string name="revanced_spoof_video_streams_user_dialog_message">إيقاف تشغيل هذا الإعداد قد يسبب مشاكل في تشغيل الفيديو.</string>
   <string name="revanced_spoof_video_streams_client_type_title">العميل الافتراضي</string>
-  <string name="revanced_spoof_video_streams_about_title">آثار جانبية وهمية</string>
-  <string name="revanced_spoof_video_streams_about_summary">"- قد لا يتم تشغيل مقاطع فيديو للأطفال
-- القائمة صوت المسار مفقودة
-- مستوى الصوت الثابت غير متاح
-- خيار فرض الصوت الأصلي غير متاح"</string>
-  <string name="revanced_spoof_video_streams_language_title">لغة البث الصوتي الافتراضية</string>
-  <string name="revanced_spoof_video_streams_language_DEFAULT">لغة التطبيق</string>
-  <string name="revanced_spoof_video_streams_language_AR">العربية</string>
-  <string name="revanced_spoof_video_streams_language_AZ">Azerbaijani</string>
-  <string name="revanced_spoof_video_streams_language_BG">Bulgarian</string>
-  <string name="revanced_spoof_video_streams_language_BN">Bengali</string>
-  <string name="revanced_spoof_video_streams_language_CA">Catalan</string>
-  <string name="revanced_spoof_video_streams_language_CS">Czech</string>
-  <string name="revanced_spoof_video_streams_language_DA">Danish</string>
-  <string name="revanced_spoof_video_streams_language_DE">German</string>
-  <string name="revanced_spoof_video_streams_language_EL">Greek</string>
-  <string name="revanced_spoof_video_streams_language_EN">English</string>
-  <string name="revanced_spoof_video_streams_language_ES">Spanish</string>
-  <string name="revanced_spoof_video_streams_language_ET">Estonian</string>
-  <string name="revanced_spoof_video_streams_language_FA">فارسى</string>
-  <string name="revanced_spoof_video_streams_language_FI">Finnish</string>
-  <string name="revanced_spoof_video_streams_language_FR">French</string>
-  <string name="revanced_spoof_video_streams_language_GU">Gujarati</string>
-  <string name="revanced_spoof_video_streams_language_HI">Hindi</string>
-  <string name="revanced_spoof_video_streams_language_HR">Croatian</string>
-  <string name="revanced_spoof_video_streams_language_HU">Hungarian</string>
-  <string name="revanced_spoof_video_streams_language_ID"> Indonesian</string>
-  <string name="revanced_spoof_video_streams_language_IT">Italian</string>
-  <string name="revanced_spoof_video_streams_language_JA">Japanese</string>
-  <string name="revanced_spoof_video_streams_language_KK">Kazakh</string>
-  <string name="revanced_spoof_video_streams_language_KO">Korean</string>
-  <string name="revanced_spoof_video_streams_language_LT">Lithuanian</string>
-  <string name="revanced_spoof_video_streams_language_LV">Latvian</string>
-  <string name="revanced_spoof_video_streams_language_MK">Macedonian</string>
-  <string name="revanced_spoof_video_streams_language_MN">Mongolian</string>
-  <string name="revanced_spoof_video_streams_language_MR">Marathi</string>
-  <string name="revanced_spoof_video_streams_language_MS">Malay</string>
-  <string name="revanced_spoof_video_streams_language_MY">Burmese</string>
-  <string name="revanced_spoof_video_streams_language_NL">Dutch</string>
-  <string name="revanced_spoof_video_streams_language_OR">Odia</string>
-  <string name="revanced_spoof_video_streams_language_PA">Punjabi</string>
-  <string name="revanced_spoof_video_streams_language_PL">Polish</string>
-  <string name="revanced_spoof_video_streams_language_PT_BR">Portuguese (Brazil)</string>
-  <string name="revanced_spoof_video_streams_language_PT_PT">Portuguese (Portugal)</string>
-  <string name="revanced_spoof_video_streams_language_RO">Romanian</string>
-  <string name="revanced_spoof_video_streams_language_RU">Russian</string>
-  <string name="revanced_spoof_video_streams_language_SK">Slovak</string>
-  <string name="revanced_spoof_video_streams_language_SL">Slovene</string>
-  <string name="revanced_spoof_video_streams_language_SR">Serbian</string>
-  <string name="revanced_spoof_video_streams_language_SV">Swedish</string>
-  <string name="revanced_spoof_video_streams_language_SW">Swahili</string>
-  <string name="revanced_spoof_video_streams_language_TA">Tamil</string>
-  <string name="revanced_spoof_video_streams_language_TE">Telugu</string>
-  <string name="revanced_spoof_video_streams_language_TH">Thai</string>
-  <string name="revanced_spoof_video_streams_language_TR">Turkish</string>
-  <string name="revanced_spoof_video_streams_language_UK">Ukrainian</string>
-  <string name="revanced_spoof_video_streams_language_UR">Urdu</string>
-  <string name="revanced_spoof_video_streams_language_VI">Vietnamese</string>
-  <string name="revanced_spoof_video_streams_language_ZH">Chinese</string>
+  <!-- 'no auth' means no authentication -->
+  <string name="revanced_spoof_video_streams_client_type_android_vr_no_auth">Android VR (بدون مصادقة)</string>
+  <string name="revanced_spoof_video_streams_ios_force_avc_title">فرض iOS AVC (H.264)</string>
+  <string name="revanced_spoof_video_streams_ios_force_avc_summary_on">يتم فرض ترميز فيديو على AVC (H.264)</string>
+  <string name="revanced_spoof_video_streams_ios_force_avc_summary_off">يتم تحديد ترميز الفيديو تلقائيًا</string>
+  <string name="revanced_spoof_video_streams_ios_force_avc_user_dialog_message">"قد يؤدي تمكين هذا إلى تحسين عمر البطارية وإصلاح تقطيع التشغيل.
+
+AVC لديه حد أقصى للدقة 1080p، لا يتوفر ترميز الصوت Opus، وسوف يستخدم تشغيل الفيديو بيانات إنترنت أكثر من VP9 أو AV1."</string>
+  <string name="revanced_spoof_video_streams_about_ios_tv_title">الآثار الجانبية لمحاكاة هوية iOS</string>
+  <string name="revanced_spoof_video_streams_about_ios_tv_summary">"• قد لا يتم تشغيل الأفلام أو الفيديوهات المدفوعة
+• مستوى الصوت الثابت غير متوفر
+• تنتهي الفيديوهات قبل ب 1 ثانية"</string>
+  <string name="revanced_spoof_video_streams_about_android_title">الآثار الجانبية لمحاكاة هوية Android</string>
+  <string name="revanced_spoof_video_streams_about_android_summary">"• قائمة المقطع الصوتي مفقودة
+• مستوى الصوت الثابت غير متاح
+• فرض الصوت الأصلي غير متوفر"</string>
+  <string name="revanced_spoof_video_streams_about_no_av1">• لا يوجد ترميز الفيديو AV1</string>
+  <string name="revanced_spoof_video_streams_about_kids_videos">• الفيديوات العربية لا يمكن تشغيل أو في وضع التشغيل أو في حالة الخفية</string>
+  <string name="revanced_spoof_streaming_data_stats_for_nerds_title">عرض في إحصاءات تقنية</string>
+  <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">يتم عرض نوع العميل في إحصاءات تقنية</string>
+  <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">تم إخفاء نوع العميل في إحصاءات تقنية</string>
+  <string name="revanced_spoof_video_streams_language_title">لغة البث الصوتي الافتراضية للواقع الافتراضي VR</string>
   </patch>
   </app>
   <app id="twitch">

patches/src/main/resources/addresources/values-as-rIN/strings.xml

@@ -136,6 +136,8 @@ Second \"item\" text"</string>
   </patch>
   <patch id="layout.panels.popup.playerPopupPanelsPatch">
   </patch>
+  <patch id="layout.player.fullscreen.exitFullscreenPatch">
+  </patch>
   <patch id="layout.player.fullscreen.openVideosFullscreen">
   </patch>
   <patch id="layout.player.overlay.customPlayerOverlayOpacityResourcePatch">
@@ -155,6 +157,8 @@ Second \"item\" text"</string>
   <!-- Toast shown if network connection times out. Translations of this should not be longer than the original English or the text can be clipped and not entirely shown. -->
   <!-- Shown in the settings preferences, and translations can be any text length. -->
   </patch>
+  <patch id="layout.formfactor.changeFormFactorPatch">
+  </patch>
   <patch id="layout.spoofappversion.spoofAppVersionPatch">
   <!-- It is ideal, but not required, if the text here appears is alphabetically after the text used for 'revanced_spoof_app_version_title'.
                  This is because the 'General layout' menu uses alphabetic sorting, and it functionally works better if the spoof target selector appears below the 'Spoof app version' UI switch -->
@@ -168,8 +172,6 @@ Second \"item\" text"</string>
   </patch>
   <patch id="layout.shortsautoplay.shortsAutoplayPatch">
   </patch>
-  <patch id="layout.tablet.enableTabletLayoutPatch">
-  </patch>
   <patch id="layout.miniplayer.miniplayerPatch">
   </patch>
   <patch id="layout.theme.themePatch">
@@ -215,11 +217,14 @@ Second \"item\" text"</string>
   </patch>
   <patch id="video.speed.remember.rememberPlaybackSpeedPatch">
   </patch>
+  <patch id="video.hdr.disableHdrPatch">
+  </patch>
   <patch id="video.videoqualitymenu.restoreOldVideoQualityMenuResourcePatch">
   </patch>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   </patch>
   <patch id="misc.fix.playback.spoofVideoStreamsPatch">
+  <!-- 'no auth' means no authentication -->
   </patch>
   </app>
   <app id="twitch">