chore(release): 0.108.0-dev.15 [skip ci]

# [0.108.0-dev.15](https://github.com/revanced/revanced-integrations/compare/v0.108.0-dev.14...v0.108.0-dev.15) (2023-05-15)

### Features

* **youtube:** import / export of revanced settings ([#388](https://github.com/revanced/revanced-integrations/issues/388)) ([c3f08d8](c3f08d8d7e))

.github/config.yml

@@ -0,0 +1,2 @@
+firstPRMergeComment: >
+  Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) if you want to receive a contributor role.

CHANGELOG.md

@@ -1,3 +1,224 @@
+# [0.108.0-dev.15](https://github.com/revanced/revanced-integrations/compare/v0.108.0-dev.14...v0.108.0-dev.15) (2023-05-15)
+
+
+### Features
+
+* **youtube:** import / export of revanced settings ([#388](https://github.com/revanced/revanced-integrations/issues/388)) ([c3f08d8](https://github.com/revanced/revanced-integrations/commit/c3f08d8d7e8116496611b85508fbd54bb3a71992))
+
+# [0.108.0-dev.14](https://github.com/revanced/revanced-integrations/compare/v0.108.0-dev.13...v0.108.0-dev.14) (2023-05-14)
+
+
+### Bug Fixes
+
+* **youtube/return-youtube-dislikes:** fix temporarily frozen video after opening a shorts ([#396](https://github.com/revanced/revanced-integrations/issues/396)) ([6a94bd2](https://github.com/revanced/revanced-integrations/commit/6a94bd2237be9cde6256c83fcec72b3f0de83496))
+
+# [0.108.0-dev.13](https://github.com/revanced/revanced-integrations/compare/v0.108.0-dev.12...v0.108.0-dev.13) (2023-05-13)
+
+
+### Bug Fixes
+
+* **youtube/remember-video-quality:** do not show 'auto' in video resolution picker if a default quality is set ([#400](https://github.com/revanced/revanced-integrations/issues/400)) ([e30d120](https://github.com/revanced/revanced-integrations/commit/e30d1201c992f4896a0b7106230377d78506cd6f))
+
+# [0.108.0-dev.12](https://github.com/revanced/revanced-integrations/compare/v0.108.0-dev.11...v0.108.0-dev.12) (2023-05-13)
+
+
+### Bug Fixes
+
+* **youtube/swipe-controls:** restart when "press to swipe" preference is changed ([#399](https://github.com/revanced/revanced-integrations/issues/399)) ([a3d754c](https://github.com/revanced/revanced-integrations/commit/a3d754c209e443135759850c7634708b23330a7c))
+
+# [0.108.0-dev.11](https://github.com/revanced/revanced-integrations/compare/v0.108.0-dev.10...v0.108.0-dev.11) (2023-05-12)
+
+
+### Features
+
+* **twitch:** add `auto-claim-channel-points` patch ([#398](https://github.com/revanced/revanced-integrations/issues/398)) ([d7f050b](https://github.com/revanced/revanced-integrations/commit/d7f050ba2ff513c91cccbf0095fc7756dbb47400))
+
+# [0.108.0-dev.10](https://github.com/revanced/revanced-integrations/compare/v0.108.0-dev.9...v0.108.0-dev.10) (2023-05-12)
+
+
+### Features
+
+* **youtube:** add `hide-filter-bar` patch ([9649c3d](https://github.com/revanced/revanced-integrations/commit/9649c3dbc8406c3639c4fff9dd179d6d29886e60))
+
+# [0.108.0-dev.9](https://github.com/revanced/revanced-integrations/compare/v0.108.0-dev.8...v0.108.0-dev.9) (2023-05-11)
+
+
+### Features
+
+* **youtube/video-speed:** change custom video speeds inside app settings ([#393](https://github.com/revanced/revanced-integrations/issues/393)) ([b42790f](https://github.com/revanced/revanced-integrations/commit/b42790fbca0f6c854d41871834fd6266dd2ea106))
+
+# [0.108.0-dev.8](https://github.com/revanced/revanced-integrations/compare/v0.108.0-dev.7...v0.108.0-dev.8) (2023-05-11)
+
+
+### Bug Fixes
+
+* **youtube/theme:** apply custom seekbar color to video thumbnails ([#391](https://github.com/revanced/revanced-integrations/issues/391)) ([ae99408](https://github.com/revanced/revanced-integrations/commit/ae994086360b45340ed1ed896c35917d785bb4f9))
+
+# [0.108.0-dev.7](https://github.com/revanced/revanced-integrations/compare/v0.108.0-dev.6...v0.108.0-dev.7) (2023-05-10)
+
+
+### Bug Fixes
+
+* **youtube/hide-ads:** don't filter for `reels_player_overlay` ([415c194](https://github.com/revanced/revanced-integrations/commit/415c1948fccdc8eb27b76b043996017c5c56eac3))
+
+# [0.108.0-dev.6](https://github.com/revanced/revanced-integrations/compare/v0.108.0-dev.5...v0.108.0-dev.6) (2023-05-09)
+
+
+### Bug Fixes
+
+* **youtube/spoof-app-version:** restore watch history preview ([#394](https://github.com/revanced/revanced-integrations/issues/394)) ([4c7f737](https://github.com/revanced/revanced-integrations/commit/4c7f737913a0c3690f8230c51f6dd217e8b04c7a))
+
+# [0.108.0-dev.5](https://github.com/revanced/revanced-integrations/compare/v0.108.0-dev.4...v0.108.0-dev.5) (2023-05-09)
+
+
+### Bug Fixes
+
+* **youtube/remember-video-quality:** fix default video quality/speed being applied when resuming app ([#392](https://github.com/revanced/revanced-integrations/issues/392)) ([c97d1b7](https://github.com/revanced/revanced-integrations/commit/c97d1b7ee5be6a0f097f2995321608bc74f5822c))
+
+# [0.108.0-dev.4](https://github.com/revanced/revanced-integrations/compare/v0.108.0-dev.3...v0.108.0-dev.4) (2023-05-07)
+
+
+### Features
+
+* **youtube/hide-player-overlay:** make it toggleable in settings ([#382](https://github.com/revanced/revanced-integrations/issues/382)) ([1b4aa0f](https://github.com/revanced/revanced-integrations/commit/1b4aa0fcc6b89acd4156e93685b1da7519aa7148))
+
+# [0.108.0-dev.3](https://github.com/revanced/revanced-integrations/compare/v0.108.0-dev.2...v0.108.0-dev.3) (2023-05-07)
+
+
+### Features
+
+* **youtube:** `hide-load-more-button` patch ([#389](https://github.com/revanced/revanced-integrations/issues/389)) ([7da9d44](https://github.com/revanced/revanced-integrations/commit/7da9d440eedfc895b49aac40498f0279156ad117))
+
+# [0.108.0-dev.2](https://github.com/revanced/revanced-integrations/compare/v0.108.0-dev.1...v0.108.0-dev.2) (2023-05-05)
+
+
+### Bug Fixes
+
+* **youtube/theme:** fix app crash if user clears seekbar color ([#390](https://github.com/revanced/revanced-integrations/issues/390)) ([e2f5290](https://github.com/revanced/revanced-integrations/commit/e2f52905dc445f881666c06877c3a69306335dcb))
+
+# [0.108.0-dev.1](https://github.com/revanced/revanced-integrations/compare/v0.107.1-dev.3...v0.108.0-dev.1) (2023-05-03)
+
+
+### Features
+
+* **youtube/settings:** add reset button to edit preference dialog ([#383](https://github.com/revanced/revanced-integrations/issues/383)) ([cb5a4d0](https://github.com/revanced/revanced-integrations/commit/cb5a4d0c9b3b340928695fcb1d10b164a6dcef27))
+
+## [0.107.1-dev.3](https://github.com/revanced/revanced-integrations/compare/v0.107.1-dev.2...v0.107.1-dev.3) (2023-05-03)
+
+
+### Bug Fixes
+
+* **youtube/theme:** fix toast shown on fresh app install ([#381](https://github.com/revanced/revanced-integrations/issues/381)) ([2dc431f](https://github.com/revanced/revanced-integrations/commit/2dc431f1bf54c12dfc45c4511a0b0792e214be4f))
+
+## [0.107.1-dev.2](https://github.com/revanced/revanced-integrations/compare/v0.107.1-dev.1...v0.107.1-dev.2) (2023-05-03)
+
+
+### Bug Fixes
+
+* **youtube/sponsorblock:** fix skip button in wrong location when full screen and comments visible ([#387](https://github.com/revanced/revanced-integrations/issues/387)) ([486b79b](https://github.com/revanced/revanced-integrations/commit/486b79b4e4927d4c05cfb4d5222a1d74fe60e327))
+
+## [0.107.1-dev.1](https://github.com/revanced/revanced-integrations/compare/v0.107.0...v0.107.1-dev.1) (2023-05-02)
+
+
+### Bug Fixes
+
+* **youtube/return-youtube-dislike:** fix potential error toast when using old UI layout ([#384](https://github.com/revanced/revanced-integrations/issues/384)) ([6c36bee](https://github.com/revanced/revanced-integrations/commit/6c36beeda139156bfbb5a17bc89aa63c25afa83c))
+
+# [0.107.0](https://github.com/revanced/revanced-integrations/compare/v0.106.0...v0.107.0) (2023-05-02)
+
+
+### Bug Fixes
+
+* **youtube/theme:** set correct default seekbar color ([a91b036](https://github.com/revanced/revanced-integrations/commit/a91b0363a8aca4e195c9da4e48e2c332c1b1a7a6))
+
+
+### Features
+
+* **youtube/theme:** change seekbar color via preference ([1185cee](https://github.com/revanced/revanced-integrations/commit/1185ceedf7fdb40759261ae8560e79604c8cb743))
+* **youtube:** `navigation-buttons` patch ([68f42fc](https://github.com/revanced/revanced-integrations/commit/68f42fc9800210f6c4d6f8e85c0132bf0cbc06d3))
+
+# [0.107.0-dev.3](https://github.com/revanced/revanced-integrations/compare/v0.107.0-dev.2...v0.107.0-dev.3) (2023-05-02)
+
+
+### Features
+
+* **youtube:** `navigation-buttons` patch ([68f42fc](https://github.com/revanced/revanced-integrations/commit/68f42fc9800210f6c4d6f8e85c0132bf0cbc06d3))
+
+# [0.107.0-dev.2](https://github.com/revanced/revanced-integrations/compare/v0.107.0-dev.1...v0.107.0-dev.2) (2023-05-02)
+
+
+### Bug Fixes
+
+* **youtube/theme:** set correct default seekbar color ([a91b036](https://github.com/revanced/revanced-integrations/commit/a91b0363a8aca4e195c9da4e48e2c332c1b1a7a6))
+
+# [0.107.0-dev.1](https://github.com/revanced/revanced-integrations/compare/v0.106.0...v0.107.0-dev.1) (2023-05-02)
+
+
+### Features
+
+* **youtube/theme:** change seekbar color via preference ([1185cee](https://github.com/revanced/revanced-integrations/commit/1185ceedf7fdb40759261ae8560e79604c8cb743))
+
+# [0.106.0](https://github.com/revanced/revanced-integrations/compare/v0.105.0...v0.106.0) (2023-05-01)
+
+
+### Bug Fixes
+
+* **youtube/general-ads:** remove broken ad filter ([#355](https://github.com/revanced/revanced-integrations/issues/355)) ([061ebc6](https://github.com/revanced/revanced-integrations/commit/061ebc65465b2c8ef087c681070b465b82e3ebd5))
+* **youtube/return-youtube-dislike:** support old UI layouts ([#378](https://github.com/revanced/revanced-integrations/issues/378)) ([d3f8fb9](https://github.com/revanced/revanced-integrations/commit/d3f8fb97399aafe98a4198234338c6d0196a7e75))
+* **youtube/spoof-signature-verification:** more fixes for subtitle window positions  ([#374](https://github.com/revanced/revanced-integrations/issues/374)) ([8cc1b6e](https://github.com/revanced/revanced-integrations/commit/8cc1b6ea4af4e642fb2d97233d50f34b0113f2c0))
+* **youtube:** no longer need to restart the app after changing `copy-video-url` or `downloads` patch ([#372](https://github.com/revanced/revanced-integrations/issues/372)) ([6b15514](https://github.com/revanced/revanced-integrations/commit/6b155148854fbfe155c9384ba8976b5ddf3d5992))
+
+
+### Features
+
+* add appreciation message for new contributors ([78d56d4](https://github.com/revanced/revanced-integrations/commit/78d56d4fe182999555ddf5881a10880e3726782e))
+* **youtube/general-ads:** hide multiple audio track button on video player overlay ([#377](https://github.com/revanced/revanced-integrations/issues/377)) ([7fc7336](https://github.com/revanced/revanced-integrations/commit/7fc73368f161ee1973f36323054f8cbb53b6e7ce))
+* **youtube/general-ads:** hide new type of ad ([15f9c90](https://github.com/revanced/revanced-integrations/commit/15f9c90941535e93a0779118158c5b4a8accb799))
+* **youtube/hide-get-premium:** hide get premium advertisements under video player ([#376](https://github.com/revanced/revanced-integrations/issues/376)) ([36fd284](https://github.com/revanced/revanced-integrations/commit/36fd2844c468a4a9af3fe6ee5e62775f1e8dbe56))
+* **youtube/spoof-app-version:** user selectable version to spoof ([#375](https://github.com/revanced/revanced-integrations/issues/375)) ([f6f6c93](https://github.com/revanced/revanced-integrations/commit/f6f6c93c57bdbec13f09acd802f58554cb981f3a))
+
+# [0.106.0-dev.7](https://github.com/revanced/revanced-integrations/compare/v0.106.0-dev.6...v0.106.0-dev.7) (2023-05-01)
+
+
+### Bug Fixes
+
+* **youtube/general-ads:** remove broken ad filter ([#355](https://github.com/revanced/revanced-integrations/issues/355)) ([061ebc6](https://github.com/revanced/revanced-integrations/commit/061ebc65465b2c8ef087c681070b465b82e3ebd5))
+
+# [0.106.0-dev.6](https://github.com/revanced/revanced-integrations/compare/v0.106.0-dev.5...v0.106.0-dev.6) (2023-05-01)
+
+
+### Features
+
+* **youtube/general-ads:** hide multiple audio track button on video player overlay ([#377](https://github.com/revanced/revanced-integrations/issues/377)) ([7fc7336](https://github.com/revanced/revanced-integrations/commit/7fc73368f161ee1973f36323054f8cbb53b6e7ce))
+
+# [0.106.0-dev.5](https://github.com/revanced/revanced-integrations/compare/v0.106.0-dev.4...v0.106.0-dev.5) (2023-04-30)
+
+
+### Features
+
+* **youtube/general-ads:** hide new type of ad ([15f9c90](https://github.com/revanced/revanced-integrations/commit/15f9c90941535e93a0779118158c5b4a8accb799))
+
+# [0.106.0-dev.4](https://github.com/revanced/revanced-integrations/compare/v0.106.0-dev.3...v0.106.0-dev.4) (2023-04-30)
+
+
+### Bug Fixes
+
+* **youtube/return-youtube-dislike:** support old UI layouts ([#378](https://github.com/revanced/revanced-integrations/issues/378)) ([d3f8fb9](https://github.com/revanced/revanced-integrations/commit/d3f8fb97399aafe98a4198234338c6d0196a7e75))
+
+# [0.106.0-dev.3](https://github.com/revanced/revanced-integrations/compare/v0.106.0-dev.2...v0.106.0-dev.3) (2023-04-30)
+
+
+### Features
+
+* **youtube/hide-get-premium:** hide get premium advertisements under video player ([#376](https://github.com/revanced/revanced-integrations/issues/376)) ([36fd284](https://github.com/revanced/revanced-integrations/commit/36fd2844c468a4a9af3fe6ee5e62775f1e8dbe56))
+
+# [0.106.0-dev.2](https://github.com/revanced/revanced-integrations/compare/v0.106.0-dev.1...v0.106.0-dev.2) (2023-04-30)
+
+
+### Features
+
+* add appreciation message for new contributors ([78d56d4](https://github.com/revanced/revanced-integrations/commit/78d56d4fe182999555ddf5881a10880e3726782e))
+
 # [0.106.0-dev.1](https://github.com/revanced/revanced-integrations/compare/v0.105.1-dev.2...v0.106.0-dev.1) (2023-04-28)
 
 

README.md

@@ -1,8 +1,10 @@
-# ReVanced Integrations  
+# 🔩 ReVanced Integrations  
+
+The official ReVanced Integrations containing classes to be merged by ReVanced Patcher.
+
+## ❓ How to use debugging:
 
-# How to use debugging:
 - Usage on Windows: ```adb logcat | findstr "revanced" > log.txt```
 - Usage on Linux: ```adb logcat | grep --line-buffered "revanced" > log.txt```
   
 This will write the log to a file called log.txt which you can view then.
- 

app/build.gradle.kts

@@ -44,7 +44,7 @@ android {
 dependencies {
     compileOnly(project(mapOf("path" to ":dummy")))
     compileOnly("androidx.annotation:annotation:1.6.0")
-    compileOnly("androidx.appcompat:appcompat:1.6.1")
+    compileOnly("androidx.appcompat:appcompat:1.7.0-alpha02")
     compileOnly("com.squareup.okhttp3:okhttp:5.0.0-alpha.11")
     compileOnly("com.squareup.retrofit2:retrofit:2.9.0")
 }

app/src/main/java/app/revanced/integrations/adremover/AdRemoverAPI.java

@@ -1,42 +0,0 @@
-package app.revanced.integrations.adremover;
-
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.Toolbar;
-
-import app.revanced.integrations.utils.LogHelper;
-
-public class AdRemoverAPI {
-
-    /**
-     * Removes Reels and Home ads
-     *
-     * @param view
-     */
-    //ToDo: refactor this
-    public static void HideViewWithLayout1dp(View view) {
-        if (view instanceof LinearLayout) {
-            LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(1, 1);
-            view.setLayoutParams(layoutParams);
-        } else if (view instanceof FrameLayout) {
-            FrameLayout.LayoutParams layoutParams2 = new FrameLayout.LayoutParams(1, 1);
-            view.setLayoutParams(layoutParams2);
-        } else if (view instanceof RelativeLayout) {
-            RelativeLayout.LayoutParams layoutParams3 = new RelativeLayout.LayoutParams(1, 1);
-            view.setLayoutParams(layoutParams3);
-        } else if (view instanceof Toolbar) {
-            Toolbar.LayoutParams layoutParams4 = new Toolbar.LayoutParams(1, 1);
-            view.setLayoutParams(layoutParams4);
-        } else if (view instanceof ViewGroup) {
-            ViewGroup.LayoutParams layoutParams5 = new ViewGroup.LayoutParams(1, 1);
-            view.setLayoutParams(layoutParams5);
-        } else {
-            LogHelper.printDebug(() -> "HideViewWithLayout1dp - Id: " + view.getId() + " Type: " + view.getClass().getName());
-        }
-    }
-
-}

app/src/main/java/app/revanced/integrations/patches/AutoRepeatPatch.java

@@ -5,6 +5,6 @@ import app.revanced.integrations.settings.SettingsEnum;
 public class AutoRepeatPatch {
     //Used by app.revanced.patches.youtube.layout.autorepeat.patch.AutoRepeatPatch
     public static boolean shouldAutoRepeat() {
-        return SettingsEnum.PREFERRED_AUTO_REPEAT.getBoolean();
+        return SettingsEnum.AUTO_REPEAT.getBoolean();
     }
 }

app/src/main/java/app/revanced/integrations/patches/DisableAutoCaptionsPatch.java

@@ -4,10 +4,13 @@ import app.revanced.integrations.settings.SettingsEnum;
 
 public class DisableAutoCaptionsPatch {
 
+    /**
+     * Used by injected code. Do not delete.
+     */
     public static boolean captionsButtonDisabled;
 
     public static boolean autoCaptionsEnabled() {
-        return SettingsEnum.CAPTIONS_ENABLED.getBoolean();
+        return SettingsEnum.AUTO_CAPTIONS.getBoolean();
     }
 
 }

app/src/main/java/app/revanced/integrations/patches/DisableStartupShortsPlayerPatch.java

@@ -5,6 +5,6 @@ import app.revanced.integrations.settings.SettingsEnum;
 public class DisableStartupShortsPlayerPatch {
     //Used by app.revanced.patches.youtube.layout.startupshortsreset.patch.DisableShortsOnStartupPatch
     public static boolean disableStartupShortsPlayer() {
-        return SettingsEnum.DISABLE_STARTUP_SHORTS_PLAYER.getBoolean();
+        return SettingsEnum.DISABLE_RESUMING_SHORTS_PLAYER.getBoolean();
     }
 }

app/src/main/java/app/revanced/integrations/patches/GeneralAdsPatch.java

@@ -1,7 +1,6 @@
 package app.revanced.integrations.patches;
 
 import android.view.View;
-import app.revanced.integrations.adremover.AdRemoverAPI;
 import app.revanced.integrations.settings.SettingsEnum;
 import app.revanced.integrations.utils.LogHelper;
 import app.revanced.integrations.utils.ReVancedUtils;
@@ -16,36 +15,37 @@ public final class GeneralAdsPatch extends Filter {
     };
 
     private final BlockRule custom = new CustomBlockRule(
-            SettingsEnum.ADREMOVER_CUSTOM_ENABLED,
-            SettingsEnum.ADREMOVER_CUSTOM_REMOVAL
+            SettingsEnum.CUSTOM_FILTER,
+            SettingsEnum.CUSTOM_FILTER_STRINGS
     );
 
     public GeneralAdsPatch() {
-        var communityPosts = new BlockRule(SettingsEnum.ADREMOVER_COMMUNITY_POSTS_REMOVAL, "post_base_wrapper");
-        var communityGuidelines = new BlockRule(SettingsEnum.ADREMOVER_COMMUNITY_GUIDELINES_REMOVAL, "community_guidelines");
-        var subscribersCommunityGuidelines = new BlockRule(SettingsEnum.ADREMOVER_SUBSCRIBERS_COMMUNITY_GUIDELINES_REMOVAL, "sponsorships_comments_upsell");
-        var channelMemberShelf = new BlockRule(SettingsEnum.ADREMOVER_CHANNEL_MEMBER_SHELF_REMOVAL, "member_recognition_shelf");
-        var compactBanner = new BlockRule(SettingsEnum.ADREMOVER_COMPACT_BANNER_REMOVAL, "compact_banner");
-        var inFeedSurvey = new BlockRule(SettingsEnum.ADREMOVER_FEED_SURVEY_REMOVAL, "in_feed_survey", "slimline_survey");
-        var medicalPanel = new BlockRule(SettingsEnum.ADREMOVER_MEDICAL_PANEL_REMOVAL, "medical_panel");
-        var paidContent = new BlockRule(SettingsEnum.ADREMOVER_PAID_CONTENT_REMOVAL, "paid_content_overlay");
-        var merchandise = new BlockRule(SettingsEnum.ADREMOVER_MERCHANDISE_REMOVAL, "product_carousel");
-        var infoPanel = new BlockRule(SettingsEnum.ADREMOVER_INFO_PANEL_REMOVAL, "publisher_transparency_panel", "single_item_information_panel");
-        var latestPosts = new BlockRule(SettingsEnum.ADREMOVER_HIDE_LATEST_POSTS, "post_shelf");
-        var channelGuidelines = new BlockRule(SettingsEnum.ADREMOVER_HIDE_CHANNEL_GUIDELINES, "channel_guidelines_entry_banner");
+        var communityPosts = new BlockRule(SettingsEnum.HIDE_COMMUNITY_POSTS, "post_base_wrapper");
+        var communityGuidelines = new BlockRule(SettingsEnum.HIDE_COMMUNITY_GUIDELINES, "community_guidelines");
+        var subscribersCommunityGuidelines = new BlockRule(SettingsEnum.HIDE_SUBSCRIBERS_COMMUNITY_GUIDELINES, "sponsorships_comments_upsell");
+        var channelMemberShelf = new BlockRule(SettingsEnum.HIDE_CHANNEL_MEMBER_SHELF, "member_recognition_shelf");
+        var compactBanner = new BlockRule(SettingsEnum.HIDE_COMPACT_BANNER, "compact_banner");
+        var inFeedSurvey = new BlockRule(SettingsEnum.HIDE_FEED_SURVEY, "in_feed_survey", "slimline_survey");
+        var medicalPanel = new BlockRule(SettingsEnum.HIDE_MEDICAL_PANELS, "medical_panel");
+        var merchandise = new BlockRule(SettingsEnum.HIDE_MERCHANDISE_BANNERS, "product_carousel");
+        var infoPanel = new BlockRule(SettingsEnum.HIDE_HIDE_INFO_PANELS, "publisher_transparency_panel", "single_item_information_panel");
+        var channelGuidelines = new BlockRule(SettingsEnum.HIDE_HIDE_CHANNEL_GUIDELINES, "channel_guidelines_entry_banner");
+        var audioTrackButton = new BlockRule(SettingsEnum.HIDE_AUDIO_TRACK_BUTTON, "multi_feed_icon_button");
         var artistCard = new BlockRule(SettingsEnum.HIDE_ARTIST_CARDS, "official_card");
-        var selfSponsor = new BlockRule(SettingsEnum.ADREMOVER_SELF_SPONSOR_REMOVAL, "cta_shelf_card");
-        var chapterTeaser = new BlockRule(SettingsEnum.ADREMOVER_CHAPTER_TEASER_REMOVAL, "expandable_metadata", "macro_markers_carousel");
-        var viewProducts = new BlockRule(SettingsEnum.ADREMOVER_VIEW_PRODUCTS, "product_item", "products_in_video");
-        var webLinkPanel = new BlockRule(SettingsEnum.ADREMOVER_WEB_SEARCH_RESULTS, "web_link_panel");
-        var channelBar = new BlockRule(SettingsEnum.ADREMOVER_CHANNEL_BAR, "channel_bar");
-        var relatedVideos = new BlockRule(SettingsEnum.ADREMOVER_RELATED_VIDEOS, "fullscreen_related_videos");
-        var quickActions = new BlockRule(SettingsEnum.ADREMOVER_QUICK_ACTIONS, "quick_actions");
-        var imageShelf = new BlockRule(SettingsEnum.ADREMOVER_IMAGE_SHELF, "image_shelf");
-        var graySeparator = new BlockRule(SettingsEnum.ADREMOVER_GRAY_SEPARATOR,
+        var chapterTeaser = new BlockRule(SettingsEnum.HIDE_CHAPTER_TEASER, "expandable_metadata", "macro_markers_carousel");
+        var viewProducts = new BlockRule(SettingsEnum.HIDE_PRODUCTS_BANNER, "product_item", "products_in_video");
+        var webLinkPanel = new BlockRule(SettingsEnum.HIDE_WEB_SEARCH_RESULTS, "web_link_panel");
+        var channelBar = new BlockRule(SettingsEnum.HIDE_CHANNEL_BAR, "channel_bar");
+        var relatedVideos = new BlockRule(SettingsEnum.HIDE_RELATED_VIDEOS, "fullscreen_related_videos");
+        var quickActions = new BlockRule(SettingsEnum.HIDE_QUICK_ACTIONS, "quick_actions");
+        var imageShelf = new BlockRule(SettingsEnum.HIDE_IMAGE_SHELF, "image_shelf");
+        var graySeparator = new BlockRule(SettingsEnum.HIDE_GRAY_SEPARATOR,
                 "cell_divider" // layout residue (gray line above the buttoned ad),
         );
-        var buttonedAd = new BlockRule(SettingsEnum.ADREMOVER_BUTTONED_REMOVAL,
+        var paidContent = new BlockRule(SettingsEnum.HIDE_PAID_CONTENT, "paid_content_overlay");
+        var latestPosts = new BlockRule(SettingsEnum.HIDE_HIDE_LATEST_POSTS, "post_shelf");
+        var selfSponsor = new BlockRule(SettingsEnum.HIDE_SELF_SPONSOR, "cta_shelf_card");
+        var buttonedAd = new BlockRule(SettingsEnum.HIDE_BUTTONED_ADS,
                 "_buttoned_layout",
                 "full_width_square_image_layout",
                 "_ad_with",
@@ -53,7 +53,7 @@ public final class GeneralAdsPatch extends Filter {
                 "landscape_image_wide_button_layout"
         );
         var generalAds = new BlockRule(
-                SettingsEnum.ADREMOVER_GENERAL_ADS_REMOVAL,
+                SettingsEnum.HIDE_GENERAL_ADS,
                 "ads_video_with_context",
                 "banner_text_icon",
                 "square_image_layout",
@@ -64,12 +64,12 @@ public final class GeneralAdsPatch extends Filter {
                 "carousel_footered_layout",
                 "text_image_button_layout",
                 "primetime_promo",
-                "feature_grid_interstitial",
                 "product_details",
+                "full_width_portrait_image_layout",
                 "brand_video_shelf"
         );
         var movieAds = new BlockRule(
-                SettingsEnum.ADREMOVER_MOVIE_REMOVAL,
+                SettingsEnum.HIDE_MOVIES_SECTION,
                 "browsy_bar",
                 "compact_movie",
                 "horizontal_movie_shelf",
@@ -97,6 +97,7 @@ public final class GeneralAdsPatch extends Filter {
                 merchandise,
                 infoPanel,
                 channelGuidelines,
+                audioTrackButton,
                 artistCard,
                 selfSponsor,
                 webLinkPanel,
@@ -105,11 +106,10 @@ public final class GeneralAdsPatch extends Filter {
                 channelMemberShelf
         );
 
-        var carouselAd = new BlockRule(SettingsEnum.ADREMOVER_GENERAL_ADS_REMOVAL,
+        var carouselAd = new BlockRule(SettingsEnum.HIDE_GENERAL_ADS,
                 "carousel_ad"
         );
-        var shorts = new BlockRule(SettingsEnum.ADREMOVER_SHORTS_REMOVAL,
-                "reels_player_overlay",
+        var shorts = new BlockRule(SettingsEnum.HIDE_SHORTS,
                 "shorts_shelf",
                 "inline_shorts",
                 "shorts_grid"
@@ -165,7 +165,7 @@ public final class GeneralAdsPatch extends Filter {
 
         LogHelper.printDebug(() -> "Hiding view with setting: " + condition);
 
-        AdRemoverAPI.HideViewWithLayout1dp(view);
+        ReVancedUtils.HideViewByLayoutParams(view);
     }
 
     /**
@@ -174,7 +174,7 @@ public final class GeneralAdsPatch extends Filter {
      * @param view The view, which shows ads.
      */
     public static void hideAdAttributionView(View view) {
-        hideView(SettingsEnum.ADREMOVER_GENERAL_ADS_REMOVAL, view);
+        hideView(SettingsEnum.HIDE_GENERAL_ADS, view);
     }
 
     /**
@@ -183,7 +183,7 @@ public final class GeneralAdsPatch extends Filter {
      * @param view The view, which shows reels.
      */
     public static void hideReelView(View view) {
-        hideView(SettingsEnum.ADREMOVER_SHORTS_REMOVAL, view);
+        hideView(SettingsEnum.HIDE_SHORTS, view);
     }
 
 }

app/src/main/java/app/revanced/integrations/patches/HDRAutoBrightnessPatch.java

@@ -21,7 +21,7 @@ public class HDRAutoBrightnessPatch {
      */
     public static float getHDRBrightness(float original) {
         // do nothing if disabled
-        if (!SettingsEnum.USE_HDR_AUTO_BRIGHTNESS.getBoolean()) {
+        if (!SettingsEnum.HDR_AUTO_BRIGHTNESS.getBoolean()) {
             return original;
         }
 

app/src/main/java/app/revanced/integrations/patches/HideAlbumCardsPatch.java

@@ -2,13 +2,12 @@ package app.revanced.integrations.patches;
 
 import android.view.View;
 
-import app.revanced.integrations.adremover.AdRemoverAPI;
 import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.ReVancedUtils;
 
 public class HideAlbumCardsPatch {
-    //Used by app.revanced.patches.youtube.layout.hidealbumcards.patch.HideAlbumCardsPatch
-    public static void hideAlbumCards(View view) {
+    public static void hideAlbumCard(View view) {
         if (!SettingsEnum.HIDE_ALBUM_CARDS.getBoolean()) return;
-        AdRemoverAPI.HideViewWithLayout1dp(view);
+        ReVancedUtils.HideViewByLayoutParams(view);
     }
 }

app/src/main/java/app/revanced/integrations/patches/HideBreakingNewsPatch.java

@@ -2,13 +2,28 @@ package app.revanced.integrations.patches;
 
 import android.view.View;
 
-import app.revanced.integrations.adremover.AdRemoverAPI;
 import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.ReVancedUtils;
 
 public class HideBreakingNewsPatch {
-    //Used by app.revanced.patches.youtube.layout.homepage.breakingnews.patch.BreakingNewsPatch
+
+    /**
+     * When spoofing to app versions older than 17.30.35, the watch history preview bar uses
+     * the same layout components as the breaking news shelf.
+     *
+     * Breaking news does not appear to be present in these older versions anyways.
+     */
+    private static boolean isSpoofingOldVersionWithHorizontalCardListWatchHistory() {
+        return SettingsEnum.SPOOF_APP_VERSION.getBoolean()
+                && SettingsEnum.SPOOF_APP_VERSION_TARGET.getString().compareTo("17.30.35") < 0;
+    }
+
+    /**
+     * Injection point.
+     */
     public static void hideBreakingNews(View view) {
-        if (!SettingsEnum.HIDE_BREAKING_NEWS.getBoolean()) return;
-        AdRemoverAPI.HideViewWithLayout1dp(view);
+        if (!SettingsEnum.HIDE_BREAKING_NEWS.getBoolean()
+                || isSpoofingOldVersionWithHorizontalCardListWatchHistory()) return;
+        ReVancedUtils.HideViewByLayoutParams(view);
     }
 }

app/src/main/java/app/revanced/integrations/patches/HideCreateButtonPatch.java

@@ -1,16 +0,0 @@
-package app.revanced.integrations.patches;
-
-import android.view.View;
-
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
-
-public class HideCreateButtonPatch {
-
-    //Used by app.revanced.patches.youtube.layout.createbutton.patch.CreateButtonRemoverPatch
-    public static void hideCreateButton(View view) {
-        boolean hidden = SettingsEnum.HIDE_CREATE_BUTTON.getBoolean();
-        LogHelper.printDebug(() -> "Create button: " + (hidden ? "hidden" : "shown"));
-        view.setVisibility(hidden ? View.GONE : View.VISIBLE);
-    }
-}

app/src/main/java/app/revanced/integrations/patches/HideCrowdfundingBoxPatch.java

@@ -2,13 +2,13 @@ package app.revanced.integrations.patches;
 
 import android.view.View;
 
-import app.revanced.integrations.adremover.AdRemoverAPI;
 import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.ReVancedUtils;
 
 public class HideCrowdfundingBoxPatch {
     //Used by app.revanced.patches.youtube.layout.hidecrowdfundingbox.patch.HideCrowdfundingBoxPatch
     public static void hideCrowdfundingBox(View view) {
         if (!SettingsEnum.HIDE_CROWDFUNDING_BOX.getBoolean()) return;
-        AdRemoverAPI.HideViewWithLayout1dp(view);
+        ReVancedUtils.HideViewByLayoutParams(view);
     }
 }

app/src/main/java/app/revanced/integrations/patches/HideFilterBarPatch.java

@@ -0,0 +1,25 @@
+package app.revanced.integrations.patches;
+
+import android.view.View;
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.ReVancedUtils;
+
+public final class HideFilterBarPatch {
+    public static int hideInFeed(final int height) {
+        if (SettingsEnum.HIDE_FILTER_BAR_FEED_IN_FEED.getBoolean()) return 0;
+
+        return height;
+    }
+
+    public static void hideInRelatedVideos(final View chipView) {
+        if (!SettingsEnum.HIDE_FILTER_BAR_FEED_IN_RELATED_VIDEOS.getBoolean()) return;
+
+        ReVancedUtils.HideViewByLayoutParams(chipView);
+    }
+
+    public static int hideInSearch(final int height) {
+        if (SettingsEnum.HIDE_FILTER_BAR_FEED_IN_SEARCH.getBoolean()) return 0;
+
+        return height;
+    }
+}

app/src/main/java/app/revanced/integrations/patches/HideGetPremiumPatch.java

@@ -0,0 +1,12 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public class HideGetPremiumPatch {
+    /**
+     * Injection point.
+     */
+    public static boolean hideGetPremiumView() {
+        return SettingsEnum.HIDE_GET_PREMIUM.getBoolean();
+    }
+}

app/src/main/java/app/revanced/integrations/patches/HideLoadMoreButtonPatch.java

@@ -0,0 +1,13 @@
+package app.revanced.integrations.patches;
+
+import android.view.View;
+
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.ReVancedUtils;
+
+public class HideLoadMoreButtonPatch {
+    public static void hideLoadMoreButton(View view){
+        if(!SettingsEnum.HIDE_LOAD_MORE_BUTTON.getBoolean()) return;
+        ReVancedUtils.HideViewByLayoutParams(view);
+    }
+}

app/src/main/java/app/revanced/integrations/patches/HidePlayerOverlayPatch.java

@@ -0,0 +1,12 @@
+package app.revanced.integrations.patches;
+
+import android.widget.ImageView;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public class HidePlayerOverlayPatch {
+    public static void hidePlayerOverlay(ImageView view) {
+        if (!SettingsEnum.HIDE_PLAYER_OVERLAY.getBoolean()) return;
+        view.setImageResource(android.R.color.transparent);
+    }
+}

app/src/main/java/app/revanced/integrations/patches/HideShortsButtonPatch.java

@@ -1,24 +0,0 @@
-package app.revanced.integrations.patches;
-
-
-import android.view.View;
-
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
-
-public class HideShortsButtonPatch {
-
-    // Used by app.revanced.patches.youtube.layout.shorts.button.patch.ShortsButtonRemoverPatch
-    public static void hideShortsButton(View view) {
-        if (lastPivotTab != null && lastPivotTab.name() == "TAB_SHORTS") {
-            boolean hide = SettingsEnum.HIDE_SHORTS_BUTTON.getBoolean();
-            LogHelper.printDebug(() -> hide ? "Shorts button: hidden" : "Shorts button: shown");
-            if (hide) {
-                view.setVisibility(View.GONE);
-            }
-        }
-    }
-
-    //Needed for the ShortsButtonRemoverPatch
-    public static Enum lastPivotTab;
-}

app/src/main/java/app/revanced/integrations/patches/MicroGSupport.java

@@ -2,6 +2,7 @@ package app.revanced.integrations.patches;
 
 import static app.revanced.integrations.utils.StringRef.str;
 
+import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -28,6 +29,7 @@ public class MicroGSupport {
         context.startActivity(intent);
     }
 
+    @TargetApi(26)
     public static void checkAvailability() {
         var context = Objects.requireNonNull(ReVancedUtils.getContext());
 
@@ -41,10 +43,11 @@ public class MicroGSupport {
             System.exit(0);
         }
 
+
         try (var client = context.getContentResolver().acquireContentProviderClient(VANCED_MICROG_PROVIDER)) {
             if (client != null) return;
             LogHelper.printInfo(() -> "Vanced MicroG is not running in the background");
             startIntent(context, DONT_KILL_MY_APP_LINK, str("microg_not_running_warning"));
         }
     }
-}
+}

app/src/main/java/app/revanced/integrations/patches/NavigationButtonsPatch.java

@@ -0,0 +1,38 @@
+package app.revanced.integrations.patches;
+
+
+import android.view.View;
+import app.revanced.integrations.settings.SettingsEnum;
+
+public final class NavigationButtonsPatch {
+    public static Enum lastNavigationButton;
+
+    public static void hideCreateButton(final View view) {
+        view.setVisibility(SettingsEnum.HIDE_CREATE_BUTTON.getBoolean() ? View.GONE : View.VISIBLE);
+    }
+
+    public static boolean switchCreateWithNotificationButton() {
+        return SettingsEnum.SWITCH_CREATE_WITH_NOTIFICATIONS_BUTTON.getBoolean();
+    }
+
+    public static void hideButton(final View buttonView) {
+        if (lastNavigationButton == null) return;
+
+        for (NavigationButton button : NavigationButton.values())
+            if (button.name.equals(lastNavigationButton.name()))
+                if (button.enabled) buttonView.setVisibility(View.GONE);
+    }
+
+    private enum NavigationButton {
+        HOME("PIVOT_HOME", SettingsEnum.HIDE_HOME_BUTTON.getBoolean()),
+        SHORTS("TAB_SHORTS", SettingsEnum.HIDE_SHORTS_BUTTON.getBoolean()),
+        SUBSCRIPTIONS("PIVOT_SUBSCRIPTIONS", SettingsEnum.HIDE_SUBSCRIPTIONS_BUTTON.getBoolean());
+        private final boolean enabled;
+        private final String name;
+
+        NavigationButton(final String name, final boolean enabled) {
+            this.name = name;
+            this.enabled = enabled;
+        }
+    }
+}

app/src/main/java/app/revanced/integrations/patches/OpenLinksExternallyPatch.java

@@ -13,7 +13,7 @@ public class OpenLinksExternallyPatch {
      * @return The new, default service to open links with or the original service.
      */
     public static String enableExternalBrowser(String original) {
-        if (SettingsEnum.ENABLE_EXTERNAL_BROWSER.getBoolean()) original = "";
+        if (SettingsEnum.EXTERNAL_BROWSER.getBoolean()) original = "";
         return original;
     }
 }

app/src/main/java/app/revanced/integrations/patches/SeekbarTappingPatch.java

@@ -6,7 +6,7 @@ public class SeekbarTappingPatch {
 
     //Used by app.revanced.patches.youtube.interaction.seekbar.patch.EnableSeekbarTappingPatch
     public static boolean isTapSeekingEnabled() {
-        return SettingsEnum.TAP_SEEKING_ENABLED.getBoolean();
+        return SettingsEnum.TAP_SEEKING.getBoolean();
     }
 
 }

app/src/main/java/app/revanced/integrations/patches/SpoofSignatureVerificationPatch.java

@@ -60,7 +60,7 @@ public class SpoofSignatureVerificationPatch {
      */
     public static String overrideProtobufParameter(String originalValue) {
         try {
-            if (!SettingsEnum.SIGNATURE_SPOOFING.getBoolean()) {
+            if (!SettingsEnum.SPOOF_SIGNATURE_VERIFICATION.getBoolean()) {
                 return originalValue;
             }
 
@@ -101,11 +101,11 @@ public class SpoofSignatureVerificationPatch {
             }
             LogHelper.printDebug(() -> "YouTube HTTP status code: " + responseCode);
 
-            if (SettingsEnum.SIGNATURE_SPOOFING.getBoolean()) {
+            if (SettingsEnum.SPOOF_SIGNATURE_VERIFICATION.getBoolean()) {
                 return;  // already enabled
             }
 
-            SettingsEnum.SIGNATURE_SPOOFING.saveValue(true);
+            SettingsEnum.SPOOF_SIGNATURE_VERIFICATION.saveValue(true);
             ReVancedUtils.showToastLong("Spoofing app signature to prevent playback issues");
             // it would be great if the video could be forcefully reloaded, but currently there is no code to do this
 
@@ -130,7 +130,7 @@ public class SpoofSignatureVerificationPatch {
      * @param sd function is not entirely clear
      */
     public static int[] getSubtitleWindowSettingsOverride(int ap, int ah, int av, boolean vs, boolean sd) {
-        final boolean signatureSpoofing = SettingsEnum.SIGNATURE_SPOOFING.getBoolean();
+        final boolean signatureSpoofing = SettingsEnum.SPOOF_SIGNATURE_VERIFICATION.getBoolean();
         if (SettingsEnum.DEBUG.getBoolean()) {
             if (ap != lastAp || ah != lastAh || av != lastAv || vs != lastVs || sd != lastSd) {
                 LogHelper.printDebug(() -> "video: " + VideoInformation.getVideoId() + " spoof: " + signatureSpoofing

app/src/main/java/app/revanced/integrations/patches/VideoAdsPatch.java

@@ -7,8 +7,7 @@ public class VideoAdsPatch {
     // Used by app.revanced.patches.youtube.ad.general.video.patch.VideoAdsPatch
     // depends on Whitelist patch (still needs to be written)
     public static boolean shouldShowAds() {
-        return !SettingsEnum.VIDEO_ADS_REMOVAL.getBoolean(); // TODO && Whitelist.shouldShowAds();
-
+        return !SettingsEnum.HIDE_VIDEO_ADS.getBoolean(); // TODO && Whitelist.shouldShowAds();
     }
 
 }

app/src/main/java/app/revanced/integrations/patches/VideoInformation.java

@@ -4,6 +4,7 @@ import androidx.annotation.NonNull;
 
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
+import java.util.Objects;
 
 import app.revanced.integrations.patches.playback.speed.RememberPlaybackSpeedPatch;
 import app.revanced.integrations.utils.LogHelper;
@@ -16,7 +17,7 @@ public final class VideoInformation {
     private static final float DEFAULT_YOUTUBE_PLAYBACK_SPEED = 1.0f;
     private static final String SEEK_METHOD_NAME = "seekTo";
 
-    private static WeakReference<Object> playerController;
+    private static WeakReference<Object> playerControllerRef;
     private static Method seekMethod;
 
     @NonNull
@@ -30,17 +31,17 @@ public final class VideoInformation {
 
     /**
      * Injection point.
-     * Sets a reference to the YouTube playback controller.
      *
-     * @param thisRef Reference to the player controller object.
+     * @param playerController player controller object.
      */
-    public static void playerController_onCreateHook(final Object thisRef) {
-        playerController = new WeakReference<>(thisRef);
-        videoLength = 0;
-        videoTime = -1;
-
+    public static void initialize(@NonNull Object playerController) {
         try {
-            seekMethod = thisRef.getClass().getMethod(SEEK_METHOD_NAME, Long.TYPE);
+            playerControllerRef = new WeakReference<>(Objects.requireNonNull(playerController));
+            videoTime = -1;
+            videoLength = 0;
+            playbackSpeed = DEFAULT_YOUTUBE_PLAYBACK_SPEED;
+
+            seekMethod = playerController.getClass().getMethod(SEEK_METHOD_NAME, Long.TYPE);
             seekMethod.setAccessible(true);
         } catch (Exception ex) {
             LogHelper.printException(() -> "Failed to initialize", ex);
@@ -56,7 +57,6 @@ public final class VideoInformation {
         if (!videoId.equals(newlyLoadedVideoId)) {
             LogHelper.printDebug(() -> "New video id: " + newlyLoadedVideoId);
             videoId = newlyLoadedVideoId;
-            playbackSpeed = DEFAULT_YOUTUBE_PLAYBACK_SPEED;
         }
     }
 
@@ -124,7 +124,7 @@ public final class VideoInformation {
 
         try {
             LogHelper.printDebug(() -> "Seeking to " + millisecond);
-            return (Boolean) seekMethod.invoke(playerController.get(), millisecond);
+            return (Boolean) seekMethod.invoke(playerControllerRef.get(), millisecond);
         } catch (Exception ex) {
             LogHelper.printException(() -> "Failed to seek", ex);
             return false;

app/src/main/java/app/revanced/integrations/patches/playback/quality/OldQualityLayoutPatch.java

@@ -10,7 +10,7 @@ import app.revanced.integrations.utils.LogHelper;
 public class OldQualityLayoutPatch {
     public static void showOldQualityMenu(ListView listView)
     {
-        if (!SettingsEnum.OLD_STYLE_VIDEO_QUALITY_PLAYER_SETTINGS.getBoolean()) return;
+        if (!SettingsEnum.SHOW_OLD_VIDEO_MENU.getBoolean()) return;
 
         listView.setOnHierarchyChangeListener(new ViewGroup.OnHierarchyChangeListener() {
             @Override

app/src/main/java/app/revanced/integrations/patches/playback/quality/RememberVideoQualityPatch.java

@@ -2,7 +2,6 @@ package app.revanced.integrations.patches.playback.quality;
 
 import static app.revanced.integrations.utils.ReVancedUtils.NetworkType;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.lang.reflect.Field;
@@ -20,12 +19,10 @@ public class RememberVideoQualityPatch {
     private static final SettingsEnum mobileQualitySetting = SettingsEnum.VIDEO_QUALITY_DEFAULT_MOBILE;
 
     private static boolean qualityNeedsUpdating;
-    @Nullable
-    private static String currentVideoId;
 
     /**
      * If the user selected a new quality from the flyout menu,
-     * and {@link SettingsEnum#VIDEO_QUALITY_REMEMBER_LAST_SELECTED} is enabled.
+     * and {@link SettingsEnum#REMEMBER_VIDEO_QUALITY_LAST_SELECTED} is enabled.
      */
     private static boolean userChangedDefaultQuality;
 
@@ -91,7 +88,7 @@ public class RememberVideoQualityPatch {
                         }
                     }
                 }
-                LogHelper.printDebug(() -> "VideoId: " + currentVideoId + " videoQualities: " + videoQualities);
+                LogHelper.printDebug(() -> "videoQualities: " + videoQualities);
             }
 
             if (userChangedDefaultQuality) {
@@ -113,15 +110,25 @@ public class RememberVideoQualityPatch {
                 }
                 i++;
             }
+
+            // If the desired quality index is equal to the original index,
+            // then the video is already set to the desired default quality.
+            //
+            // The method could return here, but the UI video quality flyout will still
+            // show 'Auto' (ie: Auto (480p))
+            // It appears that "Auto" picks the resolution on video load,
+            // and it does not appear to change the resolution during playback.
+            //
+            // To prevent confusion, set the video index anyways (even if it matches the existing index)
+            // As that will force the UI picker to not display "Auto" which may confuse the user.
             if (qualityIndexToUse == originalQualityIndex) {
                 LogHelper.printDebug(() -> "Video is already preferred quality: " + preferredQuality);
-                return originalQualityIndex;
+            } else {
+                final int qualityToUseLog = qualityToUse;
+                LogHelper.printDebug(() -> "Quality changed from: "
+                        + videoQualities.get(originalQualityIndex) + " to: " + qualityToUseLog);
             }
 
-            final int qualityToUseLog = qualityToUse;
-            LogHelper.printDebug(() -> "Quality changed from: "
-                    + videoQualities.get(originalQualityIndex) + " to: " + qualityToUseLog);
-
             Method m = qInterface.getClass().getMethod(qIndexMethod, Integer.TYPE);
             m.invoke(qInterface, qualityToUse);
             return qualityIndexToUse;
@@ -135,7 +142,7 @@ public class RememberVideoQualityPatch {
      * Injection point.
      */
     public static void userChangedQuality(int selectedQuality) {
-        if (!SettingsEnum.VIDEO_QUALITY_REMEMBER_LAST_SELECTED.getBoolean()) return;
+        if (!SettingsEnum.REMEMBER_VIDEO_QUALITY_LAST_SELECTED.getBoolean()) return;
 
         userSelectedQualityIndex = selectedQuality;
         userChangedDefaultQuality = true;
@@ -144,25 +151,9 @@ public class RememberVideoQualityPatch {
     /**
      * Injection point.
      */
-    public static void newVideoStarted(@NonNull String videoId) {
-        // The same videoId can be passed in multiple times for a single video playback.
-        // Such as closing and opening the app, and sometimes when turning off/on the device screen.
-        //
-        // Known limitation, if:
-        // 1. a default video quality exists, and remember quality is turned off
-        // 2. user opens a video
-        // 3. user changes the video quality
-        // 4. user turns off then on the device screen (or does anything else that triggers the video id hook)
-        // result: the video quality of the current video will revert back to the saved default
-        //
-        // qualityNeedsUpdating could be set only when the videoId changes
-        // but then if the user closes and re-opens the same video the default video quality will not be applied.
-        LogHelper.printDebug(() -> "newVideoStarted: " + videoId);
+    public static void newVideoStarted(Object ignoredPlayerController) {
+        LogHelper.printDebug(() -> "newVideoStarted");
         qualityNeedsUpdating = true;
-
-        if (!videoId.equals(currentVideoId)) {
-            currentVideoId = videoId;
-            videoQualities = null;
-        }
+        videoQualities = null;
     }
 }

app/src/main/java/app/revanced/integrations/patches/playback/speed/CustomVideoSpeedPatch.java

@@ -1,12 +1,103 @@
 package app.revanced.integrations.patches.playback.speed;
 
+import android.preference.ListPreference;
+
+import androidx.annotation.NonNull;
+
+import java.util.Arrays;
+
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.LogHelper;
+import app.revanced.integrations.utils.ReVancedUtils;
+
 public class CustomVideoSpeedPatch {
     /**
-     * Default playback speeds offered by YouTube.
-     * Values are also used by {@link RememberPlaybackSpeedPatch}.
-     *
-     * If custom video speed is applied,
-     * then this array is overwritten by the patch with custom speeds
+     * Maximum playback speed, exclusive value.  Custom speeds must be less than this value.
      */
-    public static final float[] videoSpeeds = {0.25f, 0.75f, 1.0f, 1.25f, 1.5f, 1.75f, 2.0f};
+    public static final float MAXIMUM_PLAYBACK_SPEED = 10;
+
+    /**
+     * Custom playback speeds.
+     */
+    public static float[] customVideoSpeeds;
+
+    /**
+     * Minimum value of {@link #customVideoSpeeds}
+     */
+    public static float minVideoSpeed;
+
+    /**
+     * Maxium value of {@link #customVideoSpeeds}
+     */
+    public static float maxVideoSpeed;
+
+    /**
+     * PreferenceList entries and values, of all available playback speeds.
+     */
+    private static String[] preferenceListEntries, preferenceListEntryValues;
+
+    static {
+        loadSpeeds();
+    }
+
+    private static void resetCustomSpeeds(@NonNull String toastMessage) {
+        ReVancedUtils.showToastLong(toastMessage);
+        SettingsEnum.CUSTOM_PLAYBACK_SPEEDS.saveValue(SettingsEnum.CUSTOM_PLAYBACK_SPEEDS.defaultValue);
+    }
+
+    private static void loadSpeeds() {
+        try {
+            String[] speedStrings = SettingsEnum.CUSTOM_PLAYBACK_SPEEDS.getString().split("\\s+");
+            Arrays.sort(speedStrings);
+            if (speedStrings.length == 0) {
+                throw new IllegalArgumentException();
+            }
+            customVideoSpeeds = new float[speedStrings.length];
+            for (int i = 0, length = speedStrings.length; i < length; i++) {
+                final float speed = Float.parseFloat(speedStrings[i]);
+                if (speed <= 0 || arrayContains(customVideoSpeeds, speed)) {
+                    throw new IllegalArgumentException();
+                }
+                if (speed >= MAXIMUM_PLAYBACK_SPEED) {
+                    resetCustomSpeeds("Custom speeds must be less than " + MAXIMUM_PLAYBACK_SPEED
+                            + ".  Using default values.");
+                    loadSpeeds();
+                    return;
+                }
+                minVideoSpeed = Math.min(minVideoSpeed, speed);
+                maxVideoSpeed = Math.max(maxVideoSpeed, speed);
+                customVideoSpeeds[i] = speed;
+            }
+        } catch (Exception ex) {
+            LogHelper.printInfo(() -> "parse error", ex);
+            resetCustomSpeeds("Invalid custom video speeds. Using default values.");
+            loadSpeeds();
+        }
+    }
+
+    private static boolean arrayContains(float[] array, float value) {
+        for (float arrayValue : array) {
+            if (arrayValue == value) return true;
+        }
+        return false;
+    }
+
+    /**
+     * Initialize a settings preference list with the available playback speeds.
+     */
+    public static void initializeListPreference(ListPreference preference) {
+        if (preferenceListEntries == null) {
+            preferenceListEntries = new String[customVideoSpeeds.length];
+            preferenceListEntryValues = new String[customVideoSpeeds.length];
+            int i = 0;
+            for (float speed : customVideoSpeeds) {
+                String speedString = String.valueOf(speed);
+                preferenceListEntries[i] = speedString + "x";
+                preferenceListEntryValues[i] = speedString;
+                i++;
+            }
+        }
+        preference.setEntries(preferenceListEntries);
+        preference.setEntryValues(preferenceListEntryValues);
+    }
 }

app/src/main/java/app/revanced/integrations/patches/playback/speed/RememberPlaybackSpeedPatch.java

@@ -1,33 +1,17 @@
 package app.revanced.integrations.patches.playback.speed;
 
-import android.preference.ListPreference;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import app.revanced.integrations.patches.VideoInformation;
 import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.LogHelper;
 import app.revanced.integrations.utils.ReVancedUtils;
 
 public final class RememberPlaybackSpeedPatch {
 
-    /**
-     * PreferenceList entries and values, of all available playback speeds.
-     */
-    private static String[] preferenceListEntries, preferenceListEntryValues;
-
-    @Nullable
-    private static String currentVideoId;
-
     /**
      * Injection point.
-     * Called when a new video loads.
      */
-    public static void newVideoLoaded(@NonNull String videoId) {
-        if (videoId.equals(currentVideoId)) {
-            return;
-        }
-        currentVideoId = videoId;
+    public static void newVideoStarted(Object ignoredPlayerController) {
+        LogHelper.printDebug(() -> "newVideoStarted");
         VideoInformation.overridePlaybackSpeed(SettingsEnum.PLAYBACK_SPEED_DEFAULT.getFloat());
     }
 
@@ -38,7 +22,7 @@ public final class RememberPlaybackSpeedPatch {
      * @param playbackSpeed The playback speed the user selected
      */
     public static void userSelectedPlaybackSpeed(float playbackSpeed) {
-        if (SettingsEnum.PLAYBACK_SPEED_REMEMBER_LAST_SELECTED.getBoolean()) {
+        if (SettingsEnum.REMEMBER_PLAYBACK_SPEED_LAST_SELECTED.getBoolean()) {
             SettingsEnum.PLAYBACK_SPEED_DEFAULT.saveValue(playbackSpeed);
             ReVancedUtils.showToastLong("Changed default speed to: " + playbackSpeed + "x");
         }
@@ -52,26 +36,4 @@ public final class RememberPlaybackSpeedPatch {
         return VideoInformation.getPlaybackSpeed();
     }
 
-    /**
-     * Initialize a settings preference list.
-     *
-     * Normally this is done during patching by creating a static xml preference list,
-     * but the available playback speeds differ depending if {@link CustomVideoSpeedPatch} is applied or not.
-     */
-    public static void initializeListPreference(ListPreference preference) {
-        if (preferenceListEntries == null) {
-            float[] videoSpeeds = CustomVideoSpeedPatch.videoSpeeds;
-            preferenceListEntries = new String[videoSpeeds.length];
-            preferenceListEntryValues = new String[videoSpeeds.length];
-            int i = 0;
-            for (float speed : videoSpeeds) {
-                String speedString = String.valueOf(speed);
-                preferenceListEntries[i] = speedString + "x";
-                preferenceListEntryValues[i] = speedString;
-                i++;
-            }
-        }
-        preference.setEntries(preferenceListEntries);
-        preference.setEntryValues(preferenceListEntryValues);
-    }
 }

app/src/main/java/app/revanced/integrations/patches/theme/ProgressBarDrawable.java

@@ -0,0 +1,47 @@
+package app.revanced.integrations.patches.theme;
+
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.PixelFormat;
+import android.graphics.drawable.Drawable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import app.revanced.integrations.patches.HideSeekbarPatch;
+import app.revanced.integrations.settings.SettingsEnum;
+
+/**
+ * Used by {@link SeekbarColorPatch} change the color of the seekbar.
+ * and {@link HideSeekbarPatch} to hide the seekbar of the feed and watch history.
+ */
+public class ProgressBarDrawable extends Drawable {
+
+    private final Paint paint = new Paint();
+
+    @Override
+    public void draw(@NonNull Canvas canvas) {
+        if (SettingsEnum.HIDE_SEEKBAR.getBoolean()) {
+            return;
+        }
+        paint.setColor(SeekbarColorPatch.getCustomSeekbarColor());
+        canvas.drawRect(getBounds(), paint);
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        paint.setAlpha(alpha);
+    }
+
+    @Override
+    public void setColorFilter(@Nullable ColorFilter colorFilter) {
+        paint.setColorFilter(colorFilter);
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.TRANSLUCENT;
+    }
+
+}