chore: Release v5.32.0-dev.4 [skip ci]

# [5.32.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.32.0-dev.3...v5.32.0-dev.4) (2025-07-25)

### Bug Fixes

* **Messenger - Hide inbox ads:** Support the latest app version ([8ec857a](8ec857a175))

.github/workflows/build_pull_request.yml

@@ -13,8 +13,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Setup Java
         uses: actions/setup-java@v4

.github/workflows/pull_strings.yml

@@ -17,7 +17,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: dev
-          fetch-depth: 0
           clean: true
 
       - name: Pull strings

.github/workflows/push_strings.yml

@@ -15,8 +15,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Preprocess strings
         env:

.github/workflows/release.yml

@@ -19,8 +19,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Setup Java
         uses: actions/setup-java@v4

CHANGELOG.md

@@ -1,3 +1,246 @@
+# [5.32.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.32.0-dev.3...v5.32.0-dev.4) (2025-07-25)
+
+
+### Bug Fixes
+
+* **Messenger - Hide inbox ads:** Support the latest app version ([2959c02](https://github.com/ReVanced/revanced-patches/commit/2959c0214dfa703ee623ef1f89bded7f78c9d252))
+
+# [5.32.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.32.0-dev.2...v5.32.0-dev.3) (2025-07-24)
+
+
+### Features
+
+* **YouTube - External downloads:** Improve the selection of the external downloader package ([#5504](https://github.com/ReVanced/revanced-patches/issues/5504)) ([5de9aa9](https://github.com/ReVanced/revanced-patches/commit/5de9aa9fad4f24186da045fb188f8718d6f63d7a))
+
+# [5.32.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.32.0-dev.1...v5.32.0-dev.2) (2025-07-23)
+
+
+### Bug Fixes
+
+* **YouTube  - Hide layout components:** Fix "Hide ticket shelf" ([#5516](https://github.com/ReVanced/revanced-patches/issues/5516)) ([3b85c71](https://github.com/ReVanced/revanced-patches/commit/3b85c71433325fff49e01c77c7b9ff8ddd0a7068))
+
+# [5.32.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.31.3-dev.1...v5.32.0-dev.1) (2025-07-16)
+
+
+### Features
+
+* **Prime Video:** Add `Playback speed` patch ([#5444](https://github.com/ReVanced/revanced-patches/issues/5444)) ([22cf313](https://github.com/ReVanced/revanced-patches/commit/22cf313a7b99b69e17b9d488c514802043a5dc10))
+
+## [5.31.3-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.31.2...v5.31.3-dev.1) (2025-07-16)
+
+
+### Bug Fixes
+
+* **YouTube - GmsCore support:** Fix search suggestions when logged out by using correct search provider ([#5483](https://github.com/ReVanced/revanced-patches/issues/5483)) ([e86fdc8](https://github.com/ReVanced/revanced-patches/commit/e86fdc86b161a6077960b85149e83bacbac664e7))
+
+## [5.31.2](https://github.com/ReVanced/revanced-patches/compare/v5.31.1...v5.31.2) (2025-07-14)
+
+
+### Bug Fixes
+
+* **Spotify - Spoof client:** Fix login failing by spoofing login request in addition ([#5448](https://github.com/ReVanced/revanced-patches/issues/5448)) ([4e59ddc](https://github.com/ReVanced/revanced-patches/commit/4e59ddc62388d09f71b89593fc8b76933d9facea))
+* **YouTube - Disable double tap actions:** Remove old incompatible targets ([857053e](https://github.com/ReVanced/revanced-patches/commit/857053e29b72ded10a84b0ac693fa107705342d9))
+* **YouTube - Hide layout components:** Hide quick actions does not work ([#5423](https://github.com/ReVanced/revanced-patches/issues/5423)) ([9c66729](https://github.com/ReVanced/revanced-patches/commit/9c6672946d44001e106bdac9041e2d79ef3f6ab2))
+* **YouTube - Hide layout components:** Show correct custom header logo if 'Hide YouTube Doodles' is enabled ([#5431](https://github.com/ReVanced/revanced-patches/issues/5431)) ([20cc141](https://github.com/ReVanced/revanced-patches/commit/20cc141e61f75de1a1749247c4f4aed167dee8ea))
+* **YouTube - Settings:** Back button/gesture closes search instead of exiting ([#5418](https://github.com/ReVanced/revanced-patches/issues/5418)) ([134b278](https://github.com/ReVanced/revanced-patches/commit/134b278baa7b90d2c4b06200cabacabf55ebc055))
+
+## [5.31.2-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.31.2-dev.4...v5.31.2-dev.5) (2025-07-14)
+
+
+### Bug Fixes
+
+* **Spotify - Spoof client:** Fix login failing by spoofing login request in addition ([#5448](https://github.com/ReVanced/revanced-patches/issues/5448)) ([4e59ddc](https://github.com/ReVanced/revanced-patches/commit/4e59ddc62388d09f71b89593fc8b76933d9facea))
+
+## [5.31.2-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.31.2-dev.3...v5.31.2-dev.4) (2025-07-13)
+
+
+### Bug Fixes
+
+* **YouTube - Settings:** Back button/gesture closes search instead of exiting ([#5418](https://github.com/ReVanced/revanced-patches/issues/5418)) ([134b278](https://github.com/ReVanced/revanced-patches/commit/134b278baa7b90d2c4b06200cabacabf55ebc055))
+
+## [5.31.2-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.31.2-dev.2...v5.31.2-dev.3) (2025-07-13)
+
+
+### Bug Fixes
+
+* **YouTube - Disable double tap actions:** Remove old incompatible targets ([857053e](https://github.com/ReVanced/revanced-patches/commit/857053e29b72ded10a84b0ac693fa107705342d9))
+
+## [5.31.2-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.31.2-dev.1...v5.31.2-dev.2) (2025-07-12)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Show correct custom header logo if 'Hide YouTube Doodles' is enabled ([#5431](https://github.com/ReVanced/revanced-patches/issues/5431)) ([20cc141](https://github.com/ReVanced/revanced-patches/commit/20cc141e61f75de1a1749247c4f4aed167dee8ea))
+
+## [5.31.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.31.1...v5.31.2-dev.1) (2025-07-12)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Hide quick actions does not work ([#5423](https://github.com/ReVanced/revanced-patches/issues/5423)) ([9c66729](https://github.com/ReVanced/revanced-patches/commit/9c6672946d44001e106bdac9041e2d79ef3f6ab2))
+
+## [5.31.1](https://github.com/ReVanced/revanced-patches/compare/v5.31.0...v5.31.1) (2025-07-11)
+
+
+### Bug Fixes
+
+* **Spotify - Unlock Premium:** Fix hiding context menu ads for latest version ([#5415](https://github.com/ReVanced/revanced-patches/issues/5415)) ([dcde393](https://github.com/ReVanced/revanced-patches/commit/dcde3935bde3172576d0f9f5ff9eb62ecfff7dfe))
+
+## [5.31.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.31.0...v5.31.1-dev.1) (2025-07-11)
+
+
+### Bug Fixes
+
+* **Spotify - Unlock Premium:** Fix hiding context menu ads for latest version ([#5415](https://github.com/ReVanced/revanced-patches/issues/5415)) ([dcde393](https://github.com/ReVanced/revanced-patches/commit/dcde3935bde3172576d0f9f5ff9eb62ecfff7dfe))
+
+# [5.31.0](https://github.com/ReVanced/revanced-patches/compare/v5.30.0...v5.31.0) (2025-07-11)
+
+
+### Bug Fixes
+
+* **Bacon Reader - Spoof client:** Use www instead of ssl API to fix auth related issues  ([#5402](https://github.com/ReVanced/revanced-patches/issues/5402)) ([72459bb](https://github.com/ReVanced/revanced-patches/commit/72459bb2eaf4691e32822dfdd1db3240e2fe98dd))
+* Correctly name `Enable ROM signature spoofing` patch ([d85881a](https://github.com/ReVanced/revanced-patches/commit/d85881a6768232a999534677bebb248e640fe5ab))
+* Fix accidental changes ([e2ac841](https://github.com/ReVanced/revanced-patches/commit/e2ac8419756e3c7d62e2c0430a2918a3c1c63666))
+* Fix refactoring typo ([ec0ae42](https://github.com/ReVanced/revanced-patches/commit/ec0ae42496628cdeb2a639020fce94316b41b751))
+* Handle empty list of announcements ([de9d720](https://github.com/ReVanced/revanced-patches/commit/de9d7209f4e818a618a7fd9000013ae8ebd728f2))
+* **SoundCloud:** Constrain patches to last working app target ([e8ea89f](https://github.com/ReVanced/revanced-patches/commit/e8ea89fc1a3f0531a0af7529663f13328aca4fe7))
+* **Spotify - Unlock Premium:** Remove wrongfully hidden non ad browse sections ([#5403](https://github.com/ReVanced/revanced-patches/issues/5403)) ([8633544](https://github.com/ReVanced/revanced-patches/commit/8633544decc0814d7a548fbc5576b4bdd1d7eee0))
+* **Spotify:** Remove other ads type from the browse screen ([#5333](https://github.com/ReVanced/revanced-patches/issues/5333)) ([c68533a](https://github.com/ReVanced/revanced-patches/commit/c68533a33a399ca813380b5c9ccddce434ceadf8))
+* **Sync for Reddit - Spoof client:** Use www instead of ssl API to fix auth related issues ([#5392](https://github.com/ReVanced/revanced-patches/issues/5392)) ([47e6b62](https://github.com/ReVanced/revanced-patches/commit/47e6b62f3d8b07960cfb2963f441222d3e67df92))
+* **YouTube - Hide ads:** Hide new type of general ad ([#5345](https://github.com/ReVanced/revanced-patches/issues/5345)) ([f23716b](https://github.com/ReVanced/revanced-patches/commit/f23716bc52c03d8d0271bfe38b19247e6de7021d))
+* **YouTube - Hide layout components:** Do not hide playlist sort button if 'Hide AI comments summary' is on ([5f3e48e](https://github.com/ReVanced/revanced-patches/commit/5f3e48ec5853f6439800ef58239291c34bcab5f6))
+* **YouTube - Playback speed:** Allow custom speeds with 0.01x precision ([#5360](https://github.com/ReVanced/revanced-patches/issues/5360)) ([0eecef0](https://github.com/ReVanced/revanced-patches/commit/0eecef00fc93d2a217944978e29dce82e3134e35))
+* **YouTube - Slide to seek:** Show tap and hold 2x speed overlay when active ([#5398](https://github.com/ReVanced/revanced-patches/issues/5398)) ([dbc9c5f](https://github.com/ReVanced/revanced-patches/commit/dbc9c5f00c1f5bbb95f8822667cc1ac3c613fa00))
+
+
+### Features
+
+* **Cricbuzz - Hide ads:** Hide Cricbuzz11 UI elements ([#5381](https://github.com/ReVanced/revanced-patches/issues/5381)) ([a42c98f](https://github.com/ReVanced/revanced-patches/commit/a42c98f8b51fd37d815fd38b75a2b7ccc4fb049b))
+* **Lightroom:** Constrain patches to last working version ([#5335](https://github.com/ReVanced/revanced-patches/issues/5335)) ([32ce70e](https://github.com/ReVanced/revanced-patches/commit/32ce70e994f354b9a569376bb89eb38b3190e6f9))
+* **Spotify - Spoof client:** Fix issues like songs skipping by spoofing to iOS ([#5388](https://github.com/ReVanced/revanced-patches/issues/5388)) ([e36d4c1](https://github.com/ReVanced/revanced-patches/commit/e36d4c1986b58815c7659e6ef44011166873f9c8))
+* **Spotify:** Remove support for old versions ([#5404](https://github.com/ReVanced/revanced-patches/issues/5404)) ([9d31238](https://github.com/ReVanced/revanced-patches/commit/9d31238803a45e957472760fc40c3862da2cf3f0))
+* **YouTube - Change header:** Add in-app setting to change the app header ([#5346](https://github.com/ReVanced/revanced-patches/issues/5346)) ([9ba45b6](https://github.com/ReVanced/revanced-patches/commit/9ba45b6680595d732b47e8fa54bee98b7c7af179))
+* **YouTube - Hide layout components:** Add `Hide channel links preview` and `Hide 'Visit Community' button` in channel page ([#5320](https://github.com/ReVanced/revanced-patches/issues/5320)) ([9d9cce3](https://github.com/ReVanced/revanced-patches/commit/9d9cce3ec5550b2fea88df745f1700bb2f17eb9e))
+* **YouTube:** Disable two-finger tap gesture for skipping chapters ([#5374](https://github.com/ReVanced/revanced-patches/issues/5374)) ([71db0a2](https://github.com/ReVanced/revanced-patches/commit/71db0a2661b5f76eb5048cdeed83f26fbfdf4fee))
+
+# [5.31.0-dev.17](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.16...v5.31.0-dev.17) (2025-07-11)
+
+
+### Bug Fixes
+
+* **Spotify - Unlock Premium:** Remove wrongfully hidden non ad browse sections ([#5403](https://github.com/ReVanced/revanced-patches/issues/5403)) ([8633544](https://github.com/ReVanced/revanced-patches/commit/8633544decc0814d7a548fbc5576b4bdd1d7eee0))
+
+
+### Features
+
+* **Spotify:** Remove support for old versions ([#5404](https://github.com/ReVanced/revanced-patches/issues/5404)) ([9d31238](https://github.com/ReVanced/revanced-patches/commit/9d31238803a45e957472760fc40c3862da2cf3f0))
+
+# [5.31.0-dev.16](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.15...v5.31.0-dev.16) (2025-07-11)
+
+
+### Features
+
+* **Spotify - Spoof client:** Fix issues like songs skipping by spoofing to iOS ([#5388](https://github.com/ReVanced/revanced-patches/issues/5388)) ([e36d4c1](https://github.com/ReVanced/revanced-patches/commit/e36d4c1986b58815c7659e6ef44011166873f9c8))
+* **YouTube:** Disable two-finger tap gesture for skipping chapters ([#5374](https://github.com/ReVanced/revanced-patches/issues/5374)) ([71db0a2](https://github.com/ReVanced/revanced-patches/commit/71db0a2661b5f76eb5048cdeed83f26fbfdf4fee))
+
+# [5.31.0-dev.15](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.14...v5.31.0-dev.15) (2025-07-11)
+
+
+### Bug Fixes
+
+* Handle empty list of announcements ([de9d720](https://github.com/ReVanced/revanced-patches/commit/de9d7209f4e818a618a7fd9000013ae8ebd728f2))
+
+# [5.31.0-dev.14](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.13...v5.31.0-dev.14) (2025-07-10)
+
+
+### Bug Fixes
+
+* **Bacon Reader - Spoof client:** Use www instead of ssl API to fix auth related issues  ([#5402](https://github.com/ReVanced/revanced-patches/issues/5402)) ([72459bb](https://github.com/ReVanced/revanced-patches/commit/72459bb2eaf4691e32822dfdd1db3240e2fe98dd))
+
+# [5.31.0-dev.13](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.12...v5.31.0-dev.13) (2025-07-10)
+
+
+### Bug Fixes
+
+* **YouTube - Slide to seek:** Show tap and hold 2x speed overlay when active ([#5398](https://github.com/ReVanced/revanced-patches/issues/5398)) ([dbc9c5f](https://github.com/ReVanced/revanced-patches/commit/dbc9c5f00c1f5bbb95f8822667cc1ac3c613fa00))
+
+# [5.31.0-dev.12](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.11...v5.31.0-dev.12) (2025-07-09)
+
+
+### Bug Fixes
+
+* **Sync for Reddit - Spoof client:** Use www instead of ssl API to fix auth related issues ([#5392](https://github.com/ReVanced/revanced-patches/issues/5392)) ([47e6b62](https://github.com/ReVanced/revanced-patches/commit/47e6b62f3d8b07960cfb2963f441222d3e67df92))
+
+# [5.31.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.10...v5.31.0-dev.11) (2025-07-09)
+
+
+### Features
+
+* **Cricbuzz - Hide ads:** Hide Cricbuzz11 UI elements ([#5381](https://github.com/ReVanced/revanced-patches/issues/5381)) ([a42c98f](https://github.com/ReVanced/revanced-patches/commit/a42c98f8b51fd37d815fd38b75a2b7ccc4fb049b))
+
+# [5.31.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.9...v5.31.0-dev.10) (2025-07-09)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Do not hide playlist sort button if 'Hide AI comments summary' is on ([5f3e48e](https://github.com/ReVanced/revanced-patches/commit/5f3e48ec5853f6439800ef58239291c34bcab5f6))
+
+# [5.31.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.8...v5.31.0-dev.9) (2025-07-07)
+
+
+### Bug Fixes
+
+* Fix accidental changes ([e2ac841](https://github.com/ReVanced/revanced-patches/commit/e2ac8419756e3c7d62e2c0430a2918a3c1c63666))
+
+# [5.31.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.7...v5.31.0-dev.8) (2025-07-07)
+
+
+### Bug Fixes
+
+* Correctly name `Enable ROM signature spoofing` patch ([d85881a](https://github.com/ReVanced/revanced-patches/commit/d85881a6768232a999534677bebb248e640fe5ab))
+
+# [5.31.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.6...v5.31.0-dev.7) (2025-07-06)
+
+
+### Bug Fixes
+
+* Fix refactoring typo ([ec0ae42](https://github.com/ReVanced/revanced-patches/commit/ec0ae42496628cdeb2a639020fce94316b41b751))
+
+# [5.31.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.5...v5.31.0-dev.6) (2025-07-06)
+
+
+### Bug Fixes
+
+* **YouTube - Playback speed:** Allow custom speeds with 0.01x precision ([#5360](https://github.com/ReVanced/revanced-patches/issues/5360)) ([0eecef0](https://github.com/ReVanced/revanced-patches/commit/0eecef00fc93d2a217944978e29dce82e3134e35))
+
+# [5.31.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.4...v5.31.0-dev.5) (2025-07-05)
+
+
+### Features
+
+* **YouTube - Change header:** Add in-app setting to change the app header ([#5346](https://github.com/ReVanced/revanced-patches/issues/5346)) ([9ba45b6](https://github.com/ReVanced/revanced-patches/commit/9ba45b6680595d732b47e8fa54bee98b7c7af179))
+
+# [5.31.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.3...v5.31.0-dev.4) (2025-07-04)
+
+
+### Bug Fixes
+
+* **YouTube - Hide ads:** Hide new type of general ad ([#5345](https://github.com/ReVanced/revanced-patches/issues/5345)) ([f23716b](https://github.com/ReVanced/revanced-patches/commit/f23716bc52c03d8d0271bfe38b19247e6de7021d))
+
+# [5.31.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.2...v5.31.0-dev.3) (2025-07-04)
+
+
+### Bug Fixes
+
+* **Spotify:** Remove other ads type from the browse screen ([#5333](https://github.com/ReVanced/revanced-patches/issues/5333)) ([c68533a](https://github.com/ReVanced/revanced-patches/commit/c68533a33a399ca813380b5c9ccddce434ceadf8))
+
+# [5.31.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.1...v5.31.0-dev.2) (2025-07-04)
+
+
+### Features
+
+* **YouTube - Hide layout components:** Add `Hide channel links preview` and `Hide 'Visit Community' button` in channel page ([#5320](https://github.com/ReVanced/revanced-patches/issues/5320)) ([9d9cce3](https://github.com/ReVanced/revanced-patches/commit/9d9cce3ec5550b2fea88df745f1700bb2f17eb9e))
+
 # [5.31.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.30.0...v5.31.0-dev.1) (2025-07-04)
 
 

extensions/cricbuzz/build.gradle.kts

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

extensions/cricbuzz/src/main/AndroidManifest.xml

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

extensions/cricbuzz/src/main/java/app/revanced/extension/cricbuzz/HideAdsPatch.java

@@ -0,0 +1,28 @@
+package app.revanced.extension.cricbuzz.ads;
+
+import com.cricbuzz.android.data.rest.model.BottomBar;
+import java.util.List;
+import java.util.Iterator;
+import app.revanced.extension.shared.Logger;
+
+@SuppressWarnings("unused")
+public class HideAdsPatch {
+
+    /**
+     * Injection point.
+     */
+    public static void filterCb11(List<BottomBar> list) {
+        try {
+            Iterator<BottomBar> iterator = list.iterator();
+            while (iterator.hasNext()) {
+                BottomBar bar = iterator.next();
+                if (bar.getName().equals("Cricbuzz11")) {
+                    Logger.printInfo(() -> "Removing Cricbuzz11 bar: " + bar);
+                    iterator.remove();
+                }
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "filterCb11 failure", ex);
+        }
+    }
+}

extensions/cricbuzz/stub/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    alias(libs.plugins.android.library)
+}
+
+android {
+    namespace = "app.revanced.extension"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 21
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}

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

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

extensions/cricbuzz/stub/src/main/java/com/cricbuzz/android/data/rest/model/BottomBar.java

@@ -0,0 +1,5 @@
+package com.cricbuzz.android.data.rest.model;
+
+public final class BottomBar {
+    public final String getName() { throw new UnsupportedOperationException(); }
+}

extensions/primevideo/src/main/java/app/revanced/extension/primevideo/videoplayer/PlaybackSpeedPatch.java

@@ -0,0 +1,207 @@
+package app.revanced.extension.primevideo.videoplayer;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.graphics.RectF;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.ColorFilter;
+import android.graphics.PixelFormat;
+import java.util.Arrays;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+
+import com.amazon.video.sdk.player.Player;
+
+public class PlaybackSpeedPatch {
+    private static Player player;
+    private static final float[] SPEED_VALUES = {0.5f, 0.7f, 0.8f, 0.9f, 0.95f, 1.0f, 1.05f, 1.1f, 1.2f, 1.3f, 1.5f, 2.0f};
+    private static final String SPEED_BUTTON_TAG = "speed_overlay";
+
+    public static void setPlayer(Player playerInstance) {
+        player = playerInstance;
+        if (player != null) {
+            // Reset playback rate when switching between episodes to ensure correct display.
+            player.setPlaybackRate(1.0f);
+        }
+    }
+
+    public static void initializeSpeedOverlay(View userControlsView) {
+        try {
+            LinearLayout buttonContainer = Utils.getChildViewByResourceName(userControlsView, "ButtonContainerPlayerTop");
+
+            // If the speed overlay exists we should return early.
+            if (Utils.getChildView(buttonContainer, false, child ->
+                    child instanceof ImageView && SPEED_BUTTON_TAG.equals(child.getTag())) != null) {
+                return;
+            }
+
+            ImageView speedButton = createSpeedButton(userControlsView.getContext());
+            speedButton.setOnClickListener(v -> changePlaybackSpeed(speedButton));
+            buttonContainer.addView(speedButton, 0);
+
+        } catch (IllegalArgumentException e) {
+            Logger.printException(() -> "initializeSpeedOverlay, no button container found", e);
+        } catch (Exception e) {
+            Logger.printException(() -> "initializeSpeedOverlay failure", e);
+        }
+    }
+
+    private static ImageView createSpeedButton(Context context) {
+        ImageView speedButton = new ImageView(context);
+        speedButton.setContentDescription("Playback Speed");
+        speedButton.setTag(SPEED_BUTTON_TAG);
+        speedButton.setClickable(true);
+        speedButton.setFocusable(true);
+        speedButton.setScaleType(ImageView.ScaleType.CENTER);
+
+        SpeedIconDrawable speedIcon = new SpeedIconDrawable();
+        speedButton.setImageDrawable(speedIcon);
+
+        int buttonSize = Utils.dipToPixels(48);
+        speedButton.setMinimumWidth(buttonSize);
+        speedButton.setMinimumHeight(buttonSize);
+
+        return speedButton;
+    }
+
+    private static String[] getSpeedOptions() {
+        String[] options = new String[SPEED_VALUES.length];
+        for (int i = 0; i < SPEED_VALUES.length; i++) {
+            options[i] = SPEED_VALUES[i] + "x";
+        }
+        return options;
+    }
+
+    private static void changePlaybackSpeed(ImageView imageView) {
+        if (player == null) {
+            Logger.printException(() -> "Player not available");
+            return;
+        }
+
+        try {
+            player.pause();
+            AlertDialog dialog = createSpeedPlaybackDialog(imageView);
+            dialog.setOnDismissListener(dialogInterface -> player.play());
+            dialog.show();
+
+        } catch (Exception e) {
+            Logger.printException(() -> "changePlaybackSpeed", e);
+        }
+    }
+
+    private static AlertDialog createSpeedPlaybackDialog(ImageView imageView) {
+        Context context = imageView.getContext();
+        int currentSelection = getCurrentSpeedSelection();
+
+        return new AlertDialog.Builder(context)
+                .setTitle("Select Playback Speed")
+                .setSingleChoiceItems(getSpeedOptions(), currentSelection,
+                        PlaybackSpeedPatch::handleSpeedSelection)
+                .create();
+    }
+
+    private static int getCurrentSpeedSelection() {
+        try {
+            float currentRate = player.getPlaybackRate();
+            int index = Arrays.binarySearch(SPEED_VALUES, currentRate);
+            return Math.max(index, 0); // Use slowest speed if not found.
+        } catch (Exception e) {
+            Logger.printException(() -> "getCurrentSpeedSelection error getting current playback speed", e);
+            return 0;
+        }
+    }
+
+    private static void handleSpeedSelection(android.content.DialogInterface dialog, int selectedIndex) {
+        try {
+            float selectedSpeed = SPEED_VALUES[selectedIndex];
+            player.setPlaybackRate(selectedSpeed);
+            player.play();
+        } catch (Exception e) {
+            Logger.printException(() -> "handleSpeedSelection error setting playback speed", e);
+        } finally {
+            dialog.dismiss();
+        }
+    }
+}
+
+class SpeedIconDrawable extends Drawable {
+    private final Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+
+    @Override
+    public void draw(Canvas canvas) {
+        int w = getBounds().width();
+        int h = getBounds().height();
+        float centerX = w / 2f;
+        // Position gauge in lower portion.
+        float centerY = h * 0.7f;
+        float radius = Math.min(w, h) / 2f * 0.8f;
+
+        paint.setColor(Color.WHITE);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(radius * 0.1f);
+
+        // Draw semicircle.
+        RectF oval = new RectF(centerX - radius, centerY - radius, centerX + radius, centerY + radius);
+        canvas.drawArc(oval, 180, 180, false, paint);
+
+        // Draw three tick marks.
+        paint.setStrokeWidth(radius * 0.06f);
+        for (int i = 0; i < 3; i++) {
+            float angle = 180 + (i * 45); // 180°, 225°, 270°.
+            float angleRad = (float) Math.toRadians(angle);
+
+            float startX = centerX + (radius * 0.8f) * (float) Math.cos(angleRad);
+            float startY = centerY + (radius * 0.8f) * (float) Math.sin(angleRad);
+            float endX = centerX + radius * (float) Math.cos(angleRad);
+            float endY = centerY + radius * (float) Math.sin(angleRad);
+
+            canvas.drawLine(startX, startY, endX, endY, paint);
+        }
+
+        // Draw needle.
+        paint.setStrokeWidth(radius * 0.08f);
+        float needleAngle = 200; // Slightly right of center.
+        float needleAngleRad = (float) Math.toRadians(needleAngle);
+
+        float needleEndX = centerX + (radius * 0.6f) * (float) Math.cos(needleAngleRad);
+        float needleEndY = centerY + (radius * 0.6f) * (float) Math.sin(needleAngleRad);
+
+        canvas.drawLine(centerX, centerY, needleEndX, needleEndY, paint);
+
+        // Center dot.
+        paint.setStyle(Paint.Style.FILL);
+        canvas.drawCircle(centerX, centerY, radius * 0.06f, paint);
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        paint.setAlpha(alpha);
+    }
+
+    @Override
+    public void setColorFilter(ColorFilter colorFilter) {
+        paint.setColorFilter(colorFilter);
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.TRANSLUCENT;
+    }
+
+    @Override
+    public int getIntrinsicWidth() {
+        return Utils.dipToPixels(32);
+    }
+
+    @Override
+    public int getIntrinsicHeight() {
+        return Utils.dipToPixels(32);
+    }
+}

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

@@ -4,4 +4,10 @@ public interface VideoPlayer {
     long getCurrentPosition();
 
     void seekTo(long positionMs);
+    
+    void pause();
+    
+    void play();
+    
+    boolean isPlaying();
 }

extensions/primevideo/stub/src/main/java/com/amazon/video/sdk/player/Player.java

@@ -0,0 +1,11 @@
+package com.amazon.video.sdk.player;
+
+public interface Player {
+    float getPlaybackRate();
+    
+    void setPlaybackRate(float rate);
+
+    void play();
+    
+    void pause();
+} 

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

@@ -1438,6 +1438,28 @@ public class Utils {
         );
     }
 
+    /**
+     * Converts a percentage of the screen height to actual device pixels.
+     *
+     * @param percentage The percentage of the screen height (e.g., 30 for 30%).
+     * @return The device pixel value corresponding to the percentage of screen height.
+     */
+    public static int percentageHeightToPixels(int percentage) {
+        DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+        return (int) (metrics.heightPixels * (percentage / 100.0f));
+    }
+
+    /**
+     * Converts a percentage of the screen width to actual device pixels.
+     *
+     * @param percentage The percentage of the screen width (e.g., 30 for 30%).
+     * @return The device pixel value corresponding to the percentage of screen width.
+     */
+    public static int percentageWidthToPixels(int percentage) {
+        DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+        return (int) (metrics.widthPixels * (percentage / 100.0f));
+    }
+
     /**
      * Adjusts the brightness of a color by lightening or darkening it based on the given factor.
      * <p>

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

@@ -1,7 +1,5 @@
 package app.revanced.extension.shared.settings.preference;
 
-import static app.revanced.extension.shared.Utils.dipToPixels;
-
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
@@ -26,7 +24,7 @@ public class CustomDialogListPreference extends ListPreference {
     /**
      * Custom ArrayAdapter to handle checkmark visibility.
      */
-    private static class ListPreferenceArrayAdapter extends ArrayAdapter<CharSequence> {
+    public static class ListPreferenceArrayAdapter extends ArrayAdapter<CharSequence> {
         private static class SubViewDataContainer {
             ImageView checkIcon;
             View placeholder;

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

@@ -1,28 +1,15 @@
 package app.revanced.extension.shared.settings.preference;
 
 import static app.revanced.extension.shared.StringRef.str;
-import static app.revanced.extension.shared.Utils.dipToPixels;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
-import android.graphics.drawable.shapes.RectShape;
-import android.graphics.drawable.shapes.RoundRectShape;
-import android.graphics.drawable.ShapeDrawable;
-import android.graphics.Paint.Style;
 import android.os.Bundle;
 import android.preference.EditTextPreference;
-import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Pair;
-import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 

extensions/spotify/build.gradle.kts

@@ -7,7 +7,6 @@ dependencies {
     compileOnly(project(":extensions:spotify:stub"))
     compileOnly(libs.annotation)
 
-    implementation(project(":extensions:spotify:utils"))
     implementation(libs.nanohttpd)
     implementation(libs.protobuf.javalite)
 }

extensions/spotify/src/main/java/app/revanced/extension/spotify/layout/hide/createbutton/HideCreateButtonPatch.java

@@ -1,9 +1,11 @@
 package app.revanced.extension.spotify.layout.hide.createbutton;
 
-import java.util.List;
-
 import app.revanced.extension.shared.Logger;
-import app.revanced.extension.spotify.shared.ComponentFilters.*;
+import app.revanced.extension.spotify.shared.ComponentFilters.ComponentFilter;
+import app.revanced.extension.spotify.shared.ComponentFilters.ResourceIdComponentFilter;
+import app.revanced.extension.spotify.shared.ComponentFilters.StringComponentFilter;
+
+import java.util.List;
 
 @SuppressWarnings("unused")
 public final class HideCreateButtonPatch {
@@ -53,7 +55,9 @@ public final class HideCreateButtonPatch {
                     return null;
                 }
             }
-        } catch (Exception ex) {
+        } catch (Throwable ex) {
+            // Catch Throwable as calling toString can cause crashes with wrongfully generated code that throws
+            // NoSuchMethod errors.
             Logger.printException(() -> "returnNullIfIsCreateButton failure", ex);
         }
 

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/ClientTokenService.java

@@ -0,0 +1,115 @@
+package app.revanced.extension.spotify.misc.fix;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.spotify.misc.fix.clienttoken.data.v0.ClienttokenHttp.*;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import static app.revanced.extension.spotify.misc.fix.Constants.*;
+
+class ClientTokenService {
+    private static final String IOS_CLIENT_ID = "58bd3c95768941ea9eb4350aaa033eb3";
+    private static final String IOS_USER_AGENT;
+
+    static {
+        String clientVersion = getClientVersion();
+        int commitHashIndex = clientVersion.lastIndexOf(".");
+        String version = clientVersion.substring(
+                clientVersion.indexOf("-") + 1,
+                clientVersion.lastIndexOf(".", commitHashIndex - 1)
+        );
+
+        IOS_USER_AGENT = "Spotify/" + version + " iOS/" + getSystemVersion() + " (" + getHardwareMachine() + ")";
+    }
+
+    private static final ConnectivitySdkData.Builder IOS_CONNECTIVITY_SDK_DATA =
+            ConnectivitySdkData.newBuilder()
+                    .setPlatformSpecificData(PlatformSpecificData.newBuilder()
+                            .setIos(NativeIOSData.newBuilder()
+                                    .setHwMachine(getHardwareMachine())
+                                    .setSystemVersion(getSystemVersion())
+                            )
+                    );
+
+    private static final ClientDataRequest.Builder IOS_CLIENT_DATA_REQUEST =
+            ClientDataRequest.newBuilder()
+                    .setClientVersion(getClientVersion())
+                    .setClientId(IOS_CLIENT_ID);
+
+    private static final ClientTokenRequest.Builder IOS_CLIENT_TOKEN_REQUEST =
+            ClientTokenRequest.newBuilder()
+                    .setRequestType(ClientTokenRequestType.REQUEST_CLIENT_DATA_REQUEST);
+
+
+    @NonNull
+    static ClientTokenRequest newIOSClientTokenRequest(String deviceId) {
+        Logger.printInfo(() -> "Creating new iOS client token request with device ID: " + deviceId);
+
+        return IOS_CLIENT_TOKEN_REQUEST
+                .setClientData(IOS_CLIENT_DATA_REQUEST
+                        .setConnectivitySdkData(IOS_CONNECTIVITY_SDK_DATA
+                                .setDeviceId(deviceId)
+                        )
+                )
+                .build();
+    }
+
+    @Nullable
+    static ClientTokenResponse getClientTokenResponse(@NonNull ClientTokenRequest request) {
+        if (request.getRequestType() == ClientTokenRequestType.REQUEST_CLIENT_DATA_REQUEST) {
+            Logger.printInfo(() -> "Requesting iOS client token");
+            String deviceId = request.getClientData().getConnectivitySdkData().getDeviceId();
+            request = newIOSClientTokenRequest(deviceId);
+        }
+
+        ClientTokenResponse response;
+        try {
+            response = requestClientToken(request);
+        } catch (IOException ex) {
+            Logger.printException(() -> "Failed to handle request", ex);
+            return null;
+        }
+
+        return response;
+    }
+
+    @NonNull
+    private static ClientTokenResponse requestClientToken(@NonNull ClientTokenRequest request) throws IOException {
+        HttpURLConnection urlConnection = (HttpURLConnection) new URL(CLIENT_TOKEN_API_URL).openConnection();
+        urlConnection.setRequestMethod("POST");
+        urlConnection.setDoOutput(true);
+        urlConnection.setRequestProperty("Content-Type", "application/x-protobuf");
+        urlConnection.setRequestProperty("Accept", "application/x-protobuf");
+        urlConnection.setRequestProperty("User-Agent", IOS_USER_AGENT);
+
+        byte[] requestArray = request.toByteArray();
+        urlConnection.setFixedLengthStreamingMode(requestArray.length);
+        urlConnection.getOutputStream().write(requestArray);
+
+        try (InputStream inputStream = urlConnection.getInputStream()) {
+            return ClientTokenResponse.parseFrom(inputStream);
+        }
+    }
+
+    @Nullable
+    static ClientTokenResponse serveClientTokenRequest(@NonNull InputStream inputStream) {
+        ClientTokenRequest request;
+        try {
+            request = ClientTokenRequest.parseFrom(inputStream);
+        } catch (IOException ex) {
+            Logger.printException(() -> "Failed to parse request from input stream", ex);
+            return null;
+        }
+        Logger.printInfo(() -> "Request of type: " + request.getRequestType());
+
+        ClientTokenResponse response = getClientTokenResponse(request);
+        if (response != null) Logger.printInfo(() -> "Response of type: " + response.getResponseType());
+
+        return response;
+    }
+}

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/Constants.java

@@ -0,0 +1,26 @@
+package app.revanced.extension.spotify.misc.fix;
+
+import androidx.annotation.NonNull;
+
+class Constants {
+    static final String CLIENT_TOKEN_API_PATH = "/v1/clienttoken";
+    static final String CLIENT_TOKEN_API_URL = "https://clienttoken.spotify.com" + CLIENT_TOKEN_API_PATH;
+
+    // Modified by a patch. Do not touch.
+    @NonNull
+    static String getClientVersion() {
+        return "";
+    }
+
+    // Modified by a patch. Do not touch.
+    @NonNull
+    static String getSystemVersion() {
+        return "";
+    }
+
+    // Modified by a patch. Do not touch.
+    @NonNull
+    static String getHardwareMachine() {
+        return "";
+    }
+}

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/LoginRequestListener.java

@@ -1,158 +0,0 @@
-package app.revanced.extension.spotify.misc.fix;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.spotify.login5.v4.proto.Login5.*;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.MessageLite;
-import fi.iki.elonen.NanoHTTPD;
-
-import java.io.ByteArrayInputStream;
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Objects;
-
-import static app.revanced.extension.spotify.misc.fix.Session.FAILED_TO_RENEW_SESSION;
-import static fi.iki.elonen.NanoHTTPD.Response.Status.INTERNAL_ERROR;
-
-class LoginRequestListener extends NanoHTTPD {
-    LoginRequestListener(int port) {
-        super(port);
-
-        try {
-            start();
-        } catch (IOException ex) {
-            Logger.printException(() -> "Failed to start login request listener on port " + port, ex);
-            throw new RuntimeException(ex);
-        }
-    }
-
-    @NonNull
-    @Override
-    public Response serve(IHTTPSession request) {
-        Logger.printInfo(() -> "Serving request for URI: " + request.getUri());
-
-        InputStream requestBodyInputStream = getRequestBodyInputStream(request);
-
-        LoginRequest loginRequest;
-        try {
-            loginRequest = LoginRequest.parseFrom(requestBodyInputStream);
-        } catch (IOException ex) {
-            Logger.printException(() -> "Failed to parse LoginRequest", ex);
-            return newResponse(INTERNAL_ERROR);
-        }
-
-        MessageLite loginResponse;
-
-        // A request may be made concurrently by Spotify,
-        // however a webview can only handle one request at a time due to singleton cookie manager.
-        // Therefore, synchronize to ensure that only one webview handles the request at a time.
-        synchronized (this) {
-            try {
-                loginResponse = getLoginResponse(loginRequest);
-            } catch (Exception ex) {
-                Logger.printException(() -> "Failed to get login response", ex);
-                return newResponse(INTERNAL_ERROR);
-            }
-        }
-
-        return newResponse(Response.Status.OK, loginResponse);
-    }
-
-
-    private static LoginResponse getLoginResponse(@NonNull LoginRequest loginRequest) {
-        Session session;
-
-        if (!loginRequest.hasStoredCredential()) {
-            Logger.printInfo(() -> "Received request for initial login");
-            session = WebApp.currentSession; // Session obtained from WebApp.launchLogin, can be null if still in progress.
-        } else {
-            Logger.printInfo(() -> "Received request to restore saved session");
-            session = Session.read(loginRequest.getStoredCredential().getUsername());
-        }
-
-        return toLoginResponse(session);
-    }
-
-    private static LoginResponse toLoginResponse(@Nullable Session session) {
-        LoginResponse.Builder builder = LoginResponse.newBuilder();
-
-        if (session == null) {
-            Logger.printException(() -> "Session is null. An initial login may still be in progress, returning try again later error");
-            builder.setError(LoginError.TRY_AGAIN_LATER);
-        } else if (session.accessTokenExpired()) {
-            Logger.printInfo(() -> "Access token expired, renewing session");
-            WebApp.renewSessionBlocking(session.cookies);
-            return toLoginResponse(WebApp.currentSession);
-        } else if (session.username == null) {
-            Logger.printException(() -> "Session username is null, likely caused by invalid cookies, returning invalid credentials error");
-            session.delete();
-            builder.setError(LoginError.INVALID_CREDENTIALS);
-        } else if (session == FAILED_TO_RENEW_SESSION) {
-            Logger.printException(() -> "Failed to renew session, likely caused by a timeout, returning try again later error");
-            builder.setError(LoginError.TRY_AGAIN_LATER);
-        } else {
-            session.save();
-            Logger.printInfo(() -> "Returning session for username: " + session.username);
-            builder.setOk(LoginOk.newBuilder()
-                    .setUsername(session.username)
-                    .setAccessToken(session.accessToken)
-                    .setStoredCredential(ByteString.fromHex("00")) // Placeholder, as it cannot be null or empty.
-                    .setAccessTokenExpiresIn(session.accessTokenExpiresInSeconds())
-                    .build());
-        }
-
-        return builder.build();
-    }
-
-    @NonNull
-    private static InputStream limitedInputStream(InputStream inputStream, long contentLength) {
-        return new FilterInputStream(inputStream) {
-            private long remaining = contentLength;
-
-            @Override
-            public int read() throws IOException {
-                if (remaining <= 0) return -1;
-                int result = super.read();
-                if (result != -1) remaining--;
-                return result;
-            }
-
-            @Override
-            public int read(byte[] b, int off, int len) throws IOException {
-                if (remaining <= 0) return -1;
-                len = (int) Math.min(len, remaining);
-                int result = super.read(b, off, len);
-                if (result != -1) remaining -= result;
-                return result;
-            }
-        };
-    }
-
-    @NonNull
-    private static InputStream getRequestBodyInputStream(@NonNull IHTTPSession request) {
-        long requestContentLength =
-                Long.parseLong(Objects.requireNonNull(request.getHeaders().get("content-length")));
-        return limitedInputStream(request.getInputStream(), requestContentLength);
-    }
-
-
-    @SuppressWarnings("SameParameterValue")
-    @NonNull
-    private static Response newResponse(Response.Status status) {
-        return newResponse(status, null);
-    }
-
-    @NonNull
-    private static Response newResponse(Response.IStatus status, MessageLite messageLite) {
-        if (messageLite == null) {
-            return newFixedLengthResponse(status, "application/x-protobuf", null);
-        }
-
-        byte[] messageBytes = messageLite.toByteArray();
-        InputStream stream = new ByteArrayInputStream(messageBytes);
-        return newFixedLengthResponse(status, "application/x-protobuf", stream, messageBytes.length);
-    }
-}

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/RequestListener.java

@@ -0,0 +1,94 @@
+package app.revanced.extension.spotify.misc.fix;
+
+import androidx.annotation.NonNull;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.spotify.misc.fix.clienttoken.data.v0.ClienttokenHttp.ClientTokenResponse;
+import com.google.protobuf.MessageLite;
+import fi.iki.elonen.NanoHTTPD;
+
+import java.io.ByteArrayInputStream;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Objects;
+
+import static app.revanced.extension.spotify.misc.fix.ClientTokenService.serveClientTokenRequest;
+import static app.revanced.extension.spotify.misc.fix.Constants.CLIENT_TOKEN_API_PATH;
+import static fi.iki.elonen.NanoHTTPD.Response.Status.INTERNAL_ERROR;
+
+class RequestListener extends NanoHTTPD {
+    RequestListener(int port) {
+        super(port);
+
+        try {
+            start();
+        } catch (IOException ex) {
+            Logger.printException(() -> "Failed to start request listener on port " + port, ex);
+            throw new RuntimeException(ex);
+        }
+    }
+
+    @NonNull
+    @Override
+    public Response serve(@NonNull IHTTPSession session) {
+        String uri = session.getUri();
+        if (!uri.equals(CLIENT_TOKEN_API_PATH)) return INTERNAL_ERROR_RESPONSE;
+
+        Logger.printInfo(() -> "Serving request for URI: " + uri);
+
+        ClientTokenResponse response = serveClientTokenRequest(getInputStream(session));
+        if (response != null) return newResponse(Response.Status.OK, response);
+
+        Logger.printException(() -> "Failed to serve client token request");
+        return INTERNAL_ERROR_RESPONSE;
+    }
+
+    @NonNull
+    private static InputStream newLimitedInputStream(InputStream inputStream, long contentLength) {
+        return new FilterInputStream(inputStream) {
+            private long remaining = contentLength;
+
+            @Override
+            public int read() throws IOException {
+                if (remaining <= 0) return -1;
+                int result = super.read();
+                if (result != -1) remaining--;
+                return result;
+            }
+
+            @Override
+            public int read(byte[] b, int off, int len) throws IOException {
+                if (remaining <= 0) return -1;
+                len = (int) Math.min(len, remaining);
+                int result = super.read(b, off, len);
+                if (result != -1) remaining -= result;
+                return result;
+            }
+        };
+    }
+
+    @NonNull
+    private static InputStream getInputStream(@NonNull IHTTPSession session) {
+        long requestContentLength = Long.parseLong(Objects.requireNonNull(session.getHeaders().get("content-length")));
+        return newLimitedInputStream(session.getInputStream(), requestContentLength);
+    }
+
+    private static final Response INTERNAL_ERROR_RESPONSE = newResponse(INTERNAL_ERROR);
+
+    @SuppressWarnings("SameParameterValue")
+    @NonNull
+    private static Response newResponse(Response.Status status) {
+        return newResponse(status, null);
+    }
+
+    @NonNull
+    private static Response newResponse(Response.IStatus status, MessageLite messageLite) {
+        if (messageLite == null) {
+            return newFixedLengthResponse(status, "application/x-protobuf", null);
+        }
+
+        byte[] messageBytes = messageLite.toByteArray();
+        InputStream stream = new ByteArrayInputStream(messageBytes);
+        return newFixedLengthResponse(status, "application/x-protobuf", stream, messageBytes.length);
+    }
+}

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/Session.java

@@ -1,136 +0,0 @@
-package app.revanced.extension.spotify.misc.fix;
-
-import android.content.SharedPreferences;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.Utils;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import static android.content.Context.MODE_PRIVATE;
-
-class Session {
-    /**
-     * Username of the account. Null if this session does not have an authenticated user.
-     */
-    @Nullable
-    final String username;
-    /**
-     * Access token for this session.
-     */
-    final String accessToken;
-    /**
-     * Session expiration timestamp in milliseconds.
-     */
-    final Long expirationTime;
-    /**
-     * Authentication cookies for this session.
-     */
-    final String cookies;
-
-    /**
-     * Session that represents a failed attempt to renew the session.
-     */
-    static final Session FAILED_TO_RENEW_SESSION = new Session("", "", "");
-
-    /**
-     * @param username    Username of the account. Empty if this session does not have an authenticated user.
-     * @param accessToken Access token for this session.
-     * @param cookies     Authentication cookies for this session.
-     */
-    Session(@Nullable String username, String accessToken, String cookies) {
-        this(username, accessToken, System.currentTimeMillis() + 60 * 60 * 1000, cookies);
-    }
-
-    private Session(@Nullable String username, String accessToken, long expirationTime, String cookies) {
-        this.username = username;
-        this.accessToken = accessToken;
-        this.expirationTime = expirationTime;
-        this.cookies = cookies;
-    }
-
-    /**
-     * @return The number of milliseconds until the access token expires.
-     */
-    long accessTokenExpiresInMillis() {
-        long currentTime = System.currentTimeMillis();
-        return expirationTime - currentTime;
-    }
-
-    /**
-     * @return The number of seconds until the access token expires.
-     */
-    int accessTokenExpiresInSeconds() {
-        return (int) accessTokenExpiresInMillis() / 1000;
-    }
-
-    /**
-     * @return True if the access token has expired, false otherwise.
-     */
-    boolean accessTokenExpired() {
-        return accessTokenExpiresInMillis() <= 0;
-    }
-
-    void save() {
-        Logger.printInfo(() -> "Saving session: " + this);
-
-        SharedPreferences.Editor editor = Utils.getContext().getSharedPreferences("revanced", MODE_PRIVATE).edit();
-
-        String json;
-        try {
-            json = new JSONObject()
-                    .put("accessToken", accessToken)
-                    .put("expirationTime", expirationTime)
-                    .put("cookies", cookies).toString();
-        } catch (JSONException ex) {
-            Logger.printException(() -> "Failed to convert session to stored credential", ex);
-            return;
-        }
-
-        editor.putString("session_" + username, json);
-        editor.apply();
-    }
-
-    void delete() {
-        Logger.printInfo(() -> "Deleting saved session for username: " + username);
-        SharedPreferences.Editor editor = Utils.getContext().getSharedPreferences("revanced", MODE_PRIVATE).edit();
-        editor.remove("session_" + username);
-        editor.apply();
-    }
-
-    @Nullable
-    static Session read(String username) {
-        Logger.printInfo(() -> "Reading saved session for username: " + username);
-
-        SharedPreferences sharedPreferences = Utils.getContext().getSharedPreferences("revanced", MODE_PRIVATE);
-        String savedJson = sharedPreferences.getString("session_" + username, null);
-        if (savedJson == null) {
-            Logger.printInfo(() -> "No session found in shared preferences");
-            return null;
-        }
-
-        try {
-            JSONObject json = new JSONObject(savedJson);
-            String accessToken = json.getString("accessToken");
-            long expirationTime = json.getLong("expirationTime");
-            String cookies = json.getString("cookies");
-
-            return new Session(username, accessToken, expirationTime, cookies);
-        } catch (JSONException ex) {
-            Logger.printException(() -> "Failed to read session from shared preferences", ex);
-            return null;
-        }
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return "Session(" +
-                "username=" + username +
-                ", accessToken=" + accessToken +
-                ", expirationTime=" + expirationTime +
-                ", cookies=" + cookies +
-                ')';
-    }
-}

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/SpoofClientPatch.java

@@ -1,19 +1,15 @@
 package app.revanced.extension.spotify.misc.fix;
 
-import android.view.LayoutInflater;
-import android.view.View;
 import app.revanced.extension.shared.Logger;
 
 @SuppressWarnings("unused")
 public class SpoofClientPatch {
-    private static LoginRequestListener listener;
+    private static RequestListener listener;
 
     /**
-     * Injection point.
-     * <br>
-     * Launch login server.
+     * Injection point. Launch requests listener server.
      */
-    public static void launchListener(int port) {
+    public synchronized static void launchListener(int port) {
         if (listener != null) {
             Logger.printInfo(() -> "Listener already running on port " + port);
             return;
@@ -21,34 +17,9 @@ public class SpoofClientPatch {
 
         try {
             Logger.printInfo(() -> "Launching listener on port " + port);
-            listener = new LoginRequestListener(port);
+            listener = new RequestListener(port);
         } catch (Exception ex) {
             Logger.printException(() -> "launchListener failure", ex);
         }
     }
-
-    /**
-     * Injection point.
-     * <br>
-     * Launch login web view.
-     */
-    public static void launchLogin(LayoutInflater inflater) {
-        try {
-            WebApp.launchLogin(inflater.getContext());
-        } catch (Exception ex) {
-            Logger.printException(() -> "launchLogin failure", ex);
-        }
-    }
-
-    /**
-     * Injection point.
-     * <br>
-     * Set handler to call the native login after the webview login.
-     */
-    public static void setNativeLoginHandler(View startLoginButton) {
-        WebApp.nativeLoginHandler = (() -> {
-            startLoginButton.setSoundEffectsEnabled(false);
-            startLoginButton.performClick();
-        });
-    }
 }

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/WebApp.java

@@ -1,297 +0,0 @@
-package app.revanced.extension.spotify.misc.fix;
-
-import android.annotation.SuppressLint;
-import android.app.Dialog;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.os.Build;
-import android.view.Window;
-import android.view.WindowInsets;
-import android.webkit.*;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.Utils;
-import app.revanced.extension.spotify.UserAgent;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import static app.revanced.extension.spotify.misc.fix.Session.FAILED_TO_RENEW_SESSION;
-
-class WebApp {
-    private static final String OPEN_SPOTIFY_COM = "open.spotify.com";
-    private static final String OPEN_SPOTIFY_COM_URL = "https://" + OPEN_SPOTIFY_COM;
-    private static final String OPEN_SPOTIFY_COM_PREFERENCES_URL = OPEN_SPOTIFY_COM_URL + "/preferences";
-    private static final String ACCOUNTS_SPOTIFY_COM_LOGIN_URL = "https://accounts.spotify.com/login?allow_password=1"
-            + "&continue=https%3A%2F%2Fopen.spotify.com%2Fpreferences";
-
-    private static final int GET_SESSION_TIMEOUT_SECONDS = 10;
-    private static final String JAVASCRIPT_INTERFACE_NAME = "androidInterface";
-    private static final String USER_AGENT = getWebUserAgent();
-
-    /**
-     * A session obtained from the webview after logging in.
-     */
-    @Nullable
-    static volatile Session currentSession = null;
-
-    /**
-     * Current webview in use. Any use of the object must be done on the main thread.
-     */
-    @SuppressLint("StaticFieldLeak")
-    private static volatile WebView currentWebView;
-
-    interface NativeLoginHandler {
-        void login();
-    }
-
-    static NativeLoginHandler nativeLoginHandler;
-
-    static void launchLogin(Context context) {
-        final Dialog dialog = newDialog(context);
-
-        Utils.runOnBackgroundThread(() -> {
-            Logger.printInfo(() -> "Launching login");
-
-            // A session must be obtained from a login. Repeat until a session is acquired.
-            boolean isAcquired = false;
-            do {
-                CountDownLatch onLoggedInLatch = new CountDownLatch(1);
-                CountDownLatch getSessionLatch = new CountDownLatch(1);
-
-                // Can't use Utils.getContext() here, because autofill won't work.
-                // See https://stackoverflow.com/a/79182053/11213244.
-                launchWebView(context, ACCOUNTS_SPOTIFY_COM_LOGIN_URL, new WebViewCallback() {
-                    @Override
-                    void onInitialized(WebView webView) {
-                        super.onInitialized(webView);
-
-                        dialog.setContentView(webView);
-                        dialog.show();
-                    }
-
-                    @Override
-                    void onLoggedIn(String cookies) {
-                        onLoggedInLatch.countDown();
-                    }
-
-                    @Override
-                    void onReceivedSession(Session session) {
-                        super.onReceivedSession(session);
-
-                        getSessionLatch.countDown();
-                        dialog.dismiss();
-
-                        try {
-                            nativeLoginHandler.login();
-                        } catch (Exception ex) {
-                            Logger.printException(() -> "nativeLoginHandler failure", ex);
-                        }
-                    }
-                });
-
-                try {
-                    // Wait indefinitely until the user logs in.
-                    onLoggedInLatch.await();
-                    // Wait until the session is received, or timeout.
-                    isAcquired = getSessionLatch.await(GET_SESSION_TIMEOUT_SECONDS, TimeUnit.SECONDS);
-                } catch (InterruptedException ex) {
-                    Logger.printException(() -> "Login interrupted", ex);
-                    Thread.currentThread().interrupt();
-                }
-            } while (!isAcquired);
-        });
-    }
-
-    static void renewSessionBlocking(String cookies) {
-        Logger.printInfo(() -> "Renewing session with cookies: " + cookies);
-
-        CountDownLatch getSessionLatch = new CountDownLatch(1);
-
-        launchWebView(Utils.getContext(), OPEN_SPOTIFY_COM_PREFERENCES_URL, new WebViewCallback() {
-            @Override
-            public void onInitialized(WebView webView) {
-                setCookies(cookies);
-                super.onInitialized(webView);
-            }
-
-            public void onReceivedSession(Session session) {
-                super.onReceivedSession(session);
-                getSessionLatch.countDown();
-            }
-        });
-
-        boolean isAcquired = false;
-        try {
-            isAcquired = getSessionLatch.await(GET_SESSION_TIMEOUT_SECONDS, TimeUnit.SECONDS);
-        } catch (InterruptedException ex) {
-            Logger.printException(() -> "Session renewal interrupted", ex);
-            Thread.currentThread().interrupt();
-        }
-
-        if (!isAcquired) {
-            Logger.printException(() -> "Failed to retrieve session within " + GET_SESSION_TIMEOUT_SECONDS + " seconds");
-            currentSession = FAILED_TO_RENEW_SESSION;
-            destructWebView();
-        }
-    }
-
-    /**
-     * All methods are called on the main thread.
-     */
-    abstract static class WebViewCallback {
-        void onInitialized(WebView webView) {
-            currentWebView = webView;
-            currentSession = null; // Reset current session.
-        }
-
-        void onLoggedIn(String cookies) {
-        }
-
-        void onReceivedSession(Session session) {
-            Logger.printInfo(() -> "Received session: " + session);
-            currentSession = session;
-
-            destructWebView();
-        }
-    }
-
-    @SuppressLint("SetJavaScriptEnabled")
-    private static void launchWebView(
-            Context context,
-            String initialUrl,
-            WebViewCallback webViewCallback
-    ) {
-        Utils.runOnMainThreadNowOrLater(() -> {
-            WebView webView = new WebView(context);
-            WebSettings settings = webView.getSettings();
-            settings.setDomStorageEnabled(true);
-            settings.setJavaScriptEnabled(true);
-            settings.setUserAgentString(USER_AGENT);
-
-            // WebViewClient is always called off the main thread,
-            // but callback interface methods are called on the main thread.
-            webView.setWebViewClient(new WebViewClient() {
-                @Override
-                public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
-                    if (OPEN_SPOTIFY_COM.equals(request.getUrl().getHost())) {
-                        Utils.runOnMainThread(() -> webViewCallback.onLoggedIn(getCurrentCookies()));
-                    }
-
-                    return super.shouldInterceptRequest(view, request);
-                }
-
-                @Override
-                public void onPageStarted(WebView view, String url, Bitmap favicon) {
-                    Logger.printInfo(() -> "Page started loading: " + url);
-
-                    if (!url.startsWith(OPEN_SPOTIFY_COM_URL)) {
-                        return;
-                    }
-
-                    Logger.printInfo(() -> "Evaluating script to get session on url: " + url);
-                    String getSessionScript = "Object.defineProperty(Object.prototype, \"_username\", {" +
-                            "   configurable: true," +
-                            "   set(username) {" +
-                            "       accessToken = this._builder?.accessToken;" +
-                            "       if (accessToken) {" +
-                            "           " + JAVASCRIPT_INTERFACE_NAME + ".getSession(username, accessToken);" +
-                            "           delete Object.prototype._username;" +
-                            "       }" +
-                            "       " +
-                            "       Object.defineProperty(this, \"_username\", {" +
-                            "           configurable: true," +
-                            "           enumerable: true," +
-                            "           writable: true," +
-                            "           value: username" +
-                            "       })" +
-                            "       " +
-                            "   }" +
-                            "});" +
-                            "if (new URLSearchParams(window.location.search).get('_authfailed') != null) {" +
-                            "   " + JAVASCRIPT_INTERFACE_NAME + ".getSession(null, null);" +
-                            "}";
-
-                    view.evaluateJavascript(getSessionScript, null);
-                }
-            });
-
-            webView.addJavascriptInterface(new Object() {
-                @SuppressWarnings("unused")
-                @JavascriptInterface
-                public void getSession(String username, String accessToken) {
-                    Session session = new Session(username, accessToken, getCurrentCookies());
-                    Utils.runOnMainThread(() -> webViewCallback.onReceivedSession(session));
-                }
-            }, JAVASCRIPT_INTERFACE_NAME);
-
-            CookieManager.getInstance().removeAllCookies((anyRemoved) -> {
-                Logger.printInfo(() -> "Loading URL: " + initialUrl);
-                webView.loadUrl(initialUrl);
-
-                Logger.printInfo(() -> "WebView initialized with user agent: " + USER_AGENT);
-                webViewCallback.onInitialized(webView);
-            });
-        });
-    }
-
-    private static void destructWebView() {
-        Utils.runOnMainThreadNowOrLater(() -> {
-            currentWebView.stopLoading();
-            currentWebView.destroy();
-            currentWebView = null;
-        });
-    }
-
-    private static String getWebUserAgent() {
-        String userAgentString = WebSettings.getDefaultUserAgent(Utils.getContext());
-        try {
-            return new UserAgent(userAgentString)
-                    .withCommentReplaced("Android", "Windows NT 10.0; Win64; x64")
-                    .withoutProduct("Mobile")
-                    .toString();
-        } catch (IllegalArgumentException ex) {
-            userAgentString = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) " +
-                    "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 Safari/537.36 Edge/137.0.0.0";
-            String fallback = userAgentString;
-            Logger.printException(() -> "Failed to get user agent, falling back to " + fallback, ex);
-        }
-
-        return userAgentString;
-    }
-
-    @NonNull
-    private static Dialog newDialog(Context context) {
-        Dialog dialog = new Dialog(context, android.R.style.Theme_Black_NoTitleBar_Fullscreen);
-        dialog.setCancelable(false);
-
-        // Ensure that the keyboard does not cover the webview content.
-        Window window = dialog.getWindow();
-        //noinspection StatementWithEmptyBody
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            window.getDecorView().setOnApplyWindowInsetsListener((v, insets) -> {
-                v.setPadding(0, 0, 0, insets.getInsets(WindowInsets.Type.ime()).bottom);
-
-                return WindowInsets.CONSUMED;
-            });
-        } else {
-            // TODO: Implement for lower Android versions.
-        }
-        return dialog;
-    }
-
-    private static String getCurrentCookies() {
-        CookieManager cookieManager = CookieManager.getInstance();
-        return cookieManager.getCookie(OPEN_SPOTIFY_COM_URL);
-    }
-
-    private static void setCookies(@NonNull String cookies) {
-        CookieManager cookieManager = CookieManager.getInstance();
-
-        String[] cookiesList = cookies.split(";");
-        for (String cookie : cookiesList) {
-            cookieManager.setCookie(OPEN_SPOTIFY_COM_URL, cookie);
-        }
-    }
-}

extensions/spotify/src/main/proto/app/revanced/extension/spotify/misc/fix/clienttoken_http.proto

@@ -0,0 +1,73 @@
+syntax = "proto3";
+
+package spotify.clienttoken.data.v0;
+
+option optimize_for = LITE_RUNTIME;
+option java_package = "app.revanced.extension.spotify.misc.fix.clienttoken.data.v0";
+
+message ClientTokenRequest {
+    ClientTokenRequestType request_type = 1;
+
+    oneof request {
+        ClientDataRequest client_data = 2;
+    }
+}
+
+enum ClientTokenRequestType {
+    REQUEST_UNKNOWN = 0;
+    REQUEST_CLIENT_DATA_REQUEST = 1;
+    REQUEST_CHALLENGE_ANSWERS_REQUEST = 2;
+}
+
+message ClientDataRequest {
+    string client_version = 1;
+    string client_id = 2;
+
+    oneof data {
+        ConnectivitySdkData connectivity_sdk_data = 3;
+    }
+}
+
+message ConnectivitySdkData {
+    PlatformSpecificData platform_specific_data = 1;
+    string device_id = 2;
+}
+
+message PlatformSpecificData {
+    oneof data {
+        NativeIOSData ios = 2;
+    }
+}
+
+message NativeIOSData {
+    int32 user_interface_idiom = 1;
+    bool target_iphone_simulator = 2;
+    string hw_machine = 3;
+    string system_version = 4;
+    string simulator_model_identifier = 5;
+}
+
+message ClientTokenResponse {
+    ClientTokenResponseType response_type = 1;
+
+    oneof response {
+        GrantedTokenResponse granted_token = 2;
+    }
+}
+
+enum ClientTokenResponseType {
+    RESPONSE_UNKNOWN = 0;
+    RESPONSE_GRANTED_TOKEN_RESPONSE = 1;
+    RESPONSE_CHALLENGES_RESPONSE = 2;
+}
+
+message GrantedTokenResponse {
+    string token = 1;
+    int32 expires_after_seconds = 2;
+    int32 refresh_after_seconds = 3;
+    repeated TokenDomain domains = 4;
+}
+
+message TokenDomain {
+    string domain = 1;
+}

extensions/spotify/src/main/proto/login5.proto

@@ -1,43 +0,0 @@
-syntax = "proto3";
-
-package spotify.login5.v4;
-
-option optimize_for = LITE_RUNTIME;
-option java_package = "app.revanced.extension.spotify.login5.v4.proto";
-
-message StoredCredential {
-    string username = 1;
-    bytes data = 2;
-}
-
-message LoginRequest {
-    oneof login_method {
-        StoredCredential stored_credential = 100;
-    }
-}
-
-message LoginOk {
-    string username = 1;
-    string access_token = 2;
-    bytes stored_credential = 3;
-    int32 access_token_expires_in = 4;
-}
-
-message LoginResponse {
-    oneof response {
-        LoginOk ok = 1;
-        LoginError error = 2;
-    }
-}
-
-enum LoginError {
-    UNKNOWN_ERROR = 0;
-    INVALID_CREDENTIALS = 1;
-    BAD_REQUEST = 2;
-    UNSUPPORTED_LOGIN_PROTOCOL = 3;
-    TIMEOUT = 4;
-    UNKNOWN_IDENTIFIER = 5;
-    TOO_MANY_ATTEMPTS = 6;
-    INVALID_PHONENUMBER = 7;
-    TRY_AGAIN_LATER = 8;
-}

extensions/spotify/stub/src/main/java/com/spotify/useraccount/v1/AccountAttribute.java

@@ -1,8 +0,0 @@
-package com.spotify.useraccount.v1;
-
-/**
- * Used for target 8.6.98.900. Class is still present in newer app targets.
- */
-public class AccountAttribute {
-    public Object value_;
-}

extensions/spotify/utils/build.gradle.kts

@@ -1,19 +0,0 @@
-plugins {
-    java
-    antlr
-}
-
-dependencies {
-    antlr(libs.antlr4)
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-tasks {
-    generateGrammarSource {
-        arguments = listOf("-visitor")
-    }
-}

extensions/spotify/utils/src/main/antlr/app/revanced/extension/spotify/UserAgent.g4

@@ -1,35 +0,0 @@
-grammar UserAgent;
-
-@header { package app.revanced.extension.spotify; }
-
-userAgent
-    : product (WS product)* EOF
-    ;
-
-product
-    : name ('/' version)? (WS comment)?
-    ;
-
-name
-    : STRING
-    ;
-
-version
-    : STRING ('.' STRING)*
-    ;
-
-comment
-    : COMMENT
-    ;
-
-COMMENT
-    : '(' ~ ')'* ')'
-    ;
-
-STRING
-    : [a-zA-Z0-9]+
-    ;
-
-WS
-    : [ \r\n]+
-    ;

extensions/spotify/utils/src/main/java/app/revanced/extension/spotify/UserAgent.java

@@ -1,60 +0,0 @@
-package app.revanced.extension.spotify;
-
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.TokenStreamRewriter;
-import org.antlr.v4.runtime.tree.ParseTreeWalker;
-
-public class UserAgent {
-    private final UserAgentParser.UserAgentContext tree;
-    private final TokenStreamRewriter rewriter;
-    private final ParseTreeWalker walker;
-
-    public UserAgent(String userAgentString) {
-        CharStream input = CharStreams.fromString(userAgentString);
-        UserAgentLexer lexer = new UserAgentLexer(input);
-        CommonTokenStream tokens = new CommonTokenStream(lexer);
-
-        tree = new UserAgentParser(tokens).userAgent();
-        walker = new ParseTreeWalker();
-        rewriter = new TokenStreamRewriter(tokens);
-    }
-
-    public UserAgent withoutProduct(String name) {
-        walker.walk(new UserAgentBaseListener() {
-            @Override
-            public void exitProduct(UserAgentParser.ProductContext ctx) {
-                if (!ctx.name().getText().contains(name)) return;
-
-                int startIndex = ctx.getStart().getTokenIndex();
-                if (startIndex != 0) startIndex -= 1; // Also remove the preceding whitespace.
-
-                int stopIndex = ctx.getStop().getTokenIndex();
-
-                
-                rewriter.delete(startIndex, stopIndex);
-            }
-        }, tree);
-
-        return new UserAgent(rewriter.getText().trim());
-    }
-
-    public UserAgent withCommentReplaced(String containing, String replacement) {
-        walker.walk(new UserAgentBaseListener() {
-            @Override
-            public void exitComment(UserAgentParser.CommentContext ctx) {
-                if (ctx.getText().contains(containing)) {
-                    rewriter.replace(ctx.getStart(), ctx.getStop(), "(" + replacement + ")");
-                }
-            }
-        }, tree);
-
-        return new UserAgent(rewriter.getText());
-    }
-
-    @Override
-    public String toString() {
-        return rewriter.getText();
-    }
-}

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

@@ -0,0 +1,101 @@
+package app.revanced.extension.youtube.patches;
+
+import android.graphics.drawable.Drawable;
+
+import androidx.annotation.Nullable;
+
+import java.util.Objects;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.youtube.settings.Settings;
+
+@SuppressWarnings("unused")
+public class ChangeHeaderPatch {
+
+    public enum HeaderLogo {
+        DEFAULT(null, null),
+        REGULAR("ytWordmarkHeader", "yt_ringo2_wordmark_header"),
+        PREMIUM("ytPremiumWordmarkHeader", "yt_ringo2_premium_wordmark_header"),
+        REVANCED("revanced_header_logo", "revanced_header_logo"),
+        REVANCED_MINIMAL("revanced_header_logo_minimal", "revanced_header_logo_minimal"),
+        CUSTOM("custom_header", "custom_header");
+
+        @Nullable
+        private final String attributeName;
+        @Nullable
+        private final String drawableName;
+
+        HeaderLogo(@Nullable String attributeName, @Nullable String drawableName) {
+            this.attributeName = attributeName;
+            this.drawableName = drawableName;
+        }
+
+        /**
+         * @return The attribute id of this header logo, or NULL if the logo should not be replaced.
+         */
+        @Nullable
+        private Integer getAttributeId() {
+            if (attributeName == null) {
+                return null;
+            }
+
+            final int identifier = Utils.getResourceIdentifier(attributeName, "attr");
+            if (identifier == 0) {
+                // Identifier is zero if custom header setting was included in imported settings
+                // and a custom image was not included during patching.
+                Logger.printDebug(() -> "Could not find attribute: " + drawableName);
+                Settings.HEADER_LOGO.resetToDefault();
+                return null;
+            }
+
+            return identifier;
+        }
+
+        @Nullable
+        public Drawable getDrawable() {
+            if (drawableName == null) {
+                return null;
+            }
+
+            String drawableFullName = drawableName + (Utils.isDarkModeEnabled()
+                    ? "_dark"
+                    : "_light");
+
+            final int identifier = Utils.getResourceIdentifier(drawableFullName, "drawable");
+            if (identifier == 0) {
+                Logger.printDebug(() -> "Could not find drawable: " + drawableFullName);
+                Settings.HEADER_LOGO.resetToDefault();
+                return null;
+            }
+            return Utils.getContext().getDrawable(identifier);
+        }
+    }
+
+    /**
+     * Injection point.
+     */
+    public static int getHeaderAttributeId(int original) {
+        return Objects.requireNonNullElse(Settings.HEADER_LOGO.get().getAttributeId(), original);
+    }
+
+    public static Drawable getDrawable(Drawable original) {
+        Drawable logo = Settings.HEADER_LOGO.get().getDrawable();
+        if (logo != null) {
+            return logo;
+        }
+
+        // TODO: If 'Hide Doodles' is enabled, this will force the regular logo regardless
+        //       what account the user has. This can be improved the next time a Doodle is
+        //       active and the attribute id is passed to this method so the correct
+        //       regular/premium logo is returned.
+        logo = HeaderLogo.REGULAR.getDrawable();
+        if (logo != null) {
+            return logo;
+        }
+
+        // Should never happen.
+        Logger.printException(() -> "Could not find regular header logo resource");
+        return original;
+    }
+}

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

@@ -0,0 +1,16 @@
+package app.revanced.extension.youtube.patches;
+
+import app.revanced.extension.youtube.settings.Settings;
+
+@SuppressWarnings("unused")
+public final class DisableDoubleTapActionsPatch {
+
+    /**
+     * Injection point.
+     *
+     * @return If "should skip to chapter start" flag is set.
+     */
+    public static boolean disableDoubleTapChapters(boolean original) {
+        return original && !Settings.DISABLE_CHAPTER_SKIP_DOUBLE_TAP.get();
+    }
+}

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

@@ -1,17 +1,15 @@
 package app.revanced.extension.youtube.patches;
 
+import static app.revanced.extension.youtube.settings.preference.ExternalDownloaderPreference.showDialogIfAppIsNotInstalled;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-
-import androidx.annotation.NonNull;
 
 import java.lang.ref.WeakReference;
 import java.util.Objects;
 
 import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.StringRef;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.youtube.settings.Settings;
 
@@ -36,7 +34,7 @@ public final class DownloadsPatch {
      *
      * Appears to always be called from the main thread.
      */
-    public static boolean inAppDownloadButtonOnClick(@NonNull String videoId) {
+    public static boolean inAppDownloadButtonOnClick(String videoId) {
         try {
             if (!Settings.EXTERNAL_DOWNLOADER_ACTION_BUTTON.get()) {
                 return false;
@@ -48,6 +46,9 @@ public final class DownloadsPatch {
             boolean isActivityContext = true;
             if (context == null) {
                 // Utils context is the application context, and not an activity context.
+                //
+                // Edit: This check may no longer be needed since YT can now
+                // only be launched from the main Activity (embedded usage in other apps no longer works).
                 context = Utils.getContext();
                 isActivityContext = false;
             }
@@ -64,8 +65,7 @@ public final class DownloadsPatch {
      * @param isActivityContext If the context parameter is for an Activity.  If this is false, then
      *                          the downloader is opened as a new task (which forces YT to minimize).
      */
-    public static void launchExternalDownloader(@NonNull String videoId,
-                                                @NonNull Context context, boolean isActivityContext) {
+    public static void launchExternalDownloader(String videoId, Context context, boolean isActivityContext) {
         try {
             Objects.requireNonNull(videoId);
             Logger.printDebug(() -> "Launching external downloader with context: " + context);
@@ -73,16 +73,8 @@ public final class DownloadsPatch {
             // Trim string to avoid any accidental whitespace.
             var downloaderPackageName = Settings.EXTERNAL_DOWNLOADER_PACKAGE_NAME.get().trim();
 
-            boolean packageEnabled = false;
-            try {
-                packageEnabled = context.getPackageManager().getApplicationInfo(downloaderPackageName, 0).enabled;
-            } catch (PackageManager.NameNotFoundException error) {
-                Logger.printDebug(() -> "External downloader could not be found: " + error);
-            }
-
-            // If the package is not installed, show the toast
-            if (!packageEnabled) {
-                Utils.showToastLong(StringRef.str("revanced_external_downloader_not_installed_warning", downloaderPackageName));
+            // If the package is not installed, show a dialog.
+            if (showDialogIfAppIsNotInstalled(context, downloaderPackageName)) {
                 return;
             }
 

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

@@ -8,6 +8,6 @@ public final class HideRelatedVideoOverlayPatch {
      * Injection point.
      */
     public static boolean hideRelatedVideoOverlay() {
-        return Settings.HIDE_RELATED_VIDEO_OVERLAY.get();
+        return Settings.HIDE_RELATED_VIDEOS_OVERLAY.get();
     }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java

@@ -59,10 +59,11 @@ public final class AnnouncementsPatch {
         int id = Settings.ANNOUNCEMENT_LAST_ID.defaultValue;
         try {
             final var announcementIds = new JSONArray(jsonString);
+            if (announcementIds.length() == 0) return true;
+            
             id = announcementIds.getJSONObject(0).getInt("id");
-
         } catch (Throwable ex) {
-            Logger.printException(() -> "Failed to parse announcement IDs", ex);
+            Logger.printException(() -> "Failed to parse announcement ID", ex);
         }
 
         // Do not show the announcement, if the last announcement id is the same as the current one.

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/requests/AnnouncementsRoutes.java

@@ -10,8 +10,8 @@ import static app.revanced.extension.shared.requests.Route.Method.GET;
 
 public class AnnouncementsRoutes {
     private static final String ANNOUNCEMENTS_PROVIDER = "https://api.revanced.app/v4";
-    public static final Route GET_LATEST_ANNOUNCEMENT_IDS = new Route(GET, "/announcements/latest/id?tag=youtube");
-    public static final Route GET_LATEST_ANNOUNCEMENTS = new Route(GET, "/announcements/latest?tag=youtube");
+    public static final Route GET_LATEST_ANNOUNCEMENT_IDS = new Route(GET, "/announcements/latest/id?tag=\uD83C\uDF9E\uFE0F%20YouTube");
+    public static final Route GET_LATEST_ANNOUNCEMENTS = new Route(GET, "/announcements/latest?tag=\uD83C\uDF9E\uFE0F%20YouTube");
 
     private AnnouncementsRoutes() {
     }

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

@@ -34,10 +34,6 @@ public final class AdsFilter extends Filter {
     private final StringFilterGroup playerShoppingShelf;
     private final ByteArrayFilterGroup playerShoppingShelfBuffer;
 
-    private final StringFilterGroup channelProfile;
-    private final ByteArrayFilterGroup visitStoreButton;
-
-    private final StringFilterGroup shoppingLinks;
 
     public AdsFilter() {
         exceptions.addPatterns(
@@ -91,6 +87,7 @@ public final class AdsFilter extends Filter {
                 "text_image_no_button_layout", // Tablet layout search results.
                 "video_display_button_group_layout",
                 "video_display_carousel_button_group_layout",
+                "video_display_carousel_buttoned_short_dr_layout",
                 "video_display_full_buttoned_short_dr_layout",
                 "video_display_full_layout",
                 "watch_metadata_app_promo"
@@ -113,18 +110,13 @@ public final class AdsFilter extends Filter {
                 "shopping_overlay.eml" // Video player overlay shopping links.
         );
 
-        shoppingLinks = new StringFilterGroup(
-                Settings.HIDE_TAGGED_PRODUCTS,
-                "expandable_list"
-        );
-
-        final var storeProductsShelf = new StringFilterGroup(
-                Settings.HIDE_CREATOR_STORE_SHELVES,
+        final var shoppingLinks = new StringFilterGroup(
+                Settings.HIDE_SHOPPING_LINKS,
                 "shopping_description_shelf.eml"
         );
 
         playerShoppingShelf = new StringFilterGroup(
-                Settings.HIDE_CREATOR_STORE_SHELVES,
+                Settings.HIDE_CREATOR_STORE_SHELF,
                 "horizontal_shelf.eml"
         );
 
@@ -133,17 +125,6 @@ public final class AdsFilter extends Filter {
                 "shopping_item_card_list"
         );
 
-        channelProfile = new StringFilterGroup(
-                Settings.HIDE_VISIT_STORE_BUTTON,
-                "channel_profile.eml",
-                "page_header.eml"
-        );
-
-        visitStoreButton = new ByteArrayFilterGroup(
-                null,
-                "header_store_button"
-        );
-
         final var webLinkPanel = new StringFilterGroup(
                 Settings.HIDE_WEB_SEARCH_RESULTS,
                 "web_link_panel"
@@ -161,7 +142,6 @@ public final class AdsFilter extends Filter {
         );
 
         addPathCallbacks(
-                channelProfile,
                 fullscreenAd,
                 generalAds,
                 merchandise,
@@ -169,7 +149,6 @@ public final class AdsFilter extends Filter {
                 playerShoppingShelf,
                 selfSponsor,
                 shoppingLinks,
-                storeProductsShelf,
                 viewProducts,
                 webLinkPanel
         );
@@ -182,11 +161,6 @@ public final class AdsFilter extends Filter {
             return contentIndex == 0 && playerShoppingShelfBuffer.check(protobufBufferArray).isFiltered();
         }
 
-        // Check for the index because of likelihood of false positives.
-        if (contentIndex != 0 && matchedGroup == shoppingLinks) {
-            return false;
-        }
-
         if (exceptions.matches(path)) {
             return false;
         }
@@ -198,10 +172,6 @@ public final class AdsFilter extends Filter {
             return false;
         }
 
-        if (matchedGroup == channelProfile) {
-            return visitStoreButton.check(protobufBufferArray).isFiltered();
-        }
-
         return true;
     }
 

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

@@ -3,11 +3,12 @@ package app.revanced.extension.youtube.patches.components;
 import androidx.annotation.Nullable;
 
 import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.youtube.shared.PlayerType;
 
 @SuppressWarnings("unused")
 final class CommentsFilter extends Filter {
 
-    private final StringFilterGroup filterChipBar;
+    private final StringFilterGroup chipBar;
     private final ByteArrayFilterGroup aiCommentsSummary;
     
     public CommentsFilter() {
@@ -16,6 +17,21 @@ final class CommentsFilter extends Filter {
                 "live_chat_summary_banner.eml"
         );
 
+        chipBar = new StringFilterGroup(
+                Settings.HIDE_COMMENTS_AI_SUMMARY,
+                "chip_bar.eml"
+        );
+
+        aiCommentsSummary = new ByteArrayFilterGroup(
+                null,
+                "yt_fill_spark_"
+        );
+
+        var channelGuidelines = new StringFilterGroup(
+                Settings.HIDE_COMMENTS_CHANNEL_GUIDELINES,
+                "channel_guidelines_entry_banner"
+        );
+
         var commentsByMembers = new StringFilterGroup(
                 Settings.HIDE_COMMENTS_BY_MEMBERS_HEADER,
                 "sponsorships_comments_header.eml",
@@ -28,6 +44,11 @@ final class CommentsFilter extends Filter {
                 "_comments"
         );
 
+        var communityGuidelines = new StringFilterGroup(
+                Settings.HIDE_COMMENTS_COMMUNITY_GUIDELINES,
+                "community_guidelines"
+        );
+
         var createAShort = new StringFilterGroup(
                 Settings.HIDE_COMMENTS_CREATE_A_SHORT_BUTTON,
                 "composer_short_creation_button.eml"
@@ -50,33 +71,28 @@ final class CommentsFilter extends Filter {
                 "composer_timestamp_button.eml"
         );
 
-        filterChipBar = new StringFilterGroup(
-                Settings.HIDE_COMMENTS_AI_SUMMARY,
-                "chip_bar.eml"
-        );
-
-        aiCommentsSummary = new ByteArrayFilterGroup(
-                null,
-                "yt_fill_spark_"
-        );
-
         addPathCallbacks(
+                channelGuidelines,
                 chatSummary,
+                chipBar,
                 commentsByMembers,
                 comments,
+                communityGuidelines,
                 createAShort,
                 previewComment,
                 thanksButton,
-                timestampButton,
-                filterChipBar
+                timestampButton
+
         );
     }
 
     @Override
     boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
-        if (matchedGroup == filterChipBar) {
-            return aiCommentsSummary.check(protobufBufferArray).isFiltered();
+        if (matchedGroup == chipBar) {
+            // Playlist sort button uses same components and must only filter if the player is opened.
+            return PlayerType.getCurrent().isMaximizedOrFullscreen()
+                    && aiCommentsSummary.check(protobufBufferArray).isFiltered();
         }
 
         return true;

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

@@ -4,12 +4,14 @@ import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButt
 
 import android.graphics.drawable.Drawable;
 import android.view.View;
+import android.widget.ImageView;
 
 import androidx.annotation.Nullable;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.youtube.StringTrieSearch;
+import app.revanced.extension.youtube.patches.ChangeHeaderPatch;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.NavigationBar;
 import app.revanced.extension.youtube.shared.PlayerType;
@@ -30,7 +32,7 @@ public final class LayoutComponentsFilter extends Filter {
     );
 
     private final StringTrieSearch exceptions = new StringTrieSearch();
-    private final StringFilterGroup inFeedSurvey;
+    private final StringFilterGroup surveys;
     private final StringFilterGroup notifyMe;
     private final StringFilterGroup singleItemInformationPanel;
     private final StringFilterGroup expandableMetadata;
@@ -40,6 +42,8 @@ public final class LayoutComponentsFilter extends Filter {
     private final StringFilterGroup horizontalShelves;
     private final ByteArrayFilterGroup ticketShelf;
     private final StringFilterGroup chipBar;
+    private final StringFilterGroup channelProfile;
+    private final ByteArrayFilterGroupList channelProfileBuffer;
 
     public LayoutComponentsFilter() {
         exceptions.addPatterns(
@@ -81,18 +85,13 @@ public final class LayoutComponentsFilter extends Filter {
                 "poll_post_responsive_root.eml"
         );
 
-        final var communityGuidelines = new StringFilterGroup(
-                Settings.HIDE_COMMUNITY_GUIDELINES,
-                "community_guidelines"
-        );
-
         final var subscribersCommunityGuidelines = new StringFilterGroup(
                 Settings.HIDE_SUBSCRIBERS_COMMUNITY_GUIDELINES,
                 "sponsorships_comments_upsell"
         );
 
-        final var channelMemberShelf = new StringFilterGroup(
-                Settings.HIDE_CHANNEL_MEMBER_SHELF,
+        final var channelMembersShelf = new StringFilterGroup(
+                Settings.HIDE_MEMBERS_SHELF,
                 "member_recognition_shelf"
         );
 
@@ -111,8 +110,8 @@ public final class LayoutComponentsFilter extends Filter {
                 "chip_bar"
         );
 
-        inFeedSurvey = new StringFilterGroup(
-                Settings.HIDE_FEED_SURVEY,
+        surveys = new StringFilterGroup(
+                Settings.HIDE_SURVEYS,
                 "in_feed_survey",
                 "slimline_survey",
                 "feed_nudge"
@@ -139,13 +138,13 @@ public final class LayoutComponentsFilter extends Filter {
         );
 
         final var latestPosts = new StringFilterGroup(
-                Settings.HIDE_HIDE_LATEST_POSTS,
+                Settings.HIDE_LATEST_POSTS,
                 "post_shelf"
         );
 
-        final var channelGuidelines = new StringFilterGroup(
-                Settings.HIDE_HIDE_CHANNEL_GUIDELINES,
-                "channel_guidelines_entry_banner"
+        final var channelLinksPreview = new StringFilterGroup(
+                Settings.HIDE_LINKS_PREVIEW,
+                "attribution.eml"
         );
 
         final var emergencyBox = new StringFilterGroup(
@@ -170,7 +169,7 @@ public final class LayoutComponentsFilter extends Filter {
         );
 
         expandableMetadata = new StringFilterGroup(
-                Settings.HIDE_EXPANDABLE_CHIP,
+                Settings.HIDE_EXPANDABLE_CARD,
                 "inline_expander"
         );
 
@@ -200,7 +199,6 @@ public final class LayoutComponentsFilter extends Filter {
                 "image_shelf"
         );
 
-
         final var timedReactions = new StringFilterGroup(
                 Settings.HIDE_TIMED_REACTIONS,
                 "emoji_control_panel",
@@ -227,7 +225,6 @@ public final class LayoutComponentsFilter extends Filter {
                 "sponsorships"
         );
 
-
         final var channelWatermark = new StringFilterGroup(
                 Settings.HIDE_VIDEO_CHANNEL_WATERMARK,
                 "featured_channel_watermark_overlay"
@@ -238,11 +235,27 @@ public final class LayoutComponentsFilter extends Filter {
                 "mixed_content_shelf"
         );
 
-        final var searchResultRecommendationLabels = new StringFilterGroup(
-                Settings.HIDE_SEARCH_RESULT_RECOMMENDATION_LABELS,
+        final var videoRecommendationLabels = new StringFilterGroup(
+                Settings.HIDE_VIDEO_RECOMMENDATION_LABELS,
                 "endorsement_header_footer.eml"
         );
 
+        channelProfile = new StringFilterGroup(
+                null,
+                "channel_profile.eml",
+                "page_header.eml"
+        );
+        channelProfileBuffer = new ByteArrayFilterGroupList();
+        channelProfileBuffer.addAll(new ByteArrayFilterGroup(
+                        Settings.HIDE_VISIT_STORE_BUTTON,
+                        "header_store_button"
+                ),
+                new ByteArrayFilterGroup(
+                        Settings.HIDE_VISIT_COMMUNITY_BUTTON,
+                        "community_button"
+                )
+        );
+
         horizontalShelves = new StringFilterGroup(
                 Settings.HIDE_HORIZONTAL_SHELVES,
                 "horizontal_video_shelf.eml",
@@ -253,40 +266,40 @@ public final class LayoutComponentsFilter extends Filter {
 
         ticketShelf = new ByteArrayFilterGroup(
                 Settings.HIDE_TICKET_SHELF,
-                "ticket.eml"
+                "ticket_item.eml"
         );
 
         addPathCallbacks(
-                expandableMetadata,
-                inFeedSurvey,
-                notifyMe,
-                compactChannelBar,
-                communityPosts,
-                paidPromotion,
-                searchResultRecommendationLabels,
-                latestPosts,
+                artistCard,
+                audioTrackButton,
+                channelLinksPreview,
+                channelMembersShelf,
+                channelProfile,
                 channelWatermark,
-                communityGuidelines,
+                chipBar,
+                compactBanner,
+                compactChannelBar,
+                compactChannelBarInner,
+                communityPosts,
+                emergencyBox,
+                expandableMetadata,
+                forYouShelf,
+                horizontalShelves,
+                imageShelf,
+                infoPanel,
+                latestPosts,
+                medicalPanel,
+                notifyMe,
+                paidPromotion,
                 playables,
                 quickActions,
                 relatedVideos,
-                compactBanner,
-                compactChannelBarInner,
-                medicalPanel,
-                infoPanel,
                 singleItemInformationPanel,
-                emergencyBox,
                 subscribersCommunityGuidelines,
                 subscriptionsChipBar,
-                chipBar,
-                channelGuidelines,
-                audioTrackButton,
-                artistCard,
+                surveys,
                 timedReactions,
-                imageShelf,
-                channelMemberShelf,
-                forYouShelf,
-                horizontalShelves
+                videoRecommendationLabels
         );
     }
 
@@ -304,10 +317,14 @@ public final class LayoutComponentsFilter extends Filter {
 
         // The groups are excluded from the filter due to the exceptions list below.
         // Filter them separately here.
-        if (matchedGroup == notifyMe || matchedGroup == inFeedSurvey || matchedGroup == expandableMetadata) {
+        if (matchedGroup == notifyMe || matchedGroup == surveys || matchedGroup == expandableMetadata) {
             return true;
         }
 
+        if (matchedGroup == channelProfile) {
+            return channelProfileBuffer.check(protobufBufferArray).isFiltered();
+        }
+
         if (exceptions.matches(path)) return false; // Exceptions are not filtered.
 
         if (matchedGroup == compactChannelBarInner) {
@@ -332,7 +349,7 @@ public final class LayoutComponentsFilter extends Filter {
      * Injection point.
      * Called from a different place then the other filters.
      */
-    public static boolean filterMixPlaylists(final Object conversionContext, @Nullable final byte[] bytes) {
+    public static boolean filterMixPlaylists(Object conversionContext, @Nullable final byte[] bytes) {
         try {
             if (!Settings.HIDE_MIX_PLAYLISTS.get()) {
                 return false;
@@ -422,13 +439,11 @@ public final class LayoutComponentsFilter extends Filter {
     /**
      * Injection point.
      */
-    @Nullable
-    public static Drawable hideYoodles(Drawable animatedYoodle) {
-        if (HIDE_DOODLES_ENABLED) {
-            return null;
-        }
-
-        return animatedYoodle;
+    public static void setDoodleDrawable(ImageView imageView, Drawable original) {
+        Drawable replacement = HIDE_DOODLES_ENABLED
+                ? ChangeHeaderPatch.getDrawable(original)
+                : original;
+        imageView.setImageDrawable(replacement);
     }
 
     private static final boolean HIDE_SHOW_MORE_BUTTON_ENABLED = Settings.HIDE_SHOW_MORE_BUTTON.get();

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

@@ -60,6 +60,11 @@ public class CustomPlaybackSpeedPatch {
      */
     public static final float PLAYBACK_SPEED_MAXIMUM = 8;
 
+    /**
+     * How much +/- speed adjustment buttons change the current speed.
+     */
+    private static final double SPEED_ADJUSTMENT_CHANGE = 0.05;
+
     /**
      * Scale used to convert user speed to {@link android.widget.ProgressBar#setProgress(int)}.
      */
@@ -390,9 +395,9 @@ public class CustomPlaybackSpeedPatch {
         });
 
         minusButton.setOnClickListener(v -> userSelectedSpeed.apply(
-                VideoInformation.getPlaybackSpeed() - 0.05f));
+                (float) (VideoInformation.getPlaybackSpeed() - SPEED_ADJUSTMENT_CHANGE)));
         plusButton.setOnClickListener(v -> userSelectedSpeed.apply(
-                VideoInformation.getPlaybackSpeed() + 0.05f));
+                (float) (VideoInformation.getPlaybackSpeed() + SPEED_ADJUSTMENT_CHANGE)));
 
         // Create GridLayout for preset speed buttons.
         GridLayout gridLayout = new GridLayout(context);
@@ -611,15 +616,21 @@ public class CustomPlaybackSpeedPatch {
     }
 
     /**
-     * Rounds the given playback speed to the nearest 0.05 increment and ensures it is within valid bounds.
+     * Rounds the given playback speed to the nearest 0.05 increment,
+     * unless the speed exactly matches a preset custom speed.
      *
      * @param speed The playback speed to round.
      * @return The rounded speed, constrained to the specified bounds.
      */
     private static float roundSpeedToNearestIncrement(float speed) {
+        // Allow speed as-is if it exactly matches a speed preset such as 1.03x.
+        if (arrayContains(customPlaybackSpeeds, speed)) {
+            return speed;
+        }
+
         // Round to nearest 0.05 speed.  Must use double precision otherwise rounding error can occur.
-        final double roundedSpeed = Math.round(speed / 0.05) * 0.05;
-        return Utils.clamp((float) roundedSpeed, 0.05f, PLAYBACK_SPEED_MAXIMUM);
+        final double roundedSpeed = Math.round(speed / SPEED_ADJUSTMENT_CHANGE) * SPEED_ADJUSTMENT_CHANGE;
+        return Utils.clamp((float) roundedSpeed, (float) SPEED_ADJUSTMENT_CHANGE, PLAYBACK_SPEED_MAXIMUM);
     }
 
     /**

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

@@ -5,7 +5,9 @@ import static app.revanced.extension.shared.Utils.getResourceIdentifier;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.preference.PreferenceFragment;
+import android.util.TypedValue;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.Toolbar;
@@ -24,12 +26,15 @@ import app.revanced.extension.youtube.settings.preference.ReVancedPreferenceFrag
  * This class is responsible for injecting our own fragment by replacing the LicenseActivity.
  */
 @SuppressWarnings("unused")
-public class LicenseActivityHook {
+public class LicenseActivityHook extends Activity {
 
     private static int currentThemeValueOrdinal = -1; // Must initially be a non-valid enum ordinal value.
 
     private static ViewGroup.LayoutParams toolbarLayoutParams;
 
+    @SuppressLint("StaticFieldLeak")
+    public static SearchViewController searchViewController;
+
     public static void setToolbarLayoutParams(Toolbar toolbar) {
         if (toolbarLayoutParams != null) {
             toolbar.setLayoutParams(toolbarLayoutParams);
@@ -126,12 +131,13 @@ public class LicenseActivityHook {
                 view -> view instanceof TextView);
         if (toolbarTextView != null) {
             toolbarTextView.setTextColor(Utils.getAppForegroundColor());
+            toolbarTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
         }
         setToolbarLayoutParams(toolbar);
 
-        // Add Search Icon and EditText for ReVancedPreferenceFragment only.
+        // Add Search bar only for ReVancedPreferenceFragment.
         if (fragment instanceof ReVancedPreferenceFragment) {
-            SearchViewController.addSearchViewComponents(activity, toolbar, (ReVancedPreferenceFragment) fragment);
+            searchViewController = SearchViewController.addSearchViewComponents(activity, toolbar, (ReVancedPreferenceFragment) fragment);
         }
 
         toolBarParent.addView(toolbar, 0);
@@ -166,4 +172,10 @@ public class LicenseActivityHook {
             Utils.setIsDarkModeEnabled(themeOrdinal == 1);
         }
     }
+
+    public static void handleConfigurationChanged(Activity activity, Configuration newConfig) {
+        if (searchViewController != null) {
+            searchViewController.handleOrientationChange(newConfig.orientation);
+        }
+    }
 }

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

@@ -10,6 +10,7 @@ import android.graphics.drawable.GradientDrawable;
 import android.util.Pair;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
@@ -51,6 +52,7 @@ public class SearchViewController {
     private final Deque<String> searchHistory;
     private final AutoCompleteTextView autoCompleteTextView;
     private final boolean showSettingsSearchHistory;
+    private int currentOrientation;
 
     /**
      * Creates a background drawable for the SearchView with rounded corners.
@@ -83,8 +85,8 @@ public class SearchViewController {
     /**
      * Adds search view components to the activity.
      */
-    public static void addSearchViewComponents(Activity activity, Toolbar toolbar, ReVancedPreferenceFragment fragment) {
-        new SearchViewController(activity, toolbar, fragment);
+    public static SearchViewController addSearchViewComponents(Activity activity, Toolbar toolbar, ReVancedPreferenceFragment fragment) {
+        return new SearchViewController(activity, toolbar, fragment);
     }
 
     private SearchViewController(Activity activity, Toolbar toolbar, ReVancedPreferenceFragment fragment) {
@@ -93,6 +95,7 @@ public class SearchViewController {
         this.originalTitle = toolbar.getTitle();
         this.showSettingsSearchHistory = Settings.SETTINGS_SEARCH_HISTORY.get();
         this.searchHistory = new LinkedList<>();
+        this.currentOrientation = activity.getResources().getConfiguration().orientation;
         StringSetting searchEntries = Settings.SETTINGS_SEARCH_ENTRIES;
         if (showSettingsSearchHistory) {
             String entries = searchEntries.get();
@@ -115,6 +118,9 @@ public class SearchViewController {
                 searchView.getContext().getResources().getIdentifier(
                         "android:id/search_src_text", null, null));
 
+        // Disable fullscreen keyboard mode.
+        autoCompleteTextView.setImeOptions(autoCompleteTextView.getImeOptions() | EditorInfo.IME_FLAG_NO_EXTRACT_UI);
+
         // Set background and query hint.
         searchView.setBackground(createBackgroundDrawable(toolbar.getContext()));
         searchView.setQueryHint(str("revanced_settings_search_hint"));
@@ -197,7 +203,7 @@ public class SearchViewController {
                 if (isSearchActive) {
                     closeSearch();
                 } else {
-                    activity.onBackPressed();
+                    activity.finish();
                 }
             } catch (Exception ex) {
                 Logger.printException(() -> "navigation click failure", ex);
@@ -285,6 +291,16 @@ public class SearchViewController {
         }
     }
 
+    public void handleOrientationChange(int newOrientation) {
+        if (newOrientation != currentOrientation) {
+            currentOrientation = newOrientation;
+            if (autoCompleteTextView != null) {
+                autoCompleteTextView.dismissDropDown();
+                Logger.printDebug(() -> "Orientation changed, search history dismissed");
+            }
+        }
+    }
+
     /**
      * Opens the search view and shows the keyboard.
      */
@@ -313,7 +329,7 @@ public class SearchViewController {
     /**
      * Closes the search view and hides the keyboard.
      */
-    private void closeSearch() {
+    public void closeSearch() {
         isSearchActive = false;
         toolbar.getMenu().findItem(getResourceIdentifier(
                 "action_search", "id")).setVisible(true);
@@ -326,6 +342,19 @@ public class SearchViewController {
         imm.hideSoftInputFromWindow(searchView.getWindowToken(), 0);
     }
 
+    public static boolean handleBackPress() {
+        if (LicenseActivityHook.searchViewController != null
+                && LicenseActivityHook.searchViewController.isSearchActive()) {
+            LicenseActivityHook.searchViewController.closeSearch();
+            return true;
+        }
+        return false;
+    }
+
+    public boolean isSearchActive() {
+        return isSearchActive;
+    }
+
     /**
      * Custom ArrayAdapter for search history.
      */

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

@@ -8,6 +8,7 @@ import static app.revanced.extension.shared.settings.Setting.parent;
 import static app.revanced.extension.shared.settings.Setting.parentsAll;
 import static app.revanced.extension.shared.settings.Setting.parentsAny;
 import static app.revanced.extension.youtube.patches.ChangeFormFactorPatch.FormFactor;
+import static app.revanced.extension.youtube.patches.ChangeHeaderPatch.HeaderLogo;
 import static app.revanced.extension.youtube.patches.ChangeStartPagePatch.ChangeStartPageTypeAvailability;
 import static app.revanced.extension.youtube.patches.ChangeStartPagePatch.StartPage;
 import static app.revanced.extension.youtube.patches.ExitFullscreenPatch.FullscreenMode;
@@ -61,6 +62,7 @@ public class Settings extends BaseSettings {
             parentsAny(REMEMBER_VIDEO_QUALITY_LAST_SELECTED, REMEMBER_SHORTS_QUALITY_LAST_SELECTED));
     public static final BooleanSetting ADVANCED_VIDEO_QUALITY_MENU = new BooleanSetting("revanced_advanced_video_quality_menu", TRUE);
     public static final BooleanSetting DISABLE_HDR_VIDEO = new BooleanSetting("revanced_disable_hdr_video", FALSE);
+
     // Speed
     public static final FloatSetting SPEED_TAP_AND_HOLD = new FloatSetting("revanced_speed_tap_and_hold", 2.0f, true);
     public static final BooleanSetting REMEMBER_PLAYBACK_SPEED_LAST_SELECTED = new BooleanSetting("revanced_remember_playback_speed_last_selected", FALSE);
@@ -70,23 +72,23 @@ public class Settings extends BaseSettings {
     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\n1.0\n1.25\n1.5\n1.75\n2.0\n2.5\n3.0\n4.0\n5.0\n6.0\n7.0\n8.0", true);
+
     // Audio
     public static final BooleanSetting FORCE_ORIGINAL_AUDIO = new BooleanSetting("revanced_force_original_audio", FALSE, new ForceOriginalAudioAvailability());
 
     // Ads
-    public static final BooleanSetting HIDE_CREATOR_STORE_SHELVES = new BooleanSetting("revanced_hide_creator_store_shelves", TRUE);
+    public static final BooleanSetting HIDE_CREATOR_STORE_SHELF = new BooleanSetting("revanced_hide_creator_store_shelf", 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);
-    public static final BooleanSetting HIDE_HIDE_LATEST_POSTS = new BooleanSetting("revanced_hide_latest_posts_ads", TRUE);
+    public static final BooleanSetting HIDE_LATEST_POSTS = new BooleanSetting("revanced_hide_latest_posts", TRUE);
     public static final BooleanSetting HIDE_MERCHANDISE_BANNERS = new BooleanSetting("revanced_hide_merchandise_banners", TRUE);
     public static final BooleanSetting HIDE_PAID_PROMOTION_LABEL = new BooleanSetting("revanced_hide_paid_promotion_label", TRUE);
     public static final BooleanSetting HIDE_SELF_SPONSOR = new BooleanSetting("revanced_hide_self_sponsor_ads", TRUE);
-    public static final BooleanSetting HIDE_TAGGED_PRODUCTS = new BooleanSetting("revanced_hide_tagged_products", TRUE);
+    public static final BooleanSetting HIDE_SHOPPING_LINKS = new BooleanSetting("revanced_hide_shopping_links", TRUE);
     public static final BooleanSetting HIDE_VIDEO_ADS = new BooleanSetting("revanced_hide_video_ads", TRUE, true);
     public static final BooleanSetting HIDE_VIEW_PRODUCTS_BANNER = new BooleanSetting("revanced_hide_view_products_banner", TRUE);
-    public static final BooleanSetting HIDE_VISIT_STORE_BUTTON = new BooleanSetting("revanced_hide_visit_store_button", TRUE);
     public static final BooleanSetting HIDE_WEB_SEARCH_RESULTS = new BooleanSetting("revanced_hide_web_search_results", TRUE);
 
     // Feed
@@ -97,23 +99,23 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_COMPACT_BANNER = new BooleanSetting("revanced_hide_compact_banner", TRUE);
     public static final BooleanSetting HIDE_CROWDFUNDING_BOX = new BooleanSetting("revanced_hide_crowdfunding_box", FALSE, true);
     public static final BooleanSetting HIDE_DOODLES = new BooleanSetting("revanced_hide_doodles", FALSE, true, "revanced_hide_doodles_user_dialog_message");
-    public static final BooleanSetting HIDE_EXPANDABLE_CHIP = new BooleanSetting("revanced_hide_expandable_chip", TRUE);
-    public static final BooleanSetting HIDE_FEED_SURVEY = new BooleanSetting("revanced_hide_feed_survey", TRUE);
+    public static final BooleanSetting HIDE_EXPANDABLE_CARD = new BooleanSetting("revanced_hide_expandable_card", TRUE);
     public static final BooleanSetting HIDE_FILTER_BAR_FEED_IN_FEED = new BooleanSetting("revanced_hide_filter_bar_feed_in_feed", FALSE, true);
     public static final BooleanSetting HIDE_FILTER_BAR_FEED_IN_HISTORY = new BooleanSetting("revanced_hide_filter_bar_feed_in_history", FALSE);
     public static final BooleanSetting HIDE_FILTER_BAR_FEED_IN_RELATED_VIDEOS = new BooleanSetting("revanced_hide_filter_bar_feed_in_related_videos", FALSE, true);
     public static final BooleanSetting HIDE_FILTER_BAR_FEED_IN_SEARCH = new BooleanSetting("revanced_hide_filter_bar_feed_in_search", FALSE, true);
     public static final BooleanSetting HIDE_FLOATING_MICROPHONE_BUTTON = new BooleanSetting("revanced_hide_floating_microphone_button", TRUE, true);
-    public static final BooleanSetting HIDE_FOR_YOU_SHELF = new BooleanSetting("revanced_hide_for_you_shelf", TRUE);
     public static final BooleanSetting HIDE_HORIZONTAL_SHELVES = new BooleanSetting("revanced_hide_horizontal_shelves", TRUE);
     public static final BooleanSetting HIDE_IMAGE_SHELF = new BooleanSetting("revanced_hide_image_shelf", TRUE);
     public static final BooleanSetting HIDE_MIX_PLAYLISTS = new BooleanSetting("revanced_hide_mix_playlists", TRUE);
     public static final BooleanSetting HIDE_MOVIES_SECTION = new BooleanSetting("revanced_hide_movies_section", TRUE);
     public static final BooleanSetting HIDE_NOTIFY_ME_BUTTON = new BooleanSetting("revanced_hide_notify_me_button", TRUE);
     public static final BooleanSetting HIDE_PLAYABLES = new BooleanSetting("revanced_hide_playables", TRUE);
-    public static final BooleanSetting HIDE_SEARCH_RESULT_RECOMMENDATION_LABELS = new BooleanSetting("revanced_hide_search_result_recommendation_labels", TRUE);
     public static final BooleanSetting HIDE_SHOW_MORE_BUTTON = new BooleanSetting("revanced_hide_show_more_button", TRUE, true);
+    public static final BooleanSetting HIDE_SURVEYS = new BooleanSetting("revanced_hide_surveys", TRUE);
     public static final BooleanSetting HIDE_TICKET_SHELF = new BooleanSetting("revanced_hide_ticket_shelf", FALSE);
+    public static final BooleanSetting HIDE_VIDEO_RECOMMENDATION_LABELS = new BooleanSetting("revanced_hide_video_recommendation_labels", TRUE);
+
     // Alternative thumbnails
     public static final EnumSetting<ThumbnailOption> ALT_THUMBNAIL_HOME = new EnumSetting<>("revanced_alt_thumbnail_home", ThumbnailOption.ORIGINAL);
     public static final EnumSetting<ThumbnailOption> ALT_THUMBNAIL_SUBSCRIPTIONS = new EnumSetting<>("revanced_alt_thumbnail_subscription", ThumbnailOption.ORIGINAL);
@@ -125,6 +127,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting ALT_THUMBNAIL_DEARROW_CONNECTION_TOAST = new BooleanSetting("revanced_alt_thumbnail_dearrow_connection_toast", TRUE, new DeArrowAvailability());
     public static final EnumSetting<ThumbnailStillTime> ALT_THUMBNAIL_STILLS_TIME = new EnumSetting<>("revanced_alt_thumbnail_stills_time", ThumbnailStillTime.MIDDLE, new StillImagesAvailability());
     public static final BooleanSetting ALT_THUMBNAIL_STILLS_FAST = new BooleanSetting("revanced_alt_thumbnail_stills_fast", FALSE, new StillImagesAvailability());
+
     // Hide keyword content
     public static final BooleanSetting HIDE_KEYWORD_CONTENT_HOME = new BooleanSetting("revanced_hide_keyword_content_home", FALSE);
     public static final BooleanSetting HIDE_KEYWORD_CONTENT_SUBSCRIPTIONS = new BooleanSetting("revanced_hide_keyword_content_subscriptions", FALSE);
@@ -132,31 +135,36 @@ public class Settings extends BaseSettings {
     public static final StringSetting HIDE_KEYWORD_CONTENT_PHRASES = new StringSetting("revanced_hide_keyword_content_phrases", "",
             parentsAny(HIDE_KEYWORD_CONTENT_HOME, HIDE_KEYWORD_CONTENT_SUBSCRIPTIONS, HIDE_KEYWORD_CONTENT_SEARCH));
 
+    // Channel page
+    public static final BooleanSetting HIDE_FOR_YOU_SHELF = new BooleanSetting("revanced_hide_for_you_shelf", FALSE);
+    public static final BooleanSetting HIDE_LINKS_PREVIEW = new BooleanSetting("revanced_hide_links_preview", TRUE);
+    public static final BooleanSetting HIDE_MEMBERS_SHELF = new BooleanSetting("revanced_hide_members_shelf", TRUE);
+    public static final BooleanSetting HIDE_VISIT_COMMUNITY_BUTTON = new BooleanSetting("revanced_hide_visit_community_button", TRUE);
+    public static final BooleanSetting HIDE_VISIT_STORE_BUTTON = new BooleanSetting("revanced_hide_visit_store_button", TRUE);
+
     // Player
     public static final BooleanSetting COPY_VIDEO_URL = new BooleanSetting("revanced_copy_video_url", FALSE);
     public static final BooleanSetting COPY_VIDEO_URL_TIMESTAMP = new BooleanSetting("revanced_copy_video_url_timestamp", TRUE);
     public static final BooleanSetting DISABLE_AUTO_CAPTIONS = new BooleanSetting("revanced_disable_auto_captions", FALSE, true);
+    public static final BooleanSetting DISABLE_CHAPTER_SKIP_DOUBLE_TAP = new BooleanSetting("revanced_disable_chapter_skip_double_tap", FALSE);
     public static final BooleanSetting DISABLE_FULLSCREEN_AMBIENT_MODE = new BooleanSetting("revanced_disable_fullscreen_ambient_mode", TRUE, true);
     public static final BooleanSetting DISABLE_ROLLING_NUMBER_ANIMATIONS = new BooleanSetting("revanced_disable_rolling_number_animations", FALSE);
     public static final EnumSetting<FullscreenMode> EXIT_FULLSCREEN = new EnumSetting<>("revanced_exit_fullscreen", FullscreenMode.DISABLED);
     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);
-    public static final BooleanSetting HIDE_PLAYER_CONTROL_BUTTONS_BACKGROUND = new BooleanSetting("revanced_hide_player_control_buttons_background", FALSE, true);
     public static final BooleanSetting HIDE_CHANNEL_BAR = new BooleanSetting("revanced_hide_channel_bar", FALSE);
-    public static final BooleanSetting HIDE_CHANNEL_MEMBER_SHELF = new BooleanSetting("revanced_hide_channel_member_shelf", TRUE);
-    public static final BooleanSetting HIDE_COMMUNITY_GUIDELINES = new BooleanSetting("revanced_hide_community_guidelines", TRUE);
     public static final BooleanSetting HIDE_EMERGENCY_BOX = new BooleanSetting("revanced_hide_emergency_box", TRUE);
     public static final BooleanSetting HIDE_ENDSCREEN_CARDS = new BooleanSetting("revanced_hide_endscreen_cards", FALSE);
     public static final BooleanSetting HIDE_END_SCREEN_SUGGESTED_VIDEO = new BooleanSetting("revanced_end_screen_suggested_video", FALSE, true);
-    public static final BooleanSetting HIDE_RELATED_VIDEO_OVERLAY = new BooleanSetting("revanced_hide_related_video_overlay", FALSE, true);
-    public static final BooleanSetting HIDE_HIDE_CHANNEL_GUIDELINES = new BooleanSetting("revanced_hide_channel_guidelines", TRUE);
-    public static final BooleanSetting HIDE_INFO_PANELS = new BooleanSetting("revanced_hide_info_panels", TRUE);
     public static final BooleanSetting HIDE_INFO_CARDS = new BooleanSetting("revanced_hide_info_cards", FALSE);
+    public static final BooleanSetting HIDE_INFO_PANELS = new BooleanSetting("revanced_hide_info_panels", TRUE);
     public static final BooleanSetting HIDE_JOIN_MEMBERSHIP_BUTTON = new BooleanSetting("revanced_hide_join_membership_button", TRUE);
     public static final BooleanSetting HIDE_MEDICAL_PANELS = new BooleanSetting("revanced_hide_medical_panels", TRUE);
+    public static final BooleanSetting HIDE_PLAYER_CONTROL_BUTTONS_BACKGROUND = new BooleanSetting("revanced_hide_player_control_buttons_background", FALSE, true);
     public static final BooleanSetting HIDE_PLAYER_PREVIOUS_NEXT_BUTTONS = new BooleanSetting("revanced_hide_player_previous_next_buttons", FALSE, true);
     public static final BooleanSetting HIDE_QUICK_ACTIONS = new BooleanSetting("revanced_hide_quick_actions", FALSE);
+    public static final BooleanSetting HIDE_RELATED_VIDEOS_OVERLAY = new BooleanSetting("revanced_hide_related_videos_overlay", FALSE, true);
     public static final BooleanSetting HIDE_RELATED_VIDEOS = new BooleanSetting("revanced_hide_related_videos", FALSE);
     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);
@@ -165,6 +173,7 @@ public class Settings extends BaseSettings {
     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);
@@ -177,20 +186,25 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting MINIPLAYER_ROUNDED_CORNERS = new BooleanSetting("revanced_miniplayer_rounded_corners", TRUE, true, MINIPLAYER_ANY_MODERN);
     public static final IntegerSetting MINIPLAYER_WIDTH_DIP = new IntegerSetting("revanced_miniplayer_width_dip", 192, true, MINIPLAYER_ANY_MODERN);
     public static final IntegerSetting MINIPLAYER_OPACITY = new IntegerSetting("revanced_miniplayer_opacity", 100, true, MINIPLAYER_TYPE.availability(MODERN_1));
+
     // External downloader
     public static final BooleanSetting EXTERNAL_DOWNLOADER = new BooleanSetting("revanced_external_downloader", FALSE);
     public static final BooleanSetting EXTERNAL_DOWNLOADER_ACTION_BUTTON = new BooleanSetting("revanced_external_downloader_action_button", FALSE);
     public static final StringSetting EXTERNAL_DOWNLOADER_PACKAGE_NAME = new StringSetting("revanced_external_downloader_name",
-            "org.schabi.newpipe" /* NewPipe */, parentsAny(EXTERNAL_DOWNLOADER, EXTERNAL_DOWNLOADER_ACTION_BUTTON));
+            "com.deniscerri.ytdl" /* YTDLnis */, parentsAny(EXTERNAL_DOWNLOADER, EXTERNAL_DOWNLOADER_ACTION_BUTTON));
+
     // Comments
     public static final BooleanSetting HIDE_COMMENTS_AI_CHAT_SUMMARY = new BooleanSetting("revanced_hide_comments_ai_chat_summary", FALSE);
     public static final BooleanSetting HIDE_COMMENTS_AI_SUMMARY = new BooleanSetting("revanced_hide_comments_ai_summary", FALSE);
     public static final BooleanSetting HIDE_COMMENTS_BY_MEMBERS_HEADER = new BooleanSetting("revanced_hide_comments_by_members_header", FALSE);
+    public static final BooleanSetting HIDE_COMMENTS_CHANNEL_GUIDELINES = new BooleanSetting("revanced_hide_comments_channel_guidelines", TRUE);
+    public static final BooleanSetting HIDE_COMMENTS_COMMUNITY_GUIDELINES = new BooleanSetting("revanced_hide_comments_community_guidelines", TRUE);
     public static final BooleanSetting HIDE_COMMENTS_CREATE_A_SHORT_BUTTON = new BooleanSetting("revanced_hide_comments_create_a_short_button", TRUE);
     public static final BooleanSetting HIDE_COMMENTS_PREVIEW_COMMENT = new BooleanSetting("revanced_hide_comments_preview_comment", FALSE);
     public static final BooleanSetting HIDE_COMMENTS_SECTION = new BooleanSetting("revanced_hide_comments_section", FALSE);
     public static final BooleanSetting HIDE_COMMENTS_THANKS_BUTTON = new BooleanSetting("revanced_hide_comments_thanks_button", TRUE);
     public static final BooleanSetting HIDE_COMMENTS_TIMESTAMP_BUTTON = new BooleanSetting("revanced_hide_comments_timestamp_button", FALSE);
+
     // Description
     public static final BooleanSetting HIDE_AI_GENERATED_VIDEO_SUMMARY_SECTION = new BooleanSetting("revanced_hide_ai_generated_video_summary_section", FALSE);
     public static final BooleanSetting HIDE_ASK_SECTION = new BooleanSetting("revanced_hide_ask_section", FALSE);
@@ -201,6 +215,7 @@ public class Settings extends BaseSettings {
     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);
     public static final BooleanSetting HIDE_TRANSCRIPT_SECTION = new BooleanSetting("revanced_hide_transcript_section", TRUE);
+
     // Action buttons
     public static final BooleanSetting DISABLE_LIKE_SUBSCRIBE_GLOW = new BooleanSetting("revanced_disable_like_subscribe_glow", FALSE);
     public static final BooleanSetting HIDE_ASK_BUTTON = new BooleanSetting("revanced_hide_ask_button", FALSE);
@@ -213,6 +228,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_SHARE_BUTTON = new BooleanSetting("revanced_hide_share_button", FALSE);
     public static final BooleanSetting HIDE_STOP_ADS_BUTTON = new BooleanSetting("revanced_hide_stop_ads_button", TRUE);
     public static final BooleanSetting HIDE_THANKS_BUTTON = new BooleanSetting("revanced_hide_thanks_button", TRUE);
+
     // Player flyout menu items
     public static final BooleanSetting HIDE_PLAYER_FLYOUT_ADDITIONAL_SETTINGS = new BooleanSetting("revanced_hide_player_flyout_additional_settings", FALSE);
     public static final BooleanSetting HIDE_PLAYER_FLYOUT_AMBIENT_MODE = new BooleanSetting("revanced_hide_player_flyout_ambient_mode", FALSE);
@@ -235,7 +251,8 @@ public class Settings extends BaseSettings {
     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 EnumSetting<SplashScreenAnimationStyle> SPLASH_SCREEN_ANIMATION_STYLE = new EnumSetting<>("splash_screen_animation_style", SplashScreenAnimationStyle.FPS_60_ONE_SECOND, true);
+    public static final EnumSetting<SplashScreenAnimationStyle> SPLASH_SCREEN_ANIMATION_STYLE = new EnumSetting<>("revanced_splash_screen_animation_style", SplashScreenAnimationStyle.FPS_60_ONE_SECOND, true);
+    public static final EnumSetting<HeaderLogo> HEADER_LOGO = new EnumSetting<>("revanced_header_logo", HeaderLogo.DEFAULT, 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");
@@ -245,9 +262,11 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting CHANGE_START_PAGE_ALWAYS = new BooleanSetting("revanced_change_start_page_always", FALSE, true,
             new ChangeStartPageTypeAvailability());
     public static final StringSetting SPOOF_APP_VERSION_TARGET = new StringSetting("revanced_spoof_app_version_target", "19.01.34", true, parent(SPOOF_APP_VERSION));
+
     // Custom filter
     public static final BooleanSetting CUSTOM_FILTER = new BooleanSetting("revanced_custom_filter", FALSE);
     public static final StringSetting CUSTOM_FILTER_STRINGS = new StringSetting("revanced_custom_filter_strings", "", true, parent(CUSTOM_FILTER));
+
     // Navigation buttons
     public static final BooleanSetting HIDE_HOME_BUTTON = new BooleanSetting("revanced_hide_home_button", FALSE, true);
     public static final BooleanSetting HIDE_CREATE_BUTTON = new BooleanSetting("revanced_hide_create_button", TRUE, true);
@@ -283,12 +302,12 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_SHORTS_LOCATION_LABEL = new BooleanSetting("revanced_hide_shorts_location_label", FALSE);
     public static final BooleanSetting HIDE_SHORTS_NAVIGATION_BAR = new BooleanSetting("revanced_hide_shorts_navigation_bar", FALSE, true);
     public static final BooleanSetting HIDE_SHORTS_PAUSED_OVERLAY_BUTTONS = new BooleanSetting("revanced_hide_shorts_paused_overlay_buttons", FALSE);
+    public static final BooleanSetting HIDE_SHORTS_PREVIEW_COMMENT = new BooleanSetting("revanced_hide_shorts_preview_comment", TRUE);
     public static final BooleanSetting HIDE_SHORTS_REMIX_BUTTON = new BooleanSetting("revanced_hide_shorts_remix_button", TRUE);
     public static final BooleanSetting HIDE_SHORTS_SAVE_SOUND_BUTTON = new BooleanSetting("revanced_hide_shorts_save_sound_button", TRUE);
     public static final BooleanSetting HIDE_SHORTS_SEARCH = new BooleanSetting("revanced_hide_shorts_search", FALSE);
     public static final BooleanSetting HIDE_SHORTS_SEARCH_SUGGESTIONS = new BooleanSetting("revanced_hide_shorts_search_suggestions", TRUE);
     public static final BooleanSetting HIDE_SHORTS_SHARE_BUTTON = new BooleanSetting("revanced_hide_shorts_share_button", FALSE);
-    public static final BooleanSetting HIDE_SHORTS_PREVIEW_COMMENT = new BooleanSetting("revanced_hide_shorts_preview_comment", TRUE);
     public static final BooleanSetting HIDE_SHORTS_SHOP_BUTTON = new BooleanSetting("revanced_hide_shorts_shop_button", TRUE);
     public static final BooleanSetting HIDE_SHORTS_SOUND_BUTTON = new BooleanSetting("revanced_hide_shorts_sound_button", FALSE);
     public static final BooleanSetting HIDE_SHORTS_SOUND_METADATA_LABEL = new BooleanSetting("revanced_hide_shorts_sound_metadata_label", FALSE);
@@ -318,7 +337,7 @@ public class Settings extends BaseSettings {
     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
+    // Miscellaneous
     public static final BooleanSetting ANNOUNCEMENTS = new BooleanSetting("revanced_announcements", TRUE);
     public static final IntegerSetting ANNOUNCEMENT_LAST_ID = new IntegerSetting("revanced_announcement_last_id", -1, false, false);
     public static final BooleanSetting AUTO_REPEAT = new BooleanSetting("revanced_auto_repeat", FALSE);

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

@@ -16,10 +16,8 @@ import app.revanced.extension.youtube.settings.Settings;
 @SuppressWarnings({"unused", "deprecation"})
 public final class CustomVideoSpeedListPreference extends CustomDialogListPreference {
 
-    /**
-     * Initialize a settings preference list with the available playback speeds.
-     */
-    private void initializeEntryValues() {
+    {
+        // Initialize a settings preference list with the available playback speeds.
         float[] customPlaybackSpeeds = CustomPlaybackSpeedPatch.customPlaybackSpeeds;
         final int numberOfEntries = customPlaybackSpeeds.length + 1;
         String[] preferenceListEntries = new String[numberOfEntries];
@@ -41,10 +39,6 @@ public final class CustomVideoSpeedListPreference extends CustomDialogListPrefer
         setEntryValues(preferenceListEntryValues);
     }
 
-    {
-        initializeEntryValues();
-    }
-
     public CustomVideoSpeedListPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }

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

@@ -0,0 +1,444 @@
+package app.revanced.extension.youtube.settings.preference;
+
+import static app.revanced.extension.shared.StringRef.sf;
+import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.shared.Utils.dipToPixels;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.RoundRectShape;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.util.Pair;
+import android.util.TypedValue;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+
+import androidx.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.preference.CustomDialogListPreference;
+import app.revanced.extension.youtube.settings.Settings;
+
+/**
+ * A custom ListPreference for selecting an external downloader package with checkmarks and EditText for custom package names.
+ */
+@SuppressWarnings({"unused", "deprecation"})
+public class ExternalDownloaderPreference extends CustomDialogListPreference {
+
+    /**
+     * Enum representing supported external downloaders with their display names, package names, and download URLs.
+     */
+    private enum Downloader {
+        YTDLNIS("YTDLnis",
+                "com.deniscerri.ytdl",
+                "https://ytdlnis.org",
+                true),
+        SEAL("Seal",
+                "com.junkfood.seal",
+                "https://github.com/JunkFood02/Seal/releases/latest",
+                true),
+        GRAYJAY("Grayjay",
+                "com.futo.platformplayer",
+                "https://grayjay.app"),
+        LIBRETUBE("LibreTube",
+                "com.github.libretube",
+                "https://libretube.dev"),
+        NEWPIPE("NewPipe",
+                "org.schabi.newpipe",
+                "https://newpipe.net"),
+        PIPEPIPE("PipePipe",
+                "InfinityLoop1309.NewPipeEnhanced",
+                "https://pipepipe.dev"),
+        TUBULAR("Tubular",
+                "org.polymorphicshade.tubular",
+                "https://github.com/polymorphicshade/Tubular/releases/latest"),
+        OTHER(sf("revanced_external_downloader_other_item").toString(),
+                null,
+                null,
+                true);
+
+        private static final Map<String, Downloader> PACKAGE_TO_ENUM = new HashMap<>();
+
+        static {
+            for (Downloader downloader : values()) {
+                String packageName = downloader.packageName;
+                if (packageName != null) {
+                    PACKAGE_TO_ENUM.put(packageName, downloader);
+                }
+            }
+        }
+
+        /**
+         * Finds a Downloader by its package name. This method can never return {@link #OTHER}.
+         * @return The Downloader enum or null if not found.
+         */
+        @Nullable
+        public static Downloader findByPackageName(String packageName) {
+            return PACKAGE_TO_ENUM.get(Objects.requireNonNull(packageName));
+        }
+
+        public final String name;
+        @Nullable
+        public final String packageName;
+        @Nullable
+        public final String downloadUrl;
+        /**
+         * If a downloader app should be shown in the preference settings
+         * if the app is not currently installed.
+         */
+        public final boolean isPreferred;
+
+        Downloader(String name, String packageName, String downloadUrl) {
+            this(name, packageName, downloadUrl, false);
+        }
+
+        Downloader(String name, @Nullable String packageName, @Nullable String downloadUrl, boolean isPreferred) {
+            this.name = name;
+            this.packageName = packageName;
+            this.downloadUrl = downloadUrl;
+            this.isPreferred = isPreferred;
+        }
+
+        public boolean isInstalled() {
+            return packageName != null && isAppInstalledAndEnabled(packageName);
+        }
+    }
+
+    private static boolean isAppInstalledAndEnabled(String packageName) {
+        try {
+            if (Utils.getContext().getPackageManager().getApplicationInfo(packageName, 0).enabled) {
+                Logger.printDebug(() -> "App installed: " + packageName);
+                return true;
+            }
+        } catch (PackageManager.NameNotFoundException error) {
+            Logger.printDebug(() -> "App not installed: " + packageName);
+        }
+        return false;
+    }
+
+    private EditText editText;
+    private CustomDialogListPreference.ListPreferenceArrayAdapter adapter;
+
+    public ExternalDownloaderPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public ExternalDownloaderPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public ExternalDownloaderPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ExternalDownloaderPreference(Context context) {
+        super(context);
+    }
+
+    private void updateEntries() {
+        List<CharSequence> entries = new ArrayList<>();
+        List<CharSequence> entryValues = new ArrayList<>();
+
+        for (Downloader downloader : Downloader.values()) {
+            if (downloader.isPreferred || downloader.isInstalled()) {
+                String packageName = downloader.packageName;
+
+                entries.add(downloader.name);
+                entryValues.add(packageName != null
+                        ? packageName
+                        : Downloader.OTHER.name);
+            }
+        }
+
+        setEntries(entries.toArray(new CharSequence[0]));
+        setEntryValues(entryValues.toArray(new CharSequence[0]));
+    }
+
+    /**
+     * Sets the summary for this ListPreference.
+     */
+    @Override
+    public void setSummary(CharSequence summary) {
+        // Ignore calls to set the summary.
+        // Summary is always the description of the category.
+        //
+        // This is required otherwise the ReVanced preference fragment
+        // sets all ListPreference summaries to show the current selection.
+    }
+
+    /**
+     * Shows a custom dialog with a ListView for predefined downloader packages and EditText for custom package input.
+     */
+    @Override
+    protected void showDialog(@Nullable Bundle state) {
+        // Must set entries before showing the dialog, to handle if
+        // an app is installed while the settings are open in the background.
+        updateEntries();
+
+        Context context = getContext();
+        String packageName = Settings.EXTERNAL_DOWNLOADER_PACKAGE_NAME.get();
+
+        // Create the main layout for the dialog content.
+        LinearLayout contentLayout = new LinearLayout(context);
+        contentLayout.setOrientation(LinearLayout.VERTICAL);
+
+        // Create ListView for predefined downloader apps.
+        ListView listView = new ListView(context);
+        listView.setId(android.R.id.list);
+        listView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
+
+        // Create custom adapter for the ListView.
+        final boolean usingCustomDownloader = Downloader.findByPackageName(packageName) == null;
+        adapter = new CustomDialogListPreference.ListPreferenceArrayAdapter(
+                context,
+                Utils.getResourceIdentifier("revanced_custom_list_item_checked", "layout"),
+                getEntries(),
+                getEntryValues(),
+                usingCustomDownloader
+                        ? Downloader.OTHER.name
+                        : packageName
+        );
+        listView.setAdapter(adapter);
+
+        Function<String, Void> updateListViewSelection = (updatedPackageName) -> {
+            String entryValueName = Downloader.findByPackageName(updatedPackageName) == null
+                    ? Downloader.OTHER.name
+                    : updatedPackageName;
+            CharSequence[] entryValues = getEntryValues();
+
+            for (int i = 0, length = entryValues.length; i < length; i++) {
+                String entryString = entryValues[i].toString();
+                if (entryString.equals(entryValueName)) {
+                    listView.setItemChecked(i, true);
+                    listView.setSelection(i);
+                    adapter.setSelectedValue(entryString);
+                    adapter.notifyDataSetChanged();
+                    break;
+                }
+            }
+            return null;
+        };
+        updateListViewSelection.apply(packageName);
+
+        // Handle item click to select value.
+        listView.setOnItemClickListener((parent, view, position, id) -> {
+            String selectedValue = getEntryValues()[position].toString();
+            Downloader selectedApp = Downloader.findByPackageName(selectedValue);
+
+            if (selectedApp != null) {
+                editText.setText(selectedApp.packageName);
+                editText.setEnabled(false); // Disable editing for predefined options.
+            } else {
+                String savedPackageName = Settings.EXTERNAL_DOWNLOADER_PACKAGE_NAME.get();
+                editText.setText(Downloader.findByPackageName(savedPackageName) == null
+                        ? savedPackageName // If the user is clicking thru options then retain existing other app.
+                        : ""
+                );
+                editText.setEnabled(true); // Enable editing for Custom.
+                editText.requestFocus();
+            }
+            editText.setSelection(editText.getText().length());
+            adapter.setSelectedValue(selectedValue);
+            adapter.notifyDataSetChanged();
+        });
+
+        // Add ListView to content layout with initial height.
+        LinearLayout.LayoutParams listViewParams = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                0 // Initial height, will be updated.
+        );
+        listViewParams.bottomMargin = dipToPixels(16);
+        contentLayout.addView(listView, listViewParams);
+
+        // Add EditText for custom package name.
+        editText = new EditText(context);
+        editText.setText(packageName);
+        editText.setSelection(packageName.length());
+        editText.setHint(str("revanced_external_downloader_other_item_hint"));
+        editText.setSingleLine(true); // Restrict EditText to a single line.
+        editText.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
+        // Set initial EditText state based on selected downloader.
+        editText.setEnabled(usingCustomDownloader);
+        editText.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {}
+
+            @Override
+            public void afterTextChanged(Editable edit) {
+                String updatedPackageName = edit.toString().trim();
+                updateListViewSelection.apply(updatedPackageName);
+            }
+        });
+
+        ShapeDrawable editTextBackground = new ShapeDrawable(new RoundRectShape(
+                Utils.createCornerRadii(10), null, null));
+        editTextBackground.getPaint().setColor(Utils.getEditTextBackground());
+        final int dip8 = dipToPixels(8);
+        editText.setPadding(dip8, dip8, dip8, dip8);
+        editText.setBackground(editTextBackground);
+        editText.setClipToOutline(true);
+        contentLayout.addView(editText);
+
+        // Create the custom dialog.
+        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                context,
+                getTitle() != null ? getTitle().toString() : "",
+                null,
+                null,
+                null,
+                () -> {
+                    String newValue = editText.getText().toString().trim();
+                    if (newValue.isEmpty()) {
+                        // Show dialog if EditText is empty.
+                        Utils.createCustomDialog(
+                                context,
+                                str("revanced_external_downloader_name_title"),
+                                str("revanced_external_downloader_empty_warning"),
+                                null,
+                                null,
+                                () -> {}, // OK button does nothing (dismiss only).
+                                null,
+                                null,
+                                null,
+                                false
+                        ).first.show();
+                        return;
+                    }
+
+                    if (showDialogIfAppIsNotInstalled(getContext(), newValue)) {
+                        return; // Invalid package. Do not save.
+                    }
+
+                    // Save custom package name.
+                    if (callChangeListener(newValue)) {
+                        setValue(newValue);
+                    }
+                },
+                () -> {}, // Cancel button action (dismiss only).
+                str("revanced_settings_reset"),
+                () -> { // Reset action.
+                    String defaultValue = Settings.EXTERNAL_DOWNLOADER_PACKAGE_NAME.defaultValue;
+                    editText.setText(defaultValue);
+                    editText.setSelection(defaultValue.length());
+                    editText.setEnabled(false); // Disable editing on reset.
+                    updateListViewSelection.apply(defaultValue);
+                },
+                false
+        );
+
+        // Add the content layout directly to the dialog's main layout.
+        LinearLayout dialogMainLayout = dialogPair.second;
+        dialogMainLayout.addView(contentLayout, dialogMainLayout.getChildCount() - 1);
+
+        // Update ListView height dynamically based on orientation.
+        //noinspection ExtractMethodRecommender
+        Runnable updateListViewHeight = () -> {
+            int totalHeight = 0;
+            ListAdapter listAdapter = listView.getAdapter();
+            if (listAdapter != null) {
+                DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+                final int listAdapterCount = listAdapter.getCount();
+                for (int i = 0; i < listAdapterCount; i++) {
+                    View item = listAdapter.getView(i, null, listView);
+                    item.measure(
+                            View.MeasureSpec.makeMeasureSpec(metrics.widthPixels, View.MeasureSpec.AT_MOST),
+                            View.MeasureSpec.UNSPECIFIED
+                    );
+                    totalHeight += item.getMeasuredHeight();
+                }
+                totalHeight += listView.getDividerHeight() * (listAdapterCount - 1);
+            }
+
+            final int orientation = context.getResources().getConfiguration().orientation;
+            if (orientation == android.content.res.Configuration.ORIENTATION_PORTRAIT) {
+                // In portrait orientation, use WRAP_CONTENT for ListView height.
+                listViewParams.height = LinearLayout.LayoutParams.WRAP_CONTENT;
+            } else {
+                // In landscape orientation, limit ListView height to 30% of screen height.
+                final int maxHeight = Utils.percentageHeightToPixels(30);
+                listViewParams.height = Math.min(totalHeight, maxHeight);
+            }
+            listView.setLayoutParams(listViewParams);
+        };
+
+        // Initial height calculation.
+        updateListViewHeight.run();
+
+        // Listen for configuration changes (e.g., orientation).
+        View dialogView = dialogPair.second;
+        // Recalculate height when layout changes (e.g., orientation change).
+        dialogView.getViewTreeObserver().addOnGlobalLayoutListener(updateListViewHeight::run);
+
+        // Show the dialog.
+        dialogPair.first.show();
+    }
+
+    /**
+     * @return If the app is not installed and a dialog was shown.
+     */
+    public static boolean showDialogIfAppIsNotInstalled(Context context, String packageName) {
+        if (isAppInstalledAndEnabled(packageName)) {
+            return false;
+        }
+
+        Downloader downloader = Downloader.findByPackageName(packageName);
+        String downloadUrl = downloader != null
+                ? downloader.downloadUrl
+                : null;
+        String okButtonText = downloadUrl != null
+                ? str("gms_core_dialog_open_website_text") // Open website.
+                : null; // Ok.
+        // Show a dialog if the recommended app is not installed or if the custom package cannot be found.
+        String message = downloader != null
+                ? str("revanced_external_downloader_not_installed_warning", downloader.name)
+                : str("revanced_external_downloader_package_not_found_warning", packageName);
+
+        Utils.createCustomDialog(
+                context,
+                str("revanced_external_downloader_not_found_title"),
+                message,
+                null,
+                okButtonText,
+                () -> {
+                    try {
+                        // OK button action: open the downloader's URL if available.
+                        if (downloadUrl != null) {
+                            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(downloadUrl));
+                            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                            context.startActivity(intent);
+                        }
+                    } catch (Exception ex) {
+                        Logger.printException(() -> "Failed to open downloader URL: " + downloader, ex);
+                    }
+                },
+                () -> {}, // Cancel button action (dismiss only).
+                null,
+                null,
+                false
+        ).first.show();
+
+        return true;
+    }
+}

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

@@ -17,6 +17,7 @@ import android.preference.SwitchPreference;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.BackgroundColorSpan;
+import android.util.TypedValue;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowInsets;
@@ -248,7 +249,15 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
                                 rootView.setOnApplyWindowInsetsListener((v, insets) -> {
                                     Insets statusInsets = insets.getInsets(WindowInsets.Type.statusBars());
                                     Insets navInsets = insets.getInsets(WindowInsets.Type.navigationBars());
-                                    v.setPadding(0, statusInsets.top, 0, navInsets.bottom);
+                                    Insets cutoutInsets = insets.getInsets(WindowInsets.Type.displayCutout());
+
+                                    // Apply padding for display cutout in landscape.
+                                    int leftPadding = cutoutInsets.left;
+                                    int rightPadding = cutoutInsets.right;
+                                    int topPadding = statusInsets.top;
+                                    int bottomPadding = navInsets.bottom;
+
+                                    v.setPadding(leftPadding, topPadding, rightPadding, bottomPadding);
                                     return insets;
                                 });
                             }
@@ -265,10 +274,16 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
                                     true, TextView.class::isInstance);
                             if (toolbarTextView != null) {
                                 toolbarTextView.setTextColor(Utils.getAppForegroundColor());
+                                toolbarTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
                             }
 
                             LicenseActivityHook.setToolbarLayoutParams(toolbar);
 
+                            if (LicenseActivityHook.searchViewController != null
+                                    && LicenseActivityHook.searchViewController.isSearchActive()) {
+                                toolbar.post(() -> LicenseActivityHook.searchViewController.closeSearch());
+                            }
+
                             rootView.addView(toolbar, 0);
                             return false;
                         }

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

@@ -830,11 +830,10 @@ public class SegmentPlaybackController {
             WindowManager.LayoutParams params = window.getAttributes();
             params.gravity = Gravity.BOTTOM;
             params.y = dipToPixels(72);
-            DisplayMetrics displayMetrics = Resources.getSystem().getDisplayMetrics();
-            int portraitWidth = (int) (displayMetrics.widthPixels * 0.6);
+            int portraitWidth = Utils.percentageWidthToPixels(60); // 60% of the screen width.
 
             if (Resources.getSystem().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
-                portraitWidth = (int) Math.min(portraitWidth, displayMetrics.heightPixels * 0.6);
+                portraitWidth = Math.min(portraitWidth, Utils.percentageHeightToPixels(60)); // 60% of the screen height.
             }
             params.width = portraitWidth;
             params.dimAmount = 0.0f;

gradle.properties

@@ -3,4 +3,4 @@ org.gradle.jvmargs = -Xms512M -Xmx2048M
 org.gradle.parallel = true
 android.useAndroidX = true
 kotlin.code.style = official
-version = 5.31.0-dev.1
+version = 5.32.0-dev.4

patches/api/patches.api

@@ -116,8 +116,8 @@ public final class app/revanced/patches/all/misc/shortcut/sharetargets/RemoveSha
 	public static final fun getRemoveShareTargetsPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
 }
 
-public final class app/revanced/patches/all/misc/spoof/SignatureSpoofPatchKt {
-	public static final fun getSignatureSpoofPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
+public final class app/revanced/patches/all/misc/spoof/EnableRomSignatureSpoofingKt {
+	public static final fun getEnableRomSignatureSpoofing ()Lapp/revanced/patcher/patch/ResourcePatch;
 }
 
 public final class app/revanced/patches/all/misc/targetSdk/SetTargetSdkVersion34Kt {
@@ -168,6 +168,10 @@ public final class app/revanced/patches/cricbuzz/ads/DisableAdsPatchKt {
 	public static final fun getDisableAdsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/cricbuzz/misc/extension/ExtensionPatchKt {
+	public static final fun getSharedExtensionPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/crunchyroll/ads/HideAdsPatchKt {
 	public static final fun getHideAdsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -472,6 +476,10 @@ public final class app/revanced/patches/primevideo/misc/permissions/RenamePermis
 	public static final fun getRenamePermissionsPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
 }
 
+public final class app/revanced/patches/primevideo/video/speed/PlaybackSpeedPatchKt {
+	public static final fun getPlaybackSpeedPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/protonmail/account/RemoveFreeAccountsLimitPatchKt {
 	public static final fun getRemoveFreeAccountsLimitPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
 }
@@ -900,6 +908,10 @@ public final class app/revanced/patches/shared/misc/spoof/UserAgentClientSpoofPa
 	public static final fun userAgentClientSpoofPatch (Ljava/lang/String;)Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/shared/misc/string/ReplaceStringPatchKt {
+	public static final fun replaceStringPatch (Ljava/lang/String;Ljava/lang/String;)Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/solidexplorer2/functionality/filesize/RemoveFileSizeLimitPatchKt {
 	public static final fun getRemoveFileSizeLimitPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1228,6 +1240,11 @@ public final class app/revanced/patches/youtube/interaction/dialog/RemoveViewerD
 	public static final fun getRemoveViewerDiscretionDialogPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/youtube/interaction/doubletap/DisableChapterSkipDoubleTapPatchKt {
+	public static final fun getDisableChapterSkipDoubleTapPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+	public static final fun getDisableDoubleTapActionsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/youtube/interaction/downloads/DownloadsPatchKt {
 	public static final fun getDownloadsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }

patches/src/main/kotlin/app/revanced/patches/all/misc/spoof/EnableRomSignatureSpoofing.kt

@@ -0,0 +1,92 @@
+package app.revanced.patches.all.misc.spoof
+
+import app.revanced.patcher.patch.resourcePatch
+import app.revanced.patcher.patch.stringOption
+import app.revanced.util.getNode
+import com.android.apksig.ApkVerifier
+import com.android.apksig.apk.ApkFormatException
+import org.w3c.dom.Element
+import java.io.File
+import java.io.IOException
+import java.nio.file.InvalidPathException
+import java.security.NoSuchAlgorithmException
+import java.security.cert.CertificateException
+import java.security.cert.CertificateFactory
+import java.util.*
+
+@Suppress("unused")
+val enableRomSignatureSpoofing = resourcePatch(
+    name = "Enable ROM signature spoofing",
+    description = "Spoofs the signature via the manifest meta-data \"fake-signature\". " +
+            "This patch only works with ROMs that support signature spoofing.",
+    use = false,
+) {
+    val signatureOrPath by stringOption(
+        key = "signatureOrApkFilePath",
+        title = "Signature or APK file path",
+        validator = validator@{ signature ->
+            signature ?: return@validator false
+
+            parseSignature(signature) != null
+        },
+        description = "The hex-encoded signature or path to an APK file with the desired signature.",
+        required = true,
+    )
+    execute {
+        document("AndroidManifest.xml").use { document ->
+            val permission = document.createElement("uses-permission").apply {
+                setAttribute("android:name", "android.permission.FAKE_PACKAGE_SIGNATURE")
+            }
+            val manifest = document.getNode("manifest").appendChild(permission)
+
+
+            val fakeSignatureMetadata = document.createElement("meta-data").apply {
+                setAttribute("android:name", "fake-signature")
+                setAttribute("android:value", parseSignature(signatureOrPath!!))
+            }
+            document.getNode("application").appendChild(fakeSignatureMetadata)
+        }
+    }
+}
+
+private fun parseSignature(optionValue: String): String? {
+    // Parse as a hex-encoded signature.
+    try {
+        // TODO: Replace with signature.hexToByteArray when stable in kotlin
+        val signatureBytes = HexFormat.of().parseHex(optionValue)
+        CertificateFactory.getInstance("X.509").generateCertificate(signatureBytes.inputStream())
+
+        return optionValue
+    } catch (_: IllegalArgumentException) {
+    } catch (_: CertificateException) {
+    }
+
+    // Parse as a path to an APK file.
+    try {
+        val apkFile = File(optionValue)
+        if (!apkFile.isFile) return null
+
+        val result = ApkVerifier.Builder(apkFile).build().verify()
+
+        val hexFormat = HexFormat.of()
+
+        val signature = (if (result.isVerifiedUsingV3Scheme) {
+            result.v3SchemeSigners[0].certificate
+        } else if (result.isVerifiedUsingV2Scheme) {
+            result.v2SchemeSigners[0].certificate
+        } else if (result.isVerifiedUsingV1Scheme) {
+            result.v1SchemeSigners[0].certificate
+        } else {
+            return null
+        }).encoded
+
+        return hexFormat.formatHex(signature)
+    } catch (_: IOException) {
+    } catch (_: InvalidPathException) {
+    } catch (_: ApkFormatException) {
+    } catch (_: NoSuchAlgorithmException) {
+    } catch (_: IllegalArgumentException) {
+    }
+
+    return null
+}

patches/src/main/kotlin/app/revanced/patches/all/misc/spoof/SignatureSpoofPatch.kt

@@ -1,95 +0,0 @@
-package app.revanced.patches.all.misc.spoof
-
-import app.revanced.patcher.patch.resourcePatch
-import app.revanced.patcher.patch.stringOption
-import app.revanced.util.getNode
-import com.android.apksig.ApkVerifier
-import com.android.apksig.apk.ApkFormatException
-import org.w3c.dom.Element
-import java.io.ByteArrayInputStream
-import java.io.IOException
-import java.nio.file.Files
-import java.nio.file.InvalidPathException
-import java.nio.file.attribute.BasicFileAttributes
-import java.security.NoSuchAlgorithmException
-import java.security.cert.CertificateException
-import java.security.cert.CertificateFactory
-import java.util.*
-import kotlin.io.path.Path
-
-val signatureSpoofPatch = resourcePatch(
-        name = "Spoof app signature",
-        description = "Spoofs the app signature via the \"fake-signature\" meta key. " +
-            "This patch only works with patched device roms.",
-        use = false,
-    ) {
-    val signature by stringOption(
-        key = "spoofedAppSignature",
-        title = "Signature",
-        validator = { signature ->
-            optionToSignature(signature) != null
-        },
-        description = "The hex-encoded signature or path to an apk file with the desired signature",
-        required = true,
-    )
-    execute {
-        document("AndroidManifest.xml").use { document ->
-            val manifest = document.getNode("manifest") as Element
-
-            val fakeSignaturePermission = document.createElement("uses-permission")
-            fakeSignaturePermission.setAttribute("android:name", "android.permission.FAKE_PACKAGE_SIGNATURE")
-            manifest.appendChild(fakeSignaturePermission)
-
-            val application = document.getNode("application") ?: {
-                val child = document.createElement("application")
-                manifest.appendChild(child)
-                child
-            } as Element;
-
-            val fakeSignatureMetadata = document.createElement("meta-data")
-            fakeSignatureMetadata.setAttribute("android:name", "fake-signature")
-            fakeSignatureMetadata.setAttribute("android:value", optionToSignature(signature))
-            application.appendChild(fakeSignatureMetadata)
-        }
-    }
-}
-
-internal fun optionToSignature(signature: String?): String? {
-    if (signature == null) {
-        return null;
-    }
-    try {
-        // TODO: Replace with signature.hexToByteArray when stable in kotlin
-        val signatureBytes = HexFormat.of()
-            .parseHex(signature)
-        val factory = CertificateFactory.getInstance("X.509")
-        factory.generateCertificate(ByteArrayInputStream(signatureBytes))
-        return signature;
-    } catch (_: IllegalArgumentException) {
-    } catch (_: CertificateException) {
-    }
-    try {
-        val signaturePath = Path(signature)
-        if (!Files.readAttributes(signaturePath, BasicFileAttributes::class.java).isRegularFile) {
-            return null;
-        }
-        val verifier = ApkVerifier.Builder(signaturePath.toFile())
-            .build()
-
-        val result = verifier.verify()
-        if (result.isVerifiedUsingV3Scheme) {
-            return HexFormat.of().formatHex(result.v3SchemeSigners[0].certificate.encoded)
-        } else if (result.isVerifiedUsingV2Scheme) {
-            return HexFormat.of().formatHex(result.v2SchemeSigners[0].certificate.encoded)
-        } else if (result.isVerifiedUsingV1Scheme) {
-            return HexFormat.of().formatHex(result.v1SchemeSigners[0].certificate.encoded)
-        }
-
-        return null;
-    } catch (_: IOException) {
-    } catch (_: InvalidPathException) {
-    } catch (_: ApkFormatException) {
-    } catch (_: NoSuchAlgorithmException) {
-    } catch (_: IllegalArgumentException) {}
-    return null;
-}

patches/src/main/kotlin/app/revanced/patches/cricbuzz/ads/DisableAdsPatch.kt

@@ -3,24 +3,38 @@ package app.revanced.patches.cricbuzz.ads
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.cricbuzz.misc.extension.sharedExtensionPatch
+import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.returnEarly
 import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference
+
+private const val EXTENSION_CLASS_DESCRIPTOR =
+    "Lapp/revanced/extension/cricbuzz/ads/HideAdsPatch;"
 
 @Suppress("unused")
 val disableAdsPatch = bytecodePatch (
     name = "Hide ads",
 ) {
-    compatibleWith("com.cricbuzz.android"("6.23.02"))
+    compatibleWith("com.cricbuzz.android"("6.24.01"))
+
+    dependsOn(sharedExtensionPatch)
 
     execute {
-        userStateSwitchFingerprint.method.apply {
-            val opcodeIndex = indexOfFirstInstructionOrThrow(Opcode.MOVE_RESULT_OBJECT)
-            val register = getInstruction<OneRegisterInstruction>(opcodeIndex).registerA
+        userStateSwitchFingerprint.method.returnEarly(true)
 
-            addInstruction(
-                opcodeIndex + 1,
-                "const-string v$register, \"ACTIVE\""
+        // Remove region-specific Cricbuzz11 elements.
+        cb11ConstructorFingerprint.method.addInstruction(0, "const/4 p7, 0x0")
+        getBottomBarFingerprint.method.apply {
+            val getIndex = indexOfFirstInstructionOrThrow() {
+                opcode == Opcode.IGET_OBJECT && getReference<FieldReference>()?.name == "bottomBar"
+            }
+            val getRegister = getInstruction<TwoRegisterInstruction>(getIndex).registerA
+
+            addInstruction(getIndex + 1,
+                "invoke-static { v$getRegister }, $EXTENSION_CLASS_DESCRIPTOR->filterCb11(Ljava/util/List;)V"
             )
         }
     }

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

@@ -4,6 +4,30 @@ import app.revanced.patcher.fingerprint
 import com.android.tools.smali.dexlib2.Opcode
 
 internal val userStateSwitchFingerprint = fingerprint {
-    strings("key.user.state", "NA")
     opcodes(Opcode.SPARSE_SWITCH)
+    strings("key.user.state", "NA")
 }
+
+internal val cb11ConstructorFingerprint = fingerprint {
+    parameters(
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        "I",
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        "Z",
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        "L"
+    )
+    custom { _, classDef ->
+        classDef.endsWith("CB11Details;")
+    }
+}
+
+internal val getBottomBarFingerprint = fingerprint {
+    custom { method, classDef ->
+        method.name == "getBottomBar" && classDef.endsWith("HomeMenu;")
+    }
+}

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

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

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

@@ -0,0 +1,9 @@
+package app.revanced.patches.cricbuzz.misc.extension
+
+import app.revanced.patches.shared.misc.extension.extensionHook
+
+internal val applicationInitHook = extensionHook {
+    custom { method, classDef ->
+        method.name == "onCreate" && classDef.endsWith("/NyitoActivity;")
+    }
+}

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

@@ -14,7 +14,7 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 
 @Suppress("unused")
 val hideAdsPatch = bytecodePatch(
-    name = "Hide Ads"
+    name = "Hide ads"
 ) {
     compatibleWith("com.crunchyroll.crunchyroid")
 

patches/src/main/kotlin/app/revanced/patches/messenger/inbox/Fingerprints.kt

@@ -23,7 +23,6 @@ internal val createInboxSubTabsFingerprint = fingerprint {
 }
 
 internal val loadInboxAdsFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC)
     returns("V")
     strings(
         "ads_load_begin",

patches/src/main/kotlin/app/revanced/patches/primevideo/ads/SkipAdsPatch.kt

@@ -12,7 +12,7 @@ val skipAdsPatch = bytecodePatch(
     name = "Skip ads",
     description = "Automatically skips video stream ads.",
 ) {
-    compatibleWith("com.amazon.avod.thirdpartyclient"("3.0.403.257"))
+    compatibleWith("com.amazon.avod.thirdpartyclient"("3.0.412.2947"))
 
     dependsOn(sharedExtensionPatch)
 

patches/src/main/kotlin/app/revanced/patches/primevideo/video/speed/Fingerprints.kt

@@ -0,0 +1,23 @@
+package app.revanced.patches.primevideo.video.speed
+
+import app.revanced.patcher.fingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal val playbackUserControlsInitializeFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC)
+    parameters("Lcom/amazon/avod/playbackclient/PlaybackInitializationContext;")
+    returns("V")
+    custom { method, classDef ->
+        method.name == "initialize" && classDef.type == "Lcom/amazon/avod/playbackclient/activity/feature/PlaybackUserControlsFeature;"
+    }
+}
+
+internal val playbackUserControlsPrepareForPlaybackFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC)
+    parameters("Lcom/amazon/avod/playbackclient/PlaybackContext;")
+    returns("V")
+    custom { method, classDef ->
+        method.name == "prepareForPlayback" && 
+        classDef.type == "Lcom/amazon/avod/playbackclient/activity/feature/PlaybackUserControlsFeature;"
+    }
+}

patches/src/main/kotlin/app/revanced/patches/primevideo/video/speed/PlaybackSpeedPatch.kt

@@ -0,0 +1,56 @@
+package app.revanced.patches.primevideo.video.speed
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.primevideo.misc.extension.sharedExtensionPatch
+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.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference
+
+private const val EXTENSION_CLASS_DESCRIPTOR = 
+    "Lapp/revanced/extension/primevideo/videoplayer/PlaybackSpeedPatch;"
+
+val playbackSpeedPatch = bytecodePatch(
+    name = "Playback speed",
+    description = "Adds playback speed controls to the video player.",
+) {
+    dependsOn(
+        sharedExtensionPatch,
+    )
+
+    compatibleWith(
+        "com.amazon.avod.thirdpartyclient"("3.0.412.2947")
+    )
+
+    execute {
+        playbackUserControlsInitializeFingerprint.method.apply {
+            val getIndex = indexOfFirstInstructionOrThrow {
+                opcode == Opcode.IPUT_OBJECT && 
+                getReference<FieldReference>()?.name == "mUserControls"
+            }
+            
+            val getRegister = getInstruction<OneRegisterInstruction>(getIndex).registerA
+            
+            addInstructions(
+                getIndex + 1,
+                """
+                invoke-static { v$getRegister }, $EXTENSION_CLASS_DESCRIPTOR->initializeSpeedOverlay(Landroid/view/View;)V
+                """
+            )
+        }
+
+        playbackUserControlsPrepareForPlaybackFingerprint.method.apply {
+            addInstructions(
+                0,
+                """
+                invoke-virtual { p1 }, Lcom/amazon/avod/playbackclient/PlaybackContext;->getPlayer()Lcom/amazon/video/sdk/player/Player;
+                move-result-object v0
+                invoke-static { v0 }, $EXTENSION_CLASS_DESCRIPTOR->setPlayer(Lcom/amazon/video/sdk/player/Player;)V
+                """
+            )
+        }
+    }
+} 

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

@@ -4,9 +4,16 @@ import app.revanced.patcher.Fingerprint
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patches.reddit.customclients.spoofClientPatch
+import app.revanced.patches.shared.misc.string.replaceStringPatch
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 val spoofClientPatch = spoofClientPatch(redirectUri = "http://baconreader.com/auth") { clientIdOption ->
+    dependsOn(
+        // Redirects from SSL to WWW domain are bugged causing auth problems.
+        // Manually rewrite the URLs to fix this.
+        replaceStringPatch("ssl.reddit.com", "www.reddit.com")
+    )
+
     compatibleWith(
         "com.onelouder.baconreader",
         "com.onelouder.baconreader.premium",

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

@@ -61,7 +61,7 @@ val spoofClientPatch = spoofClientPatch(redirectUri = "redditisfun://auth") { cl
         // region Patch miscellaneous.
 
         // Reddit messed up and does not append a redirect uri to the authorization url to old.reddit.com/login.
-        // Replace old.reddit.com with ssl.reddit.com to fix this.
+        // Replace old.reddit.com with www.reddit.com to fix this.
         buildAuthorizationStringFingerprint.method.apply {
             val index = indexOfFirstInstructionOrThrow {
                 getReference<StringReference>()?.contains("old.reddit.com") == true
@@ -70,7 +70,7 @@ val spoofClientPatch = spoofClientPatch(redirectUri = "redditisfun://auth") { cl
             val targetRegister = getInstruction<OneRegisterInstruction>(index).registerA
             replaceInstruction(
                 index,
-                "const-string v$targetRegister, \"https://ssl.reddit.com/api/v1/authorize.compact\"",
+                "const-string v$targetRegister, \"https://www.reddit.com/api/v1/authorize.compact\"",
             )
         }
 

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

@@ -4,6 +4,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patches.reddit.customclients.spoofClientPatch
 import app.revanced.patches.reddit.customclients.sync.detection.piracy.disablePiracyDetectionPatch
+import app.revanced.patches.shared.misc.string.replaceStringPatch
 import app.revanced.util.returnEarly
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
@@ -13,7 +14,12 @@ import java.util.Base64
 val spoofClientPatch = spoofClientPatch(
     redirectUri = "http://redditsync/auth",
 ) { clientIdOption ->
-    dependsOn(disablePiracyDetectionPatch)
+    dependsOn(
+        disablePiracyDetectionPatch,
+        // Redirects from SSL to WWW domain are bugged causing auth problems.
+        // Manually rewrite the URLs to fix this.
+        replaceStringPatch("ssl.reddit.com", "www.reddit.com")
+    )
 
     compatibleWith(
         "com.laurencedawson.reddit_sync",

patches/src/main/kotlin/app/revanced/patches/shared/misc/gms/GmsCoreSupportPatch.kt

@@ -148,7 +148,7 @@ fun gmsCoreSupportPatch(
 
         fun packageNameTransform(fromPackageName: String, toPackageName: String): (String) -> String? = { string ->
             when (string) {
-                "$fromPackageName.SuggestionsProvider",
+                "$fromPackageName.SuggestionProvider",
                 "$fromPackageName.fileprovider",
                 -> string.replace(fromPackageName, toPackageName)
 

patches/src/main/kotlin/app/revanced/patches/shared/misc/string/ReplaceStringPatch.kt

@@ -0,0 +1,39 @@
+package app.revanced.patches.shared.misc.string
+
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.all.misc.transformation.transformInstructionsPatch
+import app.revanced.util.getReference
+import com.android.tools.smali.dexlib2.ReferenceType
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.StringReference
+import kotlin.text.contains
+
+fun replaceStringPatch(
+    from: String,
+    to: String
+) = bytecodePatch(
+    description = "Replaces occurrences of '$from' with '$to' in string references.",
+) {
+    dependsOn(
+        transformInstructionsPatch(
+            filterMap = filterMap@{ _, _, instruction, instructionIndex ->
+                if (instruction.opcode.referenceType != ReferenceType.STRING) return@filterMap null
+
+                val stringReference = instruction.getReference<StringReference>()!!.string
+                if (from !in stringReference) return@filterMap null
+
+                Triple(instructionIndex, instruction as OneRegisterInstruction, stringReference)
+            },
+            transform = transform@{ mutableMethod, entry ->
+                val (instructionIndex, instruction, stringReference) = entry
+
+                val newString = stringReference.replace(from, to)
+                mutableMethod.replaceInstruction(
+                    instructionIndex,
+                    "${instruction.opcode.name} v${instruction.registerA}, \"$newString\"",
+                )
+            },
+        )
+    )
+}

patches/src/main/kotlin/app/revanced/patches/spotify/layout/hide/createbutton/HideCreateButtonPatch.kt

@@ -6,12 +6,10 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.spotify.misc.extension.sharedExtensionPatch
-import app.revanced.patches.spotify.shared.IS_SPOTIFY_LEGACY_APP_TARGET
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
-import java.util.logging.Logger
 
 private const val EXTENSION_CLASS_DESCRIPTOR =
     "Lapp/revanced/extension/spotify/layout/hide/createbutton/HideCreateButtonPatch;"
@@ -26,13 +24,6 @@ val hideCreateButtonPatch = bytecodePatch(
     dependsOn(sharedExtensionPatch)
 
     execute {
-        if (IS_SPOTIFY_LEGACY_APP_TARGET) {
-            Logger.getLogger(this::class.java.name).warning(
-                "Create button does not exist in legacy app target.  No changes applied."
-            )
-            return@execute
-        }
-
         val oldNavigationBarAddItemMethod = oldNavigationBarAddItemFingerprint.originalMethodOrNull
         // Only throw the fingerprint error when oldNavigationBarAddItemMethod does not exist.
         val navigationBarItemSetClassDef = if (oldNavigationBarAddItemMethod == null) {

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

@@ -7,8 +7,8 @@ import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patcher.patch.stringOption
 import app.revanced.patches.spotify.misc.extension.sharedExtensionPatch
-import app.revanced.patches.spotify.shared.IS_SPOTIFY_LEGACY_APP_TARGET
-import app.revanced.util.*
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 import org.w3c.dom.Element
@@ -19,12 +19,6 @@ private val customThemeBytecodePatch = bytecodePatch {
     dependsOn(sharedExtensionPatch)
 
     execute {
-        if (IS_SPOTIFY_LEGACY_APP_TARGET) {
-            // Bytecode changes are not needed for legacy app target.
-            // Player background color is changed with existing resource patch.
-            return@execute
-        }
-
         val colorSpaceUtilsClassDef = colorSpaceUtilsClassFingerprint.originalClassDef
 
         // Hook a util method that converts ARGB to RGBA in the sRGB color space to replace hardcoded accent colors.

patches/src/main/kotlin/app/revanced/patches/spotify/lite/ondemand/Fingerprints.kt

@@ -1,23 +0,0 @@
-package app.revanced.patches.spotify.lite.ondemand
-
-import com.android.tools.smali.dexlib2.Opcode
-import app.revanced.patcher.fingerprint
-
-internal val onDemandFingerprint = fingerprint(fuzzyPatternScanThreshold = 2) {
-    returns("L")
-    parameters()
-    opcodes(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.SGET_OBJECT,
-        Opcode.GOTO,
-        Opcode.SGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IPUT,
-        Opcode.RETURN_OBJECT,
-    )
-}

patches/src/main/kotlin/app/revanced/patches/spotify/lite/ondemand/OnDemandPatch.kt

@@ -1,21 +1,9 @@
 package app.revanced.patches.spotify.lite.ondemand
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.bytecodePatch
 
 @Deprecated("Patch no longer works and will be deleted soon")
 @Suppress("unused")
 val onDemandPatch = bytecodePatch(
     description = "Enables listening to songs on-demand, allowing to play any song from playlists, albums or artists without limitations. This does not remove ads.",
-) {
-    compatibleWith("com.spotify.lite")
-
-    execute {
-        // Spoof a premium account
-
-        onDemandFingerprint.method.addInstruction(
-            onDemandFingerprint.patternMatch!!.endIndex - 1,
-            "const/4 v0, 0x2",
-        )
-    }
-}
+)

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

@@ -2,7 +2,6 @@ package app.revanced.patches.spotify.misc
 
 import app.revanced.patcher.fingerprint
 import app.revanced.patcher.patch.BytecodePatchContext
-import app.revanced.patches.spotify.shared.IS_SPOTIFY_LEGACY_APP_TARGET
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstruction
 import com.android.tools.smali.dexlib2.AccessFlags
@@ -13,25 +12,13 @@ import com.android.tools.smali.dexlib2.iface.reference.TypeReference
 
 context(BytecodePatchContext)
 internal val accountAttributeFingerprint get() = fingerprint {
-    custom { _, classDef ->
-        classDef.type == if (IS_SPOTIFY_LEGACY_APP_TARGET) {
-            "Lcom/spotify/useraccount/v1/AccountAttribute;"
-        } else {
-            "Lcom/spotify/remoteconfig/internal/AccountAttribute;"
-        }
-    }
+    custom { _, classDef -> classDef.type == "Lcom/spotify/remoteconfig/internal/AccountAttribute;" }
 }
 
 context(BytecodePatchContext)
 internal val productStateProtoGetMapFingerprint get() = fingerprint {
     returns("Ljava/util/Map;")
-    custom { _, classDef ->
-        classDef.type == if (IS_SPOTIFY_LEGACY_APP_TARGET) {
-            "Lcom/spotify/ucs/proto/v0/UcsResponseWrapper${'$'}AccountAttributesResponse;"
-        } else {
-            "Lcom/spotify/remoteconfig/internal/ProductStateProto;"
-        }
-    }
+    custom { _, classDef -> classDef.type == "Lcom/spotify/remoteconfig/internal/ProductStateProto;" }
 }
 
 internal val buildQueryParametersFingerprint = fingerprint {
@@ -62,8 +49,8 @@ internal val contextMenuViewModelConstructorFingerprint = fingerprint {
 /**
  * Used to find the interface name of a context menu item.
  */
-internal val browsePodcastsContextMenuItemClassFingerprint = fingerprint {
-    strings("browse_podcast_item", "ui_navigate")
+internal val removeAdsContextMenuItemClassFingerprint = fingerprint {
+    strings("remove_ads_item", "ui_navigate")
 }
 
 internal const val CONTEXT_MENU_ITEM_CLASS_DESCRIPTOR_PLACEHOLDER = "Lapp/revanced/ContextMenuItemPlaceholder;"
@@ -90,14 +77,14 @@ internal val contextFromJsonFingerprint = fingerprint {
     )
     custom { method, classDef ->
         method.name == "fromJson" &&
-                classDef.endsWith("voiceassistants/playermodels/ContextJsonAdapter;")
+                classDef.type.endsWith("voiceassistants/playermodels/ContextJsonAdapter;")
     }
 }
 
 internal val readPlayerOptionOverridesFingerprint = fingerprint {
     custom { method, classDef ->
         method.name == "readPlayerOptionOverrides" &&
-                classDef.endsWith("voiceassistants/playermodels/PreparePlayOptionsJsonAdapter;")
+                classDef.type.endsWith("voiceassistants/playermodels/PreparePlayOptionsJsonAdapter;")
     }
 }
 
@@ -119,21 +106,21 @@ internal val abstractProtobufListEnsureIsMutableFingerprint = fingerprint {
 
 internal fun structureGetSectionsFingerprint(className: String) = fingerprint {
     custom { method, classDef ->
-        classDef.endsWith(className) && method.indexOfFirstInstruction {
+        classDef.type.endsWith(className) && method.indexOfFirstInstruction {
             opcode == Opcode.IGET_OBJECT && getReference<FieldReference>()?.name == "sections_"
         } >= 0
     }
 }
 
 internal val homeSectionFingerprint = fingerprint {
-    custom { _, classDef -> classDef.endsWith("homeapi/proto/Section;") }
+    custom { _, classDef -> classDef.type.endsWith("homeapi/proto/Section;") }
 }
 
 internal val homeStructureGetSectionsFingerprint =
     structureGetSectionsFingerprint("homeapi/proto/HomeStructure;")
 
 internal val browseSectionFingerprint = fingerprint {
-    custom { _, classDef-> classDef.endsWith("browsita/v1/resolved/Section;") }
+    custom { _, classDef-> classDef.type.endsWith("browsita/v1/resolved/Section;") }
 }
 
 internal val browseStructureGetSectionsFingerprint =

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

@@ -7,37 +7,28 @@ import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
-internal val getPackageInfoFingerprint = fingerprint {
-    strings(
-        "Failed to get the application signatures"
-    )
-}
-
 internal val loadOrbitLibraryFingerprint = fingerprint {
     strings("/liborbit-jni-spotify.so")
 }
 
-internal val startupPageLayoutInflateFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("Landroid/view/View;")
-    parameters("Landroid/view/LayoutInflater;", "Landroid/view/ViewGroup;", "Landroid/os/Bundle;")
-    strings("blueprintContainer", "gradient", "valuePropositionTextView")
+internal val setClientIdFingerprint = fingerprint {
+    parameters("Ljava/lang/String;")
+    custom { method, classDef ->
+        classDef.type == "Lcom/spotify/connectivity/ApplicationScopeConfiguration;"
+                && method.name == "setClientId"
+    }
 }
 
-internal val renderStartLoginScreenFingerprint = fingerprint {
-    strings("authenticationButtonFactory", "MORE_OPTIONS")
+internal val setUserAgentFingerprint = fingerprint {
+    parameters("Ljava/lang/String;")
+    custom { method, classDef ->
+        classDef.type == "Lcom/spotify/connectivity/ApplicationScopeConfiguration;"
+                && method.name == "setDefaultHTTPUserAgent"
+    }
 }
 
-internal val renderSecondLoginScreenFingerprint = fingerprint {
-    strings("authenticationButtonFactory", "intent_login")
-}
-
-internal val renderThirdLoginScreenFingerprint = fingerprint {
-    strings("EMAIL_OR_USERNAME", "listener")
-}
-
-internal val thirdLoginScreenLoginOnClickFingerprint = fingerprint {
-    strings("login", "listener", "none")
+internal val extensionFixConstantsFingerprint = fingerprint {
+    custom { _, classDef -> classDef.type == "Lapp/revanced/extension/spotify/misc/fix/Constants;" }
 }
 
 internal val runIntegrityVerificationFingerprint = fingerprint {

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

@@ -2,18 +2,13 @@ package app.revanced.patches.spotify.misc.fix
 
 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.replaceInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.intOption
+import app.revanced.patcher.patch.stringOption
 import app.revanced.patches.shared.misc.hex.HexPatchBuilder
 import app.revanced.patches.shared.misc.hex.hexPatch
 import app.revanced.patches.spotify.misc.extension.sharedExtensionPatch
-import app.revanced.util.*
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+import app.revanced.util.returnEarly
 
 internal const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/spotify/misc/fix/SpoofClientPatch;"
 
@@ -25,16 +20,40 @@ val spoofClientPatch = bytecodePatch(
     val requestListenerPort by intOption(
         key = "requestListenerPort",
         default = 4345,
-        title = " Login request listener port",
-        description = "The port to use for the listener that intercepts and handles login requests. " +
-                "Port must be between 0 and 65535.",
-        required = true,
+        title = "Request listener port",
+        description = "The port to use for the listener that intercepts and handles spoofed requests. " +
+                "Port must be between 0 and 65535. " +
+                "Do not change this option, if you do not know what you are doing.",
         validator = {
             it!!
             !(it < 0 || it > 65535)
         }
     )
 
+    val clientVersion by stringOption(
+        key = "clientVersion",
+        default = "iphone-9.0.58.558.g200011c",
+        title = "Client version",
+        description = "The client version used for spoofing the client token. " +
+                "Do not change this option, if you do not know what you are doing."
+    )
+
+    val hardwareMachine by stringOption(
+        key = "hardwareMachine",
+        default = "iPhone16,1",
+        title = "Hardware machine",
+        description = "The hardware machine used for spoofing the client token. " +
+                "Do not change this option, if you do not know what you are doing."
+    )
+
+    val systemVersion by stringOption(
+        key = "systemVersion",
+        default = "17.7.2",
+        title = "System version",
+        description = "The system version used for spoofing the client token. " +
+                "Do not change this option, if you do not know what you are doing."
+    )
+
     dependsOn(
         sharedExtensionPatch,
         hexPatch(ignoreMissingTargetFiles = true, block = fun HexPatchBuilder.() {
@@ -44,10 +63,8 @@ val spoofClientPatch = bytecodePatch(
                 "x86",
                 "x86_64"
             ).forEach { architecture ->
-                "https://login5.spotify.com/v3/login" to "http://127.0.0.1:$requestListenerPort/v3/login" inFile
-                        "lib/$architecture/liborbit-jni-spotify.so"
-
-                "https://login5.spotify.com/v4/login" to "http://127.0.0.1:$requestListenerPort/v4/login" inFile
+                "https://clienttoken.spotify.com/v1/clienttoken" to
+                        "http://127.0.0.1:$requestListenerPort/v1/clienttoken" inFile
                         "lib/$architecture/liborbit-jni-spotify.so"
             }
         })
@@ -56,52 +73,29 @@ val spoofClientPatch = bytecodePatch(
     compatibleWith("com.spotify.music")
 
     execute {
-        // region Spoof package info.
+        val clientVersion = clientVersion!!
+        val hardwareMachine = hardwareMachine!!
+        val systemVersion = systemVersion!!
 
-        getPackageInfoFingerprint.method.apply {
-            // region Spoof signature.
+        // region Spoof login request.
+        
+        val version = clientVersion
+            .substringAfter('-')
+            .substringBeforeLast('.')
+            .substringBeforeLast('.')
+        
+        setUserAgentFingerprint.method.addInstruction(
+            0,
+            "const-string p1, \"Spotify/$version iOS/$systemVersion ($hardwareMachine)\""
+        )
 
-            val failedToGetSignaturesStringIndex =
-                getPackageInfoFingerprint.stringMatches!!.first().index
-
-            val concatSignaturesIndex = indexOfFirstInstructionReversedOrThrow(
-                failedToGetSignaturesStringIndex,
-                Opcode.MOVE_RESULT_OBJECT,
-            )
-
-            val signatureRegister = getInstruction<OneRegisterInstruction>(concatSignaturesIndex).registerA
-            val expectedSignature = "d6a6dced4a85f24204bf9505ccc1fce114cadb32"
-
-            replaceInstruction(concatSignaturesIndex, "const-string v$signatureRegister, \"$expectedSignature\"")
-
-            // endregion
-
-            // region Spoof installer name.
-
-            val expectedInstallerName = "com.android.vending"
-
-            findInstructionIndicesReversedOrThrow {
-                val reference = getReference<MethodReference>()
-                reference?.name == "getInstallerPackageName" || reference?.name == "getInstallingPackageName"
-            }.forEach { index ->
-                val returnObjectIndex = index + 1
-
-                val installerPackageNameRegister = getInstruction<OneRegisterInstruction>(
-                    returnObjectIndex
-                ).registerA
-
-                addInstruction(
-                    returnObjectIndex + 1,
-                    "const-string v$installerPackageNameRegister, \"$expectedInstallerName\""
-                )
-            }
-
-            // endregion
-        }
+        setClientIdFingerprint.method.addInstruction(
+            0, "const-string p1, \"58bd3c95768941ea9eb4350aaa033eb3\""
+        )
 
         // endregion
 
-        // region Spoof client.
+        // region Spoof client-token request.
 
         loadOrbitLibraryFingerprint.method.addInstructions(
             0,
@@ -111,72 +105,12 @@ val spoofClientPatch = bytecodePatch(
             """
         )
 
-        startupPageLayoutInflateFingerprint.method.apply {
-            val openLoginWebViewDescriptor =
-                "$EXTENSION_CLASS_DESCRIPTOR->launchLogin(Landroid/view/LayoutInflater;)V"
-
-            addInstructions(
-                0,
-                "invoke-static/range { p1 .. p1 }, $openLoginWebViewDescriptor"
-            )
-        }
-
-        renderStartLoginScreenFingerprint.method.apply {
-            val onEventIndex = indexOfFirstInstructionOrThrow {
-                opcode == Opcode.INVOKE_INTERFACE && getReference<MethodReference>()?.name == "getView"
-            }
-
-            val buttonRegister = getInstruction<OneRegisterInstruction>(onEventIndex + 1).registerA
-
-            addInstruction(
-                onEventIndex + 2,
-                "invoke-static { v$buttonRegister }, $EXTENSION_CLASS_DESCRIPTOR->setNativeLoginHandler(Landroid/view/View;)V"
-            )
-        }
-
-        renderSecondLoginScreenFingerprint.method.apply {
-            val getViewIndex = indexOfFirstInstructionOrThrow {
-                opcode == Opcode.INVOKE_INTERFACE && getReference<MethodReference>()?.name == "getView"
-            }
-
-            val buttonRegister = getInstruction<OneRegisterInstruction>(getViewIndex + 1).registerA
-
-            // Early return the render for loop since the first item of the loop is the login button.
-            addInstructions(
-                getViewIndex + 2,
-                """
-                    invoke-virtual { v$buttonRegister }, Landroid/view/View;->performClick()Z
-                    return-void
-                """
-            )
-        }
-
-        renderThirdLoginScreenFingerprint.method.apply {
-            val invokeSetListenerIndex = indexOfFirstInstructionOrThrow {
-                val reference = getReference<MethodReference>()
-                reference?.definingClass == "Landroid/view/View;" && reference.name == "setOnClickListener"
-            }
-
-            val buttonRegister = getInstruction<FiveRegisterInstruction>(invokeSetListenerIndex).registerC
-
-            addInstruction(
-                invokeSetListenerIndex + 1,
-                "invoke-virtual { v$buttonRegister }, Landroid/view/View;->performClick()Z"
-            )
-        }
-
-        thirdLoginScreenLoginOnClickFingerprint.method.apply {
-            // Use placeholder credentials to pass the login screen.
-            val loginActionIndex = indexOfFirstInstructionOrThrow(Opcode.RETURN_VOID) - 1
-            val loginActionInstruction = getInstruction<FiveRegisterInstruction>(loginActionIndex)
-
-            addInstructions(
-                loginActionIndex,
-                """
-                    const-string v${loginActionInstruction.registerD}, "placeholder"
-                    const-string v${loginActionInstruction.registerE}, "placeholder"
-                """
-            )
+        mapOf(
+            "getClientVersion" to clientVersion,
+            "getSystemVersion" to systemVersion,
+            "getHardwareMachine" to hardwareMachine
+        ).forEach { (methodName, value) ->
+            extensionFixConstantsFingerprint.classDef.methods.single { it.name == methodName }.returnEarly(value)
         }
 
         // endregion

patches/src/main/kotlin/app/revanced/patches/spotify/misc/lyrics/ChangeLyricsProviderPatch.kt

@@ -6,7 +6,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.stringOption
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.spotify.shared.IS_SPOTIFY_LEGACY_APP_TARGET
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
 import app.revanced.util.indexOfFirstInstructionReversedOrThrow
@@ -57,16 +56,10 @@ val changeLyricsProviderPatch = bytecodePatch(
     }
 
     execute {
-        if (IS_SPOTIFY_LEGACY_APP_TARGET) {
-            Logger.getLogger(this::class.java.name).severe(
-                "Change lyrics provider patch is not supported for this target version."
-            )
-            return@execute
-        }
-
         val httpClientBuilderMethod = httpClientBuilderFingerprint.originalMethod
 
         // region Create a modified copy of the HTTP client builder method with the custom lyrics provider host.
+
         val patchedHttpClientBuilderMethod = with(httpClientBuilderMethod) {
             val invokeBuildUrlIndex = indexOfFirstInstructionOrThrow {
                 getReference<MethodReference>()?.returnType == "Lokhttp3/HttpUrl;"
@@ -89,9 +82,11 @@ val changeLyricsProviderPatch = bytecodePatch(
                 httpClientBuilderFingerprint.classDef.methods.add(this)
             }
         }
+
         //endregion
 
         // region Replace the call to the HTTP client builder method used exclusively for lyrics by the modified one.
+
         getLyricsHttpClientFingerprint(httpClientBuilderMethod).method.apply {
             val getLyricsHttpClientIndex = indexOfFirstInstructionOrThrow {
                 getReference<MethodReference>() == httpClientBuilderMethod
@@ -118,6 +113,7 @@ val changeLyricsProviderPatch = bytecodePatch(
                 )
             )
         }
+
         //endregion
     }
 }

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

@@ -14,7 +14,7 @@ internal val shareCopyUrlFingerprint = fingerprint {
     }
 }
 
-internal val shareCopyUrlLegacyFingerprint = fingerprint {
+internal val oldShareCopyUrlFingerprint = fingerprint {
     returns("Ljava/lang/Object;")
     parameters("Ljava/lang/Object;")
     strings("clipboard", "createNewSession failed")
@@ -38,7 +38,7 @@ internal val formatAndroidShareSheetUrlFingerprint = fingerprint {
     }
 }
 
-internal val formatAndroidShareSheetUrlLegacyFingerprint = fingerprint {
+internal val oldFormatAndroidShareSheetUrlFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC)
     returns("Ljava/lang/String;")
     parameters("Lcom/spotify/share/social/sharedata/ShareData;", "Ljava/lang/String;")

patches/src/main/kotlin/app/revanced/patches/spotify/misc/privacy/SanitizeSharingLinksPatch.kt

@@ -1,11 +1,9 @@
 package app.revanced.patches.spotify.misc.privacy
 
-import app.revanced.patcher.Fingerprint
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patches.spotify.misc.extension.sharedExtensionPatch
-import app.revanced.patches.spotify.shared.IS_SPOTIFY_LEGACY_APP_TARGET
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
 import com.android.tools.smali.dexlib2.AccessFlags
@@ -28,10 +26,10 @@ val sanitizeSharingLinksPatch = bytecodePatch(
         val extensionMethodDescriptor = "$EXTENSION_CLASS_DESCRIPTOR->" +
                 "sanitizeUrl(Ljava/lang/String;)Ljava/lang/String;"
 
-        val copyFingerprint = if (IS_SPOTIFY_LEGACY_APP_TARGET) {
-            shareCopyUrlLegacyFingerprint
-        } else {
+        val copyFingerprint = if (shareCopyUrlFingerprint.originalMethodOrNull != null) {
             shareCopyUrlFingerprint
+        } else {
+            oldShareCopyUrlFingerprint
         }
 
         copyFingerprint.method.apply {
@@ -50,15 +48,10 @@ val sanitizeSharingLinksPatch = bytecodePatch(
         }
 
         // Android native share sheet is used for all other quick share types (X, WhatsApp, etc).
-        val shareUrlParameter : String
-        val shareSheetFingerprint : Fingerprint
-        if (IS_SPOTIFY_LEGACY_APP_TARGET) {
-            shareSheetFingerprint = formatAndroidShareSheetUrlLegacyFingerprint
-            shareUrlParameter = "p2"
-        } else {
-            shareSheetFingerprint = formatAndroidShareSheetUrlFingerprint
-            val methodAccessFlags = formatAndroidShareSheetUrlFingerprint.originalMethod.accessFlags
-            shareUrlParameter = if (AccessFlags.STATIC.isSet(methodAccessFlags)) {
+        val shareUrlParameter: String
+        val shareSheetFingerprint = if (formatAndroidShareSheetUrlFingerprint.originalMethodOrNull != null) {
+            val methodAccessFlags = formatAndroidShareSheetUrlFingerprint.originalMethod
+            shareUrlParameter = if (AccessFlags.STATIC.isSet(methodAccessFlags.accessFlags)) {
                 // In newer implementations the method is static, so p0 is not `this`.
                 "p1"
             } else {
@@ -66,6 +59,11 @@ val sanitizeSharingLinksPatch = bytecodePatch(
                 // For that reason, add one to the parameter register.
                 "p2"
             }
+
+            formatAndroidShareSheetUrlFingerprint
+        } else {
+            shareUrlParameter = "p2"
+            oldFormatAndroidShareSheetUrlFingerprint
         }
 
         shareSheetFingerprint.method.addInstructions(

patches/src/main/kotlin/app/revanced/patches/spotify/misc/widgets/FixThirdPartyLaunchersWidgets.kt

@@ -1,9 +1,7 @@
 package app.revanced.patches.spotify.misc.widgets
 
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patches.spotify.shared.IS_SPOTIFY_LEGACY_APP_TARGET
 import app.revanced.util.returnEarly
-import java.util.logging.Logger
 
 @Suppress("unused")
 val fixThirdPartyLaunchersWidgets = bytecodePatch(
@@ -13,14 +11,6 @@ val fixThirdPartyLaunchersWidgets = bytecodePatch(
     compatibleWith("com.spotify.music")
 
     execute {
-        if (IS_SPOTIFY_LEGACY_APP_TARGET)  {
-            // The permission check does not exist in legacy versions.
-            Logger.getLogger(this::class.java.name).warning(
-                "Legacy app target does not have any third party launcher restrictions.  No changes applied."
-            )
-            return@execute
-        }
-
         // Only system app launchers are granted the BIND_APPWIDGET permission.
         // Override the method that checks for it to always return true, as this permission is not actually required
         // for the widgets to work.

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

@@ -1,38 +1,15 @@
 package app.revanced.patches.spotify.shared
 
 import app.revanced.patcher.fingerprint
-import app.revanced.patcher.patch.BytecodePatchContext
 import com.android.tools.smali.dexlib2.AccessFlags
 
 private const val SPOTIFY_MAIN_ACTIVITY = "Lcom/spotify/music/SpotifyMainActivity;"
 
-/**
- * Main activity of target 8.6.98.900.
- */
-internal const val SPOTIFY_MAIN_ACTIVITY_LEGACY = "Lcom/spotify/music/MainActivity;"
-
 internal val mainActivityOnCreateFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
     returns("V")
     parameters("Landroid/os/Bundle;")
     custom { method, classDef ->
-        method.name == "onCreate" && (classDef.type == SPOTIFY_MAIN_ACTIVITY
-                || classDef.type == SPOTIFY_MAIN_ACTIVITY_LEGACY)
+        method.name == "onCreate" && classDef.type == SPOTIFY_MAIN_ACTIVITY
     }
 }
-
-private var isLegacyAppTarget: Boolean? = null
-
-/**
- * If patching a legacy 8.x target. This may also be set if patching slightly older/newer app targets,
- * but the only legacy target of interest is 8.6.98.900 as it's the last version that
- * supports Spotify integration on Kenwood/Pioneer car stereos.
- */
-context(BytecodePatchContext)
-internal val IS_SPOTIFY_LEGACY_APP_TARGET
-    get(): Boolean {
-        if (isLegacyAppTarget == null) {
-            isLegacyAppTarget = mainActivityOnCreateFingerprint.originalClassDef.type == SPOTIFY_MAIN_ACTIVITY_LEGACY
-        }
-        return isLegacyAppTarget!!
-    }

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

@@ -43,16 +43,15 @@ private val hideAdsResourcePatch = resourcePatch {
         addResources("youtube", "ad.general.hideAdsResourcePatch")
 
         PreferenceScreen.ADS.addPreferences(
-            SwitchPreference("revanced_hide_creator_store_shelves"),
+            SwitchPreference("revanced_hide_creator_store_shelf"),
             SwitchPreference("revanced_hide_end_screen_store_banner"),
             SwitchPreference("revanced_hide_fullscreen_ads"),
             SwitchPreference("revanced_hide_general_ads"),
             SwitchPreference("revanced_hide_merchandise_banners"),
             SwitchPreference("revanced_hide_paid_promotion_label"),
             SwitchPreference("revanced_hide_self_sponsor_ads"),
-            SwitchPreference("revanced_hide_tagged_products"),
+            SwitchPreference("revanced_hide_shopping_links"),
             SwitchPreference("revanced_hide_view_products_banner"),
-            SwitchPreference("revanced_hide_visit_store_button"),
             SwitchPreference("revanced_hide_web_search_results"),
         )
 

patches/src/main/kotlin/app/revanced/patches/youtube/interaction/doubletap/DisableChapterSkipDoubleTapPatch.kt

@@ -0,0 +1,84 @@
+package app.revanced.patches.youtube.interaction.doubletap
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.fingerprint
+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 com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+private const val EXTENSION_CLASS_DESCRIPTOR =
+    "Lapp/revanced/extension/youtube/patches/DisableDoubleTapActionsPatch;"
+
+@Suppress("unused")
+val disableDoubleTapActionsPatch = bytecodePatch(
+    name = "Disable double tap actions",
+    description = "Adds an option to disable player double tap gestures.",
+) {
+    dependsOn(
+        sharedExtensionPatch,
+        settingsPatch,
+        addResourcesPatch,
+    )
+
+    compatibleWith(
+        "com.google.android.youtube"(
+            "20.07.39",
+            "20.12.46",
+            "20.13.41",
+        )
+    )
+
+    execute {
+        addResources("youtube", "interaction.doubletap.disableDoubleTapActionsPatch")
+
+        PreferenceScreen.PLAYER.addPreferences(
+            SwitchPreference("revanced_disable_chapter_skip_double_tap"),
+        )
+
+        val doubleTapInfoGetSeekSourceFingerprint = fingerprint {
+            accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+            parameters("Z")
+            returns(seekTypeEnumFingerprint.originalClassDef.type)
+            opcodes(
+                Opcode.IF_EQZ,
+                Opcode.SGET_OBJECT,
+                Opcode.RETURN_OBJECT,
+                Opcode.SGET_OBJECT,
+                Opcode.RETURN_OBJECT,
+            )
+            custom { _, classDef ->
+                classDef.fields.count() == 4
+            }
+        }
+
+        // Force isChapterSeek flag to false.
+        doubleTapInfoGetSeekSourceFingerprint.method.addInstructions(
+            0,
+            """
+                invoke-static { p1 }, $EXTENSION_CLASS_DESCRIPTOR->disableDoubleTapChapters(Z)Z
+                move-result p1
+            """
+        )
+
+        doubleTapInfoCtorFingerprint.match(
+            doubleTapInfoGetSeekSourceFingerprint.classDef
+        ).method.addInstructions(
+            0,
+            """
+                invoke-static { p3 }, $EXTENSION_CLASS_DESCRIPTOR->disableDoubleTapChapters(Z)Z
+                move-result p3
+            """
+        )
+    }
+}
+
+@Deprecated("Patch was renamed", ReplaceWith("disableDoubleTapActionsPatch"))
+val disableChapterSkipDoubleTapPatch = bytecodePatch {
+    dependsOn(disableDoubleTapActionsPatch)
+}

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

@@ -0,0 +1,22 @@
+package app.revanced.patches.youtube.interaction.doubletap
+
+import app.revanced.patcher.fingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal val seekTypeEnumFingerprint = fingerprint {
+    accessFlags(AccessFlags.STATIC, AccessFlags.CONSTRUCTOR)
+    strings(
+        "SEEK_SOURCE_SEEK_TO_NEXT_CHAPTER",
+        "SEEK_SOURCE_SEEK_TO_PREVIOUS_CHAPTER"
+    )
+}
+
+internal val doubleTapInfoCtorFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
+    parameters(
+        "Landroid/view/MotionEvent;",
+        "I",
+        "Z",
+        "Lj\$/time/Duration;"
+    )
+}

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

@@ -6,7 +6,6 @@ import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patches.all.misc.resources.addResources
 import app.revanced.patches.all.misc.resources.addResourcesPatch
-import app.revanced.patches.shared.misc.settings.preference.InputType
 import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference
 import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference.Sorting
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
@@ -40,7 +39,10 @@ private val downloadsResourcePatch = resourcePatch {
                 preferences = setOf(
                     SwitchPreference("revanced_external_downloader"),
                     SwitchPreference("revanced_external_downloader_action_button"),
-                    TextPreference("revanced_external_downloader_name", inputType = InputType.TEXT),
+                    TextPreference(
+                        "revanced_external_downloader_name",
+                        tag = "app.revanced.extension.youtube.settings.preference.ExternalDownloaderPreference",
+                    ),
                 ),
             ),
         )

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

@@ -73,12 +73,9 @@ val enableSlideToSeekPatch = bytecodePatch(
 
         // Disable the double speed seek gesture.
         if (is_19_17_or_greater) {
-            arrayOf(
-                disableFastForwardGestureFingerprint,
-                disableFastForwardNoticeFingerprint,
-            ).forEach { fingerprint ->
-                fingerprint.method.apply {
-                    val targetIndex = fingerprint.patternMatch!!.endIndex
+            disableFastForwardGestureFingerprint.let {
+                it.method.apply {
+                    val targetIndex = it.patternMatch!!.endIndex
                     val targetRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA
 
                     addInstructions(

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

@@ -3,14 +3,12 @@ package app.revanced.patches.youtube.interaction.seekbar
 import app.revanced.patcher.fingerprint
 import app.revanced.util.containsLiteralInstruction
 import app.revanced.util.getReference
-import app.revanced.util.indexOfFirstInstruction
 import app.revanced.util.indexOfFirstInstructionReversed
 import app.revanced.util.literal
 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.MethodReference
-import com.android.tools.smali.dexlib2.iface.reference.StringReference
 
 internal val swipingUpGestureParentFingerprint = fingerprint {
     returns("Z")
@@ -59,25 +57,6 @@ internal val disableFastForwardGestureFingerprint = fingerprint {
     }
 }
 
-internal val disableFastForwardNoticeFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("V")
-    parameters()
-    opcodes(
-        Opcode.CHECK_CAST,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-    )
-    custom { method, _ ->
-        method.name == "run" && method.indexOfFirstInstruction {
-            // In later targets the code is found in different methods with different strings.
-            val string = getReference<StringReference>()?.string
-            string == "Failed to easy seek haptics vibrate." || string == "search_landing_cache_key"
-        } >= 0
-    }
-}
-
 internal val onTouchEventHandlerFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.PUBLIC)
     returns("Z")

patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/ChangeHeaderPatch.kt

@@ -1,43 +1,95 @@
 package app.revanced.patches.youtube.layout.branding.header
 
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.PatchException
+import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patcher.patch.stringOption
-import app.revanced.patches.youtube.misc.playservice.is_19_25_or_greater
-import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
+import app.revanced.patcher.util.Document
+import app.revanced.patches.all.misc.resources.addResources
+import app.revanced.patches.all.misc.resources.addResourcesPatch
+import app.revanced.patches.shared.misc.mapping.get
+import app.revanced.patches.shared.misc.mapping.resourceMappingPatch
+import app.revanced.patches.shared.misc.mapping.resourceMappings
+import app.revanced.patches.shared.misc.settings.preference.ListPreference
+import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.util.ResourceGroup
 import app.revanced.util.Utils.trimIndentMultiline
 import app.revanced.util.copyResources
 import app.revanced.util.findElementByAttributeValueOrThrow
+import app.revanced.util.forEachLiteralValueInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import java.io.File
 
-private const val HEADER_FILE_NAME = "yt_wordmark_header"
-private const val PREMIUM_HEADER_FILE_NAME = "yt_premium_wordmark_header"
+private val variants = arrayOf("light", "dark")
 
-private const val HEADER_OPTION = "header*"
-private const val PREMIUM_HEADER_OPTION = "premium*header"
-private const val REVANCED_HEADER_OPTION = "revanced*"
-private const val REVANCED_BORDERLESS_HEADER_OPTION = "revanced*borderless"
+private const val EXTENSION_CLASS_DESCRIPTOR =
+    "Lapp/revanced/extension/youtube/patches/ChangeHeaderPatch;"
+
+private val changeHeaderBytecodePatch = bytecodePatch {
+    dependsOn(resourceMappingPatch)
+
+    execute {
+        // Resources are not used during patching, but extension code uses these
+        // images so verify they exist.
+        arrayOf(
+            "yt_ringo2_wordmark_header",
+            "yt_ringo2_premium_wordmark_header"
+        ).forEach { resource ->
+            variants.forEach { theme ->
+                resourceMappings["drawable", resource + "_" + theme]
+            }
+        }
+
+        arrayOf(
+            "ytWordmarkHeader",
+            "ytPremiumWordmarkHeader"
+        ).forEach { resourceName ->
+            val resourceId = resourceMappings["attr", resourceName]
+
+            forEachLiteralValueInstruction(resourceId) { literalIndex ->
+                val register = getInstruction<OneRegisterInstruction>(literalIndex).registerA
+                addInstructions(
+                    literalIndex + 1,
+                    """
+                        invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->getHeaderAttributeId(I)I
+                        move-result v$register    
+                    """
+                )
+            }
+        }
+    }
+}
 
 private val targetResourceDirectoryNames = mapOf(
     "xxxhdpi" to "512px x 192px",
     "xxhdpi" to "387px x 144px",
     "xhdpi" to "258px x 96px",
     "hdpi" to "194px x 72px",
-    "mdpi" to "129px x 48px",
-).map { (dpi, dim) ->
-    "drawable-$dpi" to dim
-}.toMap()
+    "mdpi" to "129px x 48px"
+).mapKeys { (dpi, _) -> "drawable-$dpi" }
 
-private val variants = arrayOf("light", "dark")
+
+/**
+ * Header logos built into this patch.
+ */
+private val logoResourceNames = arrayOf(
+    "revanced_header_logo_minimal",
+    "revanced_header_logo",
+)
+
+/**
+ * Custom header resource/file name.
+ */
+private const val CUSTOM_HEADER_RESOURCE_NAME = "custom_header"
 
 @Suppress("unused")
 val changeHeaderPatch = resourcePatch(
     name = "Change header",
-    description = "Applies a custom header in the top left corner within the app. Defaults to the ReVanced header.",
-    use = false,
+    description = "Adds an option to change the header logo in the top left corner of the app.",
 ) {
-    dependsOn(versionCheckPatch)
+    dependsOn(addResourcesPatch, changeHeaderBytecodePatch)
 
     compatibleWith(
         "com.google.android.youtube"(
@@ -50,85 +102,46 @@ val changeHeaderPatch = resourcePatch(
         )
     )
 
-    val header by stringOption(
-        key = "header",
-        default = REVANCED_BORDERLESS_HEADER_OPTION,
-        values = mapOf(
-            "YouTube" to HEADER_OPTION,
-            "YouTube Premium" to PREMIUM_HEADER_OPTION,
-            "ReVanced" to REVANCED_HEADER_OPTION,
-            "ReVanced (borderless logo)" to REVANCED_BORDERLESS_HEADER_OPTION,
-        ),
-        title = "Header",
+    val custom by stringOption(
+        key = "custom",
+        title = "Custom header logo",
         description = """
-            The header to apply to the app.
-            
-            If a path to a folder is provided, the folder must contain one or more of the following folders, depending on the DPI of the device:
+            Folder with images to use as a custom header logo.
             
+            The folder must contain one or more of the following folders, depending on the DPI of the device:
             ${targetResourceDirectoryNames.keys.joinToString("\n") { "- $it" }}
             
             Each of the folders must contain all of the following files:
-            
-            ${variants.joinToString("\n") { variant -> "- ${HEADER_FILE_NAME}_$variant.png" }}
+            ${variants.joinToString("\n") { variant -> "- ${CUSTOM_HEADER_RESOURCE_NAME}_$variant.png" }}
 
             The image dimensions must be as follows:
             ${targetResourceDirectoryNames.map { (dpi, dim) -> "- $dpi: $dim" }.joinToString("\n")}
-        """.trimIndentMultiline(),
-        required = true,
+        """.trimIndentMultiline()
     )
 
     execute {
-        // The directories to copy the header to.
-        val targetResourceDirectories = targetResourceDirectoryNames.keys.mapNotNull {
-            get("res").resolve(it).takeIf(File::exists)
-        }
-        // The files to replace in the target directories.
-        val targetResourceFiles = targetResourceDirectoryNames.keys.map { directoryName ->
-            ResourceGroup(
-                directoryName,
-                *variants.map { variant -> "${HEADER_FILE_NAME}_$variant.png" }.toTypedArray(),
-            )
-        }
+        addResources("youtube", "layout.branding.changeHeaderPatch")
 
-        /**
-         * A function that overwrites both header variants in the target resource directories.
-         */
-        fun overwriteFromTo(from: String, to: String) {
-            targetResourceDirectories.forEach { directory ->
-                variants.forEach { variant ->
-                    val fromPath = directory.resolve("${from}_$variant.png")
-                    val toPath = directory.resolve("${to}_$variant.png")
+        fun getLightDarkFileNames(vararg resourceNames: String): Array<String> =
+            variants.flatMap { variant ->
+                resourceNames.map { resource -> "${resource}_$variant.png" }
+            }.toTypedArray()
 
-                    fromPath.copyTo(toPath, true)
-                }
-            }
-        }
+        val logoResourceFileNames = getLightDarkFileNames(*logoResourceNames)
+        copyResources(
+            "change-header",
+            ResourceGroup("drawable-hdpi", *logoResourceFileNames),
+            ResourceGroup("drawable-mdpi", *logoResourceFileNames),
+            ResourceGroup("drawable-xhdpi", *logoResourceFileNames),
+            ResourceGroup("drawable-xxhdpi", *logoResourceFileNames),
+            ResourceGroup("drawable-xxxhdpi", *logoResourceFileNames),
+        )
 
-        // Functions to overwrite the header to the different variants.
-        fun toPremium() { overwriteFromTo(PREMIUM_HEADER_FILE_NAME, HEADER_FILE_NAME) }
-        fun toHeader() { overwriteFromTo(HEADER_FILE_NAME, PREMIUM_HEADER_FILE_NAME) }
-        fun toReVanced() {
-            // Copy the ReVanced header to the resource directories.
-            targetResourceFiles.forEach { copyResources("change-header/revanced", it) }
+        if (custom != null) {
+            val sourceFolders = File(custom!!).listFiles { file -> file.isDirectory }
+                ?: throw PatchException("The provided path is not a directory: $custom")
 
-            // Overwrite the premium with the custom header as well.
-            toHeader()
-        }
-        fun toReVancedBorderless() {
-            // Copy the ReVanced borderless header to the resource directories.
-            targetResourceFiles.forEach {
-                copyResources(
-                    "change-header/revanced-borderless",
-                    it
-                )
-            }
-
-            // Overwrite the premium with the custom header as well.
-            toHeader()
-        }
-        fun toCustom() {
-            val sourceFolders = File(header!!).listFiles { file -> file.isDirectory }
-                ?: throw PatchException("The provided path is not a directory: $header")
+            val customResourceFileNames = getLightDarkFileNames(CUSTOM_HEADER_RESOURCE_NAME)
 
             var copiedFiles = false
 
@@ -137,62 +150,87 @@ val changeHeaderPatch = resourcePatch(
                 val targetDpiFolder = get("res").resolve(dpiSourceFolder.name)
                 if (!targetDpiFolder.exists()) return@forEach
 
-                val imgSourceFiles = dpiSourceFolder.listFiles { file -> file.isFile }!!
-                imgSourceFiles.forEach { imgSourceFile ->
+                val customFiles = dpiSourceFolder.listFiles { file ->
+                    file.isFile && file.name in customResourceFileNames
+                }!!
+
+                if (customFiles.size > 0 && customFiles.size != variants.size) {
+                    throw PatchException("Both light/dark mode images " +
+                                "must be specified but only found: " + customFiles.map { it.name })
+                }
+
+                customFiles.forEach { imgSourceFile ->
                     val imgTargetFile = targetDpiFolder.resolve(imgSourceFile.name)
-                    imgSourceFile.copyTo(imgTargetFile, true)
+                    imgSourceFile.copyTo(imgTargetFile)
 
                     copiedFiles = true
                 }
             }
 
             if (!copiedFiles) {
-                throw PatchException("No header files were copied from the provided path: $header.")
+                throw PatchException("No custom header images found in the provided path: $custom")
+            }
+        }
+
+        // Logo is replaced using an attribute reference.
+        document("res/values/attrs.xml").use { document ->
+            val resources = document.childNodes.item(0)
+
+            fun addAttributeReference(logoName: String) {
+                val item = document.createElement("attr")
+                item.setAttribute("format", "reference")
+                item.setAttribute("name", logoName)
+                resources.appendChild(item)
             }
 
-            // Overwrite the premium with the custom header as well.
-            toHeader()
+            logoResourceNames.forEach { logoName ->
+                addAttributeReference(logoName)
+            }
+
+            if (custom != null) {
+                addAttributeReference(CUSTOM_HEADER_RESOURCE_NAME)
+            }
         }
 
-        when (header) {
-            HEADER_OPTION -> toHeader()
-            PREMIUM_HEADER_OPTION -> toPremium()
-            REVANCED_HEADER_OPTION -> toReVanced()
-            REVANCED_BORDERLESS_HEADER_OPTION -> toReVancedBorderless()
-            else -> toCustom()
-        }
+        // Add custom drawables to all styles that use the regular and premium logo.
+        document("res/values/styles.xml").use { document ->
+            arrayOf(
+                "Base.Theme.YouTube.Light" to "light",
+                "Base.Theme.YouTube.Dark" to "dark",
+                "CairoLightThemeRingo2Updates" to "light",
+                "CairoDarkThemeRingo2Updates" to "dark"
+            ).forEach { (style, mode) ->
+                val styleElement = document.childNodes.findElementByAttributeValueOrThrow(
+                    "name", style
+                )
 
-        // Fix 19.25+ A/B layout with different header icons:
-        // yt_ringo2_wordmark_header, yt_ringo2_premium_wordmark_header
-        //
-        // These images are webp and not png, so overwriting them is not so simple.
-        // Instead change styles.xml to use the old drawable resources.
-        if (is_19_25_or_greater) {
-            document("res/values/styles.xml").use { document ->
-                val documentChildNodes = document.childNodes
+                fun addDrawableElement(document: Document, logoName: String, mode: String) {
+                    val item = document.createElement("item")
+                    item.setAttribute("name", logoName)
+                    item.textContent = "@drawable/${logoName}_$mode"
+                    styleElement.appendChild(item)
+                }
 
-                arrayOf(
-                    "CairoLightThemeRingo2Updates" to variants[0],
-                    "CairoDarkThemeRingo2Updates" to variants[1]
-                ).forEach { (styleName, theme) ->
-                    val styleNodes = documentChildNodes.findElementByAttributeValueOrThrow(
-                        "name",
-                        styleName,
-                    ).childNodes
+                logoResourceNames.forEach { logoName ->
+                    addDrawableElement(document, logoName, mode)
+                }
 
-                    val drawable = "@drawable/${HEADER_FILE_NAME}_${theme}"
-
-                    arrayOf(
-                        "ytWordmarkHeader",
-                        "ytPremiumWordmarkHeader"
-                    ).forEach { itemName ->
-                        styleNodes.findElementByAttributeValueOrThrow(
-                            "name",
-                            itemName,
-                        ).textContent = drawable
-                    }
+                if (custom != null) {
+                    addDrawableElement(document, CUSTOM_HEADER_RESOURCE_NAME, mode)
                 }
             }
         }
+
+        PreferenceScreen.GENERAL_LAYOUT.addPreferences(
+            if (custom == null) {
+                ListPreference("revanced_header_logo")
+            } else {
+                ListPreference(
+                    key = "revanced_header_logo",
+                    entriesKey = "revanced_header_logo_custom_entries",
+                    entryValuesKey = "revanced_header_logo_custom_entry_values"
+                )
+            }
+        )
     }
 }

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

@@ -8,6 +8,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWith
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.instructions
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patcher.util.smali.ExternalLabel
@@ -157,8 +158,10 @@ val hideLayoutComponentsPatch = bytecodePatch(
                 preferences = setOf(
                     SwitchPreference("revanced_hide_comments_ai_chat_summary"),
                     SwitchPreference("revanced_hide_comments_ai_summary"),
+                    SwitchPreference("revanced_hide_comments_channel_guidelines"),
                     SwitchPreference("revanced_hide_comments_by_members_header"),
                     SwitchPreference("revanced_hide_comments_section"),
+                    SwitchPreference("revanced_hide_comments_community_guidelines"),
                     SwitchPreference("revanced_hide_comments_create_a_short_button"),
                     SwitchPreference("revanced_hide_comments_preview_comment"),
                     SwitchPreference("revanced_hide_comments_thanks_button"),
@@ -167,10 +170,7 @@ val hideLayoutComponentsPatch = bytecodePatch(
                 sorting = PreferenceScreenPreference.Sorting.UNSORTED,
             ),
             SwitchPreference("revanced_hide_channel_bar"),
-            SwitchPreference("revanced_hide_channel_guidelines"),
-            SwitchPreference("revanced_hide_channel_member_shelf"),
             SwitchPreference("revanced_hide_channel_watermark"),
-            SwitchPreference("revanced_hide_community_guidelines"),
             SwitchPreference("revanced_hide_emergency_box"),
             SwitchPreference("revanced_hide_info_panels"),
             SwitchPreference("revanced_hide_join_membership_button"),
@@ -201,9 +201,19 @@ val hideLayoutComponentsPatch = bytecodePatch(
                 key = "revanced_hide_filter_bar_screen",
                 preferences = setOf(
                     SwitchPreference("revanced_hide_filter_bar_feed_in_feed"),
-                    SwitchPreference("revanced_hide_filter_bar_feed_in_history"),
-                    SwitchPreference("revanced_hide_filter_bar_feed_in_search"),
                     SwitchPreference("revanced_hide_filter_bar_feed_in_related_videos"),
+                    SwitchPreference("revanced_hide_filter_bar_feed_in_search"),
+                    SwitchPreference("revanced_hide_filter_bar_feed_in_history"),
+                ),
+            ),
+            PreferenceScreenPreference(
+                key = "revanced_channel_screen",
+                preferences = setOf(
+                    SwitchPreference("revanced_hide_for_you_shelf"),
+                    SwitchPreference("revanced_hide_links_preview"),
+                    SwitchPreference("revanced_hide_members_shelf"),
+                    SwitchPreference("revanced_hide_visit_community_button"),
+                    SwitchPreference("revanced_hide_visit_store_button"),
                 ),
             ),
             SwitchPreference("revanced_hide_album_cards"),
@@ -212,20 +222,19 @@ val hideLayoutComponentsPatch = bytecodePatch(
             SwitchPreference("revanced_hide_compact_banner"),
             SwitchPreference("revanced_hide_crowdfunding_box"),
             SwitchPreference("revanced_hide_chips_shelf"),
-            SwitchPreference("revanced_hide_expandable_chip"),
-            SwitchPreference("revanced_hide_feed_survey"),
+            SwitchPreference("revanced_hide_expandable_card"),
             SwitchPreference("revanced_hide_floating_microphone_button"),
-            SwitchPreference("revanced_hide_for_you_shelf"),
             SwitchPreference("revanced_hide_horizontal_shelves"),
             SwitchPreference("revanced_hide_image_shelf"),
-            SwitchPreference("revanced_hide_latest_posts_ads"),
+            SwitchPreference("revanced_hide_latest_posts"),
             SwitchPreference("revanced_hide_mix_playlists"),
             SwitchPreference("revanced_hide_movies_section"),
             SwitchPreference("revanced_hide_notify_me_button"),
             SwitchPreference("revanced_hide_playables"),
-            SwitchPreference("revanced_hide_search_result_recommendation_labels"),
             SwitchPreference("revanced_hide_show_more_button"),
+            SwitchPreference("revanced_hide_surveys"),
             SwitchPreference("revanced_hide_ticket_shelf"),
+            SwitchPreference("revanced_hide_video_recommendation_labels"),
             SwitchPreference("revanced_hide_doodles"),
         )
 
@@ -235,7 +244,6 @@ val hideLayoutComponentsPatch = bytecodePatch(
                 sorting = PreferenceScreenPreference.Sorting.UNSORTED,
                 preferences = setOf(
                     SwitchPreference("revanced_custom_filter"),
-                    // TODO: This should be a dynamic ListPreference, which does not exist yet
                     TextPreference("revanced_custom_filter_strings", inputType = InputType.TEXT_MULTI_LINE),
                 ),
             ),
@@ -372,16 +380,13 @@ val hideLayoutComponentsPatch = bytecodePatch(
             findInstructionIndicesReversedOrThrow {
                 getReference<MethodReference>()?.name == "setImageDrawable"
             }.forEach { insertIndex ->
-                val register = getInstruction<FiveRegisterInstruction>(insertIndex).registerD
+                val drawableRegister = getInstruction<FiveRegisterInstruction>(insertIndex).registerD
+                val imageViewRegister = getInstruction<FiveRegisterInstruction>(insertIndex).registerC
 
-                addInstructionsWithLabels(
+                replaceInstruction(
                     insertIndex,
-                    """
-                        invoke-static { v$register }, $LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR->hideYoodles(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
-                        move-result-object v$register
-                        if-eqz v$register, :hide
-                    """,
-                    ExternalLabel("hide", getInstruction(insertIndex + 1)),
+                    "invoke-static { v$imageViewRegister, v$drawableRegister }, $LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR->" +
+                            "setDoodleDrawable(Landroid/widget/ImageView;Landroid/graphics/drawable/Drawable;)V"
                 )
             }
         }

patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/relatedvideooverlay/HideRelatedVideoOverlayPatch.kt

@@ -61,7 +61,7 @@ val hideRelatedVideoOverlayPatch = bytecodePatch(
         addResources("youtube", "layout.hide.relatedvideooverlay.hideRelatedVideoOverlayPatch")
 
         PreferenceScreen.PLAYER.addPreferences(
-            SwitchPreference("revanced_hide_related_video_overlay")
+            SwitchPreference("revanced_hide_related_videos_overlay")
         )
 
         relatedEndScreenResultsFingerprint.match(

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

@@ -66,8 +66,8 @@ private val hideShortsComponentsResourcePatch = resourcePatch {
 
         PreferenceScreen.SHORTS.addPreferences(
             SwitchPreference("revanced_hide_shorts_home"),
-            SwitchPreference("revanced_hide_shorts_subscriptions"),
             SwitchPreference("revanced_hide_shorts_search"),
+            SwitchPreference("revanced_hide_shorts_subscriptions"),
             SwitchPreference("revanced_hide_shorts_history"),
 
             PreferenceScreenPreference(

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

@@ -222,7 +222,7 @@ val themePatch = bytecodePatch(
 
         if (is_19_47_or_greater) {
             PreferenceScreen.GENERAL_LAYOUT.addPreferences(
-                ListPreference("splash_screen_animation_style")
+                ListPreference("revanced_splash_screen_animation_style")
             )
         }
 

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

@@ -12,31 +12,15 @@ import app.revanced.patches.shared.misc.mapping.get
 import app.revanced.patches.shared.misc.mapping.resourceMappingPatch
 import app.revanced.patches.shared.misc.mapping.resourceMappings
 import app.revanced.patches.shared.misc.settings.overrideThemeColors
-import app.revanced.patches.shared.misc.settings.preference.BasePreference
-import app.revanced.patches.shared.misc.settings.preference.BasePreferenceScreen
-import app.revanced.patches.shared.misc.settings.preference.InputType
-import app.revanced.patches.shared.misc.settings.preference.IntentPreference
-import app.revanced.patches.shared.misc.settings.preference.ListPreference
-import app.revanced.patches.shared.misc.settings.preference.NonInteractivePreference
-import app.revanced.patches.shared.misc.settings.preference.PreferenceCategory
-import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference
+import app.revanced.patches.shared.misc.settings.preference.*
 import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference.Sorting
-import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
-import app.revanced.patches.shared.misc.settings.preference.TextPreference
 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.playbackspeed.fixPlaybackSpeedWhilePlayingPatch
 import app.revanced.patches.youtube.misc.playservice.is_19_34_or_greater
 import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
-import app.revanced.util.ResourceGroup
-import app.revanced.util.addInstructionsAtControlFlowLabel
-import app.revanced.util.copyResources
-import app.revanced.util.copyXmlNode
-import app.revanced.util.findElementByAttributeValueOrThrow
-import app.revanced.util.findInstructionIndicesReversedOrThrow
-import app.revanced.util.inputStreamFromBundledResource
-import app.revanced.util.insertLiteralOverride
+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
@@ -152,15 +136,24 @@ private val settingsResourcePatch = resourcePatch {
             }
         }
 
-        // Modify the manifest and add a data intent filter to the LicenseActivity.
-        // Some devices freak out if undeclared data is passed to an intent,
-        // and this change appears to fix the issue.
+        // Modify the manifest to enhance LicenseActivity behavior:
+        // 1. Add a data intent filter with MIME type "text/plain".
+        //    Some devices crash if undeclared data is passed to an intent,
+        //    and this change appears to fix the issue.
+        // 2. Add android:configChanges="orientation|screenSize|keyboardHidden".
+        //    This prevents the activity from being recreated on configuration changes
+        //    (e.g., screen rotation), preserving its current state and fragment.
         document("AndroidManifest.xml").use { document ->
             val licenseElement = document.childNodes.findElementByAttributeValueOrThrow(
                 "android:name",
                 "com.google.android.libraries.social.licenses.LicenseActivity",
             )
 
+            licenseElement.setAttribute(
+                "android:configChanges",
+                "orientation|screenSize|keyboardHidden"
+            )
+
             val mimeType = document.createElement("data")
             mimeType.setAttribute("android:mimeType", "text/plain")
 
@@ -242,9 +235,9 @@ val settingsPatch = bytecodePatch(
             methods.removeIf { it.name != "onCreate" && !MethodUtil.isConstructor(it) }
         }
 
-        // Add context override to force a specific settings language.
         licenseActivityOnCreateFingerprint.classDef.apply {
-            val attachBaseContext = ImmutableMethod(
+            // Add attachBaseContext method to override the context for setting a specific language.
+            ImmutableMethod(
                 type,
                 "attachBaseContext",
                 listOf(ImmutableMethodParameter("Landroid/content/Context;", null, null)),
@@ -262,9 +255,50 @@ val settingsPatch = bytecodePatch(
                         return-void
                     """
                 )
-            }
+            }.let(methods::add)
 
-            methods.add(attachBaseContext)
+            // Add onBackPressed method to handle back button presses, delegating to SearchViewController.
+            ImmutableMethod(
+                type,
+                "onBackPressed",
+                emptyList(),
+                "V",
+                AccessFlags.PUBLIC.value,
+                null,
+                null,
+                MutableMethodImplementation(3),
+            ).toMutable().apply {
+                addInstructions(
+                    """
+                        invoke-static {}, Lapp/revanced/extension/youtube/settings/SearchViewController;->handleBackPress()Z
+                        move-result v0
+                        if-nez v0, :search_handled
+                        invoke-virtual { p0 }, Landroid/app/Activity;->finish()V
+                        :search_handled
+                        return-void
+                    """
+                )
+            }.let(methods::add)
+
+            // Add onConfigurationChanged method to handle configuration changes (e.g., screen orientation).
+            ImmutableMethod(
+                type,
+                "onConfigurationChanged",
+                listOf(ImmutableMethodParameter("Landroid/content/res/Configuration;", null, null)),
+                "V",
+                AccessFlags.PUBLIC.value,
+                null,
+                null,
+                MutableMethodImplementation(3)
+            ).toMutable().apply {
+                addInstructions(
+                    """
+                        invoke-super { p0, p1 }, Landroid/app/Activity;->onConfigurationChanged(Landroid/content/res/Configuration;)V
+                        invoke-static { p0, p1 }, $EXTENSION_CLASS_DESCRIPTOR->handleConfigurationChanged(Landroid/app/Activity;Landroid/content/res/Configuration;)V
+                        return-void
+                    """
+                )
+            }.let(methods::add)
         }
 
         // Update shared dark mode status based on YT theme.
@@ -338,20 +372,18 @@ object PreferenceScreen : BasePreferenceScreen() {
         icon = "@drawable/revanced_settings_screen_05_player",
         layout = "@layout/preference_with_icon",
     )
-
     val SHORTS = Screen(
         key = "revanced_settings_screen_06_shorts",
         summaryKey = null,
         icon = "@drawable/revanced_settings_screen_06_shorts",
         layout = "@layout/preference_with_icon",
     )
-
     val SEEKBAR = Screen(
         key = "revanced_settings_screen_07_seekbar",
         summaryKey = null,
         icon = "@drawable/revanced_settings_screen_07_seekbar",
         layout = "@layout/preference_with_icon",
-        )
+    )
     val SWIPE_CONTROLS = Screen(
         key = "revanced_settings_screen_08_swipe_controls",
         summaryKey = null,

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

@@ -9,7 +9,6 @@ import app.revanced.patches.all.misc.resources.addResourcesPatch
 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

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

@@ -1,8 +1,11 @@
 package app.revanced.patches.youtube.video.speed.custom
 
 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.reference.StringReference
 
 internal val speedLimiterFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
@@ -19,3 +22,16 @@ internal val speedLimiterFingerprint = fingerprint {
         Opcode.INVOKE_STATIC,
     )
 }
+
+internal val disableFastForwardNoticeFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("V")
+    parameters()
+    custom { method, _ ->
+        method.name == "run" && method.indexOfFirstInstruction {
+            // In later targets the code is found in different methods with different strings.
+            val string = getReference<StringReference>()?.string
+            string == "Failed to easy seek haptics vibrate." || string == "search_landing_cache_key"
+        } >= 0
+    }
+}

patches/src/main/kotlin/app/revanced/util/BytecodeUtils.kt

@@ -355,7 +355,7 @@ fun Method.indexOfFirstLiteralInstructionOrThrow(literal: Float): Int {
  * @see indexOfFirstLiteralInstructionOrThrow
  */
 fun Method.indexOfFirstLiteralInstruction(literal: Double) =
-    indexOfFirstLiteralInstruction(literal.toRawBits().toLong())
+    indexOfFirstLiteralInstruction(literal.toRawBits())
 
 /**
  * Find the index of the first literal instruction with the given double value,
@@ -421,7 +421,7 @@ fun Method.indexOfFirstLiteralInstructionReversedOrThrow(literal: Float): Int {
  * @see indexOfFirstLiteralInstructionOrThrow
  */
 fun Method.indexOfFirstLiteralInstructionReversed(literal: Double) =
-    indexOfFirstLiteralInstructionReversed(literal.toRawBits().toLong())
+    indexOfFirstLiteralInstructionReversed(literal.toRawBits())
 
 /**
  * Find the index of the last wide literal instruction with the given double value,
@@ -715,24 +715,50 @@ internal fun MutableMethod.insertLiteralOverride(literal: Long, override: Boolea
 }
 
 /**
- * Called for _all_ instructions with the given literal value.
+ * Called for _all_ methods with the given literal value.
+ * Method indices are iterated from last to first.
  */
 fun BytecodePatchContext.forEachLiteralValueInstruction(
     literal: Long,
-    block: MutableMethod.(literalInstructionIndex: Int) -> Unit,
+    block: MutableMethod.(matchingIndex: Int) -> Unit,
 ) {
+    val matchingIndexes = ArrayList<Int>()
+
     classes.forEach { classDef ->
         classDef.methods.forEach { method ->
-            method.implementation?.instructions?.forEachIndexed { index, instruction ->
-                if (instruction.opcode == CONST &&
-                    (instruction as WideLiteralInstruction).wideLiteral == literal
-                ) {
+            method.implementation?.instructions?.let { instructions ->
+                matchingIndexes.clear()
+
+                instructions.forEachIndexed { index, instruction ->
+                    if ((instruction as? WideLiteralInstruction)?.wideLiteral == literal) {
+                        matchingIndexes.add(index)
+                    }
+                }
+
+                if (matchingIndexes.isNotEmpty()) {
                     val mutableMethod = proxy(classDef).mutableClass.findMutableMethodOf(method)
-                    block.invoke(mutableMethod, index)
+
+                    // FIXME: Until patcher V22 is merged, this workaround is needed
+                    //        because if multiple patches modify the same class
+                    //        then after modifying the method indexes of immutable classes
+                    //        are no longer correct.
+                    matchingIndexes.clear()
+                    mutableMethod.instructions.forEachIndexed { index, instruction ->
+                        if ((instruction as? WideLiteralInstruction)?.wideLiteral == literal) {
+                            matchingIndexes.add(index)
+                        }
+                    }
+                    if (matchingIndexes.isEmpty()) return@forEach
+                    // FIXME Remove code above after V22 merge.
+
+                    matchingIndexes.asReversed().forEach { index ->
+                        block.invoke(mutableMethod, index)
+                    }
                 }
             }
         }
     }
+
 }
 
 private const val RETURN_TYPE_MISMATCH = "Mismatch between override type and Method return type"

patches/src/main/kotlin/app/revanced/util/ResourceUtils.kt

@@ -144,7 +144,7 @@ internal fun Node.addResource(
     appendChild(resource.serialize(ownerDocument, resourceCallback))
 }
 
-internal fun org.w3c.dom.Document.getNode(tagName: String) = this.getElementsByTagName(tagName).item(0)
+internal fun Document.getNode(tagName: String) = getElementsByTagName(tagName).item(0)
 
 internal fun NodeList.findElementByAttributeValue(attributeName: String, value: String): Element? {
     for (i in 0 until length) {

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

@@ -39,15 +39,17 @@ Second \"item\" text"</string>
   <patch id="misc.debugging.enableDebuggingPatch">
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
-  <!-- 'Join' should be translated using the same localized wording YouTube displays.
-                 This appears in the video player for certain videos. -->
-  <!-- 'For you' should be translated using the same localized wording YouTube displays. -->
   <!-- '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. -->
-  <!-- 'People also watched' and 'You might also like' should be translated using the same localized wording YouTube displays. -->
+                  This item appear in the Subscriptions feed for future livestreams or unreleased videos. -->
   <!-- 'Show more' should be translated with the same localized wording that YouTube displays.
                   This button usually appears when searching for a YT creator. -->
+  <!-- 'People also watched' and 'You might also like' should be translated using the same localized wording YouTube displays. -->
   <!-- https://logos.fandom.com/wiki/YouTube/Yoodles -->
+  <!-- 'Join' should be translated using the same localized wording YouTube displays.
+                  This appears in the video player for certain videos. -->
+  <!-- 'For You' should be translated using the same localized wording YouTube displays. -->
+  <!-- 'Visit Community' should be translated with the same localized wording that YouTube displays. -->
+  <!-- 'Visit store' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Component path builder strings' is the technical name for identifying the Litho UI layout items to hide. This is an advanced feature and most users will never use this. -->
   <!-- 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. -->
@@ -56,8 +58,6 @@ Second \"item\" text"</string>
   </patch>
   <patch id="ad.general.hideAdsResourcePatch">
   <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
-  <!-- 'View products' should be translated with the same localized wording that YouTube displays. -->
-  <!-- 'Visit store' should be translated with the same localized wording that YouTube displays. -->
   </patch>
   <patch id="ad.getpremium.hideGetPremiumPatch">
   </patch>
@@ -67,8 +67,10 @@ Second \"item\" text"</string>
   </patch>
   <patch id="interaction.dialog.removeViewerDiscretionDialogPatch">
   </patch>
+  <patch id="interaction.doubletap.disableDoubleTapActionsPatch">
+  </patch>
   <patch id="interaction.downloads.downloadsResourcePatch">
-  <!-- 'download action button' should be translated using the same wording as the translation of 'revanced_hide_download_button_title' -->
+  <!-- 'Download action button' should be translated using the same wording as the translation of 'revanced_hide_download_button_title'. -->
   </patch>
   <patch id="interaction.seekbar.disablePreciseSeekingGesturePatch">
   </patch>
@@ -82,19 +84,19 @@ Second \"item\" text"</string>
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
-                 This button usually appears only on live streams. -->
+                  This button usually appears only on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Download' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Thanks' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Ask' should be translated with the same localized wording that YouTube displays.
-                 Button only shows if the user ip is from specific region such as the USA or EU. -->
+                  This button only shows up if the user ip is from specific region such as the USA or EU. -->
   <!-- 'Clip' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Save' should be translated with the same localized wording that YouTube displays. -->
   </patch>
   <patch id="layout.buttons.navigation.navigationButtonsPatch">
   <!-- 'Home' should be translated using the same localized wording YouTube displays for the tab. -->
   <!-- 'Shorts' should be translated using the same localized wording YouTube displays the tab. -->
-  <!-- The Create button has no display name. Translate normally. -->
+  <!-- 'Create' has no display name. Translate normally. -->
   <!-- 'Subscriptions' should be translated using the same localized wording YouTube displays the tab. -->
   <!-- 'Notifications' should be translated using the same localized wording YouTube displays the tab. -->
   </patch>
@@ -107,14 +109,14 @@ Second \"item\" text"</string>
   <!-- 'Help & feedback' should be translated using the same localized wording YouTube displays for the menu item. -->
   <!-- 'Playback speed' should be translated using the same localized wording YouTube displays for the menu item. -->
   <!-- 'More info' should be translated using the same localized wording YouTube displays for the menu item.
-                 This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
+                  This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
   <!-- 'Lock screen' should be translated using the same localized wording YouTube displays for the menu item. -->
   <!-- 'Audio track' should be translated using the same localized wording YouTube displays for the menu item. -->
-  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <!-- 'Spoof video streams' should be the same translation used for 'revanced_spoof_video_streams_screen_title'. -->
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   </patch>
   <patch id="layout.buttons.overlay.hidePlayerOverlayButtonsPatch">
-  <!-- This button does not display any text, but 'captions' should be translated using the same wording used as the translation of 'revanced_hide_player_flyout_captions_title' -->
+  <!-- This button does not display any text, but 'Captions' should be translated using the same wording used as the translation of 'revanced_hide_player_flyout_captions_title'. -->
   </patch>
   <patch id="layout.hide.endscreencards.hideEndscreenCardsResourcePatch">
   </patch>
@@ -125,14 +127,14 @@ Second \"item\" text"</string>
   <patch id="layout.hide.rollingnumber.disableRollingNumberAnimationPatch">
   </patch>
   <patch id="layout.hide.seekbar.hideSeekbarPatch">
+  <!-- Seekbar shown inside video thumbnails found the home/feed/search/history.  The seekbar shows the prior watch progress when the video was last open. -->
   </patch>
   <patch id="layout.hide.shorts.hideShortsComponentsResourcePatch">
-  <!-- 'home' should be translated using the same localized wording YouTube displays for the home tab. -->
-  <!-- 'subscription' should be translated using the same localized wording YouTube displays for the subscription tab. -->
-  <!-- 'join' should be translated using the same localized wording YouTube displays for the button. -->
-  <!-- 'subscribe' should be translated using the same localized wording YouTube displays for the button. -->
-  <!-- 'remix' should be translated using the same localized wording YouTube displays for the button. -->
-  <!-- 'share' should be translated using the same localized wording YouTube displays for the button. -->
+  <!-- 'Home' should be translated using the same localized wording YouTube displays for the Home tab. -->
+  <!-- 'Subscriptions' should be translated using the same localized wording YouTube displays for the Subscriptions tab. -->
+  <!-- 'Join' should be translated using the same localized wording YouTube displays for the button. -->
+  <!-- 'Share' should be translated using the same localized wording YouTube displays for the button. -->
+  <!-- 'Remix' should be translated using the same localized wording YouTube displays for the button. -->
   </patch>
   <patch id="layout.hide.endscreensuggestion.hideEndScreenSuggestedVideoPatch">
   </patch>
@@ -152,7 +154,7 @@ 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. -->
   <!-- Toast shown if the user enables RYD while a video is opened, and then tries to vote for the video. -->
   <!-- Video likes have been set to hidden by the video uploader. -->
-  <!-- Translations should use language similar to 'revanced_sb_enable_compact_skip_button' -->
+  <!-- Translations should use language similar to 'revanced_sb_enable_compact_skip_button'. -->
   <!-- Statistic strings are shown in the settings only when ReVanced debug mode is enabled. Typical users will never see these. -->
   </patch>
   <patch id="layout.searchbar.wideSearchbarPatch">
@@ -160,16 +162,14 @@ Second \"item\" text"</string>
   <patch id="layout.seekbar.seekbarThumbnailsPatch">
   </patch>
   <patch id="layout.sponsorblock.sponsorBlockResourcePatch">
-  <!-- Translations should use language similar to 'revanced_ryd_compact_layout_title' -->
+  <!-- Translations should use language similar to 'revanced_ryd_compact_layout_title'. -->
   <!-- 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. -->
-  <!-- A segment start and end time, such as "02:10 to 03:40" -->
+  <!-- A segment start and end time, such as "02:10 to 03:40". -->
   <!-- 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 -->
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   </patch>
@@ -183,12 +183,15 @@ Second \"item\" text"</string>
   </patch>
   <patch id="layout.theme.themePatch">
   </patch>
+  <patch id="layout.branding.changeHeaderPatch">
+  <!-- For this situation "Minimal" means minimalistic. It does not mean small or tiny. -->
+  </patch>
   <patch id="layout.thumbnails.bypassImageRegionRestrictionsPatch">
   </patch>
   <patch id="layout.thumbnails.alternativeThumbnailsPatch">
-  <!-- 'Home' should be translated using the same localized wording YouTube displays for the home tab. -->
-  <!-- 'Subscription' should be translated using the same localized wording YouTube displays for the subscription tab. -->
-  <!-- 'You' should be translated using the same localized wording YouTube displays for the You (library) tab. -->
+  <!-- 'Home' should be translated using the same localized wording YouTube displays for the Home tab. -->
+  <!-- 'Subscriptions' should be translated using the same localized wording YouTube displays for the Subscriptions tab. -->
+  <!-- 'You' should be translated using the same localized wording YouTube displays for the You (Library) tab. -->
   <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
   </patch>
   <patch id="misc.announcements.announcementsPatch">
@@ -212,10 +215,10 @@ Second \"item\" text"</string>
   <patch id="misc.privacy.removeTrackingQueryParameterPatch">
   </patch>
   <patch id="video.audio.forceOriginalAudioPatch">
-  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <!-- 'Spoof video streams' should be the same translation used for 'revanced_spoof_video_streams_screen_title'. -->
   </patch>
   <patch id="video.quality.rememberVideoQualityPatch">
-  <!-- Translations should use the same text as revanced_custom_playback_speeds_auto -->
+  <!-- Translations should use the same text as 'revanced_custom_playback_speeds_auto'. -->
   </patch>
   <patch id="video.speed.button.playbackSpeedButtonPatch">
   </patch>
@@ -244,7 +247,7 @@ Second \"item\" text"</string>
   <patch id="chat.autoclaim.autoClaimChannelPointsPatch">
   </patch>
   <patch id="debug.debugModePatch">
-  <!-- Twitch specific internal debug mode, and not the same as 'revanced_debug_title' -->
+  <!-- Twitch specific internal debug mode, and not the same as 'revanced_debug_title'. -->
   </patch>
   <patch id="misc.settings.settingsPatch">
   </patch>

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

@@ -39,15 +39,17 @@ Second \"item\" text"</string>
   <patch id="misc.debugging.enableDebuggingPatch">
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
-  <!-- 'Join' should be translated using the same localized wording YouTube displays.
-                 This appears in the video player for certain videos. -->
-  <!-- 'For you' should be translated using the same localized wording YouTube displays. -->
   <!-- '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. -->
-  <!-- 'People also watched' and 'You might also like' should be translated using the same localized wording YouTube displays. -->
+                  This item appear in the Subscriptions feed for future livestreams or unreleased videos. -->
   <!-- 'Show more' should be translated with the same localized wording that YouTube displays.
                   This button usually appears when searching for a YT creator. -->
+  <!-- 'People also watched' and 'You might also like' should be translated using the same localized wording YouTube displays. -->
   <!-- https://logos.fandom.com/wiki/YouTube/Yoodles -->
+  <!-- 'Join' should be translated using the same localized wording YouTube displays.
+                  This appears in the video player for certain videos. -->
+  <!-- 'For You' should be translated using the same localized wording YouTube displays. -->
+  <!-- 'Visit Community' should be translated with the same localized wording that YouTube displays. -->
+  <!-- 'Visit store' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Component path builder strings' is the technical name for identifying the Litho UI layout items to hide. This is an advanced feature and most users will never use this. -->
   <!-- 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. -->
@@ -56,8 +58,6 @@ Second \"item\" text"</string>
   </patch>
   <patch id="ad.general.hideAdsResourcePatch">
   <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
-  <!-- 'View products' should be translated with the same localized wording that YouTube displays. -->
-  <!-- 'Visit store' should be translated with the same localized wording that YouTube displays. -->
   </patch>
   <patch id="ad.getpremium.hideGetPremiumPatch">
   </patch>
@@ -67,8 +67,10 @@ Second \"item\" text"</string>
   </patch>
   <patch id="interaction.dialog.removeViewerDiscretionDialogPatch">
   </patch>
+  <patch id="interaction.doubletap.disableDoubleTapActionsPatch">
+  </patch>
   <patch id="interaction.downloads.downloadsResourcePatch">
-  <!-- 'download action button' should be translated using the same wording as the translation of 'revanced_hide_download_button_title' -->
+  <!-- 'Download action button' should be translated using the same wording as the translation of 'revanced_hide_download_button_title'. -->
   </patch>
   <patch id="interaction.seekbar.disablePreciseSeekingGesturePatch">
   </patch>
@@ -82,19 +84,19 @@ Second \"item\" text"</string>
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
-                 This button usually appears only on live streams. -->
+                  This button usually appears only on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Download' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Thanks' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Ask' should be translated with the same localized wording that YouTube displays.
-                 Button only shows if the user ip is from specific region such as the USA or EU. -->
+                  This button only shows up if the user ip is from specific region such as the USA or EU. -->
   <!-- 'Clip' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Save' should be translated with the same localized wording that YouTube displays. -->
   </patch>
   <patch id="layout.buttons.navigation.navigationButtonsPatch">
   <!-- 'Home' should be translated using the same localized wording YouTube displays for the tab. -->
   <!-- 'Shorts' should be translated using the same localized wording YouTube displays the tab. -->
-  <!-- The Create button has no display name. Translate normally. -->
+  <!-- 'Create' has no display name. Translate normally. -->
   <!-- 'Subscriptions' should be translated using the same localized wording YouTube displays the tab. -->
   <!-- 'Notifications' should be translated using the same localized wording YouTube displays the tab. -->
   </patch>
@@ -107,14 +109,14 @@ Second \"item\" text"</string>
   <!-- 'Help & feedback' should be translated using the same localized wording YouTube displays for the menu item. -->
   <!-- 'Playback speed' should be translated using the same localized wording YouTube displays for the menu item. -->
   <!-- 'More info' should be translated using the same localized wording YouTube displays for the menu item.
-                 This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
+                  This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
   <!-- 'Lock screen' should be translated using the same localized wording YouTube displays for the menu item. -->
   <!-- 'Audio track' should be translated using the same localized wording YouTube displays for the menu item. -->
-  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <!-- 'Spoof video streams' should be the same translation used for 'revanced_spoof_video_streams_screen_title'. -->
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   </patch>
   <patch id="layout.buttons.overlay.hidePlayerOverlayButtonsPatch">
-  <!-- This button does not display any text, but 'captions' should be translated using the same wording used as the translation of 'revanced_hide_player_flyout_captions_title' -->
+  <!-- This button does not display any text, but 'Captions' should be translated using the same wording used as the translation of 'revanced_hide_player_flyout_captions_title'. -->
   </patch>
   <patch id="layout.hide.endscreencards.hideEndscreenCardsResourcePatch">
   </patch>
@@ -125,14 +127,14 @@ Second \"item\" text"</string>
   <patch id="layout.hide.rollingnumber.disableRollingNumberAnimationPatch">
   </patch>
   <patch id="layout.hide.seekbar.hideSeekbarPatch">
+  <!-- Seekbar shown inside video thumbnails found the home/feed/search/history.  The seekbar shows the prior watch progress when the video was last open. -->
   </patch>
   <patch id="layout.hide.shorts.hideShortsComponentsResourcePatch">
-  <!-- 'home' should be translated using the same localized wording YouTube displays for the home tab. -->
-  <!-- 'subscription' should be translated using the same localized wording YouTube displays for the subscription tab. -->
-  <!-- 'join' should be translated using the same localized wording YouTube displays for the button. -->
-  <!-- 'subscribe' should be translated using the same localized wording YouTube displays for the button. -->
-  <!-- 'remix' should be translated using the same localized wording YouTube displays for the button. -->
-  <!-- 'share' should be translated using the same localized wording YouTube displays for the button. -->
+  <!-- 'Home' should be translated using the same localized wording YouTube displays for the Home tab. -->
+  <!-- 'Subscriptions' should be translated using the same localized wording YouTube displays for the Subscriptions tab. -->
+  <!-- 'Join' should be translated using the same localized wording YouTube displays for the button. -->
+  <!-- 'Share' should be translated using the same localized wording YouTube displays for the button. -->
+  <!-- 'Remix' should be translated using the same localized wording YouTube displays for the button. -->
   </patch>
   <patch id="layout.hide.endscreensuggestion.hideEndScreenSuggestedVideoPatch">
   </patch>
@@ -152,7 +154,7 @@ 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. -->
   <!-- Toast shown if the user enables RYD while a video is opened, and then tries to vote for the video. -->
   <!-- Video likes have been set to hidden by the video uploader. -->
-  <!-- Translations should use language similar to 'revanced_sb_enable_compact_skip_button' -->
+  <!-- Translations should use language similar to 'revanced_sb_enable_compact_skip_button'. -->
   <!-- Statistic strings are shown in the settings only when ReVanced debug mode is enabled. Typical users will never see these. -->
   </patch>
   <patch id="layout.searchbar.wideSearchbarPatch">
@@ -160,16 +162,14 @@ Second \"item\" text"</string>
   <patch id="layout.seekbar.seekbarThumbnailsPatch">
   </patch>
   <patch id="layout.sponsorblock.sponsorBlockResourcePatch">
-  <!-- Translations should use language similar to 'revanced_ryd_compact_layout_title' -->
+  <!-- Translations should use language similar to 'revanced_ryd_compact_layout_title'. -->
   <!-- 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. -->
-  <!-- A segment start and end time, such as "02:10 to 03:40" -->
+  <!-- A segment start and end time, such as "02:10 to 03:40". -->
   <!-- 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 -->
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   </patch>
@@ -183,12 +183,15 @@ Second \"item\" text"</string>
   </patch>
   <patch id="layout.theme.themePatch">
   </patch>
+  <patch id="layout.branding.changeHeaderPatch">
+  <!-- For this situation "Minimal" means minimalistic. It does not mean small or tiny. -->
+  </patch>
   <patch id="layout.thumbnails.bypassImageRegionRestrictionsPatch">
   </patch>
   <patch id="layout.thumbnails.alternativeThumbnailsPatch">
-  <!-- 'Home' should be translated using the same localized wording YouTube displays for the home tab. -->
-  <!-- 'Subscription' should be translated using the same localized wording YouTube displays for the subscription tab. -->
-  <!-- 'You' should be translated using the same localized wording YouTube displays for the You (library) tab. -->
+  <!-- 'Home' should be translated using the same localized wording YouTube displays for the Home tab. -->
+  <!-- 'Subscriptions' should be translated using the same localized wording YouTube displays for the Subscriptions tab. -->
+  <!-- 'You' should be translated using the same localized wording YouTube displays for the You (Library) tab. -->
   <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
   </patch>
   <patch id="misc.announcements.announcementsPatch">
@@ -212,10 +215,10 @@ Second \"item\" text"</string>
   <patch id="misc.privacy.removeTrackingQueryParameterPatch">
   </patch>
   <patch id="video.audio.forceOriginalAudioPatch">
-  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <!-- 'Spoof video streams' should be the same translation used for 'revanced_spoof_video_streams_screen_title'. -->
   </patch>
   <patch id="video.quality.rememberVideoQualityPatch">
-  <!-- Translations should use the same text as revanced_custom_playback_speeds_auto -->
+  <!-- Translations should use the same text as 'revanced_custom_playback_speeds_auto'. -->
   </patch>
   <patch id="video.speed.button.playbackSpeedButtonPatch">
   </patch>
@@ -244,7 +247,7 @@ Second \"item\" text"</string>
   <patch id="chat.autoclaim.autoClaimChannelPointsPatch">
   </patch>
   <patch id="debug.debugModePatch">
-  <!-- Twitch specific internal debug mode, and not the same as 'revanced_debug_title' -->
+  <!-- Twitch specific internal debug mode, and not the same as 'revanced_debug_title'. -->
   </patch>
   <patch id="misc.settings.settingsPatch">
   </patch>

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

@@ -137,7 +137,7 @@ Second \"item\" text"</string>
   <string name="revanced_debug_logs_disabled">تم تعطيل تسجيلات تصحيح الأخطاء</string>
   <string name="revanced_debug_logs_none_found">لم يتم العثور على سجلات</string>
   <string name="revanced_debug_logs_copied_to_clipboard">تم نسخ السجلات</string>
-  <string name="revanced_debug_logs_failed_to_export">فشل تصدير السجلات: $s</string>
+  <string name="revanced_debug_logs_failed_to_export">فشل تصدير السجلات: %s</string>
   <string name="revanced_debug_logs_clear_buffer_title">مسح سجلات تصحيح الأخطاء</string>
   <string name="revanced_debug_logs_clear_buffer_summary">يمسح جميع سجلات تصحيح أخطاء ReVanced المخزنة</string>
   <string name="revanced_debug_logs_clear_toast">تم مسح السجلات</string>
@@ -146,118 +146,113 @@ Second \"item\" text"</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>
-  <string name="revanced_hide_crowdfunding_box_title">إخفاء مربع التمويل الجماعي</string>
-  <string name="revanced_hide_crowdfunding_box_summary_on">تم إخفاء مربع التمويل الجماعي</string>
-  <string name="revanced_hide_crowdfunding_box_summary_off">يتم عرض مربع التمويل الجماعي</string>
-  <string name="revanced_hide_floating_microphone_button_title">إخفاء زر الميكروفون العائم</string>
-  <string name="revanced_hide_floating_microphone_button_summary_on">تم إخفاء زر الميكروفون</string>
-  <string name="revanced_hide_floating_microphone_button_summary_off">يتم عرض زر الميكروفون</string>
-  <string name="revanced_hide_channel_watermark_title">إخفاء العلامة المائية للقناة</string>
-  <string name="revanced_hide_channel_watermark_summary_on">تم إخفاء علامة الفيديو المائية</string>
-  <string name="revanced_hide_channel_watermark_summary_off">يتم عرض علامة الفيديو المائية</string>
-  <string name="revanced_hide_horizontal_shelves_title">إخفاء الرفوف الأفقية</string>
-  <string name="revanced_hide_horizontal_shelves_summary_on">"تكون الرفوف مخفية مثل:
-• الأخبار العاجلة
-• متابعة المشاهدة
-• استكشاف المزيد من القنوات
-• التسوق
-• مشاهدة مرة أخرى"</string>
-  <string name="revanced_hide_horizontal_shelves_summary_off">يتم عرض الرفوف</string>
-  <!-- 'Join' should be translated using the same localized wording YouTube displays.
-                 This appears in the video player for certain videos. -->
-  <string name="revanced_hide_join_membership_button_title">إخفاء زر الانضمام</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_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_summary_on">تم إخفاء الزر</string>
-  <string name="revanced_hide_notify_me_button_summary_off">يتم عرض الزر</string>
-  <!-- 'People also watched' and 'You might also like' should be translated using the same localized wording YouTube displays. -->
-  <string name="revanced_hide_search_result_recommendation_labels_title">إخفاء علامات اقتراحات الفيديو</string>
-  <string name="revanced_hide_search_result_recommendation_labels_summary_on">تم إخفاء علامات \'اقتراحات للمشاهدة\' و\'قد يعجبك أيضًا\'</string>
-  <string name="revanced_hide_search_result_recommendation_labels_summary_off">يتم عرض علامات \'اقتراحات للمشاهدة\' و\'قد يعجبك أيضًا\'</string>
-  <!-- 'Show more' should be translated with the same localized wording that YouTube displays.
-                  This button usually appears when searching for a YT creator. -->
-  <string name="revanced_hide_show_more_button_title">إخفاء زر \'عرض المزيد\'</string>
-  <string name="revanced_hide_show_more_button_summary_on">تم إخفاء الزر</string>
-  <string name="revanced_hide_show_more_button_summary_off">يتم عرض الزر</string>
-  <string name="revanced_hide_ticket_shelf_title">إخفاء رف التذاكر</string>
-  <string name="revanced_hide_ticket_shelf_summary_on">تم إخفاء رف التذاكر</string>
-  <string name="revanced_hide_ticket_shelf_summary_off">يتم عرض رف التذاكر</string>
-  <string name="revanced_hide_timed_reactions_title">إخفاء ردود الفعل المؤقتة</string>
-  <string name="revanced_hide_timed_reactions_summary_on">تم إخفاء ردود الفعل المؤقتة</string>
-  <string name="revanced_hide_timed_reactions_summary_off">يتم عرض ردود الفعل المؤقتة</string>
-  <string name="revanced_hide_channel_guidelines_title">إخفاء إرشادات القناة</string>
-  <string name="revanced_hide_channel_guidelines_summary_on">تم إخفاء إرشادات القناة</string>
-  <string name="revanced_hide_channel_guidelines_summary_off">يتم عرض إرشادات القناة</string>
+  <string name="revanced_hide_artist_cards_title">إخفاء بطاقات الفنان</string>
+  <string name="revanced_hide_artist_cards_summary_on">تم إخفاء بطاقات الفنان</string>
+  <string name="revanced_hide_artist_cards_summary_off">يتم عرض بطاقات الفنان</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_community_posts_title">إخفاء مشاركات المجتمع</string>
   <string name="revanced_hide_community_posts_summary_on">تم إخفاء مشاركات المجتمع</string>
   <string name="revanced_hide_community_posts_summary_off">يتم عرض مشاركات المجتمع</string>
   <string name="revanced_hide_compact_banner_title">إخفاء شريط الإعلانات</string>
   <string name="revanced_hide_compact_banner_summary_on">تم إخفاء شريط الإعلانات</string>
   <string name="revanced_hide_compact_banner_summary_off">يتم عرض شريط الإعلانات</string>
+  <string name="revanced_hide_crowdfunding_box_title">إخفاء مربع التمويل الجماعي</string>
+  <string name="revanced_hide_crowdfunding_box_summary_on">تم إخفاء مربع التمويل الجماعي</string>
+  <string name="revanced_hide_crowdfunding_box_summary_off">يتم عرض مربع التمويل الجماعي</string>
+  <string name="revanced_hide_expandable_card_title">إخفاء البطاقة القابلة للتوسيع</string>
+  <string name="revanced_hide_expandable_card_summary_on">البطاقة القابلة للتوسيع أسفل مقاطع الفيديو مخفية</string>
+  <string name="revanced_hide_expandable_card_summary_off">البطاقة القابلة للتوسيع أسفل مقاطع الفيديو معروضة</string>
+  <string name="revanced_hide_floating_microphone_button_title">إخفاء زر الميكروفون العائم</string>
+  <string name="revanced_hide_floating_microphone_button_summary_on">زر الميكروفون العائم في البحث مخفي</string>
+  <string name="revanced_hide_floating_microphone_button_summary_off">يظهر زر الميكروفون العائم في البحث</string>
+  <string name="revanced_hide_horizontal_shelves_title">إخفاء الرفوف الأفقية</string>
+  <string name="revanced_hide_horizontal_shelves_summary_on">"الأرفف الأفقية مخفية، مثل:
+• الأخبار العاجلة
+• متابعة المشاهدة
+• استكشاف المزيد من القنوات
+• الأكثر صلة
+• التسوق
+• شاهدها مرة أخرى"</string>
+  <string name="revanced_hide_horizontal_shelves_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>
+  <string name="revanced_hide_latest_posts_title">إخفاء آخر المشاركات</string>
+  <string name="revanced_hide_latest_posts_summary_on">تم إخفاء أحدث المشاركات</string>
+  <string name="revanced_hide_latest_posts_summary_off">يتم عرض أحدث المشاركات</string>
+  <string name="revanced_hide_mix_playlists_title">إخفاء قوائم تشغيل التشكيلة</string>
+  <string name="revanced_hide_mix_playlists_summary_on">تم إخفاء قوائم تشغيل التشكيلة</string>
+  <string name="revanced_hide_mix_playlists_summary_off">يتم عرض قوائم تشغيل التشكيلة</string>
   <string name="revanced_hide_movies_section_title">إخفاء قسم الأفلام</string>
   <string name="revanced_hide_movies_section_summary_on">تم إخفاء قسم الأفلام</string>
   <string name="revanced_hide_movies_section_summary_off">يتم عرض قسم الأفلام</string>
-  <string name="revanced_hide_feed_survey_title">إخفاء الاستبيانات</string>
-  <string name="revanced_hide_feed_survey_summary_on">تم إخفاء الاستبيانات</string>
-  <string name="revanced_hide_feed_survey_summary_off">يتم عرض الاستبيانات</string>
-  <string name="revanced_hide_community_guidelines_title">إخفاء إرشادات المجتمع</string>
-  <string name="revanced_hide_community_guidelines_summary_on">تم إخفاء إرشادات المجتمع</string>
-  <string name="revanced_hide_community_guidelines_summary_off">يتم عرض إرشادات المجتمع</string>
-  <string name="revanced_hide_subscribers_community_guidelines_title">إخفاء إرشادات المشتركين</string>
-  <string name="revanced_hide_subscribers_community_guidelines_summary_on">تم إخفاء إرشادات مجتمع المشتركين</string>
-  <string name="revanced_hide_subscribers_community_guidelines_summary_off">يتم عرض إرشادات مجتمع المشتركين</string>
-  <string name="revanced_hide_channel_member_shelf_title">إخفاء رف أعضاء القناة</string>
-  <string name="revanced_hide_channel_member_shelf_summary_on">تم إخفاء رف أعضاء القناة</string>
-  <string name="revanced_hide_channel_member_shelf_summary_off">يتم عرض رف أعضاء القناة</string>
+  <!-- 'Notify me' should be translated using the same localized wording YouTube displays.
+                  This item appear in the Subscriptions feed for future livestreams or unreleased videos. -->
+  <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>
+  <string name="revanced_hide_playables_title">إخفاء هيّا نلعب</string>
+  <string name="revanced_hide_playables_summary_on">تم إخفاء هيّا نلعب</string>
+  <string name="revanced_hide_playables_summary_off">يتم عرض هيّا نلعب</string>
+  <!-- 'Show more' should be translated with the same localized wording that YouTube displays.
+                  This button usually appears when searching for a YT creator. -->
+  <string name="revanced_hide_show_more_button_title">إخفاء زر \'عرض المزيد\'</string>
+  <string name="revanced_hide_show_more_button_summary_on">زر إظهار المزيد في نتائج البحث مخفي</string>
+  <string name="revanced_hide_show_more_button_summary_off">زر إظهار المزيد في نتائج البحث معروض</string>
+  <string name="revanced_hide_surveys_title">إخفاء الاستبيانات</string>
+  <string name="revanced_hide_surveys_summary_on">الاستطلاعات مخفية</string>
+  <string name="revanced_hide_surveys_summary_off">الاستطلاعات معروضة</string>
+  <string name="revanced_hide_ticket_shelf_title">إخفاء رف التذاكر</string>
+  <string name="revanced_hide_ticket_shelf_summary_on">تم إخفاء رف التذاكر</string>
+  <string name="revanced_hide_ticket_shelf_summary_off">يتم عرض رف التذاكر</string>
+  <!-- 'People also watched' and 'You might also like' should be translated using the same localized wording YouTube displays. -->
+  <string name="revanced_hide_video_recommendation_labels_title">إخفاء تسميات توصيات الفيديو</string>
+  <string name="revanced_hide_video_recommendation_labels_summary_on">تسميات \'شاهد المستخدمون أيضاً\' و\'قد يعجبك أيضاً\' في نتائج البحث مخفية</string>
+  <string name="revanced_hide_video_recommendation_labels_summary_off">تسميات \'شاهد المستخدمون أيضاً\' و\'قد يعجبك أيضاً\' في نتائج البحث معروضة</string>
+  <!-- https://logos.fandom.com/wiki/YouTube/Yoodles -->
+  <string name="revanced_hide_doodles_title">إخفاء رسومات YouTube</string>
+  <string name="revanced_hide_doodles_summary_on">رسوم Doodles المتحركة في شعار YouTube مخفية</string>
+  <string name="revanced_hide_doodles_summary_off">يتم عرض رسوم متحركة Doodles من YouTube على الشعار</string>
+  <string name="revanced_hide_doodles_user_dialog_message">"تظهر \"\"Doodles\"\" على YouTube بضعة أيام كل عام.
+
+إذا كان يتم عرض \"Doodle\" حاليًا في منطقتك وإذا كان إعداد الإخفاء هذا قيد التشغيل، فسيتم أيضًا إخفاء شريط التصفية أسفل شريط البحث."</string>
+  <string name="revanced_hide_channel_bar_title">إخفاء شريط القناة</string>
+  <string name="revanced_hide_channel_bar_summary_on">تم إخفاء شريط القناة</string>
+  <string name="revanced_hide_channel_bar_summary_off">يتم عرض شريط القناة</string>
+  <string name="revanced_hide_channel_watermark_title">إخفاء العلامة المائية للقناة</string>
+  <string name="revanced_hide_channel_watermark_summary_on">تم إخفاء علامة الفيديو المائية</string>
+  <string name="revanced_hide_channel_watermark_summary_off">يتم عرض علامة الفيديو المائية</string>
   <string name="revanced_hide_emergency_box_title">إخفاء صناديق الطوارئ</string>
   <string name="revanced_hide_emergency_box_summary_on">تم إخفاء صناديق الطوارئ</string>
   <string name="revanced_hide_emergency_box_summary_off">يتم عرض صناديق الطوارئ</string>
   <string name="revanced_hide_info_panels_title">إخفاء لوحات المعلومات</string>
   <string name="revanced_hide_info_panels_summary_on">تم إخفاء لوحات المعلومات</string>
   <string name="revanced_hide_info_panels_summary_off">يتم عرض لوحات المعلومات</string>
+  <!-- 'Join' should be translated using the same localized wording YouTube displays.
+                  This appears in the video player for certain videos. -->
+  <string name="revanced_hide_join_membership_button_title">إخفاء زر الانضمام</string>
+  <string name="revanced_hide_join_membership_button_summary_on">زر الانضمام مخفي</string>
+  <string name="revanced_hide_join_membership_button_summary_off">زر الانضمام معروض</string>
   <string name="revanced_hide_medical_panels_title">إخفاء اللوحات الطبية</string>
   <string name="revanced_hide_medical_panels_summary_on">تم إخفاء اللوحات الطبية</string>
   <string name="revanced_hide_medical_panels_summary_off">يتم عرض اللوحات الطبية</string>
-  <string name="revanced_hide_channel_bar_title">إخفاء شريط القناة</string>
-  <string name="revanced_hide_channel_bar_summary_on">تم إخفاء شريط القناة</string>
-  <string name="revanced_hide_channel_bar_summary_off">يتم عرض شريط القناة</string>
-  <string name="revanced_hide_playables_title">إخفاء هيّا نلعب</string>
-  <string name="revanced_hide_playables_summary_on">تم إخفاء هيّا نلعب</string>
-  <string name="revanced_hide_playables_summary_off">يتم عرض هيّا نلعب</string>
-  <string name="revanced_hide_quick_actions_title">إخفاء الإجراءات السريعة في ملء الشاشة</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_image_shelf_title">إخفاء رف الصورة في نتائج البحث</string>
-  <string name="revanced_hide_image_shelf_summary_on">تم إخفاء رف الصورة</string>
-  <string name="revanced_hide_image_shelf_summary_off">يتم عرض رف الصورة</string>
-  <string name="revanced_hide_latest_posts_ads_title">إخفاء آخر المشاركات</string>
-  <string name="revanced_hide_latest_posts_ads_summary_on">تم إخفاء أحدث المشاركات</string>
-  <string name="revanced_hide_latest_posts_ads_summary_off">يتم عرض أحدث المشاركات</string>
-  <string name="revanced_hide_mix_playlists_title">إخفاء قوائم تشغيل التشكيلة</string>
-  <string name="revanced_hide_mix_playlists_summary_on">تم إخفاء قوائم تشغيل التشكيلة</string>
-  <string name="revanced_hide_mix_playlists_summary_off">يتم عرض قوائم تشغيل التشكيلة</string>
-  <string name="revanced_hide_artist_cards_title">إخفاء بطاقات الفنان</string>
-  <string name="revanced_hide_artist_cards_summary_on">تم إخفاء بطاقات الفنان</string>
-  <string name="revanced_hide_artist_cards_summary_off">يتم عرض بطاقات الفنان</string>
+  <string name="revanced_hide_quick_actions_title">إخفاء الإجراءات السريعة</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_subscribers_community_guidelines_title">إخفاء إرشادات المشتركين</string>
+  <string name="revanced_hide_subscribers_community_guidelines_summary_on">تم إخفاء إرشادات مجتمع المشتركين</string>
+  <string name="revanced_hide_subscribers_community_guidelines_summary_off">يتم عرض إرشادات مجتمع المشتركين</string>
+  <string name="revanced_hide_timed_reactions_title">إخفاء ردود الفعل المؤقتة</string>
+  <string name="revanced_hide_timed_reactions_summary_on">تم إخفاء ردود الفعل المؤقتة</string>
+  <string name="revanced_hide_timed_reactions_summary_off">يتم عرض ردود الفعل المؤقتة</string>
   <string name="revanced_hide_ai_generated_video_summary_section_title">إخفاء \'ملخص الفيديو الذي تم إنشاؤه بواسطة الذكاء الاصطناعي\'</string>
-  <string name="revanced_hide_ai_generated_video_summary_section_summary_on">تم إخفاء قسم ملخص الفيديو</string>
-  <string name="revanced_hide_ai_generated_video_summary_section_summary_off">يتم عرض قسم ملخص الفيديو</string>
+  <string name="revanced_hide_ai_generated_video_summary_section_summary_on">قسم ملخص الفيديو الذي تم إنشاؤه بواسطة الذكاء الاصطناعي مخفي</string>
+  <string name="revanced_hide_ai_generated_video_summary_section_summary_off">قسم ملخص الفيديو الذي تم إنشاؤه بواسطة الذكاء الاصطناعي معروض</string>
   <string name="revanced_hide_ask_section_title">إخفاء \"Ask\"</string>
   <string name="revanced_hide_ask_section_summary_on">تم إخفاء قسم \"Ask\"</string>
   <string name="revanced_hide_ask_section_summary_off">يتم عرض قسم \"Ask\"</string>
@@ -285,33 +280,59 @@ 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>
-  <string name="revanced_hide_filter_bar_feed_in_history_title">إخفاء في السجل</string>
-  <string name="revanced_hide_filter_bar_feed_in_history_summary_on">مخفي في السجل</string>
-  <string name="revanced_hide_filter_bar_feed_in_history_summary_off">معروض في السجل</string>
-  <string name="revanced_hide_filter_bar_feed_in_search_title">إخفاء في نتائج البحث</string>
-  <string name="revanced_hide_filter_bar_feed_in_search_summary_on">مخفي في نتائج البحث</string>
-  <string name="revanced_hide_filter_bar_feed_in_search_summary_off">يُعرض في نتائج البحث</string>
   <string name="revanced_hide_filter_bar_feed_in_related_videos_title">إخفاء في الفيديوهات ذات الصلة</string>
   <string name="revanced_hide_filter_bar_feed_in_related_videos_summary_on">مخفي في الفيديوهات ذات الصلة</string>
   <string name="revanced_hide_filter_bar_feed_in_related_videos_summary_off">يُعرض في الفيديوهات ذات الصلة</string>
+  <string name="revanced_hide_filter_bar_feed_in_search_title">إخفاء في نتائج البحث</string>
+  <string name="revanced_hide_filter_bar_feed_in_search_summary_on">مخفي في نتائج البحث</string>
+  <string name="revanced_hide_filter_bar_feed_in_search_summary_off">يُعرض في نتائج البحث</string>
+  <string name="revanced_hide_filter_bar_feed_in_history_title">إخفاء في سجل المشاهدة</string>
+  <string name="revanced_hide_filter_bar_feed_in_history_summary_on">مخفي في سجل المشاهدة</string>
+  <string name="revanced_hide_filter_bar_feed_in_history_summary_off">معروض في سجل المشاهدة</string>
+  <string name="revanced_channel_screen_title">صفحة القناة</string>
+  <string name="revanced_channel_screen_summary">إخفاء أو إظهار مكونات صفحة القناة</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_summary_on">رف \"لك\" مخفي</string>
+  <string name="revanced_hide_for_you_shelf_summary_off">رف \"لك\" معروض</string>
+  <string name="revanced_hide_links_preview_title">إخفاء معاينة الروابط</string>
+  <string name="revanced_hide_links_preview_summary_on">معاينة الروابط مخفية</string>
+  <string name="revanced_hide_links_preview_summary_off">معاينة الروابط معروضة</string>
+  <string name="revanced_hide_members_shelf_title">إخفاء رف الأعضاء</string>
+  <string name="revanced_hide_members_shelf_summary_on">رف الأعضاء مخفي</string>
+  <string name="revanced_hide_members_shelf_summary_off">يتم عرض رف الأعضاء</string>
+  <!-- 'Visit Community' should be translated with the same localized wording that YouTube displays. -->
+  <string name="revanced_hide_visit_community_button_title">إخفاء زر \"زيارة المنتدى\"</string>
+  <string name="revanced_hide_visit_community_button_summary_on">زر \"زيارة المنتدى\" مخفي</string>
+  <string name="revanced_hide_visit_community_button_summary_off">زر زيارة المجتمع معروض</string>
+  <!-- 'Visit store' should be translated with the same localized wording that YouTube displays. -->
+  <string name="revanced_hide_visit_store_button_title">إخفاء زر \'زيارة المتجر\' على صفحات القناة</string>
+  <string name="revanced_hide_visit_store_button_summary_on">زر زيارة المتجر مخفي</string>
+  <string name="revanced_hide_visit_store_button_summary_off">زر زيارة المتجر معروض</string>
   <string name="revanced_comments_screen_title">التعليقات</string>
   <string name="revanced_comments_screen_summary">إخفاء أو عرض مكونات قسم التعليقات</string>
-  <string name="revanced_hide_comments_ai_chat_summary_title">إخفاء ملخص محادثات الذكاء الاصطناعي</string>
-  <string name="revanced_hide_comments_ai_chat_summary_summary_on">تم إخفاء ملخص المحادثات</string>
-  <string name="revanced_hide_comments_ai_chat_summary_summary_off">يتم عرض ملخص المحادثات</string>
+  <string name="revanced_hide_comments_ai_chat_summary_title">إخفاء ملخص الدردشة بالذكاء الاصطناعي</string>
+  <string name="revanced_hide_comments_ai_chat_summary_summary_on">ملخص الدردشة بالذكاء الاصطناعي مخفي</string>
+  <string name="revanced_hide_comments_ai_chat_summary_summary_off">ملخص الدردشة بالذكاء الاصطناعي معروض</string>
   <string name="revanced_hide_comments_ai_summary_title">إخفاء ملخص تعليقات الذكاء الاصطناعي</string>
-  <string name="revanced_hide_comments_ai_summary_summary_on">تم إخفاء ملخص التعليقات</string>
-  <string name="revanced_hide_comments_ai_summary_summary_off">يتم عرض ملخص التعليقات</string>
+  <string name="revanced_hide_comments_ai_summary_summary_on">ملخص تعليقات الذكاء الاصطناعي مخفي</string>
+  <string name="revanced_hide_comments_ai_summary_summary_off">ملخص تعليقات الذكاء الاصطناعي معروض</string>
+  <string name="revanced_hide_comments_channel_guidelines_title">إخفاء إرشادات القناة</string>
+  <string name="revanced_hide_comments_channel_guidelines_summary_on">إرشادات القناة مخفية</string>
+  <string name="revanced_hide_comments_channel_guidelines_summary_off">إرشادات القناة معروضة</string>
   <string name="revanced_hide_comments_by_members_header_title">إخفاء رأس \'تعليقات الأعضاء\'</string>
   <string name="revanced_hide_comments_by_members_header_summary_on">تم إخفاء علامة تعليقات من الأعضاء</string>
   <string name="revanced_hide_comments_by_members_header_summary_off">يتم عرض علامة تعليقات من الأعضاء</string>
   <string name="revanced_hide_comments_section_title">إخفاء قسم التعليقات</string>
   <string name="revanced_hide_comments_section_summary_on">تم إخفاء قسم التعليقات</string>
   <string name="revanced_hide_comments_section_summary_off">يتم عرض قسم التعليقات</string>
+  <string name="revanced_hide_comments_community_guidelines_title">إخفاء إرشادات المنتدى</string>
+  <string name="revanced_hide_comments_community_guidelines_summary_on">إرشادات المجتمع مخفية</string>
+  <string name="revanced_hide_comments_community_guidelines_summary_off">إرشادات المجتمع معروضة</string>
   <string name="revanced_hide_comments_create_a_short_button_title">إخفاء زر \'إنشاء Short\'</string>
   <string name="revanced_hide_comments_create_a_short_button_summary_on">تم إخفاء زر إنشاء Short</string>
   <string name="revanced_hide_comments_create_a_short_button_summary_off">يتم عرض زر إنشاء Short</string>
@@ -321,16 +342,9 @@ Second \"item\" text"</string>
   <string name="revanced_hide_comments_thanks_button_title">إخفاء زر شكرًا</string>
   <string name="revanced_hide_comments_thanks_button_summary_on">تم إخفاء زر شكرًا</string>
   <string name="revanced_hide_comments_thanks_button_summary_off">يتم عرض زر شكرًا</string>
-  <string name="revanced_hide_comments_timestamp_button_title">زر إخفاء الطابع الزمني</string>
+  <string name="revanced_hide_comments_timestamp_button_title">إخفاء زر الطابع الزمني</string>
   <string name="revanced_hide_comments_timestamp_button_summary_on">زر الطابع الزمني مخفي</string>
   <string name="revanced_hide_comments_timestamp_button_summary_off">زر الطابع الزمني معروض</string>
-  <!-- https://logos.fandom.com/wiki/YouTube/Yoodles -->
-  <string name="revanced_hide_doodles_title">إخفاء رسومات YouTube</string>
-  <string name="revanced_hide_doodles_summary_on">تم إخفاء رسومات شريط البحث</string>
-  <string name="revanced_hide_doodles_summary_off">يتم عرض رسومات شريط البحث</string>
-  <string name="revanced_hide_doodles_user_dialog_message">"تظهر \"\"Doodles\"\" على YouTube بضعة أيام كل عام.
-
-إذا كان يتم عرض \"Doodle\" حاليًا في منطقتك وإذا كان إعداد الإخفاء هذا قيد التشغيل، فسيتم أيضًا إخفاء شريط التصفية أسفل شريط البحث."</string>
   <string name="revanced_custom_filter_screen_title">فلتر مخصص</string>
   <string name="revanced_custom_filter_screen_summary">إخفاء المكونات باستخدام فلاتر مخصصة</string>
   <string name="revanced_custom_filter_title">تمكين الفلتر المخصص</string>
@@ -377,12 +391,12 @@ Second \"item\" text"</string>
   <string name="revanced_hide_keyword_toast_invalid_broad">الكلمة المفتاحية سوف تخفي جميع الفيديوهات: %s</string>
   </patch>
   <patch id="ad.general.hideAdsResourcePatch">
-  <string name="revanced_hide_creator_store_shelves_title">إخفاء رفوف متجر المنشئ</string>
-  <string name="revanced_hide_creator_store_shelves_summary_on">رفوف المتجر أسفل المشغل وفي وصف الفيديو مخفية</string>
-  <string name="revanced_hide_creator_store_shelves_summary_off">تظهر أرفف المتجر أسفل المشغل وفي وصف الفيديو</string>
+  <string name="revanced_hide_creator_store_shelf_title">إخفاء رف متجر المبدع</string>
+  <string name="revanced_hide_creator_store_shelf_summary_on">رف متجر المنشئ أسفل مشغل الفيديو مخفي</string>
+  <string name="revanced_hide_creator_store_shelf_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_end_screen_store_banner_summary_on">لافتة متجر الشاشة النهائية مخفية</string>
+  <string name="revanced_hide_end_screen_store_banner_summary_off">لافتة متجر الشاشة النهائية معروضة</string>
   <string name="revanced_hide_fullscreen_ads_title">إخفاء إعلانات ملء الشاشة</string>
   <string name="revanced_hide_fullscreen_ads_summary_on">"يتم إخفاء إعلانات ملء الشاشة
 
@@ -399,20 +413,15 @@ Second \"item\" text"</string>
   <string name="revanced_hide_paid_promotion_label_title">إخفاء تسمية الترقية المدفوعة</string>
   <string name="revanced_hide_paid_promotion_label_summary_on">تم إخفاء تسمية الترقية المدفوعة</string>
   <string name="revanced_hide_paid_promotion_label_summary_off">يتم عرض تسمية الترقية المدفوعة</string>
-  <!-- 'View products' should be translated with the same localized wording that YouTube displays. -->
-  <string name="revanced_hide_view_products_banner_title">إخفاء لافتة \'عرض المنتجات\'</string>
-  <string name="revanced_hide_view_products_banner_summary_on">الشعار في تراكب الفيديو مخفي</string>
-  <string name="revanced_hide_view_products_banner_summary_off">تظهر اللافتة في تراكب الفيديو</string>
   <string name="revanced_hide_self_sponsor_ads_title">إخفاء بطاقات الرعاية الذاتية</string>
   <string name="revanced_hide_self_sponsor_ads_summary_on">تم إخفاء بطاقات الرعاية الذاتية</string>
   <string name="revanced_hide_self_sponsor_ads_summary_off">يتم عرض بطاقات الرعاية الذاتية</string>
-  <string name="revanced_hide_tagged_products_title">إخفاء المنتجات الموسومة</string>
-  <string name="revanced_hide_tagged_products_summary_on">المنتجات الموسومة في وصف الفيديو مخفية</string>
-  <string name="revanced_hide_tagged_products_summary_off">تظهر المنتجات الموسومة في وصف الفيديو</string>
-  <!-- 'Visit store' should be translated with the same localized wording that YouTube displays. -->
-  <string name="revanced_hide_visit_store_button_title">إخفاء زر \'زيارة المتجر\' على صفحات القناة</string>
-  <string name="revanced_hide_visit_store_button_summary_on">تم إخفاء الزر في صفحة القناة</string>
-  <string name="revanced_hide_visit_store_button_summary_off">يتم عرض الزر في صفحة القناة</string>
+  <string name="revanced_hide_shopping_links_title">إخفاء روابط التسوق</string>
+  <string name="revanced_hide_shopping_links_summary_on">روابط التسوق في وصف الفيديو مخفية</string>
+  <string name="revanced_hide_shopping_links_summary_off">يتم عرض روابط التسوق في وصف الفيديو</string>
+  <string name="revanced_hide_view_products_banner_title">إخفاء لافتة \'عرض المنتجات\'</string>
+  <string name="revanced_hide_view_products_banner_summary_on">لافتة عرض المنتجات في تراكب الفيديو مخفية</string>
+  <string name="revanced_hide_view_products_banner_summary_off">لافتة عرض المنتجات في تراكب الفيديو معروضة</string>
   <string name="revanced_hide_web_search_results_title">إخفاء نتائج بحث الويب</string>
   <string name="revanced_hide_web_search_results_summary_on">تم إخفاء نتائج البحث على الويب</string>
   <string name="revanced_hide_web_search_results_summary_off">يتم عرض نتائج البحث على الويب</string>
@@ -443,19 +452,31 @@ Second \"item\" text"</string>
   <string name="revanced_remove_viewer_discretion_dialog_summary_off">سيتم عرض مربع الحوار</string>
   <string name="revanced_remove_viewer_discretion_dialog_user_dialog_message">وهذا لا يتجاوز قيود السن. بل يقبلها تلقائيًا.</string>
   </patch>
+  <patch id="interaction.doubletap.disableDoubleTapActionsPatch">
+  <string name="revanced_disable_chapter_skip_double_tap_title">تعطيل تخطي الفصل بالنقر المزدوج</string>
+  <string name="revanced_disable_chapter_skip_double_tap_summary_on">لا يمكن للنقر المزدوج مطلقًا أن يؤدي إلى تخطي الفصل التالي/السابق</string>
+  <string name="revanced_disable_chapter_skip_double_tap_summary_off">يمكن للنقر المزدوج أن يؤدي أحيانًا إلى تخطي الفصل التالي/السابق</string>
+  </patch>
   <patch id="interaction.downloads.downloadsResourcePatch">
   <string name="revanced_external_downloader_screen_title">التنزيلات الخارجية</string>
   <string name="revanced_external_downloader_screen_summary">إعدادات لاستخدام أداة التنزيل الخارجية</string>
   <string name="revanced_external_downloader_title">عرض زر التنزيل الخارجي</string>
   <string name="revanced_external_downloader_summary_on">يتم عرض زر التنزيل في المشغل</string>
   <string name="revanced_external_downloader_summary_off">لا يتم عرض زر التنزيل في المشغل</string>
-  <!-- 'download action button' should be translated using the same wording as the translation of 'revanced_hide_download_button_title' -->
+  <!-- 'Download action button' should be translated using the same wording as the translation of 'revanced_hide_download_button_title'. -->
   <string name="revanced_external_downloader_action_button_title">تجاوز زر إجراء التنزيل</string>
   <string name="revanced_external_downloader_action_button_summary_on">يفتح زر التنزيل أداة التنزيل الخارجية</string>
   <string name="revanced_external_downloader_action_button_summary_off">يفتح زر التنزيل أداة التنزيل الأصلية داخل التطبيق</string>
   <string name="revanced_external_downloader_name_title">اسم حزمة أداة التنزيل</string>
-  <string name="revanced_external_downloader_name_summary">اسم الحزمة لتطبيق التنزيل الخارجي المثبت لديك، مثل NewPipe أو Seal</string>
+  <string name="revanced_external_downloader_name_summary">اسم حزمة تطبيق التنزيل الخارجي المثبت لديك</string>
+  <string name="revanced_external_downloader_other_item_hint">أدخل اسم الحزمة</string>
+  <string name="revanced_external_downloader_other_item">أخرى</string>
+  <string name="revanced_external_downloader_not_found_title">التطبيق غير مثبت</string>
   <string name="revanced_external_downloader_not_installed_warning">لم يتم تثبيت %s . الرجاء تثبيته.</string>
+  <string name="revanced_external_downloader_package_not_found_warning">"تعذر العثور على التطبيق المثبت باسم الحزمة: %s
+
+تأكد من أن اسم الحزمة صحيح وأن التطبيق مثبت"</string>
+  <string name="revanced_external_downloader_empty_warning">لا يمكن أن يكون اسم الحزمة فارغًا</string>
   </patch>
   <patch id="interaction.seekbar.disablePreciseSeekingGesturePatch">
   <string name="revanced_disable_precise_seeking_gesture_title">تعطيل إيماءة التمرير الدقيقة</string>
@@ -542,7 +563,7 @@ Second \"item\" text"</string>
   <string name="revanced_hide_stop_ads_button_summary_on">زر إيقاف الإعلانات مخفي</string>
   <string name="revanced_hide_stop_ads_button_summary_off">زر إيقاف الإعلانات معروض</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
-                 This button usually appears only on live streams. -->
+                  This button usually appears only on live streams. -->
   <string name="revanced_hide_report_button_title">إخفاء الإبلاغ</string>
   <string name="revanced_hide_report_button_summary_on">تم إخفاء زر الإبلاغ</string>
   <string name="revanced_hide_report_button_summary_off">يتم عرض زر الإبلاغ</string>
@@ -559,7 +580,7 @@ Second \"item\" text"</string>
   <string name="revanced_hide_thanks_button_summary_on">تم إخفاء زر شكرًا</string>
   <string name="revanced_hide_thanks_button_summary_off">يتم عرض زر شكرًا</string>
   <!-- 'Ask' should be translated with the same localized wording that YouTube displays.
-                 Button only shows if the user ip is from specific region such as the USA or EU. -->
+                  This button only shows up if the user ip is from specific region such as the USA or EU. -->
   <string name="revanced_hide_ask_button_title">إخفاء \"Ask\"</string>
   <string name="revanced_hide_ask_button_summary_on">تم إخفاء زر \"Ask\"</string>
   <string name="revanced_hide_ask_button_summary_off">يتم عرض زر \"Ask\"</string>
@@ -583,7 +604,7 @@ Second \"item\" text"</string>
   <string name="revanced_hide_shorts_button_title">إخفاء Shorts</string>
   <string name="revanced_hide_shorts_button_summary_on">تم إخفاء زر Shorts</string>
   <string name="revanced_hide_shorts_button_summary_off">يتم عرض زر Shorts</string>
-  <!-- The Create button has no display name. Translate normally. -->
+  <!-- 'Create' has no display name. Translate normally. -->
   <string name="revanced_hide_create_button_title">إخفاء الإنشاء</string>
   <string name="revanced_hide_create_button_summary_on">تم إخفاء زر الإنشاء</string>
   <string name="revanced_hide_create_button_summary_off">يتم عرض زر الإنشاء</string>
@@ -652,7 +673,7 @@ Second \"item\" text"</string>
   <string name="revanced_hide_player_flyout_speed_summary_on">تم إخفاء قائمة سرعة التشغيل</string>
   <string name="revanced_hide_player_flyout_speed_summary_off">يتم عرض قائمة سرعة التشغيل</string>
   <!-- 'More info' should be translated using the same localized wording YouTube displays for the menu item.
-                 This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
+                  This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
   <string name="revanced_hide_player_flyout_more_info_title">إخفاء المزيد من المعلومات</string>
   <string name="revanced_hide_player_flyout_more_info_summary_on">تم إخفاء قائمة المزيد من المعلومات</string>
   <string name="revanced_hide_player_flyout_more_info_summary_off">يتم عرض قائمة المزيد من المعلومات</string>
@@ -664,7 +685,7 @@ Second \"item\" text"</string>
   <string name="revanced_hide_player_flyout_audio_track_title">إخفاء المقطع الصوتي</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">تم إخفاء قائمة المقطع الصوتي</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">يتم عرض قائمة المقطع الصوتي</string>
-  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <!-- 'Spoof video streams' should be the same translation used for 'revanced_spoof_video_streams_screen_title'. -->
   <string name="revanced_hide_player_flyout_audio_track_not_available">"تم إخفاء قائمة المقطع الصوتي
 
 لعرض قائمة المقطع الصوتي، غيّر 'Spoof Video Streams' إلى iOS TV"</string>
@@ -677,22 +698,22 @@ Second \"item\" text"</string>
   <string name="revanced_hide_player_flyout_video_quality_footer_summary_off">يتم عرض تذييل قائمة جودة الفيديو</string>
   </patch>
   <patch id="layout.buttons.overlay.hidePlayerOverlayButtonsPatch">
-  <string name="revanced_hide_player_previous_next_buttons_title">إخفاء زري \"السابق\" و \"التالي\"</string>
-  <string name="revanced_hide_player_previous_next_buttons_summary_on">تم إخفاء الأزرار</string>
-  <string name="revanced_hide_player_previous_next_buttons_summary_off">يتم عرض الأزرار</string>
-  <string name="revanced_hide_cast_button_title">إخفاء زر البث</string>
-  <string name="revanced_hide_cast_button_summary_on">تم إخفاء زر البث</string>
-  <string name="revanced_hide_cast_button_summary_off">يتم عرض زر البث</string>
-  <!-- This button does not display any text, but 'captions' should be translated using the same wording used as the translation of 'revanced_hide_player_flyout_captions_title' -->
-  <string name="revanced_hide_captions_button_title">إخفاء زر التَرْجَمَة</string>
-  <string name="revanced_hide_captions_button_summary_on">تم إخفاء زر التَرْجَمَة</string>
-  <string name="revanced_hide_captions_button_summary_off">يتم عرض زر التَرْجَمَة</string>
   <string name="revanced_hide_autoplay_button_title">إخفاء زر التشغيل التلقائي</string>
   <string name="revanced_hide_autoplay_button_summary_on">تم إخفاء زر التشغيل التلقائي</string>
   <string name="revanced_hide_autoplay_button_summary_off">يتم عرض زر التشغيل التلقائي</string>
-  <string name="revanced_hide_player_control_buttons_background_title">إخفاء خلفية أزرار التحكم في المشغل</string>
-  <string name="revanced_hide_player_control_buttons_background_summary_on">تم إخفاء خلفية أزرار التحكم في المشغل</string>
-  <string name="revanced_hide_player_control_buttons_background_summary_off">تم إظهار خلفية أزرار التحكم في المشغل</string>
+  <!-- This button does not display any text, but 'Captions' should be translated using the same wording used as the translation of 'revanced_hide_player_flyout_captions_title'. -->
+  <string name="revanced_hide_captions_button_title">إخفاء زر التَرْجَمَة</string>
+  <string name="revanced_hide_captions_button_summary_on">تم إخفاء زر التَرْجَمَة</string>
+  <string name="revanced_hide_captions_button_summary_off">يتم عرض زر التَرْجَمَة</string>
+  <string name="revanced_hide_cast_button_title">إخفاء زر البث</string>
+  <string name="revanced_hide_cast_button_summary_on">تم إخفاء زر البث</string>
+  <string name="revanced_hide_cast_button_summary_off">يتم عرض زر البث</string>
+  <string name="revanced_hide_player_control_buttons_background_title">إخفاء خلفية عناصر التحكم بالمشغل</string>
+  <string name="revanced_hide_player_control_buttons_background_summary_on">خلفية عناصر تحكم المشغل مخفية</string>
+  <string name="revanced_hide_player_control_buttons_background_summary_off">يتم عرض خلفية عناصر التحكم بالمشغل</string>
+  <string name="revanced_hide_player_previous_next_buttons_title">إخفاء زري \"السابق\" و \"التالي\"</string>
+  <string name="revanced_hide_player_previous_next_buttons_summary_on">تم إخفاء الأزرار</string>
+  <string name="revanced_hide_player_previous_next_buttons_summary_off">يتم عرض الأزرار</string>
   </patch>
   <patch id="layout.hide.endscreencards.hideEndscreenCardsResourcePatch">
   <string name="revanced_hide_endscreen_cards_title">إخفاء بطاقات شاشة النهاية</string>
@@ -715,86 +736,86 @@ Second \"item\" text"</string>
   <string name="revanced_disable_rolling_number_animations_summary_off">عدد مرات المشاهدة والإعجابات متحركة</string>
   </patch>
   <patch id="layout.hide.seekbar.hideSeekbarPatch">
-  <string name="revanced_hide_seekbar_title">إخفاء شريط التقدم في مشغل الفيديو</string>
+  <string name="revanced_hide_seekbar_title">إخفاء شريط تقدم مشغل الفيديو</string>
   <string name="revanced_hide_seekbar_summary_on">تم إخفاء شريط تقدم الفيديو</string>
   <string name="revanced_hide_seekbar_summary_off">يتم عرض شريط تقدم الفيديو</string>
-  <string name="revanced_hide_seekbar_thumbnail_title">إخفاء شريط التقدم في مُصَّغَرات الفيديو</string>
-  <string name="revanced_hide_seekbar_thumbnail_summary_on">تم إخفاء مصغرة شريط التقدم</string>
-  <string name="revanced_hide_seekbar_thumbnail_summary_off">يتم عرض مصغرة شريط التقدم</string>
+  <!-- Seekbar shown inside video thumbnails found the home/feed/search/history.  The seekbar shows the prior watch progress when the video was last open. -->
+  <string name="revanced_hide_seekbar_thumbnail_title">إخفاء شريط تقدم صور مصغرة للفيديو</string>
+  <string name="revanced_hide_seekbar_thumbnail_summary_on">شريط تقدم صور مصغرة للفيديو مخفي</string>
+  <string name="revanced_hide_seekbar_thumbnail_summary_off">شريط تقدم صور مصغرة للفيديو معروض</string>
   </patch>
   <patch id="layout.hide.shorts.hideShortsComponentsResourcePatch">
   <string name="revanced_shorts_player_screen_title">مشغل Shorts</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">مخفية في الصفحة الرئيسية والفيديوهات ذات الصلة</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">مخفية في موجز الاشتراكات</string>
-  <string name="revanced_hide_shorts_subscriptions_summary_off">تُعرض في موجز الاشتراكات</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">مخفية في الصفحة الرئيسية ومقاطع الفيديو ذات الصلة</string>
+  <string name="revanced_hide_shorts_home_summary_off">معروضة في الصفحة الرئيسية ومقاطع الفيديو ذات الصلة</string>
   <string name="revanced_hide_shorts_search_title">إخفاء Shorts في نتائج البحث</string>
   <string name="revanced_hide_shorts_search_summary_on">مخفية في نتائج البحث</string>
   <string name="revanced_hide_shorts_search_summary_off">تُعرض في نتائج البحث</string>
+  <!-- 'Subscriptions' should be translated using the same localized wording YouTube displays for the Subscriptions tab. -->
+  <string name="revanced_hide_shorts_subscriptions_title">إخفاء 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_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>
-  <string name="revanced_hide_shorts_join_button_summary_off">يتم عرض زر الانضمام</string>
-  <!-- 'subscribe' should be translated using the same localized wording YouTube displays for the button. -->
-  <string name="revanced_hide_shorts_subscribe_button_title">إخفاء زر الاشتراك</string>
-  <string name="revanced_hide_shorts_subscribe_button_summary_on">تم إخفاء زر الاشتراك</string>
-  <string name="revanced_hide_shorts_subscribe_button_summary_off">يتم عرض زر الاشتراك</string>
-  <string name="revanced_hide_shorts_paused_overlay_buttons_title">إخفاء أزرار واجهة التوقف</string>
-  <string name="revanced_hide_shorts_paused_overlay_buttons_summary_on">تم إخفاء أزرار واجهة التوقف</string>
-  <string name="revanced_hide_shorts_paused_overlay_buttons_summary_off">يتم عرض أزرار واجهة التوقف</string>
-  <string name="revanced_hide_shorts_shop_button_title">إخفاء زر المتجر</string>
-  <string name="revanced_hide_shorts_shop_button_summary_on">تم إخفاء زر المتجر</string>
-  <string name="revanced_hide_shorts_shop_button_summary_off">يتم عرض زر المتجر</string>
   <string name="revanced_hide_shorts_super_thanks_button_title">إخفاء زر Super Thanks</string>
-  <string name="revanced_hide_shorts_super_thanks_button_summary_on">تم إخفاء زر Super Thanks</string>
-  <string name="revanced_hide_shorts_super_thanks_button_summary_off">يتم عرض زر Super Thanks</string>
-  <string name="revanced_hide_shorts_tagged_products_title">إخفاء المنتجات الموسومة</string>
-  <string name="revanced_hide_shorts_tagged_products_summary_on">تم إخفاء المنتجات الموسومة</string>
-  <string name="revanced_hide_shorts_tagged_products_summary_off">يتم عرض المنتجات الموسومة</string>
-  <string name="revanced_hide_shorts_location_label_title">إخفاء تسمية الموقع</string>
-  <string name="revanced_hide_shorts_location_label_summary_on">تم إخفاء تسمية الموقع</string>
-  <string name="revanced_hide_shorts_location_label_summary_off">يتم عرض تسمية الموقع</string>
-  <string name="revanced_hide_shorts_preview_comment_title">إخفاء تعليق المعاينة</string>
-  <string name="revanced_hide_shorts_preview_comment_summary_on">تم إخفاء تعليق المعاينة</string>
-  <string name="revanced_hide_shorts_preview_comment_summary_off">يتم عرض تعليق المعاينة</string>
-  <string name="revanced_hide_shorts_save_sound_button_title">إخفاء زر حفظ الموسيقى</string>
-  <string name="revanced_hide_shorts_save_sound_button_summary_on">تم إخفاء زر حفظ الموسيقى</string>
-  <string name="revanced_hide_shorts_save_sound_button_summary_off">يتم عرض زر حفظ الموسيقى</string>
-  <string name="revanced_hide_shorts_use_sound_button_title">إخفاء زر استخدام هذا الصوت</string>
-  <string name="revanced_hide_shorts_use_sound_button_summary_on">زر استخدام هذا الصوت مخفي</string>
-  <string name="revanced_hide_shorts_use_sound_button_summary_off">زر استخدام هذا الصوت معروض</string>
-  <string name="revanced_hide_shorts_use_template_button_title">إخفاء زر استخدام هذا القالب</string>
-  <string name="revanced_hide_shorts_use_template_button_summary_on">زر استخدام هذا القالب مخفي</string>
-  <string name="revanced_hide_shorts_use_template_button_summary_off">زر استخدام هذا القالب ظاهر</string>
-  <string name="revanced_hide_shorts_upcoming_button_title">إخفاء زر القادم</string>
-  <string name="revanced_hide_shorts_upcoming_button_summary_on">تم إخفاء زر القادم</string>
-  <string name="revanced_hide_shorts_upcoming_button_summary_off">يتم عرض زر القادم</string>
+  <string name="revanced_hide_shorts_super_thanks_button_summary_on">زر شراء Super Thanks مخفي</string>
+  <string name="revanced_hide_shorts_super_thanks_button_summary_off">زر شراء Super Thanks معروض</string>
   <string name="revanced_hide_shorts_effect_button_title">إخفاء زر التأثير</string>
   <string name="revanced_hide_shorts_effect_button_summary_on">زر التأثير مخفي</string>
   <string name="revanced_hide_shorts_effect_button_summary_off">زر التأثير معروض</string>
   <string name="revanced_hide_shorts_green_screen_button_title">إخفاء زر الشاشة الخضراء</string>
   <string name="revanced_hide_shorts_green_screen_button_summary_on">تم إخفاء زر الشاشة الخضراء</string>
   <string name="revanced_hide_shorts_green_screen_button_summary_off">يتم عرض زر الشاشة الخضراء</string>
-  <string name="revanced_hide_shorts_new_posts_button_title">إخفاء زر \"مشاركات جديدة\"</string>
-  <string name="revanced_hide_shorts_new_posts_button_summary_off">يتم عرض زر \"مشاركات جديدة\"</string>
-  <string name="revanced_hide_shorts_new_posts_button_summary_on">تم إخفاء زر \"مشاركات جديدة\"</string>
   <string name="revanced_hide_shorts_hashtag_button_title">إخفاء زر الهاشتاج</string>
   <string name="revanced_hide_shorts_hashtag_button_summary_on">تم إخفاء زر الهاشتاج</string>
   <string name="revanced_hide_shorts_hashtag_button_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>
+  <string name="revanced_hide_shorts_join_button_summary_off">يتم عرض زر الانضمام</string>
+  <string name="revanced_hide_shorts_location_label_title">إخفاء تسمية الموقع</string>
+  <string name="revanced_hide_shorts_location_label_summary_on">تم إخفاء تسمية الموقع</string>
+  <string name="revanced_hide_shorts_location_label_summary_off">يتم عرض تسمية الموقع</string>
+  <string name="revanced_hide_shorts_new_posts_button_title">إخفاء زر \"مشاركات جديدة\"</string>
+  <string name="revanced_hide_shorts_new_posts_button_summary_on">تم إخفاء زر \"مشاركات جديدة\"</string>
+  <string name="revanced_hide_shorts_new_posts_button_summary_off">يتم عرض زر \"مشاركات جديدة\"</string>
+  <string name="revanced_hide_shorts_paused_overlay_buttons_title">إخفاء أزرار واجهة التوقف</string>
+  <string name="revanced_hide_shorts_paused_overlay_buttons_summary_on">تم إخفاء أزرار واجهة التوقف</string>
+  <string name="revanced_hide_shorts_paused_overlay_buttons_summary_off">يتم عرض أزرار واجهة التوقف</string>
+  <string name="revanced_hide_shorts_preview_comment_title">إخفاء تعليق المعاينة</string>
+  <string name="revanced_hide_shorts_preview_comment_summary_on">تم إخفاء تعليق المعاينة</string>
+  <string name="revanced_hide_shorts_preview_comment_summary_off">يتم عرض تعليق المعاينة</string>
+  <string name="revanced_hide_shorts_save_sound_button_title">إخفاء زر حفظ الموسيقى</string>
+  <string name="revanced_hide_shorts_save_sound_button_summary_on">تم إخفاء زر حفظ الموسيقى</string>
+  <string name="revanced_hide_shorts_save_sound_button_summary_off">يتم عرض زر حفظ الموسيقى</string>
   <string name="revanced_hide_shorts_search_suggestions_title">إخفاء اقتراحات البحث</string>
   <string name="revanced_hide_shorts_search_suggestions_summary_on">تم إخفاء اقتراحات البحث</string>
   <string name="revanced_hide_shorts_search_suggestions_summary_off">يتم عرض اقتراحات البحث</string>
+  <string name="revanced_hide_shorts_shop_button_title">إخفاء زر المتجر</string>
+  <string name="revanced_hide_shorts_shop_button_summary_on">تم إخفاء زر المتجر</string>
+  <string name="revanced_hide_shorts_shop_button_summary_off">يتم عرض زر المتجر</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_subscribe_button_title">إخفاء زر الاشتراك</string>
+  <string name="revanced_hide_shorts_subscribe_button_summary_on">تم إخفاء زر الاشتراك</string>
+  <string name="revanced_hide_shorts_subscribe_button_summary_off">يتم عرض زر الاشتراك</string>
+  <string name="revanced_hide_shorts_tagged_products_title">إخفاء المنتجات الموسومة</string>
+  <string name="revanced_hide_shorts_tagged_products_summary_on">تم إخفاء المنتجات الموسومة</string>
+  <string name="revanced_hide_shorts_tagged_products_summary_off">يتم عرض المنتجات الموسومة</string>
+  <string name="revanced_hide_shorts_upcoming_button_title">إخفاء زر القادم</string>
+  <string name="revanced_hide_shorts_upcoming_button_summary_on">تم إخفاء زر القادم</string>
+  <string name="revanced_hide_shorts_upcoming_button_summary_off">يتم عرض زر القادم</string>
+  <string name="revanced_hide_shorts_use_sound_button_title">إخفاء زر استخدام هذا الصوت</string>
+  <string name="revanced_hide_shorts_use_sound_button_summary_on">زر استخدام هذا الصوت مخفي</string>
+  <string name="revanced_hide_shorts_use_sound_button_summary_off">زر استخدام هذا الصوت معروض</string>
+  <string name="revanced_hide_shorts_use_template_button_title">إخفاء زر استخدام هذا القالب</string>
+  <string name="revanced_hide_shorts_use_template_button_summary_on">زر استخدام هذا القالب مخفي</string>
+  <string name="revanced_hide_shorts_use_template_button_summary_off">زر استخدام هذا القالب ظاهر</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>
@@ -807,14 +828,17 @@ Second \"item\" text"</string>
   <string name="revanced_hide_shorts_comments_button_title">إخفاء زر التعليقات</string>
   <string name="revanced_hide_shorts_comments_button_summary_on">تم إخفاء زر التعليقات</string>
   <string name="revanced_hide_shorts_comments_button_summary_off">يتم عرض زر التعليقات</string>
-  <!-- 'remix' should be translated using the same localized wording YouTube displays for the button. -->
-  <string name="revanced_hide_shorts_remix_button_title">إخفاء زر ريمكس</string>
-  <string name="revanced_hide_shorts_remix_button_summary_on">تم إخفاء زر ريمكس</string>
-  <string name="revanced_hide_shorts_remix_button_summary_off">يتم عرض زر ريمكس</string>
-  <!-- 'share' should be translated using the same localized wording YouTube displays for the button. -->
+  <!-- 'Share' should be translated using the same localized wording YouTube displays for the button. -->
   <string name="revanced_hide_shorts_share_button_title">إخفاء زر مشاركة</string>
   <string name="revanced_hide_shorts_share_button_summary_on">تم إخفاء زر مشاركة</string>
   <string name="revanced_hide_shorts_share_button_summary_off">يتم عرض زر مشاركة</string>
+  <!-- 'Remix' should be translated using the same localized wording YouTube displays for the button. -->
+  <string name="revanced_hide_shorts_remix_button_title">إخفاء زر ريمكس</string>
+  <string name="revanced_hide_shorts_remix_button_summary_on">تم إخفاء زر ريمكس</string>
+  <string name="revanced_hide_shorts_remix_button_summary_off">يتم عرض زر ريمكس</string>
+  <string name="revanced_hide_shorts_sound_button_title">إخفاء زر الصوت</string>
+  <string name="revanced_hide_shorts_sound_button_summary_on">تم إخفاء زر الصوت</string>
+  <string name="revanced_hide_shorts_sound_button_summary_off">يتم عرض زر الصوت</string>
   <string name="revanced_hide_shorts_info_panel_title">إخفاء لوحة المعلومات</string>
   <string name="revanced_hide_shorts_info_panel_summary_on">تم إخفاء لوحة المعلومات</string>
   <string name="revanced_hide_shorts_info_panel_summary_off">يتم عرض لوحة المعلومات</string>
@@ -822,17 +846,14 @@ Second \"item\" text"</string>
   <string name="revanced_hide_shorts_channel_bar_summary_on">تم إخفاء شريط القناة</string>
   <string name="revanced_hide_shorts_channel_bar_summary_off">يتم عرض شريط القناة</string>
   <string name="revanced_hide_shorts_video_title_title">إخفاء عنوان الفيديو</string>
-  <string name="revanced_hide_shorts_video_title_summary_on">تم إخفاء العنوان</string>
-  <string name="revanced_hide_shorts_video_title_summary_off">يتم عرض العنوان</string>
+  <string name="revanced_hide_shorts_video_title_summary_on">عنوان الفيديو مخفي</string>
+  <string name="revanced_hide_shorts_video_title_summary_off">عنوان الفيديو معروض</string>
   <string name="revanced_hide_shorts_sound_metadata_label_title">إخفاء تسمية بيانات التعريف الصوتية</string>
-  <string name="revanced_hide_shorts_sound_metadata_label_summary_on">تم إخفاء تسمية بيانات التعريف</string>
-  <string name="revanced_hide_shorts_sound_metadata_label_summary_off">يتم عرض تسمية بيانات التعريف</string>
+  <string name="revanced_hide_shorts_sound_metadata_label_summary_on">تسمية بيانات تعريف الصوت مخفية</string>
+  <string name="revanced_hide_shorts_sound_metadata_label_summary_off">تسمية بيانات تعريف الصوت معروضة</string>
   <string name="revanced_hide_shorts_full_video_link_label_title">إخفاء تسمية رابط الفيديو</string>
   <string name="revanced_hide_shorts_full_video_link_label_summary_on">تم إخفاء تسمية رابط الفيديو</string>
   <string name="revanced_hide_shorts_full_video_link_label_summary_off">يتم عرض تسمية رابط الفيديو</string>
-  <string name="revanced_hide_shorts_sound_button_title">إخفاء زر الصوت</string>
-  <string name="revanced_hide_shorts_sound_button_summary_on">تم إخفاء زر الصوت</string>
-  <string name="revanced_hide_shorts_sound_button_summary_off">يتم عرض زر الصوت</string>
   <string name="revanced_hide_shorts_navigation_bar_title">إخفاء شريط التنقل</string>
   <string name="revanced_hide_shorts_navigation_bar_summary_on">تم إخفاء شريط التنقل</string>
   <string name="revanced_hide_shorts_navigation_bar_summary_off">يتم عرض شريط التنقل</string>
@@ -846,9 +867,9 @@ Second \"item\" text"</string>
   <string name="revanced_end_screen_suggested_video_summary_off">يتم عرض الفيديو المقترح في شاشة النهاية</string>
   </patch>
   <patch id="layout.hide.relatedvideooverlay.hideRelatedVideoOverlayPatch">
-  <string name="revanced_hide_related_video_overlay_title">إخفاء واجهة الفيديوهات ذات الصلة في وضع ملء الشاشة</string>
-  <string name="revanced_hide_related_video_overlay_summary_on">تم إخفاء واجهة الفيديوهات ذات الصلة</string>
-  <string name="revanced_hide_related_video_overlay_summary_off">يتم عرض واجهة الفيديوهات ذات الصلة</string>
+  <string name="revanced_hide_related_videos_overlay_title">إخفاء تراكب مقاطع الفيديو ذات الصلة</string>
+  <string name="revanced_hide_related_videos_overlay_summary_on">تراكب مقاطع الفيديو ذات الصلة في وضع ملء الشاشة مخفي</string>
+  <string name="revanced_hide_related_videos_overlay_summary_off">تراكب مقاطع الفيديو ذات الصلة في وضع ملء الشاشة معروض</string>
   </patch>
   <patch id="layout.hide.time.hideTimestampPatch">
   <string name="revanced_hide_timestamp_title">إخفاء الطابع الزمني للفيديو</string>
@@ -897,7 +918,7 @@ Second \"item\" text"</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>
-  <!-- Translations should use language similar to 'revanced_sb_enable_compact_skip_button' -->
+  <!-- Translations should use language similar to 'revanced_sb_enable_compact_skip_button'. -->
   <string name="revanced_ryd_compact_layout_title">مقاس زر أعجبني</string>
   <string name="revanced_ryd_compact_layout_summary_on">زر أعجبني مصمم لأدنى عرض</string>
   <string name="revanced_ryd_compact_layout_summary_off">زر أعجبني مصمم لأفضل مظهر</string>
@@ -954,7 +975,7 @@ Second \"item\" text"</string>
   <string name="revanced_sb_square_layout">استخدام التخطيط المربع</string>
   <string name="revanced_sb_square_layout_sum_on">الأزرار وعناصر التحكم مربعة الشكل</string>
   <string name="revanced_sb_square_layout_sum_off">الأزرار وعناصر التحكم مدورة الشكل</string>
-  <!-- Translations should use language similar to 'revanced_ryd_compact_layout_title' -->
+  <!-- Translations should use language similar to 'revanced_ryd_compact_layout_title'. -->
   <string name="revanced_sb_enable_compact_skip_button">استخدام زر التخطي المُصَغَّر</string>
   <string name="revanced_sb_enable_compact_skip_button_sum_on">زر التخطي مصمم لأدنى عرض</string>
   <string name="revanced_sb_enable_compact_skip_button_sum_off">زر التخطي مصمم لأفضل مظهر</string>
@@ -1098,7 +1119,7 @@ Second \"item\" text"</string>
   <string name="revanced_sb_vote_downvote">اعتراض</string>
   <string name="revanced_sb_vote_category">تغيير الفئة</string>
   <string name="revanced_sb_vote_no_segments">لا توجد مقاطع للتصويت عليها</string>
-  <!-- A segment start and end time, such as "02:10 to 03:40" -->
+  <!-- A segment start and end time, such as "02:10 to 03:40". -->
   <string name="revanced_sb_vote_segment_time_to_from">%1$s إلى %2$s</string>
   <string name="revanced_sb_new_segment_choose_category">اختيار فئة المقطع</string>
   <string name="revanced_sb_new_segment_disabled_category">الفئة معطلة في الإعدادات. تمكين الفئة للإرسال.</string>
@@ -1176,8 +1197,6 @@ Second \"item\" text"</string>
 سيؤدي هذا إلى تغيير مظهر ومميزات التطبيق، ولكن قد تحدث تأثيرات جانبية غير معروفة.
 
 إذا تم إيقاف تشغيله لاحقًا، من المستحسن مسح بيانات التطبيق لمنع حدوث أخطاء في واجهة المستخدم."</string>
-  <!-- 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 -->
   <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.01.34 - استعادة أيقونات التنقل القديمة</string>
@@ -1284,9 +1303,9 @@ Second \"item\" text"</string>
   <string name="revanced_gradient_loading_screen_title">تمكين شاشة التحميل المتدرجة</string>
   <string name="revanced_gradient_loading_screen_summary_on">ستحتوي شاشة التحميل على خلفية متدرجة</string>
   <string name="revanced_gradient_loading_screen_summary_off">ستحتوي شاشة التحميل على خلفية ثابتة</string>
-  <string name="splash_screen_animation_style_title">نمط الشاشة الترحيبية</string>
-  <string name="splash_screen_animation_style_entry_1">اللون</string>
-  <string name="splash_screen_animation_style_entry_2">أبيض وأسود</string>
+  <string name="revanced_splash_screen_animation_style_title">نمط الشاشة الترحيبية</string>
+  <string name="revanced_splash_screen_animation_style_entry_1">اللون</string>
+  <string name="revanced_splash_screen_animation_style_entry_2">أبيض وأسود</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>
@@ -1296,6 +1315,14 @@ Second \"item\" text"</string>
   <string name="revanced_seekbar_custom_color_accent_summary">اللون المميز لشريط التقدم</string>
   <string name="revanced_seekbar_custom_color_invalid">لون شريط التقدم غير صالح</string>
   </patch>
+  <patch id="layout.branding.changeHeaderPatch">
+  <string name="revanced_header_logo_title">شعار الرأس</string>
+  <string name="revanced_header_logo_entry_1">افتراضي</string>
+  <string name="revanced_header_logo_entry_2">عادي</string>
+  <!-- For this situation "Minimal" means minimalistic. It does not mean small or tiny. -->
+  <string name="revanced_header_logo_entry_5">ريـفانسد بسيط</string>
+  <string name="revanced_header_logo_entry_6">مخصص</string>
+  </patch>
   <patch id="layout.thumbnails.bypassImageRegionRestrictionsPatch">
   <string name="revanced_bypass_image_region_restrictions_title">تجاوز قيود منطقة الصورة</string>
   <string name="revanced_bypass_image_region_restrictions_summary_on">استخدام مضيف الصورة yt4.ggpht.com</string>
@@ -1304,13 +1331,13 @@ Second \"item\" text"</string>
 تمكين هذا يمكن إصلاح الصور المفقودة التي يتم حظرها في بعض المناطق"</string>
   </patch>
   <patch id="layout.thumbnails.alternativeThumbnailsPatch">
-  <!-- 'Home' should be translated using the same localized wording YouTube displays for the home tab. -->
+  <!-- 'Home' should be translated using the same localized wording YouTube displays for the Home tab. -->
   <string name="revanced_alt_thumbnail_home_title">علامة التبويب الصفحة الرئيسية</string>
-  <!-- 'Subscription' should be translated using the same localized wording YouTube displays for the subscription tab. -->
-  <string name="revanced_alt_thumbnail_subscription_title">علامة التبويب الاشتراكات</string>
-  <!-- 'You' should be translated using the same localized wording YouTube displays for the You (library) tab. -->
+  <!-- 'Subscriptions' should be translated using the same localized wording YouTube displays for the Subscriptions tab. -->
+  <string name="revanced_alt_thumbnail_subscription_title">علامة تبويب الاشتراكات</string>
+  <!-- 'You' should be translated using the same localized wording YouTube displays for the You (Library) tab. -->
   <string name="revanced_alt_thumbnail_library_title">علامة التبويب أنت</string>
-  <string name="revanced_alt_thumbnail_player_title">قوائم تشغيل المشغل، التوصيات</string>
+  <string name="revanced_alt_thumbnail_player_title">قوائم تشغيل المشغل والتوصيات</string>
   <string name="revanced_alt_thumbnail_search_title">نتائج البحث</string>
   <string name="revanced_alt_thumbnail_options_entry_1">المصّغرات الأصلية</string>
   <string name="revanced_alt_thumbnail_options_entry_2">DeArrow &amp; المصّغرات الأصلية</string>
@@ -1409,11 +1436,11 @@ 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>
-  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <!-- 'Spoof video streams' should be the same translation used for 'revanced_spoof_video_streams_screen_title'. -->
   <string name="revanced_force_original_audio_not_available">لاستخدام هذه الميزة، غيّر \'Spoof Video Streams\' إلى iOS TV</string>
   </patch>
   <patch id="video.quality.rememberVideoQualityPatch">
-  <!-- Translations should use the same text as revanced_custom_playback_speeds_auto -->
+  <!-- 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>
@@ -1539,7 +1566,7 @@ AVC لديه حد أقصى للدقة 1080p، لا يتوفر ترميز الص
   <string name="revanced_auto_claim_channel_points_summary_off">لا تتم المطالبة بنقاط القناة تلقائيًا</string>
   </patch>
   <patch id="debug.debugModePatch">
-  <!-- Twitch specific internal debug mode, and not the same as 'revanced_debug_title' -->
+  <!-- Twitch specific internal debug mode, and not the same as 'revanced_debug_title'. -->
   <string name="revanced_twitch_debug_mode_title">تمكين وضع تصحيح أخطاء Twitch</string>
   <string name="revanced_twitch_debug_mode_summary_on">تم تمكين وضع تصحيح أخطاء Twitch (غير مستحسن)</string>
   <string name="revanced_twitch_debug_mode_summary_off">تم تعطيل وضع تصحيح أخطاء Twitch</string>
@@ -1548,11 +1575,11 @@ AVC لديه حد أقصى للدقة 1080p، لا يتوفر ترميز الص
   <string name="revanced_settings">إعدادات ReVanced</string>
   <string name="revanced_about_title">لمحة</string>
   <string name="revanced_about_summary">لمحة عن ReVanced</string>
-  <string name="revanced_ads_screen_title">الإعلانات</string>
-  <string name="revanced_ads_screen_summary">إعدادات حجب الإعلانات</string>
+  <string name="revanced_ads_screen_title">حظر الإعلانات</string>
+  <string name="revanced_ads_screen_summary">إعدادات حظر الإعلانات</string>
   <string name="revanced_chat_screen_title">الدردشة</string>
   <string name="revanced_chat_screen_summary">إعدادات الدردشة</string>
-  <string name="revanced_misc_screen_title">الخصائص المختلفة</string>
+  <string name="revanced_misc_screen_title">متنوعة</string>
   <string name="revanced_misc_screen_summary">إعدادات متنوعة</string>
   <string name="revanced_general_category_title">الإعدادات العامة</string>
   <string name="revanced_other_category_title">إعدادات أخرى</string>

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

@@ -39,15 +39,17 @@ Second \"item\" text"</string>
   <patch id="misc.debugging.enableDebuggingPatch">
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
-  <!-- 'Join' should be translated using the same localized wording YouTube displays.
-                 This appears in the video player for certain videos. -->
-  <!-- 'For you' should be translated using the same localized wording YouTube displays. -->
   <!-- '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. -->
-  <!-- 'People also watched' and 'You might also like' should be translated using the same localized wording YouTube displays. -->
+                  This item appear in the Subscriptions feed for future livestreams or unreleased videos. -->
   <!-- 'Show more' should be translated with the same localized wording that YouTube displays.
                   This button usually appears when searching for a YT creator. -->
+  <!-- 'People also watched' and 'You might also like' should be translated using the same localized wording YouTube displays. -->
   <!-- https://logos.fandom.com/wiki/YouTube/Yoodles -->
+  <!-- 'Join' should be translated using the same localized wording YouTube displays.
+                  This appears in the video player for certain videos. -->
+  <!-- 'For You' should be translated using the same localized wording YouTube displays. -->
+  <!-- 'Visit Community' should be translated with the same localized wording that YouTube displays. -->
+  <!-- 'Visit store' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Component path builder strings' is the technical name for identifying the Litho UI layout items to hide. This is an advanced feature and most users will never use this. -->
   <!-- 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. -->
@@ -56,8 +58,6 @@ Second \"item\" text"</string>
   </patch>
   <patch id="ad.general.hideAdsResourcePatch">
   <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
-  <!-- 'View products' should be translated with the same localized wording that YouTube displays. -->
-  <!-- 'Visit store' should be translated with the same localized wording that YouTube displays. -->
   </patch>
   <patch id="ad.getpremium.hideGetPremiumPatch">
   </patch>
@@ -67,8 +67,10 @@ Second \"item\" text"</string>
   </patch>
   <patch id="interaction.dialog.removeViewerDiscretionDialogPatch">
   </patch>
+  <patch id="interaction.doubletap.disableDoubleTapActionsPatch">
+  </patch>
   <patch id="interaction.downloads.downloadsResourcePatch">
-  <!-- 'download action button' should be translated using the same wording as the translation of 'revanced_hide_download_button_title' -->
+  <!-- 'Download action button' should be translated using the same wording as the translation of 'revanced_hide_download_button_title'. -->
   </patch>
   <patch id="interaction.seekbar.disablePreciseSeekingGesturePatch">
   </patch>
@@ -82,19 +84,19 @@ Second \"item\" text"</string>
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
-                 This button usually appears only on live streams. -->
+                  This button usually appears only on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Download' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Thanks' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Ask' should be translated with the same localized wording that YouTube displays.
-                 Button only shows if the user ip is from specific region such as the USA or EU. -->
+                  This button only shows up if the user ip is from specific region such as the USA or EU. -->
   <!-- 'Clip' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Save' should be translated with the same localized wording that YouTube displays. -->
   </patch>
   <patch id="layout.buttons.navigation.navigationButtonsPatch">
   <!-- 'Home' should be translated using the same localized wording YouTube displays for the tab. -->
   <!-- 'Shorts' should be translated using the same localized wording YouTube displays the tab. -->
-  <!-- The Create button has no display name. Translate normally. -->
+  <!-- 'Create' has no display name. Translate normally. -->
   <!-- 'Subscriptions' should be translated using the same localized wording YouTube displays the tab. -->
   <!-- 'Notifications' should be translated using the same localized wording YouTube displays the tab. -->
   </patch>
@@ -107,14 +109,14 @@ Second \"item\" text"</string>
   <!-- 'Help & feedback' should be translated using the same localized wording YouTube displays for the menu item. -->
   <!-- 'Playback speed' should be translated using the same localized wording YouTube displays for the menu item. -->
   <!-- 'More info' should be translated using the same localized wording YouTube displays for the menu item.
-                 This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
+                  This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
   <!-- 'Lock screen' should be translated using the same localized wording YouTube displays for the menu item. -->
   <!-- 'Audio track' should be translated using the same localized wording YouTube displays for the menu item. -->
-  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <!-- 'Spoof video streams' should be the same translation used for 'revanced_spoof_video_streams_screen_title'. -->
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   </patch>
   <patch id="layout.buttons.overlay.hidePlayerOverlayButtonsPatch">
-  <!-- This button does not display any text, but 'captions' should be translated using the same wording used as the translation of 'revanced_hide_player_flyout_captions_title' -->
+  <!-- This button does not display any text, but 'Captions' should be translated using the same wording used as the translation of 'revanced_hide_player_flyout_captions_title'. -->
   </patch>
   <patch id="layout.hide.endscreencards.hideEndscreenCardsResourcePatch">
   </patch>
@@ -125,14 +127,14 @@ Second \"item\" text"</string>
   <patch id="layout.hide.rollingnumber.disableRollingNumberAnimationPatch">
   </patch>
   <patch id="layout.hide.seekbar.hideSeekbarPatch">
+  <!-- Seekbar shown inside video thumbnails found the home/feed/search/history.  The seekbar shows the prior watch progress when the video was last open. -->
   </patch>
   <patch id="layout.hide.shorts.hideShortsComponentsResourcePatch">
-  <!-- 'home' should be translated using the same localized wording YouTube displays for the home tab. -->
-  <!-- 'subscription' should be translated using the same localized wording YouTube displays for the subscription tab. -->
-  <!-- 'join' should be translated using the same localized wording YouTube displays for the button. -->
-  <!-- 'subscribe' should be translated using the same localized wording YouTube displays for the button. -->
-  <!-- 'remix' should be translated using the same localized wording YouTube displays for the button. -->
-  <!-- 'share' should be translated using the same localized wording YouTube displays for the button. -->
+  <!-- 'Home' should be translated using the same localized wording YouTube displays for the Home tab. -->
+  <!-- 'Subscriptions' should be translated using the same localized wording YouTube displays for the Subscriptions tab. -->
+  <!-- 'Join' should be translated using the same localized wording YouTube displays for the button. -->
+  <!-- 'Share' should be translated using the same localized wording YouTube displays for the button. -->
+  <!-- 'Remix' should be translated using the same localized wording YouTube displays for the button. -->
   </patch>
   <patch id="layout.hide.endscreensuggestion.hideEndScreenSuggestedVideoPatch">
   </patch>
@@ -152,7 +154,7 @@ 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. -->
   <!-- Toast shown if the user enables RYD while a video is opened, and then tries to vote for the video. -->
   <!-- Video likes have been set to hidden by the video uploader. -->
-  <!-- Translations should use language similar to 'revanced_sb_enable_compact_skip_button' -->
+  <!-- Translations should use language similar to 'revanced_sb_enable_compact_skip_button'. -->
   <!-- Statistic strings are shown in the settings only when ReVanced debug mode is enabled. Typical users will never see these. -->
   </patch>
   <patch id="layout.searchbar.wideSearchbarPatch">
@@ -160,16 +162,14 @@ Second \"item\" text"</string>
   <patch id="layout.seekbar.seekbarThumbnailsPatch">
   </patch>
   <patch id="layout.sponsorblock.sponsorBlockResourcePatch">
-  <!-- Translations should use language similar to 'revanced_ryd_compact_layout_title' -->
+  <!-- Translations should use language similar to 'revanced_ryd_compact_layout_title'. -->
   <!-- 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. -->
-  <!-- A segment start and end time, such as "02:10 to 03:40" -->
+  <!-- A segment start and end time, such as "02:10 to 03:40". -->
   <!-- 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 -->
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   </patch>
@@ -183,12 +183,15 @@ Second \"item\" text"</string>
   </patch>
   <patch id="layout.theme.themePatch">
   </patch>
+  <patch id="layout.branding.changeHeaderPatch">
+  <!-- For this situation "Minimal" means minimalistic. It does not mean small or tiny. -->
+  </patch>
   <patch id="layout.thumbnails.bypassImageRegionRestrictionsPatch">
   </patch>
   <patch id="layout.thumbnails.alternativeThumbnailsPatch">
-  <!-- 'Home' should be translated using the same localized wording YouTube displays for the home tab. -->
-  <!-- 'Subscription' should be translated using the same localized wording YouTube displays for the subscription tab. -->
-  <!-- 'You' should be translated using the same localized wording YouTube displays for the You (library) tab. -->
+  <!-- 'Home' should be translated using the same localized wording YouTube displays for the Home tab. -->
+  <!-- 'Subscriptions' should be translated using the same localized wording YouTube displays for the Subscriptions tab. -->
+  <!-- 'You' should be translated using the same localized wording YouTube displays for the You (Library) tab. -->
   <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
   </patch>
   <patch id="misc.announcements.announcementsPatch">
@@ -214,10 +217,10 @@ Second \"item\" text"</string>
   <patch id="misc.privacy.removeTrackingQueryParameterPatch">
   </patch>
   <patch id="video.audio.forceOriginalAudioPatch">
-  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <!-- 'Spoof video streams' should be the same translation used for 'revanced_spoof_video_streams_screen_title'. -->
   </patch>
   <patch id="video.quality.rememberVideoQualityPatch">
-  <!-- Translations should use the same text as revanced_custom_playback_speeds_auto -->
+  <!-- Translations should use the same text as 'revanced_custom_playback_speeds_auto'. -->
   </patch>
   <patch id="video.speed.button.playbackSpeedButtonPatch">
   </patch>
@@ -246,7 +249,7 @@ Second \"item\" text"</string>
   <patch id="chat.autoclaim.autoClaimChannelPointsPatch">
   </patch>
   <patch id="debug.debugModePatch">
-  <!-- Twitch specific internal debug mode, and not the same as 'revanced_debug_title' -->
+  <!-- Twitch specific internal debug mode, and not the same as 'revanced_debug_title'. -->
   </patch>
   <patch id="misc.settings.settingsPatch">
   </patch>

patches/src/main/resources/addresources/values-az-rAZ/strings.xml

@@ -137,7 +137,6 @@ Gözlənilməz hallardan xəbərdar olmayacaqsınız."</string>
   <string name="revanced_debug_logs_disabled">Sazlama qeydi qapalıdır</string>
   <string name="revanced_debug_logs_none_found">Qeydlər tapılmadı</string>
   <string name="revanced_debug_logs_copied_to_clipboard">Qeydlər köçürüldü</string>
-  <string name="revanced_debug_logs_failed_to_export">Qeydləri ixrac etmək alınmadı: $s</string>
   <string name="revanced_debug_logs_clear_buffer_title">Sazlama qeydlərini təmizlə</string>
   <string name="revanced_debug_logs_clear_buffer_summary">Saxlanılan bütün ReVanced sazlama qeydlərini təmizləyir</string>
   <string name="revanced_debug_logs_clear_toast">Qeydlər silindi</string>
@@ -146,118 +145,113 @@ Gözlənilməz hallardan xəbərdar olmayacaqsınız."</string>
   <string name="revanced_hide_album_cards_title">Albom kartlarını gizlət</string>
   <string name="revanced_hide_album_cards_summary_on">Albom kartları gizlidir</string>
   <string name="revanced_hide_album_cards_summary_off">Albom kartları göstərilir</string>
-  <string name="revanced_hide_crowdfunding_box_title">İanə qutusunu gizlət</string>
-  <string name="revanced_hide_crowdfunding_box_summary_on">İanə qutusu gizlidir</string>
-  <string name="revanced_hide_crowdfunding_box_summary_off">İanə qutusu göstərilir</string>
-  <string name="revanced_hide_floating_microphone_button_title">Üzən mikrofon düyməsini gizlət</string>
-  <string name="revanced_hide_floating_microphone_button_summary_on">Mikrofon düyməsi gizlidir</string>
-  <string name="revanced_hide_floating_microphone_button_summary_off">Mikrofon düyməsi göstərilir</string>
-  <string name="revanced_hide_channel_watermark_title">Kanal filiqranını gizlət</string>
-  <string name="revanced_hide_channel_watermark_summary_on">Su nişanı gizlidir</string>
-  <string name="revanced_hide_channel_watermark_summary_off">Su nişanı göstərilir</string>
-  <string name="revanced_hide_horizontal_shelves_title">Üfüqi hissələri gizlət</string>
-  <string name="revanced_hide_horizontal_shelves_summary_on">"Hissələr gizlidir, nümunə:
-• Son xəbərlər
-• İzləməyə davam et
-• Daha çox kanallar kəşf et
-• Mağaza
-• Təkrar izlə"</string>
-  <string name="revanced_hide_horizontal_shelves_summary_off">Hissələr göstərilir</string>
-  <!-- 'Join' should be translated using the same localized wording YouTube displays.
-                 This appears in the video player for certain videos. -->
-  <string name="revanced_hide_join_membership_button_title">Qoşul düyməsin gizlət</string>
-  <string name="revanced_hide_join_membership_button_summary_on">Düymə gizlidir</string>
-  <string name="revanced_hide_join_membership_button_summary_off">Düymə göstərilir</string>
-  <!-- 'For you' should be translated using the same localized wording YouTube displays. -->
-  <string name="revanced_hide_for_you_shelf_title">\"Sizin üçün\" bölməsin gizlət</string>
-  <string name="revanced_hide_for_you_shelf_summary_on">Kanal səhifəsində bölmə gizlidir</string>
-  <string name="revanced_hide_for_you_shelf_summary_off">Kanal səhifəsində bölmə görünür</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">\"Mənə bildir\" düyməsini gizlət</string>
-  <string name="revanced_hide_notify_me_button_summary_on">Düymə gizlidir</string>
-  <string name="revanced_hide_notify_me_button_summary_off">Düymə göstərilir</string>
-  <!-- 'People also watched' and 'You might also like' should be translated using the same localized wording YouTube displays. -->
-  <string name="revanced_hide_search_result_recommendation_labels_title">Video tövsiyə etiketlərini gizlət</string>
-  <string name="revanced_hide_search_result_recommendation_labels_summary_on">\"İnsanlar həmçinin izləyiblər\" və \"Bunu da bəyənə bilərsiniz\" etiketləri gizlədilib</string>
-  <string name="revanced_hide_search_result_recommendation_labels_summary_off">\"İnsanlar həmçinin izləyiblər\" və \"Bunu da bəyənə bilərsiniz\" etiketləri görünür</string>
-  <!-- 'Show more' should be translated with the same localized wording that YouTube displays.
-                  This button usually appears when searching for a YT creator. -->
-  <string name="revanced_hide_show_more_button_title">\'Daha çox göstər\' düyməsini gizlət</string>
-  <string name="revanced_hide_show_more_button_summary_on">Düymə gizlidir</string>
-  <string name="revanced_hide_show_more_button_summary_off">Düymə göstərilir</string>
-  <string name="revanced_hide_ticket_shelf_title">Bilet bölməsin gizlət</string>
-  <string name="revanced_hide_ticket_shelf_summary_on">Bilet bölməsi gizlidir</string>
-  <string name="revanced_hide_ticket_shelf_summary_off">Bilet bölməsi görünür</string>
-  <string name="revanced_hide_timed_reactions_title">Vaxtlı reaksiyaları gizlət</string>
-  <string name="revanced_hide_timed_reactions_summary_on">Zamanlanmış reaksiyalar gizlədilir</string>
-  <string name="revanced_hide_timed_reactions_summary_off">Zamanlanmış reaksiyalar göstərilir</string>
-  <string name="revanced_hide_channel_guidelines_title">Kanal təlimatlarını gizlət</string>
-  <string name="revanced_hide_channel_guidelines_summary_on">Kanal təlimatları gizlidir</string>
-  <string name="revanced_hide_channel_guidelines_summary_off">Kanal təlimatları göstərilir</string>
+  <string name="revanced_hide_artist_cards_title">Sənətçi kartlarını gizlət</string>
+  <string name="revanced_hide_artist_cards_summary_on">Sənətçi kartları gizlidir</string>
+  <string name="revanced_hide_artist_cards_summary_off">Sənətçi kartları göstərilir</string>
   <string name="revanced_hide_chips_shelf_title">Çip bölməsin gizlət</string>
   <string name="revanced_hide_chips_shelf_summary_on">Çip bölməsi gizlidir</string>
   <string name="revanced_hide_chips_shelf_summary_off">Çip bölməsi göstərilir</string>
-  <string name="revanced_hide_expandable_chip_title">Videoların aşağısında açılan kartı gizlət</string>
-  <string name="revanced_hide_expandable_chip_summary_on">Genişləndirilən kart gizlidir</string>
-  <string name="revanced_hide_expandable_chip_summary_off">Genişləndirilən kart görünür</string>
   <string name="revanced_hide_community_posts_title">İcma elanların gizlət</string>
   <string name="revanced_hide_community_posts_summary_on">İcma elanları gizlədilib</string>
   <string name="revanced_hide_community_posts_summary_off">İcma elanları göstərilir</string>
   <string name="revanced_hide_compact_banner_title">Yığcam etiketləri gizlət</string>
   <string name="revanced_hide_compact_banner_summary_on">Yığcam etiketlər gizlidir</string>
   <string name="revanced_hide_compact_banner_summary_off">Yığcam etiketlər göstərilir</string>
+  <string name="revanced_hide_crowdfunding_box_title">İanə qutusunu gizlət</string>
+  <string name="revanced_hide_crowdfunding_box_summary_on">İanə qutusu gizlidir</string>
+  <string name="revanced_hide_crowdfunding_box_summary_off">İanə qutusu göstərilir</string>
+  <string name="revanced_hide_expandable_card_title">Genişlənən kartı gizlət</string>
+  <string name="revanced_hide_expandable_card_summary_on">Videoların aşağısında genişlənən kart gizlidir</string>
+  <string name="revanced_hide_expandable_card_summary_off">Videoların altında genişlənən kart görünür</string>
+  <string name="revanced_hide_floating_microphone_button_title">Üzən mikrofon düyməsini gizlət</string>
+  <string name="revanced_hide_floating_microphone_button_summary_on">Axtarışda üzən mikrofon düyməsi gizlidir</string>
+  <string name="revanced_hide_floating_microphone_button_summary_off">Üzən mikrofon düyməsi axtarışda göstərilir</string>
+  <string name="revanced_hide_horizontal_shelves_title">Üfüqi hissələri gizlət</string>
+  <string name="revanced_hide_horizontal_shelves_summary_on">"Üfüqi cərgələr gizlidir, məsələn:
+• Son xəbərlər
+• İzləməyə davam et
+• Daha çox kanal kəşf et
+• Ən uyğun
+• Alış-veriş
+• Yenidən izləyin"</string>
+  <string name="revanced_hide_horizontal_shelves_summary_off">Üfüqi cərgələr görünür</string>
+  <string name="revanced_hide_image_shelf_title">Şəkil cərgəsin gizlət</string>
+  <string name="revanced_hide_image_shelf_summary_on">Şəkil cərgəsi axtarış nəticələrində gizlidir</string>
+  <string name="revanced_hide_image_shelf_summary_off">Şəkil cərgəsi axtarış nəticələrində görünür</string>
+  <string name="revanced_hide_latest_posts_title">Son elanları gizlət</string>
+  <string name="revanced_hide_latest_posts_summary_on">Ən son elanlar gizlədilib</string>
+  <string name="revanced_hide_latest_posts_summary_off">Ən son elanlar göstərilir</string>
+  <string name="revanced_hide_mix_playlists_title">Qarışıq pleylistləri gizlət</string>
+  <string name="revanced_hide_mix_playlists_summary_on">Qarışıq oynatma siyahıları gizlədilir</string>
+  <string name="revanced_hide_mix_playlists_summary_off">Qarışıq oynatma siyahıları göstərilir</string>
   <string name="revanced_hide_movies_section_title">Filmlər bölməsini gizlət</string>
   <string name="revanced_hide_movies_section_summary_on">Filmlər bölməsi gizlidir</string>
   <string name="revanced_hide_movies_section_summary_off">Filmlər bölməsi göstərilir</string>
-  <string name="revanced_hide_feed_survey_title">Axın sorğuların gizlət</string>
-  <string name="revanced_hide_feed_survey_summary_on">Axın sorğuları gizlidir</string>
-  <string name="revanced_hide_feed_survey_summary_off">Axın sorğuları göstərilir</string>
-  <string name="revanced_hide_community_guidelines_title">İcma təlimatlarını gizlət</string>
-  <string name="revanced_hide_community_guidelines_summary_on">İcma təlimatları gizlidir</string>
-  <string name="revanced_hide_community_guidelines_summary_off">İcma təlimatları göstərilir</string>
-  <string name="revanced_hide_subscribers_community_guidelines_title">Abunəçi təlimatlarını gizlət</string>
-  <string name="revanced_hide_subscribers_community_guidelines_summary_on">Abunəliklərin icma təlimatları gizlidir</string>
-  <string name="revanced_hide_subscribers_community_guidelines_summary_off">Abunəliklərin icma təlimatları göstərilir</string>
-  <string name="revanced_hide_channel_member_shelf_title">Kanal üzvü bölməsin gizlət</string>
-  <string name="revanced_hide_channel_member_shelf_summary_on">Kanal üzvü bölməsi gizlidir</string>
-  <string name="revanced_hide_channel_member_shelf_summary_off">Kanal üzvü bölməsi göstərilir</string>
+  <!-- 'Notify me' should be translated using the same localized wording YouTube displays.
+                  This item appear in the Subscriptions feed for future livestreams or unreleased videos. -->
+  <string name="revanced_hide_notify_me_button_title">\"Mənə bildir\" düyməsini gizlət</string>
+  <string name="revanced_hide_notify_me_button_summary_on">Mənə bildir düyməsi gizlidir</string>
+  <string name="revanced_hide_notify_me_button_summary_off">Mənə bildir düyməsi görünür</string>
+  <string name="revanced_hide_playables_title">Oynadılan elementləri gizlət</string>
+  <string name="revanced_hide_playables_summary_on">Oynadılanlar gizlidir</string>
+  <string name="revanced_hide_playables_summary_off">Oynadılanlar göstərilir</string>
+  <!-- 'Show more' should be translated with the same localized wording that YouTube displays.
+                  This button usually appears when searching for a YT creator. -->
+  <string name="revanced_hide_show_more_button_title">\'Daha çox göstər\' düyməsini gizlət</string>
+  <string name="revanced_hide_show_more_button_summary_on">Daha çox göstər düyməsi axtarış nəticələrində gizlidir</string>
+  <string name="revanced_hide_show_more_button_summary_off">Daha çox göstər düyməsi axtarış nəticələrində görünür</string>
+  <string name="revanced_hide_surveys_title">Sorğuları gizlət</string>
+  <string name="revanced_hide_surveys_summary_on">Sorğular gizlədilib</string>
+  <string name="revanced_hide_surveys_summary_off">Sorğular görünür</string>
+  <string name="revanced_hide_ticket_shelf_title">Bilet bölməsin gizlət</string>
+  <string name="revanced_hide_ticket_shelf_summary_on">Bilet bölməsi gizlidir</string>
+  <string name="revanced_hide_ticket_shelf_summary_off">Bilet bölməsi görünür</string>
+  <!-- 'People also watched' and 'You might also like' should be translated using the same localized wording YouTube displays. -->
+  <string name="revanced_hide_video_recommendation_labels_title">Video tövsiyə etiketlərini gizlət</string>
+  <string name="revanced_hide_video_recommendation_labels_summary_on">\'İnsanlar həmçinin izləyiblər\' və \'Bunu da bəyənə bilərsiniz\' etiketləri axtarış nəticələrində gizlədilib</string>
+  <string name="revanced_hide_video_recommendation_labels_summary_off">\'İnsanlar həmçinin izləyiblər\' və \'Bunu da bəyənə bilərsiniz\' etiketləri axtarış nəticələrində görünür</string>
+  <!-- https://logos.fandom.com/wiki/YouTube/Yoodles -->
+  <string name="revanced_hide_doodles_title">YouTube Doodle-ları gizlət</string>
+  <string name="revanced_hide_doodles_summary_on">YouTube Doodles animasiyası simvolda gizlidir</string>
+  <string name="revanced_hide_doodles_summary_off">YouTube Doodles animasiyası simvolda görünür</string>
+  <string name="revanced_hide_doodles_user_dialog_message">"YouTube Doodle-ları hər il bir neçə gün görünür.
+
+Əgər hazırda bölgənizdə Doodle göstərilirsə və bu gizlətmə seçimi aktivdirsə, axtarış cizgisi aşağısındakı filtr sahəsi də gizlədiləcək."</string>
+  <string name="revanced_hide_channel_bar_title">Kanal çubuğunu gizlət</string>
+  <string name="revanced_hide_channel_bar_summary_on">Kanal çubuğu gizlidir</string>
+  <string name="revanced_hide_channel_bar_summary_off">Kanal çubuğu göstərilir</string>
+  <string name="revanced_hide_channel_watermark_title">Kanal filiqranını gizlət</string>
+  <string name="revanced_hide_channel_watermark_summary_on">Su nişanı gizlidir</string>
+  <string name="revanced_hide_channel_watermark_summary_off">Su nişanı göstərilir</string>
   <string name="revanced_hide_emergency_box_title">Ciddi vəziyyət qutularını gizlət</string>
   <string name="revanced_hide_emergency_box_summary_on">Ciddi vəziyyət qutuları gizlidir</string>
   <string name="revanced_hide_emergency_box_summary_off">Ciddi vəziyyət qutuları göstərilir</string>
   <string name="revanced_hide_info_panels_title">Məlumat lövhələrini gizlət</string>
   <string name="revanced_hide_info_panels_summary_on">Məlumat lövhələri gizlidir</string>
   <string name="revanced_hide_info_panels_summary_off">Məlumat lövhələri göstərilir</string>
+  <!-- 'Join' should be translated using the same localized wording YouTube displays.
+                  This appears in the video player for certain videos. -->
+  <string name="revanced_hide_join_membership_button_title">Qoşul düyməsin gizlət</string>
+  <string name="revanced_hide_join_membership_button_summary_on">Qoşul düyməsi gizlidir</string>
+  <string name="revanced_hide_join_membership_button_summary_off">Qoşul düyməsi görünür</string>
   <string name="revanced_hide_medical_panels_title">Tibbi lövhələri gizlət</string>
   <string name="revanced_hide_medical_panels_summary_on">Tibbi lövhələr gizlidir</string>
   <string name="revanced_hide_medical_panels_summary_off">Tibbi lövhələr göstərilir</string>
-  <string name="revanced_hide_channel_bar_title">Kanal çubuğunu gizlət</string>
-  <string name="revanced_hide_channel_bar_summary_on">Kanal çubuğu gizlidir</string>
-  <string name="revanced_hide_channel_bar_summary_off">Kanal çubuğu göstərilir</string>
-  <string name="revanced_hide_playables_title">Oynadılan elementləri gizlət</string>
-  <string name="revanced_hide_playables_summary_on">Oynadılanlar gizlidir</string>
-  <string name="revanced_hide_playables_summary_off">Oynadılanlar göstərilir</string>
-  <string name="revanced_hide_quick_actions_title">Tam ekranda cəld fəaliyyətləri gizlət</string>
-  <string name="revanced_hide_quick_actions_summary_on">Cəld fəaliyyətlər gizlədilir</string>
-  <string name="revanced_hide_quick_actions_summary_off">Cəld fəaliyyətlər göstərilir</string>
-  <string name="revanced_hide_related_videos_title">Cəld fəaliyyətlərdə əlaqəli videoları gizlə</string>
-  <string name="revanced_hide_related_videos_summary_on">Əlaqədar videolar gizlədilib</string>
-  <string name="revanced_hide_related_videos_summary_off">Əlaqədar videolar göstərilir</string>
-  <string name="revanced_hide_image_shelf_title">Axtarış nəticəsində şəkil bölməsin gizlə</string>
-  <string name="revanced_hide_image_shelf_summary_on">Şəkil bölməsi gizlidir</string>
-  <string name="revanced_hide_image_shelf_summary_off">Şəkil bölməsi göstərilir</string>
-  <string name="revanced_hide_latest_posts_ads_title">Son elanları gizlət</string>
-  <string name="revanced_hide_latest_posts_ads_summary_on">Ən son elanlar gizlədilib</string>
-  <string name="revanced_hide_latest_posts_ads_summary_off">Ən son elanlar göstərilir</string>
-  <string name="revanced_hide_mix_playlists_title">Qarışıq pleylistləri gizlət</string>
-  <string name="revanced_hide_mix_playlists_summary_on">Qarışıq oynatma siyahıları gizlədilir</string>
-  <string name="revanced_hide_mix_playlists_summary_off">Qarışıq oynatma siyahıları göstərilir</string>
-  <string name="revanced_hide_artist_cards_title">Sənətçi kartlarını gizlət</string>
-  <string name="revanced_hide_artist_cards_summary_on">Sənətçi kartları gizlidir</string>
-  <string name="revanced_hide_artist_cards_summary_off">Sənətçi kartları göstərilir</string>
+  <string name="revanced_hide_quick_actions_title">Cəld fəaliyyətləri gizlət</string>
+  <string name="revanced_hide_quick_actions_summary_on">Tam ekranda cəld fəaliyyətlər gizlədilib</string>
+  <string name="revanced_hide_quick_actions_summary_off">Tam ekranda cəld fəaliyyətlər görünür</string>
+  <string name="revanced_hide_related_videos_title">Əlaqəli videoları gizlət</string>
+  <string name="revanced_hide_related_videos_summary_on">Əlaqəli videolar cəld fəaliyyətlərdə gizlədilib</string>
+  <string name="revanced_hide_related_videos_summary_off">Əlaqəli videolar cəld fəaliyyətlərdə görünür</string>
+  <string name="revanced_hide_subscribers_community_guidelines_title">Abunəçi təlimatlarını gizlət</string>
+  <string name="revanced_hide_subscribers_community_guidelines_summary_on">Abunəliklərin icma təlimatları gizlidir</string>
+  <string name="revanced_hide_subscribers_community_guidelines_summary_off">Abunəliklərin icma təlimatları göstərilir</string>
+  <string name="revanced_hide_timed_reactions_title">Vaxtlı reaksiyaları gizlət</string>
+  <string name="revanced_hide_timed_reactions_summary_on">Zamanlanmış reaksiyalar gizlədilir</string>
+  <string name="revanced_hide_timed_reactions_summary_off">Zamanlanmış reaksiyalar göstərilir</string>
   <string name="revanced_hide_ai_generated_video_summary_section_title">\"AI ilə yaradılan video xülasəsini\" gizlət</string>
-  <string name="revanced_hide_ai_generated_video_summary_section_summary_on">Video xülasə bölməsi gizlədilib</string>
-  <string name="revanced_hide_ai_generated_video_summary_section_summary_off">Video xülasə bölməsi göstərilir</string>
+  <string name="revanced_hide_ai_generated_video_summary_section_summary_on">Sİ ilə yaradılan video xülasə bölməsi gizlədilib</string>
+  <string name="revanced_hide_ai_generated_video_summary_section_summary_off">Sİ ilə yaradılan video xülasə bölməsi görünür</string>
   <string name="revanced_hide_ask_section_title">Soruş\'u Gizlət</string>
   <string name="revanced_hide_ask_section_summary_on">Soruş bölməsi gizlidir</string>
   <string name="revanced_hide_ask_section_summary_off">\"Soruş\" bölməsi göstərilir</string>
@@ -285,33 +279,59 @@ Gözlənilməz hallardan xəbərdar olmayacaqsınız."</string>
   <string name="revanced_hide_description_components_screen_title">Video təsviri</string>
   <string name="revanced_hide_description_components_screen_summary">Video təsviri elementlərini gizlət və ya göstər</string>
   <string name="revanced_hide_filter_bar_screen_title">Filtr çubuğu</string>
-  <string name="revanced_hide_filter_bar_screen_summary">Axınlar, tarixçə, axtarış nəticələri və əlaqəli videolarda filtr panelini gizlət və ya göstər</string>
+  <string name="revanced_hide_filter_bar_screen_summary">Axınlar, əlaqəli videolar, axtarış nəticələri və baxış tarixçəsində filtr cərgəsin gizlət və ya göstər</string>
   <string name="revanced_hide_filter_bar_feed_in_feed_title">Axınlarda gizlət</string>
   <string name="revanced_hide_filter_bar_feed_in_feed_summary_on">Axınlarda gizlidir</string>
   <string name="revanced_hide_filter_bar_feed_in_feed_summary_off">Axınlarda göstər</string>
-  <string name="revanced_hide_filter_bar_feed_in_history_title">Tarixçədə gizlət</string>
-  <string name="revanced_hide_filter_bar_feed_in_history_summary_on">Tarixçədə gizlədilib</string>
-  <string name="revanced_hide_filter_bar_feed_in_history_summary_off">Tarixçədə göstərilib</string>
-  <string name="revanced_hide_filter_bar_feed_in_search_title">Axtarış nəticələrində gizlət</string>
-  <string name="revanced_hide_filter_bar_feed_in_search_summary_on">Axtarış nəticələrində gizlədilib</string>
-  <string name="revanced_hide_filter_bar_feed_in_search_summary_off">Axtarış nəticələrində göstərilir</string>
   <string name="revanced_hide_filter_bar_feed_in_related_videos_title">Əlaqəli videolarda gizlət</string>
   <string name="revanced_hide_filter_bar_feed_in_related_videos_summary_on">Əlaqəli videolarda gizlidir</string>
   <string name="revanced_hide_filter_bar_feed_in_related_videos_summary_off">Əlaqəli videolarda görünür</string>
+  <string name="revanced_hide_filter_bar_feed_in_search_title">Axtarış nəticələrində gizlət</string>
+  <string name="revanced_hide_filter_bar_feed_in_search_summary_on">Axtarış nəticələrində gizlədilib</string>
+  <string name="revanced_hide_filter_bar_feed_in_search_summary_off">Axtarış nəticələrində göstərilir</string>
+  <string name="revanced_hide_filter_bar_feed_in_history_title">Baxış tarixçəsində gizlət</string>
+  <string name="revanced_hide_filter_bar_feed_in_history_summary_on">Baxış tarixçəsində gizlədilib</string>
+  <string name="revanced_hide_filter_bar_feed_in_history_summary_off">Baxış tarixçəsində görünür</string>
+  <string name="revanced_channel_screen_title">Kanal səhifəsi</string>
+  <string name="revanced_channel_screen_summary">Kanal səhifə elementlərini gizlət və ya göstər</string>
+  <!-- 'For You' should be translated using the same localized wording YouTube displays. -->
+  <string name="revanced_hide_for_you_shelf_title">\"Sizin üçün\" bölməsin gizlət</string>
+  <string name="revanced_hide_for_you_shelf_summary_on">Sizin üçün cərgəsi gizlidir</string>
+  <string name="revanced_hide_for_you_shelf_summary_off">Sizin üçün cərgəsi görünür</string>
+  <string name="revanced_hide_links_preview_title">Keçidlərin önizləməsini gizlət</string>
+  <string name="revanced_hide_links_preview_summary_on">Keçidlər önizləməsi gizlədilib</string>
+  <string name="revanced_hide_links_preview_summary_off">Keçidlər önizləməsi görünür</string>
+  <string name="revanced_hide_members_shelf_title">Üzvlər cərgəsini gizlət</string>
+  <string name="revanced_hide_members_shelf_summary_on">Üzvlər cərgəsi gizlidir</string>
+  <string name="revanced_hide_members_shelf_summary_off">Üzvlər cərgəsi görünür</string>
+  <!-- 'Visit Community' should be translated with the same localized wording that YouTube displays. -->
+  <string name="revanced_hide_visit_community_button_title">\'İcmaya daxil olun\' düyməsini gizlət</string>
+  <string name="revanced_hide_visit_community_button_summary_on">İcmaya daxil ol düyməsi gizlidir</string>
+  <string name="revanced_hide_visit_community_button_summary_off">İcmaya daxil ol düyməsi görünür</string>
+  <!-- 'Visit store' should be translated with the same localized wording that YouTube displays. -->
+  <string name="revanced_hide_visit_store_button_title">Kanalda \"Mağazaya baxın\" düyməsin gizlə</string>
+  <string name="revanced_hide_visit_store_button_summary_on">Mağazaya baxın düyməsi gizlidir</string>
+  <string name="revanced_hide_visit_store_button_summary_off">Mağazaya baxın düyməsi görünür</string>
   <string name="revanced_comments_screen_title">Şərhlər</string>
   <string name="revanced_comments_screen_summary">Şərhlər bölməsi elementlərin gizlət və ya göstər</string>
-  <string name="revanced_hide_comments_ai_chat_summary_title">AI Söhbət Xülasəsini Gizlət</string>
-  <string name="revanced_hide_comments_ai_chat_summary_summary_on">Söhbət yekunu gizlidir </string>
-  <string name="revanced_hide_comments_ai_chat_summary_summary_off">Söhbət yekunu görünür</string>
+  <string name="revanced_hide_comments_ai_chat_summary_title">Sİ söhbət xülasəsini gizlət</string>
+  <string name="revanced_hide_comments_ai_chat_summary_summary_on">Sİ söhbət xülasəsi gizlidir</string>
+  <string name="revanced_hide_comments_ai_chat_summary_summary_off">Sİ söhbət xülasəsi görünür</string>
   <string name="revanced_hide_comments_ai_summary_title">AI Ṣərhlər Xülasəsini Gizlət</string>
-  <string name="revanced_hide_comments_ai_summary_summary_on">Ṣərh yekunu gizlidir </string>
-  <string name="revanced_hide_comments_ai_summary_summary_off">Şərh yekunu görünür</string>
+  <string name="revanced_hide_comments_ai_summary_summary_on">Sİ şərhlər xülasəsi gizlidir</string>
+  <string name="revanced_hide_comments_ai_summary_summary_off">Sİ şərhlər xülasəsi görünür</string>
+  <string name="revanced_hide_comments_channel_guidelines_title">Kanal təlimatlarını gizlət</string>
+  <string name="revanced_hide_comments_channel_guidelines_summary_on">Kanal təlimatları gizlidir</string>
+  <string name="revanced_hide_comments_channel_guidelines_summary_off">Kanal təlimatları görünür</string>
   <string name="revanced_hide_comments_by_members_header_title">\'Üzvlərin şərhləri\' başlığını gizlət</string>
   <string name="revanced_hide_comments_by_members_header_summary_on">Üzvlərin şərhləri başlığı gizlidir</string>
   <string name="revanced_hide_comments_by_members_header_summary_off">Üzvlərin şərhləri başlığı görünür</string>
   <string name="revanced_hide_comments_section_title">Şərhlər bölməsini gizlət</string>
   <string name="revanced_hide_comments_section_summary_on">Şərhlər bölməsi gizlidir</string>
   <string name="revanced_hide_comments_section_summary_off">Şərhlər bölməsi göstərilir</string>
+  <string name="revanced_hide_comments_community_guidelines_title">İcma təlimatlarını gizlət</string>
+  <string name="revanced_hide_comments_community_guidelines_summary_on">İcma təlimatları gizlidir</string>
+  <string name="revanced_hide_comments_community_guidelines_summary_off">İcma təlimatları görünür</string>
   <string name="revanced_hide_comments_create_a_short_button_title">\"Shorts Yarat\" düyməsini gizlət</string>
   <string name="revanced_hide_comments_create_a_short_button_summary_on">Short yarat düyməsi gizlidir</string>
   <string name="revanced_hide_comments_create_a_short_button_summary_off">Short yarat düyməsi görünür</string>
@@ -321,16 +341,9 @@ Gözlənilməz hallardan xəbərdar olmayacaqsınız."</string>
   <string name="revanced_hide_comments_thanks_button_title">Təşəkkür Düyməsini Gizlət</string>
   <string name="revanced_hide_comments_thanks_button_summary_on">Təşəkkür düyməsi gizlidir</string>
   <string name="revanced_hide_comments_thanks_button_summary_off">Təşəkkür düyməsi göstərilir</string>
-  <string name="revanced_hide_comments_timestamp_button_title">Vaxt möhürü düyməsini gizlət</string>
+  <string name="revanced_hide_comments_timestamp_button_title">Vaxt damğası düyməsin gizlət</string>
   <string name="revanced_hide_comments_timestamp_button_summary_on">Vaxt damğası düyməsi gizlidir</string>
   <string name="revanced_hide_comments_timestamp_button_summary_off">Vaxt möhürü düyməsi göstərilir</string>
-  <!-- https://logos.fandom.com/wiki/YouTube/Yoodles -->
-  <string name="revanced_hide_doodles_title">YouTube Doodle-ları gizlət</string>
-  <string name="revanced_hide_doodles_summary_on">Axtarış çubuğu Doodle-ları gizlidir</string>
-  <string name="revanced_hide_doodles_summary_off">Axtarış çubuğu Doodle-ları göstərilir</string>
-  <string name="revanced_hide_doodles_user_dialog_message">"YouTube Doodle-ları hər il bir neçə gün görünür.
-
-Əgər hazırda bölgənizdə Doodle göstərilirsə və bu gizlətmə seçimi aktivdirsə, axtarış cizgisi aşağısındakı filtr sahəsi də gizlədiləcək."</string>
   <string name="revanced_custom_filter_screen_title">Şəxsi filtr</string>
   <string name="revanced_custom_filter_screen_summary">Fərdi filtrlər işlədərək elementləri gizlət</string>
   <string name="revanced_custom_filter_title">Fərdi filtri aktivləşdir</string>
@@ -377,12 +390,12 @@ Məhdudiyyətlər
   <string name="revanced_hide_keyword_toast_invalid_broad">Açar söz, bütün videoları gizlədəcək: %s</string>
   </patch>
   <patch id="ad.general.hideAdsResourcePatch">
-  <string name="revanced_hide_creator_store_shelves_title">Yaradıcı mağaza bölmələrin gizlət</string>
-  <string name="revanced_hide_creator_store_shelves_summary_on">Oynadıcı altında və video təsvirində mağaza bölümün gizlidir</string>
-  <string name="revanced_hide_creator_store_shelves_summary_off">Oynadıcı altında və video təsvirində mağaza bölümün görünür</string>
+  <string name="revanced_hide_creator_store_shelf_title">Yaradıcı mağaza bölümün gizlət</string>
+  <string name="revanced_hide_creator_store_shelf_summary_on">Yaradıcı alış-veriş cərgəsi video oynadıcı altında gizlidir</string>
+  <string name="revanced_hide_creator_store_shelf_summary_off">Yaradıcı alış-veriş cərgəsi video oynadıcı altında görünür</string>
   <string name="revanced_hide_end_screen_store_banner_title">Son ekran mağaza etiketini gizlət</string>
-  <string name="revanced_hide_end_screen_store_banner_summary_on">Mağaza etiketi gizlidir</string>
-  <string name="revanced_hide_end_screen_store_banner_summary_off">Mağaza etiketi görünür</string>
+  <string name="revanced_hide_end_screen_store_banner_summary_on">Son ekran alış-veriş etiketi gizlədilib</string>
+  <string name="revanced_hide_end_screen_store_banner_summary_off">Son ekran alış-veriş etiketi görünür</string>
   <string name="revanced_hide_fullscreen_ads_title">Tam ekran reklamlarını gizlət</string>
   <string name="revanced_hide_fullscreen_ads_summary_on">"Tam ekran reklamları gizlidir
 
@@ -399,20 +412,15 @@ Bu xüsusiyyət yalnız köhnə cihazlar üçün mövcuddur"</string>
   <string name="revanced_hide_paid_promotion_label_title">Ödənişli tanıtım etiketini gizlət</string>
   <string name="revanced_hide_paid_promotion_label_summary_on">Ödənişli reklam etiketi gizlədilib</string>
   <string name="revanced_hide_paid_promotion_label_summary_off">Ödənişli reklam etiketi göstərilir</string>
-  <!-- 'View products' should be translated with the same localized wording that YouTube displays. -->
-  <string name="revanced_hide_view_products_banner_title">“Məhsullara baxın” panelin gizlət</string>
-  <string name="revanced_hide_view_products_banner_summary_on">Video örtüyündəki panel gizlədilib</string>
-  <string name="revanced_hide_view_products_banner_summary_off">Video örtüyündəki panel görünür</string>
   <string name="revanced_hide_self_sponsor_ads_title">Öz-sponsorlu kartları gizlət</string>
   <string name="revanced_hide_self_sponsor_ads_summary_on">Özünə sponsorluq edilən kartlar gizlidir</string>
   <string name="revanced_hide_self_sponsor_ads_summary_off">Özünə sponsorluq edilən kartlar göstərilir</string>
-  <string name="revanced_hide_tagged_products_title">Etiketlənən məhsulları gizlət</string>
-  <string name="revanced_hide_tagged_products_summary_on">Video təsvirdəki etiketlənən məhsullar gizlidir</string>
-  <string name="revanced_hide_tagged_products_summary_off">Video təsvirdəki etiketlənən məhsullar görünür</string>
-  <!-- 'Visit store' should be translated with the same localized wording that YouTube displays. -->
-  <string name="revanced_hide_visit_store_button_title">Kanalda \"Mağazaya baxın\" düyməsin gizlə</string>
-  <string name="revanced_hide_visit_store_button_summary_on">Kanal səhifəsindəki düymə gizlidir</string>
-  <string name="revanced_hide_visit_store_button_summary_off">Kanal səhifəsindəki düymə görünür</string>
+  <string name="revanced_hide_shopping_links_title">Alış-veriş linklərini gizlət</string>
+  <string name="revanced_hide_shopping_links_summary_on">Alış-veriş linkləri video təsvirdə gizlidir</string>
+  <string name="revanced_hide_shopping_links_summary_off">Alış-veriş linkləri video təsvirdə görünür</string>
+  <string name="revanced_hide_view_products_banner_title">“Məhsullara baxın” panelin gizlət</string>
+  <string name="revanced_hide_view_products_banner_summary_on">Məhsullara baxış etiketi video örtüyündə gizlidir</string>
+  <string name="revanced_hide_view_products_banner_summary_off">Məhsullara baxış etiketi video örtüyündə görünür</string>
   <string name="revanced_hide_web_search_results_title">Veb axtarış nəticələrini gizlət</string>
   <string name="revanced_hide_web_search_results_summary_on">Veb axtarış nəticələri gizlədilir</string>
   <string name="revanced_hide_web_search_results_summary_off">Veb axtarış nəticələri göstərilir</string>
@@ -443,18 +451,22 @@ Bu xüsusiyyət yalnız köhnə cihazlar üçün mövcuddur"</string>
   <string name="revanced_remove_viewer_discretion_dialog_summary_off">Dialoq göstərilir</string>
   <string name="revanced_remove_viewer_discretion_dialog_user_dialog_message">Bu, yaş məhdudiyyətini ötürmür. Sadəcə birbaşa qəbul edir.</string>
   </patch>
+  <patch id="interaction.doubletap.disableDoubleTapActionsPatch">
+  <string name="revanced_disable_chapter_skip_double_tap_title">Cüt toxunuşla fəsil ötürməsini qapat</string>
+  <string name="revanced_disable_chapter_skip_double_tap_summary_on">Cüt toxunma heç vaxt növbəti/əvvəlki fəsilə keçidi zorlaya bilməz</string>
+  <string name="revanced_disable_chapter_skip_double_tap_summary_off">Cüt toxunma bəzən növbəti/əvvəlki fəsilə keçidi zorlaya bilər</string>
+  </patch>
   <patch id="interaction.downloads.downloadsResourcePatch">
   <string name="revanced_external_downloader_screen_title">Xarici yükləmələr</string>
   <string name="revanced_external_downloader_screen_summary">Xarici yükləyici istifadəsi üçün tənzimləmələr</string>
   <string name="revanced_external_downloader_title">Xarici yükləmə düyməsini göstər</string>
   <string name="revanced_external_downloader_summary_on">Endirin düyməsi oynadıcıda göstərilir</string>
   <string name="revanced_external_downloader_summary_off">Endirin düyməsi oynadıcıda göstərilmir</string>
-  <!-- 'download action button' should be translated using the same wording as the translation of 'revanced_hide_download_button_title' -->
+  <!-- 'Download action button' should be translated using the same wording as the translation of 'revanced_hide_download_button_title'. -->
   <string name="revanced_external_downloader_action_button_title">Yükləmə fəaliyyət düyməsin qəbul etmə</string>
   <string name="revanced_external_downloader_action_button_summary_on">Yükləmə düyməsi, xarici yükləyicinizi açır</string>
   <string name="revanced_external_downloader_action_button_summary_off">Yükləmə düyməsi tətbiqə xas yükləyicini açır</string>
   <string name="revanced_external_downloader_name_title">Yükləyici paketi adı</string>
-  <string name="revanced_external_downloader_name_summary">NewPipe və ya Seal kimi quraşdırılan xarici yükləmə tətbiqinizin paket adı</string>
   <string name="revanced_external_downloader_not_installed_warning">%s quraşdırılmayıb. Lütfən, bunu quraşdır.</string>
   </patch>
   <patch id="interaction.seekbar.disablePreciseSeekingGesturePatch">
@@ -542,7 +554,7 @@ Ekranın sağ tərəfində düzünə sürüşdürərək səs səviyyəsini tənz
   <string name="revanced_hide_stop_ads_button_summary_on">Reklamları dayandır düyməsi gizlidir</string>
   <string name="revanced_hide_stop_ads_button_summary_off">Reklamları dayandır düyməsi görünür</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
-                 This button usually appears only on live streams. -->
+                  This button usually appears only on live streams. -->
   <string name="revanced_hide_report_button_title">\"Xəbər verin\"i gizlət</string>
   <string name="revanced_hide_report_button_summary_on">Xəbər ver/düyməsi gizlidir</string>
   <string name="revanced_hide_report_button_summary_off">Xəbər ver/düyməsi göstərilir</string>
@@ -559,7 +571,7 @@ Ekranın sağ tərəfində düzünə sürüşdürərək səs səviyyəsini tənz
   <string name="revanced_hide_thanks_button_summary_on">Təşəkkür düyməsi gizlidir</string>
   <string name="revanced_hide_thanks_button_summary_off">Təşəkkür düyməsi göstərilir</string>
   <!-- 'Ask' should be translated with the same localized wording that YouTube displays.
-                 Button only shows if the user ip is from specific region such as the USA or EU. -->
+                  This button only shows up if the user ip is from specific region such as the USA or EU. -->
   <string name="revanced_hide_ask_button_title">Soruş\'u Gizlət</string>
   <string name="revanced_hide_ask_button_summary_on">Soruş düyməsi gizlidir</string>
   <string name="revanced_hide_ask_button_summary_off">\"Soruş\" düyməsi göstərilir</string>
@@ -583,7 +595,7 @@ Ekranın sağ tərəfində düzünə sürüşdürərək səs səviyyəsini tənz
   <string name="revanced_hide_shorts_button_title">\"Shorts\"u gizlət</string>
   <string name="revanced_hide_shorts_button_summary_on">Shorts düyməsi gizlidir</string>
   <string name="revanced_hide_shorts_button_summary_off">Shorts düyməsi göstərilir</string>
-  <!-- The Create button has no display name. Translate normally. -->
+  <!-- 'Create' has no display name. Translate normally. -->
   <string name="revanced_hide_create_button_title">\"Yarat\"ı gizlət</string>
   <string name="revanced_hide_create_button_summary_on">Yarat düyməsi gizlidir</string>
   <string name="revanced_hide_create_button_summary_off">Yarat düyməsi göstərilir</string>
@@ -652,7 +664,7 @@ Bu seçimi dəyişdirmə işə düşmürsə, Gizli rejimə keçməyə çalışı
   <string name="revanced_hide_player_flyout_speed_summary_on">Oynatma sürəti menyusu gizlidir</string>
   <string name="revanced_hide_player_flyout_speed_summary_off">Oynatma sürəti menyusu göstərilir</string>
   <!-- 'More info' should be translated using the same localized wording YouTube displays for the menu item.
-                 This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
+                  This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
   <string name="revanced_hide_player_flyout_more_info_title">\"Daha çox məlumat\"ı gizlət</string>
   <string name="revanced_hide_player_flyout_more_info_summary_on">Ətraflı məlumat menyusu gizlidir</string>
   <string name="revanced_hide_player_flyout_more_info_summary_off">Ətraflı məlumat menyusu göstərilir</string>
@@ -664,7 +676,7 @@ Bu seçimi dəyişdirmə işə düşmürsə, Gizli rejimə keçməyə çalışı
   <string name="revanced_hide_player_flyout_audio_track_title">Səs trekini gizlət</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">Səs axını menyusu gizlidir</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">Səs axını menyusu göstərilir</string>
-  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <!-- 'Spoof video streams' should be the same translation used for 'revanced_spoof_video_streams_screen_title'. -->
   <string name="revanced_hide_player_flyout_audio_track_not_available">"Audio trek seçimi gizlədilib
 
 Audio trek seçimin göstərmək üçün \"Video axınları saxtalaşdır\"ı iOS TV-yə dəyiş"</string>
@@ -677,22 +689,22 @@ Audio trek seçimin göstərmək üçün \"Video axınları saxtalaşdır\"ı iO
   <string name="revanced_hide_player_flyout_video_quality_footer_summary_off">Video keyfiyyət menyusu alt məlumatı göstərilir</string>
   </patch>
   <patch id="layout.buttons.overlay.hidePlayerOverlayButtonsPatch">
-  <string name="revanced_hide_player_previous_next_buttons_title">Əvvəlki və Növbəti düymələrin gizlət</string>
-  <string name="revanced_hide_player_previous_next_buttons_summary_on">Düymələr gizlidir</string>
-  <string name="revanced_hide_player_previous_next_buttons_summary_off">Düymələr göstərilir</string>
-  <string name="revanced_hide_cast_button_title">Yayımla düyməsini gizlət</string>
-  <string name="revanced_hide_cast_button_summary_on">Yayım düyməsi gizlidir</string>
-  <string name="revanced_hide_cast_button_summary_off">Yayım düyməsi göstərilir</string>
-  <!-- This button does not display any text, but 'captions' should be translated using the same wording used as the translation of 'revanced_hide_player_flyout_captions_title' -->
-  <string name="revanced_hide_captions_button_title">Titrlər Düyməsin Gizlət</string>
-  <string name="revanced_hide_captions_button_summary_on">Titrlər düyməsi gizlidir</string>
-  <string name="revanced_hide_captions_button_summary_off">Titrlər düyməsi göstərilir</string>
   <string name="revanced_hide_autoplay_button_title">Avtomatik oynatma düyməsini gizlət</string>
   <string name="revanced_hide_autoplay_button_summary_on">Avtomatik oynatma düyməsi gizlidir</string>
   <string name="revanced_hide_autoplay_button_summary_off">Avtomatik oynatma düyməsi göstərilir</string>
-  <string name="revanced_hide_player_control_buttons_background_title">Oynadıcı idarəetmə düymələri fonunu gizlət</string>
-  <string name="revanced_hide_player_control_buttons_background_summary_on">Oynadıcı idarəetmə düymələri fonu gizlidir</string>
-  <string name="revanced_hide_player_control_buttons_background_summary_off">Oynadıcı idarəetmə düymələri fonu görünür</string>
+  <!-- This button does not display any text, but 'Captions' should be translated using the same wording used as the translation of 'revanced_hide_player_flyout_captions_title'. -->
+  <string name="revanced_hide_captions_button_title">Titrlər Düyməsin Gizlət</string>
+  <string name="revanced_hide_captions_button_summary_on">Titrlər düyməsi gizlidir</string>
+  <string name="revanced_hide_captions_button_summary_off">Titrlər düyməsi göstərilir</string>
+  <string name="revanced_hide_cast_button_title">Yayımla düyməsini gizlət</string>
+  <string name="revanced_hide_cast_button_summary_on">Yayım düyməsi gizlidir</string>
+  <string name="revanced_hide_cast_button_summary_off">Yayım düyməsi göstərilir</string>
+  <string name="revanced_hide_player_control_buttons_background_title">Oynadıcı idarəetmələri fonunu gizlət</string>
+  <string name="revanced_hide_player_control_buttons_background_summary_on">Oynadıcı idarəetmə fonu gizlədilib</string>
+  <string name="revanced_hide_player_control_buttons_background_summary_off">Oynadıcı idarəetmə fonu görünür</string>
+  <string name="revanced_hide_player_previous_next_buttons_title">Əvvəlki və Növbəti düymələrin gizlət</string>
+  <string name="revanced_hide_player_previous_next_buttons_summary_on">Düymələr gizlidir</string>
+  <string name="revanced_hide_player_previous_next_buttons_summary_off">Düymələr göstərilir</string>
   </patch>
   <patch id="layout.hide.endscreencards.hideEndscreenCardsResourcePatch">
   <string name="revanced_hide_endscreen_cards_title">Son ekran kartlarını gizlət</string>
@@ -715,86 +727,86 @@ Audio trek seçimin göstərmək üçün \"Video axınları saxtalaşdır\"ı iO
   <string name="revanced_disable_rolling_number_animations_summary_off">Sürüşən say animasiyası açıqdır</string>
   </patch>
   <patch id="layout.hide.seekbar.hideSeekbarPatch">
-  <string name="revanced_hide_seekbar_title">Video oynadıcıda irəliləyiş cizgisin gizlə</string>
+  <string name="revanced_hide_seekbar_title">Video oynadıcı irəliləyiş cizgisin gizlət</string>
   <string name="revanced_hide_seekbar_summary_on">Video oynadıcı irəliləyiş cizgisi gizlidir</string>
   <string name="revanced_hide_seekbar_summary_off">Video oynadıcı irəliləyiş cizgisi göstərilir</string>
-  <string name="revanced_hide_seekbar_thumbnail_title">Video miniatürdə irəliləmə cizgisin gizlə</string>
-  <string name="revanced_hide_seekbar_thumbnail_summary_on">Miniatür irəliləmə cizgisi gizlədilib</string>
-  <string name="revanced_hide_seekbar_thumbnail_summary_off">Miniatür irəliləmə cizgisi göstərilir</string>
+  <!-- Seekbar shown inside video thumbnails found the home/feed/search/history.  The seekbar shows the prior watch progress when the video was last open. -->
+  <string name="revanced_hide_seekbar_thumbnail_title">Video miniatür irəliləyiş cizgisin gizlət</string>
+  <string name="revanced_hide_seekbar_thumbnail_summary_on">Video miniatür irəliləyiş cizgisi gizlidir</string>
+  <string name="revanced_hide_seekbar_thumbnail_summary_off">Video miniatür irəliləyiş cizgisi görünür</string>
   </patch>
   <patch id="layout.hide.shorts.hideShortsComponentsResourcePatch">
   <string name="revanced_shorts_player_screen_title">Shorts oynadıcı</string>
-  <string name="revanced_shorts_player_screen_summary">Shorts oynadıcıda hissəcikləri gizlət və ya göstər</string>
-  <!-- 'home' should be translated using the same localized wording YouTube displays for the home tab. -->
-  <string name="revanced_hide_shorts_home_title">Ev axınında \"Shorts\"u gizlət</string>
-  <string name="revanced_hide_shorts_home_summary_on">Ev axınında və əlaqəli videolarda gizlədilib</string>
-  <string name="revanced_hide_shorts_home_summary_off">Ev axınında və əlaqəli videolarda göstərilir</string>
-  <!-- 'subscription' should be translated using the same localized wording YouTube displays for the subscription tab. -->
-  <string name="revanced_hide_shorts_subscriptions_title">Abunəlik axınında \"Shorts\"u gizlət</string>
-  <string name="revanced_hide_shorts_subscriptions_summary_on">Abunəlik axınında gizlidir</string>
-  <string name="revanced_hide_shorts_subscriptions_summary_off">Abunəlik axınında göstərilir</string>
+  <string name="revanced_shorts_player_screen_summary">Shorts oynadıcı elementlərini gizlət və ya göstər</string>
+  <!-- 'Home' should be translated using the same localized wording YouTube displays for the Home tab. -->
+  <string name="revanced_hide_shorts_home_title">Shorts-u Ev axınında gizlət</string>
+  <string name="revanced_hide_shorts_home_summary_on">Ev axını və əlaqəli videolarda gizlidir</string>
+  <string name="revanced_hide_shorts_home_summary_off">Ev axını və əlaqəli videolarda görünür</string>
   <string name="revanced_hide_shorts_search_title">Axtarış nəticələrindəki \"Shorts\"u gizlət</string>
   <string name="revanced_hide_shorts_search_summary_on">Axtarış nəticələrində gizlidir</string>
   <string name="revanced_hide_shorts_search_summary_off">Axtarış nəticələrində görünür</string>
+  <!-- 'Subscriptions' should be translated using the same localized wording YouTube displays for the Subscriptions tab. -->
+  <string name="revanced_hide_shorts_subscriptions_title">Shorts-u Abunəliklər axınında gizlət</string>
+  <string name="revanced_hide_shorts_subscriptions_summary_on">Abunəliklər axınında gizlidir</string>
+  <string name="revanced_hide_shorts_subscriptions_summary_off">Abunəliklər axınında görünür</string>
   <string name="revanced_hide_shorts_history_title">Baxış tarixçəsində Shorts-u gizlət</string>
   <string name="revanced_hide_shorts_history_summary_on">Baxış tarixçəsində gizlidir</string>
   <string name="revanced_hide_shorts_history_summary_off">Baxış tarixçəsində göstərilib</string>
-  <!-- 'join' should be translated using the same localized wording YouTube displays for the button. -->
-  <string name="revanced_hide_shorts_join_button_title">Qoşul düyməsin gizlə</string>
-  <string name="revanced_hide_shorts_join_button_summary_on">Qoşulma düyməsi gizlidir</string>
-  <string name="revanced_hide_shorts_join_button_summary_off">Qoşulma düyməsi göstərilir</string>
-  <!-- 'subscribe' should be translated using the same localized wording YouTube displays for the button. -->
-  <string name="revanced_hide_shorts_subscribe_button_title">Abunə ol düyməsini gizlət</string>
-  <string name="revanced_hide_shorts_subscribe_button_summary_on">Abunə ol düyməsi gizlidir</string>
-  <string name="revanced_hide_shorts_subscribe_button_summary_off">Abunə ol düyməsi göstərilir</string>
-  <string name="revanced_hide_shorts_paused_overlay_buttons_title">Dayandırma örtük düymələrini gizlət</string>
-  <string name="revanced_hide_shorts_paused_overlay_buttons_summary_on">Dayandırma örtük düymələri gizlədilir</string>
-  <string name="revanced_hide_shorts_paused_overlay_buttons_summary_off">Dayandırma örtük düymələri göstərilir</string>
-  <string name="revanced_hide_shorts_shop_button_title">Mağaza düyməsini gizlət</string>
-  <string name="revanced_hide_shorts_shop_button_summary_on">Mağaza düyməsi gizlidir</string>
-  <string name="revanced_hide_shorts_shop_button_summary_off">Mağaza düyməsi göstərilir</string>
   <string name="revanced_hide_shorts_super_thanks_button_title">Super Təşəkkür Al düyməsini gizlət</string>
-  <string name="revanced_hide_shorts_super_thanks_button_summary_on">Super Təşəkkür düyməsi gizlidir</string>
-  <string name="revanced_hide_shorts_super_thanks_button_summary_off">Super Təşəkkür düyməsi görünəndir</string>
-  <string name="revanced_hide_shorts_tagged_products_title">Etiketlənmiş məhsulları gizlət</string>
-  <string name="revanced_hide_shorts_tagged_products_summary_on">Etiketlənmiş məhsullar gizlədilir</string>
-  <string name="revanced_hide_shorts_tagged_products_summary_off">Etiketlənmiş məhsullar göstərilir</string>
-  <string name="revanced_hide_shorts_location_label_title">Məkan etiketini gizlət</string>
-  <string name="revanced_hide_shorts_location_label_summary_on">Məkan etiketi gizlidir</string>
-  <string name="revanced_hide_shorts_location_label_summary_off">Məkan etiketi göstərilir</string>
-  <string name="revanced_hide_shorts_preview_comment_title">Öncül baxış şərhini gizlət</string>
-  <string name="revanced_hide_shorts_preview_comment_summary_on">Öncül baxış şərhi gizlidir</string>
-  <string name="revanced_hide_shorts_preview_comment_summary_off">Öncül baxış şərhi göstərilir</string>
-  <string name="revanced_hide_shorts_save_sound_button_title">Musiqini saxla düyməsini gizlət</string>
-  <string name="revanced_hide_shorts_save_sound_button_summary_on">\"Musiqini saxla\" düyməsi gizlidir</string>
-  <string name="revanced_hide_shorts_save_sound_button_summary_off">\"Musiqini saxla\" düyməsi göstərilir</string>
-  <string name="revanced_hide_shorts_use_sound_button_title">Bu səsi işlət düyməsini gizlət</string>
-  <string name="revanced_hide_shorts_use_sound_button_summary_on">Bu səsi işlət düyməsi gizlidir</string>
-  <string name="revanced_hide_shorts_use_sound_button_summary_off">Bu səsi işlət düyməsi görünür</string>
-  <string name="revanced_hide_shorts_use_template_button_title">Bu şablonu işlət düyməsini gizlət</string>
-  <string name="revanced_hide_shorts_use_template_button_summary_on">Bu şablonu işlət düyməsi gizlidir</string>
-  <string name="revanced_hide_shorts_use_template_button_summary_off">Bu şablonu işlət düyməsi görünür</string>
-  <string name="revanced_hide_shorts_upcoming_button_title">Yaxınlaşan düyməsini gizlət</string>
-  <string name="revanced_hide_shorts_upcoming_button_summary_on">\"Yaxınlaşan\" düyməsi gizlidir</string>
-  <string name="revanced_hide_shorts_upcoming_button_summary_off">\"Yaxınlaşan\" düyməsi göstərilir</string>
+  <string name="revanced_hide_shorts_super_thanks_button_summary_on">Super Təşəkkürlər Al düyməsi gizlidir</string>
+  <string name="revanced_hide_shorts_super_thanks_button_summary_off">Super Təşəkkürlər Al düyməsi görünür</string>
   <string name="revanced_hide_shorts_effect_button_title">Effekt düyməsini gizlət</string>
   <string name="revanced_hide_shorts_effect_button_summary_on">Effekt düyməsi gizlidir</string>
   <string name="revanced_hide_shorts_effect_button_summary_off">Effekt düyməsi görünür</string>
   <string name="revanced_hide_shorts_green_screen_button_title">Yaşıl ekran düyməsini gizlət</string>
   <string name="revanced_hide_shorts_green_screen_button_summary_on">\"Yaşıl ekran\" düyməsi gizlidir</string>
   <string name="revanced_hide_shorts_green_screen_button_summary_off">\"Yaşıl ekran\" düyməsi göstərilir</string>
-  <string name="revanced_hide_shorts_new_posts_button_title">Yeni elanları gizlət düyməsi</string>
-  <string name="revanced_hide_shorts_new_posts_button_summary_off">Yeni elanlar düyməsi göstərilir</string>
-  <string name="revanced_hide_shorts_new_posts_button_summary_on">Yeni elanlar düyməsi gizlidir</string>
   <string name="revanced_hide_shorts_hashtag_button_title">Mövzu etiketi düyməsini gizlət</string>
   <string name="revanced_hide_shorts_hashtag_button_summary_on">Mövzu etiketi düyməsi gizlidir</string>
   <string name="revanced_hide_shorts_hashtag_button_summary_off">Mövzu etiketi düyməsi göstərilir</string>
+  <!-- 'Join' should be translated using the same localized wording YouTube displays for the button. -->
+  <string name="revanced_hide_shorts_join_button_title">Qoşul düyməsin gizlə</string>
+  <string name="revanced_hide_shorts_join_button_summary_on">Qoşulma düyməsi gizlidir</string>
+  <string name="revanced_hide_shorts_join_button_summary_off">Qoşulma düyməsi göstərilir</string>
+  <string name="revanced_hide_shorts_location_label_title">Məkan etiketini gizlət</string>
+  <string name="revanced_hide_shorts_location_label_summary_on">Məkan etiketi gizlidir</string>
+  <string name="revanced_hide_shorts_location_label_summary_off">Məkan etiketi göstərilir</string>
+  <string name="revanced_hide_shorts_new_posts_button_title">Yeni elanları gizlət düyməsi</string>
+  <string name="revanced_hide_shorts_new_posts_button_summary_on">Yeni elanlar düyməsi gizlidir</string>
+  <string name="revanced_hide_shorts_new_posts_button_summary_off">Yeni elanlar düyməsi göstərilir</string>
+  <string name="revanced_hide_shorts_paused_overlay_buttons_title">Dayandırma örtük düymələrini gizlət</string>
+  <string name="revanced_hide_shorts_paused_overlay_buttons_summary_on">Dayandırma örtük düymələri gizlədilir</string>
+  <string name="revanced_hide_shorts_paused_overlay_buttons_summary_off">Dayandırma örtük düymələri göstərilir</string>
+  <string name="revanced_hide_shorts_preview_comment_title">Öncül baxış şərhini gizlət</string>
+  <string name="revanced_hide_shorts_preview_comment_summary_on">Öncül baxış şərhi gizlidir</string>
+  <string name="revanced_hide_shorts_preview_comment_summary_off">Öncül baxış şərhi göstərilir</string>
+  <string name="revanced_hide_shorts_save_sound_button_title">Musiqini saxla düyməsini gizlət</string>
+  <string name="revanced_hide_shorts_save_sound_button_summary_on">\"Musiqini saxla\" düyməsi gizlidir</string>
+  <string name="revanced_hide_shorts_save_sound_button_summary_off">\"Musiqini saxla\" düyməsi göstərilir</string>
   <string name="revanced_hide_shorts_search_suggestions_title">Axtarış təkliflərini gizlət</string>
   <string name="revanced_hide_shorts_search_suggestions_summary_on">Axtarış təklifləri gizlədilib</string>
   <string name="revanced_hide_shorts_search_suggestions_summary_off">Axtarış təklifləri göstərilir</string>
+  <string name="revanced_hide_shorts_shop_button_title">Mağaza düyməsini gizlət</string>
+  <string name="revanced_hide_shorts_shop_button_summary_on">Mağaza düyməsi gizlidir</string>
+  <string name="revanced_hide_shorts_shop_button_summary_off">Mağaza düyməsi göstərilir</string>
   <string name="revanced_hide_shorts_stickers_title">Stikerləri gizlət</string>
   <string name="revanced_hide_shorts_stickers_summary_on">Stikerlər gizlidir</string>
   <string name="revanced_hide_shorts_stickers_summary_off">Stikerlər göstərilir</string>
+  <string name="revanced_hide_shorts_subscribe_button_title">Abunə ol düyməsini gizlət</string>
+  <string name="revanced_hide_shorts_subscribe_button_summary_on">Abunə ol düyməsi gizlidir</string>
+  <string name="revanced_hide_shorts_subscribe_button_summary_off">Abunə ol düyməsi göstərilir</string>
+  <string name="revanced_hide_shorts_tagged_products_title">Etiketlənmiş məhsulları gizlət</string>
+  <string name="revanced_hide_shorts_tagged_products_summary_on">Etiketlənmiş məhsullar gizlədilir</string>
+  <string name="revanced_hide_shorts_tagged_products_summary_off">Etiketlənmiş məhsullar göstərilir</string>
+  <string name="revanced_hide_shorts_upcoming_button_title">Yaxınlaşan düyməsini gizlət</string>
+  <string name="revanced_hide_shorts_upcoming_button_summary_on">\"Yaxınlaşan\" düyməsi gizlidir</string>
+  <string name="revanced_hide_shorts_upcoming_button_summary_off">\"Yaxınlaşan\" düyməsi göstərilir</string>
+  <string name="revanced_hide_shorts_use_sound_button_title">Bu səsi işlət düyməsini gizlət</string>
+  <string name="revanced_hide_shorts_use_sound_button_summary_on">Bu səsi işlət düyməsi gizlidir</string>
+  <string name="revanced_hide_shorts_use_sound_button_summary_off">Bu səsi işlət düyməsi görünür</string>
+  <string name="revanced_hide_shorts_use_template_button_title">Bu şablonu işlət düyməsini gizlət</string>
+  <string name="revanced_hide_shorts_use_template_button_summary_on">Bu şablonu işlət düyməsi gizlidir</string>
+  <string name="revanced_hide_shorts_use_template_button_summary_off">Bu şablonu işlət düyməsi görünür</string>
   <string name="revanced_hide_shorts_like_fountain_title">Bəyənmə düyməsi fontan animasiyasın gizlət</string>
   <string name="revanced_hide_shorts_like_fountain_summary_on">\"Bəyən\" fontan animasiyası gizlidir</string>
   <string name="revanced_hide_shorts_like_fountain_summary_off">\"Bəyən\" fontan animasiyası göstərilir</string>
@@ -807,14 +819,17 @@ Audio trek seçimin göstərmək üçün \"Video axınları saxtalaşdır\"ı iO
   <string name="revanced_hide_shorts_comments_button_title">Şərhlər düyməsin gizlət</string>
   <string name="revanced_hide_shorts_comments_button_summary_on">Şərhlər düyməsi gizlidir</string>
   <string name="revanced_hide_shorts_comments_button_summary_off">Şərhlər düyməsi göstərilir</string>
-  <!-- 'remix' should be translated using the same localized wording YouTube displays for the button. -->
-  <string name="revanced_hide_shorts_remix_button_title">Remix düyməsini gizlət</string>
-  <string name="revanced_hide_shorts_remix_button_summary_on">Remix düyməsi gizlidir</string>
-  <string name="revanced_hide_shorts_remix_button_summary_off">Remix düyməsi göstərilir</string>
-  <!-- 'share' should be translated using the same localized wording YouTube displays for the button. -->
+  <!-- 'Share' should be translated using the same localized wording YouTube displays for the button. -->
   <string name="revanced_hide_shorts_share_button_title">Paylaş düyməsini gizlət</string>
   <string name="revanced_hide_shorts_share_button_summary_on">Paylaş düyməsi gizlidir</string>
   <string name="revanced_hide_shorts_share_button_summary_off">Paylaş düyməsi göstərilir</string>
+  <!-- 'Remix' should be translated using the same localized wording YouTube displays for the button. -->
+  <string name="revanced_hide_shorts_remix_button_title">Remix düyməsini gizlət</string>
+  <string name="revanced_hide_shorts_remix_button_summary_on">Remix düyməsi gizlidir</string>
+  <string name="revanced_hide_shorts_remix_button_summary_off">Remix düyməsi göstərilir</string>
+  <string name="revanced_hide_shorts_sound_button_title">Səs düyməsini gizlət</string>
+  <string name="revanced_hide_shorts_sound_button_summary_on">Səs düyməsi gizlidir</string>
+  <string name="revanced_hide_shorts_sound_button_summary_off">Səs düyməsi göstərilir</string>
   <string name="revanced_hide_shorts_info_panel_title">Məlumat panelini gizlət</string>
   <string name="revanced_hide_shorts_info_panel_summary_on">Məlumat paneli gizlidir</string>
   <string name="revanced_hide_shorts_info_panel_summary_off">Məlumat paneli göstərilir</string>
@@ -822,17 +837,14 @@ Audio trek seçimin göstərmək üçün \"Video axınları saxtalaşdır\"ı iO
   <string name="revanced_hide_shorts_channel_bar_summary_on">Kanal çubuğu gizlidir</string>
   <string name="revanced_hide_shorts_channel_bar_summary_off">Kanal çubuğu göstərilir</string>
   <string name="revanced_hide_shorts_video_title_title">Video başlığını gizlət</string>
-  <string name="revanced_hide_shorts_video_title_summary_on">Başlıq gizlədilir</string>
-  <string name="revanced_hide_shorts_video_title_summary_off">Başlıq göstərilir</string>
+  <string name="revanced_hide_shorts_video_title_summary_on">Video başlığı gizlidir</string>
+  <string name="revanced_hide_shorts_video_title_summary_off">Video başlığı görünür</string>
   <string name="revanced_hide_shorts_sound_metadata_label_title">Səs üst məlumat etiketini gizlət</string>
-  <string name="revanced_hide_shorts_sound_metadata_label_summary_on">Üst məlumat etiketi gizlidir</string>
-  <string name="revanced_hide_shorts_sound_metadata_label_summary_off">Üst məlumat etiketi göstərilir</string>
+  <string name="revanced_hide_shorts_sound_metadata_label_summary_on">Səs üst məlumat etiketi gizlədilib</string>
+  <string name="revanced_hide_shorts_sound_metadata_label_summary_off">Səs üst məlumat etiketi görünür</string>
   <string name="revanced_hide_shorts_full_video_link_label_title">Video keçidi etiketini gizlət</string>
   <string name="revanced_hide_shorts_full_video_link_label_summary_on">Video linki etiketi gizlidir</string>
   <string name="revanced_hide_shorts_full_video_link_label_summary_off">Video link etiketi göstərilir</string>
-  <string name="revanced_hide_shorts_sound_button_title">Səs düyməsini gizlət</string>
-  <string name="revanced_hide_shorts_sound_button_summary_on">Səs düyməsi gizlidir</string>
-  <string name="revanced_hide_shorts_sound_button_summary_off">Səs düyməsi göstərilir</string>
   <string name="revanced_hide_shorts_navigation_bar_title">Fəaliyyət çubuğunu gizlət</string>
   <string name="revanced_hide_shorts_navigation_bar_summary_on">Fəaliyyət çubuğu gizlidir</string>
   <string name="revanced_hide_shorts_navigation_bar_summary_off">Fəaliyyət çubuğu göstərilir</string>
@@ -845,9 +857,9 @@ Avtomatik oynatma YouTube ayarlarında dəyişdirilə bilər: Ayarlar → Oxunu
   <string name="revanced_end_screen_suggested_video_summary_off">Son ekranda bildirilən video göstərilir</string>
   </patch>
   <patch id="layout.hide.relatedvideooverlay.hideRelatedVideoOverlayPatch">
-  <string name="revanced_hide_related_video_overlay_title">Əlaqəli video örtüyünü tam ekranda gizlət</string>
-  <string name="revanced_hide_related_video_overlay_summary_on">Əlaqəli video örtüyü gizlədilib</string>
-  <string name="revanced_hide_related_video_overlay_summary_off">Əlaqəli video örtüyü göstərilir</string>
+  <string name="revanced_hide_related_videos_overlay_title">Əlaqəli videolar örtüyünü gizlət</string>
+  <string name="revanced_hide_related_videos_overlay_summary_on">Əlaqəli videolar yerləşməsi tam ekranda gizlidir</string>
+  <string name="revanced_hide_related_videos_overlay_summary_off">Əlaqəli videolar yerləşməsi tam ekranda görünür</string>
   </patch>
   <patch id="layout.hide.time.hideTimestampPatch">
   <string name="revanced_hide_timestamp_title">Video vaxt möhürünü gizlət</string>
@@ -896,7 +908,7 @@ Məhdudiyyət: Bəyənməmələr gizli rejimdə görünməyə bilər"</string>
   <string name="revanced_ryd_dislike_percentage_title">\"Bəyənməmə\"lər faiz olaraq</string>
   <string name="revanced_ryd_dislike_percentage_summary_on">Bəyənməmələr faiz kimi göstərilir</string>
   <string name="revanced_ryd_dislike_percentage_summary_off">Bəyənməmələr nömrə kimi göstərilir</string>
-  <!-- Translations should use language similar to 'revanced_sb_enable_compact_skip_button' -->
+  <!-- Translations should use language similar to 'revanced_sb_enable_compact_skip_button'. -->
   <string name="revanced_ryd_compact_layout_title">Yığcam Bəyən Düyməsi</string>
   <string name="revanced_ryd_compact_layout_summary_on">Daha kiçik en üçün hazırlanmış Bəyən düyməsi</string>
   <string name="revanced_ryd_compact_layout_summary_off">Ən yaxşı görünüş üçün tərtib edilmiş Bəyən düyməsi</string>
@@ -953,7 +965,7 @@ Bu funksiya 720p və ya daha aşağı video keyfiyyəti ilə və çox sürətli
   <string name="revanced_sb_square_layout">Kvadrat düzümü istifadə et</string>
   <string name="revanced_sb_square_layout_sum_on">Düymələr və idarəedicilər kvadratdır </string>
   <string name="revanced_sb_square_layout_sum_off">Düymələr və idarəedicilər dairəvidir</string>
-  <!-- Translations should use language similar to 'revanced_ryd_compact_layout_title' -->
+  <!-- Translations should use language similar to 'revanced_ryd_compact_layout_title'. -->
   <string name="revanced_sb_enable_compact_skip_button">Yığcam Ötürmə düyməsini istifadə et</string>
   <string name="revanced_sb_enable_compact_skip_button_sum_on">Ən kiçik en üçün hazırlanmış ötürmə düyməsi</string>
   <string name="revanced_sb_enable_compact_skip_button_sum_off">Ən yaxşı görünüş üçün hazırlanan ötürmə düyməsi</string>
@@ -961,12 +973,12 @@ Bu funksiya 720p və ya daha aşağı video keyfiyyəti ilə və çox sürətli
   <string name="revanced_sb_enable_auto_hide_skip_segment_button_sum_on">Ötürmə düyməsi bir neçə saniyə sonra gizlənir</string>
   <string name="revanced_sb_enable_auto_hide_skip_segment_button_sum_off">Ötürmə düyməsi bütün bölüm ərzində göstərilir</string>
   <string name="revanced_sb_auto_hide_skip_button_duration">Ötür düyməsi müddəti</string>
-  <string name="revanced_sb_auto_hide_skip_button_duration_sum">Avtomatik gizlənən ötür və vurğulama düymələri nə qədər göstərilir</string>
+  <string name="revanced_sb_auto_hide_skip_button_duration_sum">Avtomatik gizlənmədən əvvəl ötür və vurğulamaya keç düymələri nə qədər görünür</string>
   <string name="revanced_sb_general_skiptoast">Ötürməni geri al bildirişin göstər</string>
   <string name="revanced_sb_general_skiptoast_sum_on">Ani bildiriş bölüm birbaşa ötürüldükdə görünür. Ötürməni geri qaytarmaq üçün bildirişə toxun</string>
   <string name="revanced_sb_general_skiptoast_sum_off">Ani bildiriş görünmür</string>
   <string name="revanced_sb_toast_on_skip_duration">Ötür ani bildiriş müddəti</string>
-  <string name="revanced_sb_toast_on_skip_duration_sum">Ötürmə ani bildirişi nə qədər göstərilir</string>
+  <string name="revanced_sb_toast_on_skip_duration_sum">Ötür ani bildirişin ləğv etmə göstərilməsi müddəti</string>
   <string name="revanced_sb_duration_1s">1 saniyə</string>
   <string name="revanced_sb_duration_2s">2 saniyə</string>
   <string name="revanced_sb_duration_3s">3 saniyə</string>
@@ -1097,7 +1109,7 @@ Artıq mövcuddur"</string>
   <string name="revanced_sb_vote_downvote">Mənfi səs</string>
   <string name="revanced_sb_vote_category">Kateqoriyanı dəyişdir</string>
   <string name="revanced_sb_vote_no_segments">Səsvermə üçün bölüm yoxdur</string>
-  <!-- A segment start and end time, such as "02:10 to 03:40" -->
+  <!-- A segment start and end time, such as "02:10 to 03:40". -->
   <string name="revanced_sb_vote_segment_time_to_from">%1$s - %2$s</string>
   <string name="revanced_sb_new_segment_choose_category">Bölüm kateqoriyasını seçin</string>
   <string name="revanced_sb_new_segment_disabled_category">Seçimlərdə kateqoriya qeyri-aktivdir. Göndərmək üçün kateqoriyanı aktiv et.</string>
@@ -1175,8 +1187,6 @@ Avtomobil tərtibatı
 Bu tətbiqin görünüşün və xüsusiyyətlərin dəyişdirəcək, lakin bilinməyən yan təsirlər ola bilər.
 
 Sonradan qapadılarsa, UI səhvlərin önləmək üçün tətbiq məlumatların silmək tövsiyə olunur."</string>
-  <!-- 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 -->
   <string name="revanced_spoof_app_version_target_title">Saxta tətbiq versiyası hədəfi</string>
   <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - Köhnə Shorts oynadıcı işarələrin bərpa et</string>
   <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - Köhnə fəaliyyət simvolların bərpa et</string>
@@ -1283,9 +1293,9 @@ Kiçik oynadıcı ekrandan sola və ya sağa sürüklənə bilər"</string>
   <string name="revanced_gradient_loading_screen_title">Dəyişkən yükləmə ekranını aktivləşdir</string>
   <string name="revanced_gradient_loading_screen_summary_on">Yükləmə ekranı, dəyişkən arxa plana malik olacaq</string>
   <string name="revanced_gradient_loading_screen_summary_off">Yükləmə ekranı, vahid arxa plana malik olacaq</string>
-  <string name="splash_screen_animation_style_title">Sıçrama ekran üslubu</string>
-  <string name="splash_screen_animation_style_entry_1">Rəng</string>
-  <string name="splash_screen_animation_style_entry_2">Qara və ağ</string>
+  <string name="revanced_splash_screen_animation_style_title">Sıçrama ekran üslubu</string>
+  <string name="revanced_splash_screen_animation_style_entry_1">Rəng</string>
+  <string name="revanced_splash_screen_animation_style_entry_2">Qara və ağ</string>
   <string name="revanced_seekbar_custom_color_title">Fərdi irəliləmə cizgisi rəngini aktivləşdir</string>
   <string name="revanced_seekbar_custom_color_summary_on">Fərdi irəliləmə cizgisi rəngi göstərilir</string>
   <string name="revanced_seekbar_custom_color_summary_off">Orijinal irəliləmə cizgisi rəngi göstərilir</string>
@@ -1295,6 +1305,14 @@ Kiçik oynadıcı ekrandan sola və ya sağa sürüklənə bilər"</string>
   <string name="revanced_seekbar_custom_color_accent_summary">İrəliləyiş cizgisi vurğu rəngi</string>
   <string name="revanced_seekbar_custom_color_invalid">Etibarsız irəliləmə cizgisi rəng dəyəri</string>
   </patch>
+  <patch id="layout.branding.changeHeaderPatch">
+  <string name="revanced_header_logo_title">Başlıq simvolu</string>
+  <string name="revanced_header_logo_entry_1">İlkin</string>
+  <string name="revanced_header_logo_entry_2">Müntəzəm</string>
+  <!-- For this situation "Minimal" means minimalistic. It does not mean small or tiny. -->
+  <string name="revanced_header_logo_entry_5">Ən kiçik ReVanced</string>
+  <string name="revanced_header_logo_entry_6">Fərdi</string>
+  </patch>
   <patch id="layout.thumbnails.bypassImageRegionRestrictionsPatch">
   <string name="revanced_bypass_image_region_restrictions_title">Təsvir bölgə məhdudiyyətlərini ötür</string>
   <string name="revanced_bypass_image_region_restrictions_summary_on">Yt4.ggpht.com təsvir serveri istifadə edilir</string>
@@ -1303,13 +1321,13 @@ Kiçik oynadıcı ekrandan sola və ya sağa sürüklənə bilər"</string>
 Bunu aktivləşdirmə, bəzi regionlarda əngəllənib silinən şəkilləri düzəldə bilər"</string>
   </patch>
   <patch id="layout.thumbnails.alternativeThumbnailsPatch">
-  <!-- 'Home' should be translated using the same localized wording YouTube displays for the home tab. -->
+  <!-- 'Home' should be translated using the same localized wording YouTube displays for the Home tab. -->
   <string name="revanced_alt_thumbnail_home_title">Ev paneli</string>
-  <!-- 'Subscription' should be translated using the same localized wording YouTube displays for the subscription tab. -->
-  <string name="revanced_alt_thumbnail_subscription_title">Abunəliklər paneli</string>
-  <!-- 'You' should be translated using the same localized wording YouTube displays for the You (library) tab. -->
+  <!-- 'Subscriptions' should be translated using the same localized wording YouTube displays for the Subscriptions tab. -->
+  <string name="revanced_alt_thumbnail_subscription_title">Abunəliklər bölməsi</string>
+  <!-- 'You' should be translated using the same localized wording YouTube displays for the You (Library) tab. -->
   <string name="revanced_alt_thumbnail_library_title">\"Siz\" paneli</string>
-  <string name="revanced_alt_thumbnail_player_title">Oynadıcı pleylistləri, tövsiyələr</string>
+  <string name="revanced_alt_thumbnail_player_title">Oynadıcı pleylistləri &amp; tövsiyələri</string>
   <string name="revanced_alt_thumbnail_search_title">Axtarış nəticələri</string>
   <string name="revanced_alt_thumbnail_options_entry_1">Orijinal miniatürlər</string>
   <string name="revanced_alt_thumbnail_options_entry_2">DeArrow &amp; Orijinal miniatürlər</string>
@@ -1408,11 +1426,11 @@ Bunu aktivləşdirmə daha yüksək video keyfiyyətləri əngəlin silə bilər
   <string name="revanced_force_original_audio_title">Orijinal səs dilini zorla</string>
   <string name="revanced_force_original_audio_summary_on">Orijinal səs dilini istifadə</string>
   <string name="revanced_force_original_audio_summary_off">İlkin səs istifadəsi</string>
-  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <!-- 'Spoof video streams' should be the same translation used for 'revanced_spoof_video_streams_screen_title'. -->
   <string name="revanced_force_original_audio_not_available">Bu xüsusiyyəti istifadə etmək üçün \"Saxta video yayımların\" iOS TV-yə dəyiş</string>
   </patch>
   <patch id="video.quality.rememberVideoQualityPatch">
-  <!-- Translations should use the same text as revanced_custom_playback_speeds_auto -->
+  <!-- Translations should use the same text as 'revanced_custom_playback_speeds_auto'. -->
   <string name="revanced_video_quality_default_entry_1">Avtomatik</string>
   <string name="revanced_remember_video_quality_last_selected_title">Video keyfiyyəti dəyişikliklərini xatırla</string>
   <string name="revanced_remember_video_quality_last_selected_summary_on">Keyfiyyət dəyişiklikləri bütün videolara tətbiq edilir</string>
@@ -1525,7 +1543,7 @@ AVC maksimum 1080p görüntü imkanına malikdir, Opus audio kodlama olmur və v
   <string name="revanced_block_video_ads_summary_off">Video reklamlar bloklanmır</string>
   </patch>
   <patch id="chat.antidelete.showDeletedMessagesPatch">
-  <string name="revanced_deleted_msg">mesaj silindi</string>
+  <string name="revanced_deleted_msg">Məlumat silindi</string>
   <string name="revanced_show_deleted_messages_title">Silinən mesajları göstər</string>
   <string name="revanced_show_deleted_messages_entry_1">Silinən mesajlar göstərilməsin</string>
   <string name="revanced_show_deleted_messages_entry_2">Silinmiş mesajları boz panel arxasında gizlət</string>
@@ -1537,7 +1555,7 @@ AVC maksimum 1080p görüntü imkanına malikdir, Opus audio kodlama olmur və v
   <string name="revanced_auto_claim_channel_points_summary_off">Kanal Xalları avtomatik olaraq təsdiqlənmir</string>
   </patch>
   <patch id="debug.debugModePatch">
-  <!-- Twitch specific internal debug mode, and not the same as 'revanced_debug_title' -->
+  <!-- Twitch specific internal debug mode, and not the same as 'revanced_debug_title'. -->
   <string name="revanced_twitch_debug_mode_title">Twitch sazlama rejimini aktivləşdir</string>
   <string name="revanced_twitch_debug_mode_summary_on">Twitch sazlama rejimi aktivdir (tövsiyə edilmir)</string>
   <string name="revanced_twitch_debug_mode_summary_off">Twitch sazlama rejimi qeyri-aktiv edilib</string>
@@ -1546,11 +1564,11 @@ AVC maksimum 1080p görüntü imkanına malikdir, Opus audio kodlama olmur və v
   <string name="revanced_settings">ReVanced Tənzimləmələri</string>
   <string name="revanced_about_title">Haqqında</string>
   <string name="revanced_about_summary">ReVanced Haqqında</string>
-  <string name="revanced_ads_screen_title">Reklamlar</string>
-  <string name="revanced_ads_screen_summary">Reklam əngəlləmə tənzimləmələri</string>
+  <string name="revanced_ads_screen_title">Reklam Əngəlləmə</string>
+  <string name="revanced_ads_screen_summary">Reklam Əngəlləmə tənzimləmələri</string>
   <string name="revanced_chat_screen_title">Söhbət</string>
   <string name="revanced_chat_screen_summary">Söhbət tənzimləmələri</string>
-  <string name="revanced_misc_screen_title">Müxtəlif</string>
+  <string name="revanced_misc_screen_title">Çoxvariantlı</string>
   <string name="revanced_misc_screen_summary">Müxtəlif tənzimləmələr</string>
   <string name="revanced_general_category_title">Ümumi tənzimləmələr</string>
   <string name="revanced_other_category_title">Digər tənzimləmələr</string>