chore(release): 0.116.0-dev.3 [skip ci]

# [0.116.0-dev.3](https://github.com/ReVanced/revanced-integrations/compare/v0.116.0-dev.2...v0.116.0-dev.3) (2023-08-08)

### Bug Fixes

* **YouTube - Player Flyout Menu:** Change 'audio track flyout menu' to show up by default ([#458](https://github.com/ReVanced/revanced-integrations/issues/458)) ([97880ea](97880eaf72))

.github/workflows/release.yml

@@ -30,7 +30,6 @@ jobs:
             ${{ runner.home }}/.gradle/caches
             ${{ runner.home }}/.gradle/wrapper
             .gradle
-            build
             node_modules
           key: ${{ runner.os }}-gradle-npm-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'package-lock.json') }}
       - name: Setup Java
@@ -38,7 +37,7 @@ jobs:
       - name: Build with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew clean --no-daemon
+        run: ./gradlew build clean
       - name: Setup semantic-release
         run: npm install
       - name: Release

CHANGELOG.md

@@ -1,3 +1,193 @@
+# [0.116.0-dev.3](https://github.com/ReVanced/revanced-integrations/compare/v0.116.0-dev.2...v0.116.0-dev.3) (2023-08-08)
+
+
+### Bug Fixes
+
+* **YouTube - Player Flyout Menu:** Change 'audio track flyout menu' to show up by default ([#458](https://github.com/ReVanced/revanced-integrations/issues/458)) ([97880ea](https://github.com/ReVanced/revanced-integrations/commit/97880eaf72b0ae746ae3851d51e36039244b01c0))
+
+# [0.116.0-dev.2](https://github.com/ReVanced/revanced-integrations/compare/v0.116.0-dev.1...v0.116.0-dev.2) (2023-08-07)
+
+
+### Features
+
+* **YouTube - Hide video action buttons:** Hide individual action buttons ([#451](https://github.com/ReVanced/revanced-integrations/issues/451)) ([8e5ca65](https://github.com/ReVanced/revanced-integrations/commit/8e5ca65286b8b62eaeff3bce5fa1d2fb5a198703))
+
+# [0.116.0-dev.1](https://github.com/ReVanced/revanced-integrations/compare/v0.115.1...v0.116.0-dev.1) (2023-08-07)
+
+
+### Features
+
+* **YouTube - Debug:** Logging of layout proto buffer strings ([#456](https://github.com/ReVanced/revanced-integrations/issues/456)) ([769a200](https://github.com/ReVanced/revanced-integrations/commit/769a2006ce8dc934dd5de0acc59ed6aa6985da4f))
+
+## [0.115.1](https://github.com/ReVanced/revanced-integrations/compare/v0.115.0...v0.115.1) (2023-08-05)
+
+
+### Bug Fixes
+
+* **YouTube - Hide Shorts components:** Hide new type of shorts in feed ([#453](https://github.com/ReVanced/revanced-integrations/issues/453)) ([6959808](https://github.com/ReVanced/revanced-integrations/commit/6959808f0c24e638a33f671728f7a9668f2de2c2))
+
+## [0.115.1-dev.1](https://github.com/ReVanced/revanced-integrations/compare/v0.115.0...v0.115.1-dev.1) (2023-08-05)
+
+
+### Bug Fixes
+
+* **YouTube - Hide Shorts components:** Hide new type of shorts in feed ([#453](https://github.com/ReVanced/revanced-integrations/issues/453)) ([6959808](https://github.com/ReVanced/revanced-integrations/commit/6959808f0c24e638a33f671728f7a9668f2de2c2))
+
+# [0.115.0](https://github.com/ReVanced/revanced-integrations/compare/v0.114.0...v0.115.0) (2023-08-02)
+
+
+### Bug Fixes
+
+* **YouTube - SponsorBlock:** Fix skip highlight button showing when set to 'show in seekbar' ([ea7bc57](https://github.com/ReVanced/revanced-integrations/commit/ea7bc5737584ce967becd5b9e5d0d57f5d2fbc49))
+* **YouTube - Spoof App Version:** Remove 17.30.35 target ([e906c6d](https://github.com/ReVanced/revanced-integrations/commit/e906c6d3a2195c94c926f9903f1e4e66c3714e3e))
+* **YouTube:** fix potential litho filter thread race ([d3f523f](https://github.com/ReVanced/revanced-integrations/commit/d3f523f9dd5c3638cf9e2ba849b91e446daa99fa))
+
+
+### Features
+
+* **Tiktok - Feed filter:** Add more filters ([#445](https://github.com/ReVanced/revanced-integrations/issues/445)) ([c16c038](https://github.com/ReVanced/revanced-integrations/commit/c16c038396bde365ce1eec7b385eeb1f485efe99))
+* **YouTube - Hide layout components:** Hide `chips shelf` ([#448](https://github.com/ReVanced/revanced-integrations/issues/448)) ([c7d2a9b](https://github.com/ReVanced/revanced-integrations/commit/c7d2a9b3101439b241218c45d0c4b64012adab65))
+* **YouTube:** add `Player Flyout Menu` patch ([#416](https://github.com/ReVanced/revanced-integrations/issues/416)) ([b2085ae](https://github.com/ReVanced/revanced-integrations/commit/b2085aeebf4cfc21d69c0abfe545b382e2c82abe))
+
+
+### Performance Improvements
+
+* **YouTube:** Filter litho components using prefix tree ([#447](https://github.com/ReVanced/revanced-integrations/issues/447)) ([18f2900](https://github.com/ReVanced/revanced-integrations/commit/18f29004b8d570915a0228e292f1256785ac2cab))
+
+# [0.115.0-dev.7](https://github.com/ReVanced/revanced-integrations/compare/v0.115.0-dev.6...v0.115.0-dev.7) (2023-08-02)
+
+
+### Features
+
+* **Tiktok - Feed filter:** Add more filters ([#445](https://github.com/ReVanced/revanced-integrations/issues/445)) ([c16c038](https://github.com/ReVanced/revanced-integrations/commit/c16c038396bde365ce1eec7b385eeb1f485efe99))
+
+# [0.115.0-dev.6](https://github.com/ReVanced/revanced-integrations/compare/v0.115.0-dev.5...v0.115.0-dev.6) (2023-08-02)
+
+
+### Bug Fixes
+
+* **YouTube:** fix potential litho filter thread race ([d3f523f](https://github.com/ReVanced/revanced-integrations/commit/d3f523f9dd5c3638cf9e2ba849b91e446daa99fa))
+
+# [0.115.0-dev.5](https://github.com/ReVanced/revanced-integrations/compare/v0.115.0-dev.4...v0.115.0-dev.5) (2023-08-01)
+
+
+### Performance Improvements
+
+* **YouTube:** Filter litho components using prefix tree ([#447](https://github.com/ReVanced/revanced-integrations/issues/447)) ([18f2900](https://github.com/ReVanced/revanced-integrations/commit/18f29004b8d570915a0228e292f1256785ac2cab))
+
+# [0.115.0-dev.4](https://github.com/ReVanced/revanced-integrations/compare/v0.115.0-dev.3...v0.115.0-dev.4) (2023-07-30)
+
+
+### Features
+
+* **YouTube:** add `Player Flyout Menu` patch ([#416](https://github.com/ReVanced/revanced-integrations/issues/416)) ([b2085ae](https://github.com/ReVanced/revanced-integrations/commit/b2085aeebf4cfc21d69c0abfe545b382e2c82abe))
+
+# [0.115.0-dev.3](https://github.com/ReVanced/revanced-integrations/compare/v0.115.0-dev.2...v0.115.0-dev.3) (2023-07-27)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof App Version:** Remove 17.30.35 target ([e906c6d](https://github.com/ReVanced/revanced-integrations/commit/e906c6d3a2195c94c926f9903f1e4e66c3714e3e))
+
+# [0.115.0-dev.2](https://github.com/ReVanced/revanced-integrations/compare/v0.115.0-dev.1...v0.115.0-dev.2) (2023-07-26)
+
+
+### Bug Fixes
+
+* **YouTube - SponsorBlock:** Fix skip highlight button showing when set to 'show in seekbar' ([ea7bc57](https://github.com/ReVanced/revanced-integrations/commit/ea7bc5737584ce967becd5b9e5d0d57f5d2fbc49))
+
+# [0.115.0-dev.1](https://github.com/ReVanced/revanced-integrations/compare/v0.114.0...v0.115.0-dev.1) (2023-07-26)
+
+
+### Features
+
+* **YouTube - Hide layout components:** Hide `chips shelf` ([#448](https://github.com/ReVanced/revanced-integrations/issues/448)) ([c7d2a9b](https://github.com/ReVanced/revanced-integrations/commit/c7d2a9b3101439b241218c45d0c4b64012adab65))
+
+# [0.114.0](https://github.com/ReVanced/revanced-integrations/compare/v0.113.0...v0.114.0) (2023-07-21)
+
+
+### Bug Fixes
+
+* **Tiktok - Settings:** check for null when opening ads settings ([#443](https://github.com/ReVanced/revanced-integrations/issues/443)) ([8c61561](https://github.com/ReVanced/revanced-integrations/commit/8c61561d6375cfad3571cea98013b549ed6ecd6b))
+
+
+### Features
+
+* **youtube/theme:** add a switch to enable/disable custom seekbar color ([#442](https://github.com/ReVanced/revanced-integrations/issues/442)) ([2a784a4](https://github.com/ReVanced/revanced-integrations/commit/2a784a47d18da90ce23fcd527eef1f6e2d8e166d))
+
+# [0.114.0-dev.1](https://github.com/ReVanced/revanced-integrations/compare/v0.113.1-dev.1...v0.114.0-dev.1) (2023-07-20)
+
+
+### Features
+
+* **youtube/theme:** add a switch to enable/disable custom seekbar color ([#442](https://github.com/ReVanced/revanced-integrations/issues/442)) ([2a784a4](https://github.com/ReVanced/revanced-integrations/commit/2a784a47d18da90ce23fcd527eef1f6e2d8e166d))
+
+## [0.113.1-dev.1](https://github.com/ReVanced/revanced-integrations/compare/v0.113.0...v0.113.1-dev.1) (2023-07-20)
+
+
+### Bug Fixes
+
+* **Tiktok - Settings:** check for null when opening ads settings ([#443](https://github.com/ReVanced/revanced-integrations/issues/443)) ([8c61561](https://github.com/ReVanced/revanced-integrations/commit/8c61561d6375cfad3571cea98013b549ed6ecd6b))
+
+# [0.113.0](https://github.com/ReVanced/revanced-integrations/compare/v0.112.0...v0.113.0) (2023-07-20)
+
+
+### Bug Fixes
+
+* **Tiktok - Settings:** bump compatibility ([#440](https://github.com/ReVanced/revanced-integrations/issues/440)) ([821a32e](https://github.com/ReVanced/revanced-integrations/commit/821a32ee40d7795cabedc40f24356c1c1069ddec))
+* **YouTube - Hide Shorts Components:** hide sound button ([a2b1630](https://github.com/ReVanced/revanced-integrations/commit/a2b1630df8d330f3c0cbf77e9ea46b9d1c51adde))
+* **YouTube - Spoof client:** show video time and chapters while using seekbar ([#435](https://github.com/ReVanced/revanced-integrations/issues/435)) ([a0f831a](https://github.com/ReVanced/revanced-integrations/commit/a0f831ac3f3773a0b47a0fb532d0bf58f6aa96d7))
+* **youtube/return-youtube-dislike:** fix dislikes not showing in some situations ([#439](https://github.com/ReVanced/revanced-integrations/issues/439)) ([7a28c2f](https://github.com/ReVanced/revanced-integrations/commit/7a28c2fa13438947931b8c41ef73b128a32530eb))
+* **youtube/sponsorblock:** fix some segments skipping slightly too late ([#436](https://github.com/ReVanced/revanced-integrations/issues/436)) ([f694928](https://github.com/ReVanced/revanced-integrations/commit/f69492819e52e0fd99c4e10390fd39f26c3a9c48))
+
+
+### Features
+
+* **YouTube - Hide ads:** hide new type of buttoned ad ([9f21c72](https://github.com/ReVanced/revanced-integrations/commit/9f21c7268e5a08f542f5b090316486aadf4a5acd))
+* **youtube:** rename `video-speed` to `playback-speed` ([#438](https://github.com/ReVanced/revanced-integrations/issues/438)) ([630776f](https://github.com/ReVanced/revanced-integrations/commit/630776fd3514435dd83ef1c765a4f5b007e8e2f2))
+
+# [0.113.0-dev.5](https://github.com/ReVanced/revanced-integrations/compare/v0.113.0-dev.4...v0.113.0-dev.5) (2023-07-19)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof client:** show video time and chapters while using seekbar ([#435](https://github.com/ReVanced/revanced-integrations/issues/435)) ([a0f831a](https://github.com/ReVanced/revanced-integrations/commit/a0f831ac3f3773a0b47a0fb532d0bf58f6aa96d7))
+
+# [0.113.0-dev.4](https://github.com/ReVanced/revanced-integrations/compare/v0.113.0-dev.3...v0.113.0-dev.4) (2023-07-19)
+
+
+### Bug Fixes
+
+* **Tiktok - Settings:** bump compatibility ([#440](https://github.com/ReVanced/revanced-integrations/issues/440)) ([821a32e](https://github.com/ReVanced/revanced-integrations/commit/821a32ee40d7795cabedc40f24356c1c1069ddec))
+
+# [0.113.0-dev.3](https://github.com/ReVanced/revanced-integrations/compare/v0.113.0-dev.2...v0.113.0-dev.3) (2023-07-16)
+
+
+### Bug Fixes
+
+* **youtube/return-youtube-dislike:** fix dislikes not showing in some situations ([#439](https://github.com/ReVanced/revanced-integrations/issues/439)) ([7a28c2f](https://github.com/ReVanced/revanced-integrations/commit/7a28c2fa13438947931b8c41ef73b128a32530eb))
+
+# [0.113.0-dev.2](https://github.com/ReVanced/revanced-integrations/compare/v0.113.0-dev.1...v0.113.0-dev.2) (2023-07-16)
+
+
+### Features
+
+* **YouTube - Hide ads:** hide new type of buttoned ad ([9f21c72](https://github.com/ReVanced/revanced-integrations/commit/9f21c7268e5a08f542f5b090316486aadf4a5acd))
+
+# [0.113.0-dev.1](https://github.com/revanced/revanced-integrations/compare/v0.112.1-dev.2...v0.113.0-dev.1) (2023-07-15)
+
+
+### Features
+
+* **youtube:** rename `video-speed` to `playback-speed` ([#438](https://github.com/revanced/revanced-integrations/issues/438)) ([630776f](https://github.com/revanced/revanced-integrations/commit/630776fd3514435dd83ef1c765a4f5b007e8e2f2))
+
+## [0.112.1-dev.2](https://github.com/revanced/revanced-integrations/compare/v0.112.1-dev.1...v0.112.1-dev.2) (2023-07-15)
+
+
+### Bug Fixes
+
+* **YouTube - Hide Shorts Components:** hide sound button ([a2b1630](https://github.com/revanced/revanced-integrations/commit/a2b1630df8d330f3c0cbf77e9ea46b9d1c51adde))
+
 ## [0.112.1-dev.1](https://github.com/revanced/revanced-integrations/compare/v0.112.0...v0.112.1-dev.1) (2023-07-14)
 
 

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

@@ -1,9 +0,0 @@
-package app.revanced.integrations.patches;
-
-import app.revanced.integrations.settings.SettingsEnum;
-
-public class HideWatchInVRPatch {
-    public static boolean hideWatchInVR() {
-        return SettingsEnum.HIDE_WATCH_IN_VR.getBoolean();
-    }
-}

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

@@ -202,7 +202,13 @@ public class ReturnYouTubeDislikePatch {
      */
     public static boolean setShortsDislikes(@NonNull View likeDislikeView) {
         try {
-            if (!SettingsEnum.RYD_ENABLED.getBoolean() || !SettingsEnum.RYD_SHORTS.getBoolean()) {
+            if (!SettingsEnum.RYD_ENABLED.getBoolean()) {
+                return false;
+            }
+            if (!SettingsEnum.RYD_SHORTS.getBoolean()) {
+                // Must clear the data here, in case a new video was loaded while PlayerType
+                // suggested the video was not a short (can happen when spoofing to an old app version).
+                ReturnYouTubeDislike.setCurrentVideoId(null);
                 return false;
             }
             LogHelper.printDebug(() -> "setShortsDislikes");
@@ -302,7 +308,7 @@ public class ReturnYouTubeDislikePatch {
             if (!videoId.equals(currentVideoId)) {
                 currentVideoId = videoId;
 
-                final boolean noneHiddenOrMinimized = PlayerType.getCurrent().isNoneHiddenOrMinimized();
+                final boolean noneHiddenOrMinimized = PlayerType.getCurrent().isNoneOrHidden();
                 if (noneHiddenOrMinimized && !SettingsEnum.RYD_SHORTS.getBoolean()) {
                     ReturnYouTubeDislike.setCurrentVideoId(null);
                     return;

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

@@ -2,6 +2,10 @@ package app.revanced.integrations.patches;
 
 import static app.revanced.integrations.utils.ReVancedUtils.containsAny;
 
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
 import app.revanced.integrations.settings.SettingsEnum;
 import app.revanced.integrations.shared.PlayerType;
 import app.revanced.integrations.utils.LogHelper;
@@ -67,4 +71,25 @@ public class SpoofSignatureVerificationPatch {
         return originalValue;
     }
 
+    /**
+     * Injection point.
+     */
+    public static boolean getSeekbarThumbnailOverrideValue() {
+        return SettingsEnum.SPOOF_SIGNATURE_VERIFICATION.getBoolean();
+    }
+
+    /**
+     * Injection point.
+     *
+     * @param view seekbar thumbnail view.  Includes both shorts and regular videos.
+     */
+    public static void seekbarImageViewCreated(ImageView view) {
+        if (SettingsEnum.SPOOF_SIGNATURE_VERIFICATION.getBoolean()) {
+            view.setVisibility(View.GONE);
+            // Also hide the border around the thumbnail (otherwise a 1 pixel wide bordered frame is visible).
+            ViewGroup parentLayout = (ViewGroup) view.getParent();
+            parentLayout.setPadding(0, 0, 0, 0);
+        }
+    }
+
 }

app/src/main/java/app/revanced/integrations/patches/components/AdsFilter.java

@@ -2,27 +2,32 @@ package app.revanced.integrations.patches.components;
 
 
 import android.view.View;
+
+import androidx.annotation.Nullable;
+
 import app.revanced.integrations.settings.SettingsEnum;
 import app.revanced.integrations.utils.ReVancedUtils;
+import app.revanced.integrations.utils.StringTrieSearch;
 
 
 public final class AdsFilter extends Filter {
-    private final String[] exceptions;
+    private final StringTrieSearch exceptions = new StringTrieSearch();
 
     public AdsFilter() {
-        exceptions = new String[]{
+        exceptions.addPatterns(
                 "home_video_with_context", // Don't filter anything in the home page video component.
                 "related_video_with_context", // Don't filter anything in the related video component.
                 "comment_thread", // Don't filter anything in the comments.
                 "|comment.", // Don't filter anything in the comments replies.
-                "library_recent_shelf",
-        };
+                "library_recent_shelf"
+        );
 
         final var buttonedAd = new StringFilterGroup(
                 SettingsEnum.HIDE_BUTTONED_ADS,
                 "_buttoned_layout",
                 "full_width_square_image_layout",
                 "_ad_with",
+                "text_image_button_group_layout",
                 "video_display_button_group_layout",
                 "landscape_image_wide_button_layout"
         );
@@ -94,11 +99,12 @@ public final class AdsFilter extends Filter {
     }
 
     @Override
-    public boolean isFiltered(final String path, final String identifier, final byte[] _protobufBufferArray) {
-        if (ReVancedUtils.containsAny(path, exceptions))
+    public boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+                              FilterGroupList matchedList, FilterGroup matchedGroup, int matchedIndex) {
+        if (exceptions.matches(path))
            return false;
 
-        return super.isFiltered(path, identifier, _protobufBufferArray);
+        return super.isFiltered(identifier, path, protobufBufferArray, matchedList, matchedGroup, matchedIndex);
     }
 
     /**

app/src/main/java/app/revanced/integrations/patches/components/ButtonsFilter.java

@@ -1,54 +1,113 @@
 package app.revanced.integrations.patches.components;
 
+import android.os.Build;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
 import app.revanced.integrations.settings.SettingsEnum;
 
+@RequiresApi(api = Build.VERSION_CODES.N)
 final class ButtonsFilter extends Filter {
+
+    private static final String VIDEO_ACTION_BAR_PATH = "video_action_bar.eml";
+
     private final StringFilterGroup actionBarRule;
+    private final StringFilterGroup bufferFilterPathRule;
+    private final ByteArrayFilterGroupList bufferButtonsGroupList = new ByteArrayFilterGroupList();
 
     public ButtonsFilter() {
         actionBarRule = new StringFilterGroup(
                 null,
-                "video_action_bar"
+                VIDEO_ACTION_BAR_PATH
         );
+        identifierFilterGroups.addAll(actionBarRule);
 
+
+        bufferFilterPathRule = new StringFilterGroup(
+                null,
+                "|CellType|CollectionType|CellType|ContainerType|button.eml|"
+        );
         pathFilterGroups.addAll(
                 new StringFilterGroup(
                         SettingsEnum.HIDE_LIKE_DISLIKE_BUTTON,
-                        "|like_button",
-                        "dislike_button"
+                        "|segmented_like_dislike_button"
                 ),
                 new StringFilterGroup(
                         SettingsEnum.HIDE_DOWNLOAD_BUTTON,
-                        "download_button"
+                        "|download_button.eml|"
                 ),
                 new StringFilterGroup(
                         SettingsEnum.HIDE_PLAYLIST_BUTTON,
-                        "save_to_playlist_button"
+                        "|save_to_playlist_button"
                 ),
                 new StringFilterGroup(
                         SettingsEnum.HIDE_CLIP_BUTTON,
                         "|clip_button.eml|"
                 ),
-                new StringFilterGroup(
-                        SettingsEnum.HIDE_ACTION_BUTTONS,
-                        "ContainerType|video_action_button",
-                        "|CellType|CollectionType|CellType|ContainerType|button.eml|"
+                bufferFilterPathRule
+        );
+
+        bufferButtonsGroupList.addAll(
+                new ByteArrayAsStringFilterGroup(
+                        SettingsEnum.HIDE_LIVE_CHAT_BUTTON,
+                        "yt_outline_message_bubble_overlap"
+                ),
+                new ByteArrayAsStringFilterGroup(
+                        SettingsEnum.HIDE_REPORT_BUTTON,
+                        "yt_outline_flag"
+                ),
+                new ByteArrayAsStringFilterGroup(
+                        SettingsEnum.HIDE_SHARE_BUTTON,
+                        "yt_outline_share"
+                ),
+                new ByteArrayAsStringFilterGroup(
+                        SettingsEnum.HIDE_REMIX_BUTTON,
+                        "yt_outline_youtube_shorts_plus"
+                ),
+                // Check for clip button both here and using a path filter,
+                // as there's a chance the path is a generic action button and won't contain 'clip_button'
+                new ByteArrayAsStringFilterGroup(
+                        SettingsEnum.HIDE_CLIP_BUTTON,
+                        "yt_outline_scissors"
+                ),
+                new ByteArrayAsStringFilterGroup(
+                        SettingsEnum.HIDE_SHOP_BUTTON,
+                        "yt_outline_bag"
+                ),
+                new ByteArrayAsStringFilterGroup(
+                        SettingsEnum.HIDE_THANKS_BUTTON,
+                        "yt_outline_dollar_sign_heart"
                 )
         );
     }
 
     private boolean isEveryFilterGroupEnabled() {
-        for (StringFilterGroup rule : pathFilterGroups)
+        for (FilterGroup rule : pathFilterGroups)
+            if (!rule.isEnabled()) return false;
+
+        for (FilterGroup rule : bufferButtonsGroupList)
             if (!rule.isEnabled()) return false;
 
         return true;
     }
 
     @Override
-    public boolean isFiltered(final String path, final String identifier, final byte[] _protobufBufferArray) {
-        if (isEveryFilterGroupEnabled())
-            if (actionBarRule.check(identifier).isFiltered()) return true;
+    public boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+                              FilterGroupList matchedList, FilterGroup matchedGroup, int matchedIndex) {
+        if (matchedGroup == actionBarRule) {
+            if (!isEveryFilterGroupEnabled()) {
+                return false;
+            }
+        } else if (matchedGroup == bufferFilterPathRule) {
+            if (!path.startsWith(VIDEO_ACTION_BAR_PATH)) {
+                return false; // Some other unknown button and not part of the player action buttons.
+            }
+            if (!bufferButtonsGroupList.check(protobufBufferArray).isFiltered()) {
+                return false; // Action button is not set to hide.
+            }
+        }
 
-        return super.isFiltered(path, identifier, _protobufBufferArray);
+        return super.isFiltered(identifier, path, protobufBufferArray, matchedList, matchedGroup, matchedIndex);
     }
 }

app/src/main/java/app/revanced/integrations/patches/components/LayoutComponentsFilter.java

@@ -2,15 +2,16 @@ package app.revanced.integrations.patches.components;
 
 
 import android.os.Build;
-import androidx.annotation.RequiresApi;
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.ReVancedUtils;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.StringTrieSearch;
 
 @RequiresApi(api = Build.VERSION_CODES.N)
 public final class LayoutComponentsFilter extends Filter {
-    private final String[] exceptions;
-
+    private final StringTrieSearch exceptions = new StringTrieSearch();
     private final CustomFilterGroup custom;
 
     private static final ByteArrayAsStringFilterGroup mixPlaylists = new ByteArrayAsStringFilterGroup(
@@ -20,13 +21,13 @@ public final class LayoutComponentsFilter extends Filter {
 
     @RequiresApi(api = Build.VERSION_CODES.N)
     public LayoutComponentsFilter() {
-        exceptions = new String[]{
+        exceptions.addPatterns(
                 "home_video_with_context",
                 "related_video_with_context",
                 "comment_thread", // skip filtering anything in the comments
                 "|comment.", // skip filtering anything in the comments replies
-                "library_recent_shelf",
-        };
+                "library_recent_shelf"
+        );
 
         custom = new CustomFilterGroup(
                 SettingsEnum.CUSTOM_FILTER,
@@ -136,6 +137,11 @@ public final class LayoutComponentsFilter extends Filter {
                 "cell_divider" // layout residue (gray line above the buttoned ad),
         );
 
+        final var chipsShelf = new StringFilterGroup(
+                SettingsEnum.HIDE_CHIPS_SHELF,
+                "chips_shelf"
+        );
+
         this.pathFilterGroups.addAll(
                 channelBar,
                 communityPosts,
@@ -155,26 +161,32 @@ public final class LayoutComponentsFilter extends Filter {
                 artistCard,
                 imageShelf,
                 subscribersCommunityGuidelines,
-                channelMemberShelf
+                channelMemberShelf,
+                custom
         );
 
-        this.identifierFilterGroups.addAll(graySeparator);
+        this.identifierFilterGroups.addAll(
+                graySeparator,
+                chipsShelf
+        );
     }
 
     @Override
-    public boolean isFiltered(final String path, final String identifier, final byte[] _protobufBufferArray) {
-        if (custom.isEnabled() && custom.check(path).isFiltered())
-            return true;
-
-        if (ReVancedUtils.containsAny(path, exceptions))
+    public boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+                              FilterGroupList matchedList, FilterGroup matchedGroup, int matchedIndex) {
+        if (matchedGroup != custom && exceptions.matches(path))
             return false; // Exceptions are not filtered.
 
-        return super.isFiltered(path, identifier, _protobufBufferArray);
+        return super.isFiltered(identifier, path, protobufBufferArray, matchedList, matchedGroup, matchedIndex);
     }
 
 
-    // Called from a different place then the other filters.
+    /**
+     * Injection point.
+     *
+     * Called from a different place then the other filters.
+     */
     public static boolean filterMixPlaylists(final byte[] bytes) {
-        return mixPlaylists.isEnabled() && mixPlaylists.check(bytes).isFiltered();
+        return mixPlaylists.check(bytes).isFiltered();
     }
 }

app/src/main/java/app/revanced/integrations/patches/components/PlaybackSpeedMenuFilterPatch.java

@@ -0,0 +1,24 @@
+package app.revanced.integrations.patches.components;
+
+import androidx.annotation.Nullable;
+
+// Abuse LithoFilter for CustomPlaybackSpeedPatch.
+public final class PlaybackSpeedMenuFilterPatch extends Filter {
+    // Must be volatile or synchronized, as litho filtering runs off main thread and this field is then access from the main thread.
+    public static volatile boolean isPlaybackSpeedMenuVisible;
+
+    public PlaybackSpeedMenuFilterPatch() {
+        pathFilterGroups.addAll(new StringFilterGroup(
+                null,
+                "playback_speed_sheet_content.eml-js"
+        ));
+    }
+
+    @Override
+    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+                       FilterGroupList matchedList, FilterGroup matchedGroup, int matchedIndex) {
+        isPlaybackSpeedMenuVisible = true;
+
+        return false;
+    }
+}

app/src/main/java/app/revanced/integrations/patches/components/PlayerFlyoutMenuItemsFilter.java

@@ -0,0 +1,74 @@
+package app.revanced.integrations.patches.components;
+
+import android.os.Build;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public class PlayerFlyoutMenuItemsFilter extends Filter {
+
+    // Search the buffer only if the flyout menu identifier is found.
+    // Handle the searching in this class instead of adding to the global filter group (which searches all the time)
+    private final ByteArrayFilterGroupList flyoutFilterGroupList = new ByteArrayFilterGroupList();
+
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    public PlayerFlyoutMenuItemsFilter() {
+        identifierFilterGroups.addAll(new StringFilterGroup(null, "overflow_menu_item.eml|"));
+
+        flyoutFilterGroupList.addAll(
+                new ByteArrayAsStringFilterGroup(
+                        SettingsEnum.HIDE_QUALITY_MENU,
+                        "yt_outline_gear"
+                ),
+                new ByteArrayAsStringFilterGroup(
+                        SettingsEnum.HIDE_CAPTIONS_MENU,
+                        "closed_caption"
+                ),
+                new ByteArrayAsStringFilterGroup(
+                        SettingsEnum.HIDE_LOOP_VIDEO_MENU,
+                        "yt_outline_arrow_repeat_1_"
+                ),
+                new ByteArrayAsStringFilterGroup(
+                        SettingsEnum.HIDE_AMBIENT_MODE_MENU,
+                        "yt_outline_screen_light"
+                ),
+                new ByteArrayAsStringFilterGroup(
+                        SettingsEnum.HIDE_REPORT_MENU,
+                        "yt_outline_flag"
+                ),
+                new ByteArrayAsStringFilterGroup(
+                        SettingsEnum.HIDE_HELP_MENU,
+                        "yt_outline_question_circle"
+                ),
+                new ByteArrayAsStringFilterGroup(
+                        SettingsEnum.HIDE_MORE_INFO_MENU,
+                        "yt_outline_info_circle"
+                ),
+                new ByteArrayAsStringFilterGroup(
+                        SettingsEnum.HIDE_SPEED_MENU,
+                        "yt_outline_play_arrow_half_circle"
+                ),
+                new ByteArrayAsStringFilterGroup(
+                        SettingsEnum.HIDE_AUDIO_TRACK_MENU,
+                        "yt_outline_person_radar"
+                ),
+                new ByteArrayAsStringFilterGroup(
+                        SettingsEnum.HIDE_WATCH_IN_VR_MENU,
+                        "yt_outline_vr"
+                )
+        );
+    }
+
+    @Override
+    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+                       FilterGroupList matchedList, FilterGroup matchedGroup, int matchedIndex) {
+        // Only 1 group is added to the parent class, so the matched group must be the overflow menu.
+        if (matchedIndex == 0 && flyoutFilterGroupList.check(protobufBufferArray).isFiltered()) {
+            // Super class handles logging.
+            return super.isFiltered(identifier, path, protobufBufferArray, matchedList, matchedGroup, matchedIndex);
+        }
+        return false;
+    }
+}

app/src/main/java/app/revanced/integrations/patches/components/ShortsFilter.java

@@ -3,30 +3,37 @@ package app.revanced.integrations.patches.components;
 import static app.revanced.integrations.utils.ReVancedUtils.hideViewBy1dpUnderCondition;
 import static app.revanced.integrations.utils.ReVancedUtils.hideViewUnderCondition;
 
-import android.annotation.SuppressLint;
-import android.os.Build;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.google.android.libraries.youtube.rendering.ui.pivotbar.PivotBar;
 
 import app.revanced.integrations.settings.SettingsEnum;
 
 public final class ShortsFilter extends Filter {
-    public static PivotBar pivotBar;
-    @SuppressLint("StaticFieldLeak")
+    private static final String REEL_CHANNEL_BAR_PATH = "reel_channel_bar";
+    public static PivotBar pivotBar; // Set by patch.
 
-    private final StringFilterGroup reelChannelBar = new StringFilterGroup(
-            null,
-            "reel_channel_bar"
-    );
-
-    private final StringFilterGroup infoPanel = new StringFilterGroup(
-            SettingsEnum.HIDE_SHORTS_INFO_PANEL,
-            "shorts_info_panel_overview"
-    );
+    private final StringFilterGroup channelBar;
+    private final StringFilterGroup soundButton;
+    private final StringFilterGroup infoPanel;
 
     public ShortsFilter() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) return;
+        channelBar = new StringFilterGroup(
+                SettingsEnum.HIDE_SHORTS_CHANNEL_BAR,
+                REEL_CHANNEL_BAR_PATH
+        );
+
+        soundButton = new StringFilterGroup(
+                SettingsEnum.HIDE_SHORTS_SOUND_BUTTON,
+                "reel_pivot_button"
+        );
+
+        infoPanel = new StringFilterGroup(
+                SettingsEnum.HIDE_SHORTS_INFO_PANEL,
+                "shorts_info_panel_overview"
+        );
 
         final var thanksButton = new StringFilterGroup(
                 SettingsEnum.HIDE_SHORTS_THANKS_BUTTON,
@@ -43,39 +50,30 @@ public final class ShortsFilter extends Filter {
                 "sponsor_button"
         );
 
-        final var soundButton = new StringFilterGroup(
-                SettingsEnum.HIDE_SHORTS_SOUND_BUTTON,
-                "reel_pivot_button"
-        );
-
-        final var channelBar = new StringFilterGroup(
-                SettingsEnum.HIDE_SHORTS_CHANNEL_BAR,
-                "reel_channel_bar"
-        );
-
         final var shorts = new StringFilterGroup(
                 SettingsEnum.HIDE_SHORTS,
                 "shorts_shelf",
                 "inline_shorts",
                 "shorts_grid",
-                "shorts_video_cell"
+                "shorts_video_cell",
+                "shorts_pivot_item"
         );
 
-        this.pathFilterGroups.addAll(joinButton, subscribeButton, soundButton, channelBar);
-        this.identifierFilterGroups.addAll(shorts, thanksButton);
+        pathFilterGroups.addAll(joinButton, subscribeButton, channelBar, soundButton, infoPanel);
+        identifierFilterGroups.addAll(shorts, thanksButton);
     }
 
     @Override
-    boolean isFiltered(final String path, final String identifier,
-                       final byte[] protobufBufferArray) {
+    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+                       FilterGroupList matchedList, FilterGroup matchedGroup, int matchedIndex) {
+        if (matchedGroup == soundButton || matchedGroup == infoPanel || matchedGroup == channelBar) return true;
+
         // Filter the path only when reelChannelBar is visible.
-        if (reelChannelBar.check(path).isFiltered())
-            if (this.pathFilterGroups.contains(path)) return true;
+        if (pathFilterGroups == matchedList) {
+            return path.contains(REEL_CHANNEL_BAR_PATH);
+        }
 
-        // Shorts info panel path appears outside of reelChannelBar path.
-        if (infoPanel.isEnabled() && infoPanel.check(path).isFiltered()) return true;
-
-        return this.identifierFilterGroups.contains(identifier);
+        return identifierFilterGroups == matchedList;
     }
 
     public static void hideShortsShelf(final View shortsShelfView) {

app/src/main/java/app/revanced/integrations/patches/components/VideoQualityMenuFilterPatch.java

@@ -1,5 +1,7 @@
 package app.revanced.integrations.patches.components;
 
+import androidx.annotation.Nullable;
+
 import app.revanced.integrations.settings.SettingsEnum;
 
 // Abuse LithoFilter for OldVideoQualityMenuPatch.
@@ -15,8 +17,9 @@ public final class VideoQualityMenuFilterPatch extends Filter {
     }
 
     @Override
-    boolean isFiltered(final String path, final String identifier, final byte[] protobufBufferArray) {
-        isVideoQualityMenuVisible = super.isFiltered(path, identifier, protobufBufferArray);
+    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+                       FilterGroupList matchedList, FilterGroup matchedGroup, int matchedIndex) {
+        isVideoQualityMenuVisible = true;
 
         return false;
     }

app/src/main/java/app/revanced/integrations/patches/components/VideoSpeedMenuFilterPatch.java

@@ -1,21 +0,0 @@
-package app.revanced.integrations.patches.components;
-
-// Abuse LithoFilter for CustomVideoSpeedPatch.
-public final class VideoSpeedMenuFilterPatch extends Filter {
-    // Must be volatile or synchronized, as litho filtering runs off main thread and this field is then access from the main thread.
-    public static volatile boolean isVideoSpeedMenuVisible;
-
-    public VideoSpeedMenuFilterPatch() {
-        pathFilterGroups.addAll(new StringFilterGroup(
-                null,
-                "playback_speed_sheet_content.eml-js"
-        ));
-    }
-
-    @Override
-    boolean isFiltered(final String path, final String identifier, final byte[] protobufBufferArray) {
-        isVideoSpeedMenuVisible = super.isFiltered(path, identifier, protobufBufferArray);
-
-        return false;
-    }
-}

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

@@ -26,7 +26,8 @@ public final class OldVideoQualityMenuPatch {
         // The quality menu is a RecyclerView with 3 children. The third child is the "Advanced" quality menu.
         addRecyclerListener(linearLayout, 3, 2, recyclerView -> {
             // Check if the current view is the quality menu.
-            if (VideoQualityMenuFilterPatch.isVideoQualityMenuVisible) {// Hide the video quality menu.
+            if (VideoQualityMenuFilterPatch.isVideoQualityMenuVisible) {
+                VideoQualityMenuFilterPatch.isVideoQualityMenuVisible = false;
                 linearLayout.setVisibility(View.GONE);
 
                 // Click the "Advanced" quality menu to show the "old" quality menu.

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

@@ -1,24 +1,21 @@
 package app.revanced.integrations.patches.playback.speed;
 
-import static app.revanced.integrations.patches.playback.quality.OldVideoQualityMenuPatch.addRecyclerListener;
-
 import android.preference.ListPreference;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
-
 import androidx.annotation.NonNull;
-
+import app.revanced.integrations.patches.components.PlaybackSpeedMenuFilterPatch;
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.LogHelper;
+import app.revanced.integrations.utils.ReVancedUtils;
 import com.facebook.litho.ComponentHost;
 
 import java.util.Arrays;
 
-import app.revanced.integrations.patches.components.VideoSpeedMenuFilterPatch;
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
-import app.revanced.integrations.utils.ReVancedUtils;
+import static app.revanced.integrations.patches.playback.quality.OldVideoQualityMenuPatch.addRecyclerListener;
 
-public class CustomVideoSpeedPatch {
+public class CustomPlaybackSpeedPatch {
     /**
      * Maximum playback speed, exclusive value.  Custom speeds must be less than this value.
      */
@@ -27,17 +24,17 @@ public class CustomVideoSpeedPatch {
     /**
      * Custom playback speeds.
      */
-    public static float[] customVideoSpeeds;
+    public static float[] customPlaybackSpeeds;
 
     /**
-     * Minimum value of {@link #customVideoSpeeds}
+     * Minimum value of {@link #customPlaybackSpeeds}
      */
-    public static float minVideoSpeed;
+    public static float minPlaybackSpeed;
 
     /**
-     * Maxium value of {@link #customVideoSpeeds}
+     * Maxium value of {@link #customPlaybackSpeeds}
      */
-    public static float maxVideoSpeed;
+    public static float maxPlaybackSpeed;
 
     /**
      * PreferenceList entries and values, of all available playback speeds.
@@ -60,10 +57,10 @@ public class CustomVideoSpeedPatch {
             if (speedStrings.length == 0) {
                 throw new IllegalArgumentException();
             }
-            customVideoSpeeds = new float[speedStrings.length];
+            customPlaybackSpeeds = 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)) {
+                if (speed <= 0 || arrayContains(customPlaybackSpeeds, speed)) {
                     throw new IllegalArgumentException();
                 }
                 if (speed >= MAXIMUM_PLAYBACK_SPEED) {
@@ -72,13 +69,13 @@ public class CustomVideoSpeedPatch {
                     loadCustomSpeeds();
                     return;
                 }
-                minVideoSpeed = Math.min(minVideoSpeed, speed);
-                maxVideoSpeed = Math.max(maxVideoSpeed, speed);
-                customVideoSpeeds[i] = speed;
+                minPlaybackSpeed = Math.min(minPlaybackSpeed, speed);
+                maxPlaybackSpeed = Math.max(maxPlaybackSpeed, speed);
+                customPlaybackSpeeds[i] = speed;
             }
         } catch (Exception ex) {
             LogHelper.printInfo(() -> "parse error", ex);
-            resetCustomSpeeds("Invalid custom video speeds. Using default values.");
+            resetCustomSpeeds("Invalid custom playback speeds. Using default values.");
             loadCustomSpeeds();
         }
     }
@@ -95,10 +92,10 @@ public class CustomVideoSpeedPatch {
      */
     public static void initializeListPreference(ListPreference preference) {
         if (preferenceListEntries == null) {
-            preferenceListEntries = new String[customVideoSpeeds.length];
-            preferenceListEntryValues = new String[customVideoSpeeds.length];
+            preferenceListEntries = new String[customPlaybackSpeeds.length];
+            preferenceListEntryValues = new String[customPlaybackSpeeds.length];
             int i = 0;
-            for (float speed : customVideoSpeeds) {
+            for (float speed : customPlaybackSpeeds) {
                 String speedString = String.valueOf(speed);
                 preferenceListEntries[i] = speedString + "x";
                 preferenceListEntryValues[i] = speedString;
@@ -110,28 +107,29 @@ public class CustomVideoSpeedPatch {
     }
 
     /*
-     * To reduce copy paste between two similar code paths.
+     * To reduce copy and paste between two similar code paths.
      */
     public static void onFlyoutMenuCreate(final LinearLayout linearLayout) {
         // The playback rate menu is a RecyclerView with 2 children. The third child is the "Advanced" quality menu.
         addRecyclerListener(linearLayout, 2, 1, recyclerView -> {
-            if (VideoSpeedMenuFilterPatch.isVideoSpeedMenuVisible &&
-                    recyclerView.getChildCount() == 1 &&
-                    recyclerView.getChildAt(0) instanceof ComponentHost
-            ) {
-                linearLayout.setVisibility(View.GONE);
+            if (PlaybackSpeedMenuFilterPatch.isPlaybackSpeedMenuVisible) {
+                PlaybackSpeedMenuFilterPatch.isPlaybackSpeedMenuVisible = false;
 
-                // Close the new video speed menu and instead show the old one.
-                showOldVideoSpeedMenu();
+                if (recyclerView.getChildCount() == 1 && recyclerView.getChildAt(0) instanceof ComponentHost) {
+                    linearLayout.setVisibility(View.GONE);
 
-                // DismissView [R.id.touch_outside] is the 1st ChildView of the 3rd ParentView.
-                ((ViewGroup) linearLayout.getParent().getParent().getParent())
-                        .getChildAt(0).performClick();
+                    // Close the new Playback speed menu and instead show the old one.
+                    showOldPlaybackSpeedMenu();
+
+                    // DismissView [R.id.touch_outside] is the 1st ChildView of the 3rd ParentView.
+                    ((ViewGroup) linearLayout.getParent().getParent().getParent())
+                            .getChildAt(0).performClick();
+                }
             }
         });
     }
 
-    public static void showOldVideoSpeedMenu() {
+    public static void showOldPlaybackSpeedMenu() {
         LogHelper.printDebug(() -> "Old video quality menu shown");
 
         // Rest of the implementation added by patch.

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

@@ -18,6 +18,7 @@ import app.revanced.integrations.settings.SettingsEnum;
  */
 public class ProgressBarDrawable extends Drawable {
 
+
     private final Paint paint = new Paint();
 
     @Override
@@ -25,7 +26,7 @@ public class ProgressBarDrawable extends Drawable {
         if (SettingsEnum.HIDE_SEEKBAR_THUMBNAIL.getBoolean()) {
             return;
         }
-        paint.setColor(SeekbarColorPatch.getCustomSeekbarColor());
+        paint.setColor(SeekbarColorPatch.getSeekbarColor());
         canvas.drawRect(getBounds(), paint);
     }
 

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

@@ -8,8 +8,10 @@ import app.revanced.integrations.utils.ReVancedUtils;
 
 public final class SeekbarColorPatch {
 
+    private static final boolean USE_SEEKBAR_CUSTOM_COLOR = SettingsEnum.SEEKBAR_CUSTOM_COLOR.getBoolean();
+
     /**
-     * Default color of seekbar.
+     * Default color of the seekbar.
      */
     private static final int ORIGINAL_SEEKBAR_COLOR = 0xFFFF0000;
 
@@ -19,9 +21,11 @@ public final class SeekbarColorPatch {
     private static final float ORIGINAL_SEEKBAR_COLOR_BRIGHTNESS;
 
     /**
-     * Color value of {@link SettingsEnum#SEEKBAR_COLOR}
+     * If {@link SettingsEnum#SEEKBAR_CUSTOM_COLOR} is enabled,
+     * this is the color value of {@link SettingsEnum#SEEKBAR_CUSTOM_COLOR_VALUE}.
+     * Otherwise this is {@link #ORIGINAL_SEEKBAR_COLOR}.
      */
-    private static int customSeekbarColor;
+    private static int seekbarColor = ORIGINAL_SEEKBAR_COLOR;
 
     /**
      * Custom seekbar hue, saturation, and brightness values.
@@ -33,22 +37,24 @@ public final class SeekbarColorPatch {
         Color.colorToHSV(ORIGINAL_SEEKBAR_COLOR, hsv);
         ORIGINAL_SEEKBAR_COLOR_BRIGHTNESS = hsv[2];
 
-        loadCustomSeekbarColorHSV();
-    }
-
-    private static void loadCustomSeekbarColorHSV() {
-        try {
-            customSeekbarColor = Color.parseColor(SettingsEnum.SEEKBAR_COLOR.getString());
-            Color.colorToHSV(customSeekbarColor, customSeekbarColorHSV);
-        } catch (Exception ex) {
-            ReVancedUtils.showToastShort("Invalid seekbar color value. Using default value.");
-            SettingsEnum.SEEKBAR_COLOR.saveValue(SettingsEnum.SEEKBAR_COLOR.defaultValue);
-            loadCustomSeekbarColorHSV();
+        if (USE_SEEKBAR_CUSTOM_COLOR) {
+            loadCustomSeekbarColor();
         }
     }
 
-    public static int getCustomSeekbarColor() {
-        return customSeekbarColor;
+    private static void loadCustomSeekbarColor() {
+        try {
+            seekbarColor = Color.parseColor(SettingsEnum.SEEKBAR_CUSTOM_COLOR_VALUE.getString());
+            Color.colorToHSV(seekbarColor, customSeekbarColorHSV);
+        } catch (Exception ex) {
+            ReVancedUtils.showToastShort("Invalid seekbar color value. Using default value.");
+            SettingsEnum.SEEKBAR_CUSTOM_COLOR_VALUE.saveValue(SettingsEnum.SEEKBAR_CUSTOM_COLOR_VALUE.defaultValue);
+            loadCustomSeekbarColor();
+        }
+    }
+
+    public static int getSeekbarColor() {
+        return seekbarColor;
     }
 
 
@@ -96,7 +102,7 @@ public final class SeekbarColorPatch {
      */
     private static int getSeekbarColorValue(int originalColor) {
         try {
-            if (customSeekbarColor == ORIGINAL_SEEKBAR_COLOR) {
+            if (!USE_SEEKBAR_CUSTOM_COLOR || originalColor == seekbarColor) {
                 return originalColor; // nothing to do
             }
             final int alphaDifference = Color.alpha(originalColor) - Color.alpha(ORIGINAL_SEEKBAR_COLOR);
@@ -111,7 +117,7 @@ public final class SeekbarColorPatch {
             hsv[1] = customSeekbarColorHSV[1];
             hsv[2] = clamp(customSeekbarColorHSV[2] + brightnessDifference, 0, 1);
 
-            final int replacementAlpha = clamp(Color.alpha(customSeekbarColor) + alphaDifference, 0, 255);
+            final int replacementAlpha = clamp(Color.alpha(seekbarColor) + alphaDifference, 0, 255);
             final int replacementColor = Color.HSVToColor(replacementAlpha, hsv);
             LogHelper.printDebug(() -> String.format("Original color: #%08X  replacement color: #%08X",
                             originalColor, replacementColor));

app/src/main/java/app/revanced/integrations/returnyoutubedislike/ReturnYouTubeDislike.java

@@ -255,7 +255,7 @@ public class ReturnYouTubeDislike {
             // If a Short is opened while a regular video is on screen, this will incorrectly set this as false.
             // But this check is needed to fix unusual situations of opening/closing the app
             // while both a regular video and a short are on screen.
-            dislikeDataIsShort = currentPlayerType.isNoneHiddenOrMinimized();
+            dislikeDataIsShort = currentPlayerType.isNoneOrHidden();
 
             RYDCachedFetch entry = futureCache.get(videoId);
             if (entry != null && entry.futureInProgressOrFinishedSuccessfully()) {
@@ -371,7 +371,7 @@ public class ReturnYouTubeDislike {
             // Must make a local copy of videoId, since it may change between now and when the vote thread runs.
             String videoIdToVoteFor = getCurrentVideoId();
             if (videoIdToVoteFor == null ||
-                    (SettingsEnum.RYD_SHORTS.getBoolean() && dislikeDataIsShort != PlayerType.getCurrent().isNoneHiddenOrMinimized())) {
+                    (SettingsEnum.RYD_SHORTS.getBoolean() && dislikeDataIsShort != PlayerType.getCurrent().isNoneOrHidden())) {
                 // User enabled RYD after starting playback of a video.
                 // Or shorts was loaded with regular video present, then shorts was closed,
                 // and then user voted on the now visible original video.

app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java

@@ -89,10 +89,15 @@ public enum SettingsEnum {
 
     // Action buttons
     HIDE_LIKE_DISLIKE_BUTTON("revanced_hide_like_dislike_button", BOOLEAN, FALSE),
+    HIDE_LIVE_CHAT_BUTTON("revanced_hide_live_chat_button", BOOLEAN, FALSE),
+    HIDE_SHARE_BUTTON("revanced_hide_share_button", BOOLEAN, FALSE),
+    HIDE_REPORT_BUTTON("revanced_hide_report_button", BOOLEAN, FALSE),
+    HIDE_REMIX_BUTTON("revanced_hide_remix_button", BOOLEAN, TRUE),
     HIDE_DOWNLOAD_BUTTON("revanced_hide_download_button", BOOLEAN, FALSE),
+    HIDE_THANKS_BUTTON("revanced_hide_thanks_button", BOOLEAN, TRUE),
+    HIDE_CLIP_BUTTON("revanced_hide_clip_button", BOOLEAN, TRUE),
     HIDE_PLAYLIST_BUTTON("revanced_hide_playlist_button", BOOLEAN, FALSE),
-    HIDE_CLIP_BUTTON("revanced_hide_clip_button", BOOLEAN, FALSE, "revanced_hide_clip_button_user_dialog_message"),
-    HIDE_ACTION_BUTTONS("revanced_hide_action_buttons", BOOLEAN, FALSE),
+    HIDE_SHOP_BUTTON("revanced_hide_shop_button", BOOLEAN, TRUE),
 
     // Layout
     DISABLE_RESUMING_SHORTS_PLAYER("revanced_disable_resuming_shorts_player", BOOLEAN, FALSE),
@@ -105,6 +110,7 @@ public enum SettingsEnum {
     HIDE_CAST_BUTTON("revanced_hide_cast_button", BOOLEAN, TRUE, true),
     HIDE_COMMENTS_SECTION("revanced_hide_comments_section", BOOLEAN, FALSE, true),
     HIDE_CREATE_BUTTON("revanced_hide_create_button", BOOLEAN, TRUE, true),
+    HIDE_CHIPS_SHELF("revanced_hide_chips_shelf", BOOLEAN, TRUE),
     HIDE_CROWDFUNDING_BOX("revanced_hide_crowdfunding_box", BOOLEAN, FALSE, true),
     HIDE_EMAIL_ADDRESS("revanced_hide_email_address", BOOLEAN, FALSE),
     HIDE_ENDSCREEN_CARDS("revanced_hide_endscreen_cards", BOOLEAN, TRUE),
@@ -116,21 +122,23 @@ public enum SettingsEnum {
     HIDE_PLAYER_BUTTONS("revanced_hide_player_buttons", BOOLEAN, FALSE),
     HIDE_PLAYER_OVERLAY("revanced_hide_player_overlay", BOOLEAN, FALSE, true),
     HIDE_PREVIEW_COMMENT("revanced_hide_preview_comment", BOOLEAN, FALSE, true),
-    HIDE_SEEKBAR("revanced_hide_seekbar", BOOLEAN, FALSE, true),
-    HIDE_SEEKBAR_THUMBNAIL("revanced_hide_seekbar_thumbnail", BOOLEAN, FALSE, true),
+    HIDE_SEEKBAR("revanced_hide_seekbar", BOOLEAN, FALSE),
+    HIDE_SEEKBAR_THUMBNAIL("revanced_hide_seekbar_thumbnail", BOOLEAN, FALSE),
     HIDE_HOME_BUTTON("revanced_hide_home_button", BOOLEAN, FALSE, true),
     HIDE_SHORTS_BUTTON("revanced_hide_shorts_button", BOOLEAN, TRUE, true),
     HIDE_SUBSCRIPTIONS_BUTTON("revanced_hide_subscriptions_button", BOOLEAN, FALSE, true),
     HIDE_TIMESTAMP("revanced_hide_timestamp", BOOLEAN, FALSE),
     HIDE_VIDEO_WATERMARK("revanced_hide_video_watermark", BOOLEAN, TRUE),
-    HIDE_WATCH_IN_VR("revanced_hide_watch_in_vr", BOOLEAN, FALSE, true),
     PLAYER_POPUP_PANELS("revanced_hide_player_popup_panels", BOOLEAN, FALSE),
     SWITCH_CREATE_WITH_NOTIFICATIONS_BUTTON("revanced_switch_create_with_notifications_button", BOOLEAN, TRUE, true),
     SPOOF_APP_VERSION("revanced_spoof_app_version", BOOLEAN, FALSE, true, "revanced_spoof_app_version_user_dialog_message"),
-    SPOOF_APP_VERSION_TARGET("revanced_spoof_app_version_target", STRING, "17.30.35", true, parents(SPOOF_APP_VERSION)),
+    SPOOF_APP_VERSION_TARGET("revanced_spoof_app_version_target", STRING, "17.08.35", true, parents(SPOOF_APP_VERSION)),
     USE_TABLET_MINIPLAYER("revanced_tablet_miniplayer", BOOLEAN, FALSE, true),
     WIDE_SEARCHBAR("revanced_wide_searchbar", BOOLEAN, FALSE, true),
-    SEEKBAR_COLOR("revanced_seekbar_color", STRING, "#FF0000", true),
+    @Deprecated
+    DEPRECATED_SEEKBAR_COLOR("revanced_seekbar_color", STRING, "#FF0000"), // TODO: delete this
+    SEEKBAR_CUSTOM_COLOR("revanced_seekbar_custom_color", BOOLEAN, TRUE, true),
+    SEEKBAR_CUSTOM_COLOR_VALUE("revanced_seekbar_custom_color_value", STRING, "#FF0000", true, parents(SEEKBAR_CUSTOM_COLOR)),
     HIDE_FILTER_BAR_FEED_IN_FEED("revanced_hide_filter_bar_feed_in_feed", BOOLEAN, FALSE, true),
     HIDE_FILTER_BAR_FEED_IN_SEARCH("revanced_hide_filter_bar_feed_in_search", BOOLEAN, FALSE, true),
     HIDE_FILTER_BAR_FEED_IN_RELATED_VIDEOS("revanced_hide_filter_bar_feed_in_related_videos", BOOLEAN, FALSE, true),
@@ -146,13 +154,26 @@ public enum SettingsEnum {
     HIDE_SHORTS_NAVIGATION_BAR("revanced_hide_shorts_navigation_bar", BOOLEAN, TRUE, true),
     HIDE_SHORTS("revanced_hide_shorts", BOOLEAN, FALSE, true),
 
+    //Player flyout menu items
+    HIDE_QUALITY_MENU("revanced_hide_player_flyout_quality", BOOLEAN, FALSE),
+    HIDE_CAPTIONS_MENU("revanced_hide_player_flyout_captions", BOOLEAN, FALSE),
+    HIDE_LOOP_VIDEO_MENU("revanced_hide_player_flyout_loop_video", BOOLEAN, FALSE),
+    HIDE_AMBIENT_MODE_MENU("revanced_hide_player_flyout_ambient_mode", BOOLEAN, FALSE),
+    HIDE_REPORT_MENU("revanced_hide_player_flyout_report", BOOLEAN, TRUE),
+    HIDE_HELP_MENU("revanced_hide_player_flyout_help", BOOLEAN, TRUE),
+    HIDE_SPEED_MENU("revanced_hide_player_flyout_speed", BOOLEAN, FALSE),
+    HIDE_MORE_INFO_MENU("revanced_hide_player_flyout_more_info", BOOLEAN, TRUE),
+    HIDE_AUDIO_TRACK_MENU("revanced_hide_player_flyout_audio_track", BOOLEAN, FALSE),
+    HIDE_WATCH_IN_VR_MENU("revanced_hide_player_flyout_watch_in_vr", BOOLEAN, TRUE),
+
     // Misc
     AUTO_CAPTIONS("revanced_auto_captions", BOOLEAN, FALSE),
     DISABLE_ZOOM_HAPTICS("revanced_disable_zoom_haptics", BOOLEAN, TRUE),
     EXTERNAL_BROWSER("revanced_external_browser", BOOLEAN, TRUE, true),
     AUTO_REPEAT("revanced_auto_repeat", BOOLEAN, FALSE),
     SEEKBAR_TAPPING("revanced_seekbar_tapping", BOOLEAN, TRUE),
-    SPOOF_SIGNATURE_VERIFICATION("revanced_spoof_signature_verification", BOOLEAN, TRUE, "revanced_spoof_signature_verification_user_dialog_message"),
+    SPOOF_SIGNATURE_VERIFICATION("revanced_spoof_signature_verification", BOOLEAN, TRUE, true,
+            "revanced_spoof_signature_verification_user_dialog_message"),
 
     // Swipe controls
     SWIPE_BRIGHTNESS("revanced_swipe_brightness", BOOLEAN, TRUE),
@@ -175,6 +196,7 @@ public enum SettingsEnum {
     // Debugging
     DEBUG("revanced_debug", BOOLEAN, FALSE),
     DEBUG_STACKTRACE("revanced_debug_stacktrace", BOOLEAN, FALSE, parents(DEBUG)),
+    DEBUG_PROTOBUFFER("revanced_debug_protobuffer", BOOLEAN, FALSE, parents(DEBUG)),
     DEBUG_TOAST_ON_ERROR("revanced_debug_toast_on_error", BOOLEAN, TRUE, "revanced_debug_toast_on_error_user_dialog_message"),
 
     // ReturnYoutubeDislike
@@ -358,6 +380,14 @@ public enum SettingsEnum {
         // TODO: delete DEPRECATED_SHOW_OLD_VIDEO_QUALITY_MENU (When? anytime).
         migrateOldSettingToNew(DEPRECATED_SHOW_OLD_VIDEO_QUALITY_MENU, SHOW_OLD_VIDEO_QUALITY_MENU);
 
+        // TODO: delete this seekbar color migration code
+        String oldSeekbarColorValue = DEPRECATED_SEEKBAR_COLOR.getString();
+        if (!oldSeekbarColorValue.equalsIgnoreCase((String) DEPRECATED_SEEKBAR_COLOR.defaultValue)) {
+            SEEKBAR_CUSTOM_COLOR_VALUE.saveValue(oldSeekbarColorValue);
+            SEEKBAR_CUSTOM_COLOR.saveValue(true);
+            DEPRECATED_SEEKBAR_COLOR.saveValue(DEPRECATED_SEEKBAR_COLOR.defaultValue);
+        }
+
         // endregion
     }
 

app/src/main/java/app/revanced/integrations/settingsmenu/ReVancedSettingsFragment.java

@@ -24,7 +24,7 @@ import androidx.annotation.Nullable;
 
 import com.google.android.apps.youtube.app.application.Shell_HomeActivity;
 
-import app.revanced.integrations.patches.playback.speed.CustomVideoSpeedPatch;
+import app.revanced.integrations.patches.playback.speed.CustomPlaybackSpeedPatch;
 import app.revanced.integrations.settings.SettingsEnum;
 import app.revanced.integrations.settings.SharedPrefCategory;
 import app.revanced.integrations.utils.LogHelper;
@@ -135,7 +135,7 @@ public class ReVancedSettingsFragment extends PreferenceFragment {
             // if the preference was included, then initialize it based on the available playback speed
             Preference defaultSpeedPreference = findPreference(SettingsEnum.PLAYBACK_SPEED_DEFAULT.path);
             if (defaultSpeedPreference instanceof ListPreference) {
-                CustomVideoSpeedPatch.initializeListPreference((ListPreference) defaultSpeedPreference);
+                CustomPlaybackSpeedPatch.initializeListPreference((ListPreference) defaultSpeedPreference);
             }
 
             // Set current value from SettingsEnum

app/src/main/java/app/revanced/integrations/shared/PlayerType.kt

@@ -18,7 +18,7 @@ enum class PlayerType {
     HIDDEN,
     /**
      * When spoofing to 16.x YouTube and watching a short with a regular video in the background,
-     * the type will be this (and not [HIDDEN]).
+     * the type can be this (and not [HIDDEN]).
      */
     WATCH_WHILE_MINIMIZED,
     WATCH_WHILE_MAXIMIZED,

app/src/main/java/app/revanced/integrations/sponsorblock/SegmentPlaybackController.java

@@ -50,7 +50,7 @@ public class SegmentPlaybackController {
     private static SponsorSegment[] segments;
 
     /**
-     * Highlight segment, if one exists.
+     * Highlight segment, if one exists and the skip behavior is not set to {@link CategoryBehaviour#SHOW_IN_SEEKBAR}.
      */
     @Nullable
     private static SponsorSegment highlightSegment;
@@ -112,10 +112,13 @@ public class SegmentPlaybackController {
         segments = videoSegments;
         calculateTimeWithoutSegments();
 
-        for (SponsorSegment segment : videoSegments) {
-            if (segment.category == SegmentCategory.HIGHLIGHT) {
-                highlightSegment = segment;
-                return;
+        if (SegmentCategory.HIGHLIGHT.behaviour == CategoryBehaviour.SKIP_AUTOMATICALLY
+                || SegmentCategory.HIGHLIGHT.behaviour == CategoryBehaviour.MANUAL_SKIP) {
+            for (SponsorSegment segment : videoSegments) {
+                if (segment.category == SegmentCategory.HIGHLIGHT) {
+                    highlightSegment = segment;
+                    return;
+                }
             }
         }
         highlightSegment = null;

app/src/main/java/app/revanced/integrations/utils/ByteTrieSearch.java

@@ -0,0 +1,38 @@
+package app.revanced.integrations.utils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.Objects;
+
+public final class ByteTrieSearch extends TrieSearch<byte[]> {
+
+    private static final class ByteTrieNode extends TrieNode<byte[]> {
+        TrieNode<byte[]> createNode() {
+            return new ByteTrieNode();
+        }
+        char getCharValue(byte[] text, int index) {
+            return (char) text[index];
+        }
+    }
+
+    public ByteTrieSearch() {
+        super(new ByteTrieNode());
+    }
+
+    @Override
+    public void addPattern(@NonNull byte[] pattern) {
+        super.addPattern(pattern, pattern.length, null);
+    }
+
+    @Override
+    public void addPattern(@NonNull byte[] pattern, @NonNull TriePatternMatchedCallback<byte[]> callback) {
+        super.addPattern(pattern, pattern.length, Objects.requireNonNull(callback));
+    }
+
+    @Override
+    public boolean matches(@NonNull byte[] textToSearch, @Nullable Object callbackParameter) {
+        return super.matches(textToSearch, textToSearch.length, callbackParameter);
+    }
+
+}

app/src/main/java/app/revanced/integrations/utils/StringTrieSearch.java

@@ -0,0 +1,40 @@
+package app.revanced.integrations.utils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.Objects;
+
+/**
+ * Text pattern searching using a prefix tree (trie).
+ */
+public final class StringTrieSearch extends TrieSearch<String> {
+
+    private static final class StringTrieNode extends TrieNode<String> {
+        TrieNode<String> createNode() {
+            return new StringTrieNode();
+        }
+        char getCharValue(String text, int index) {
+            return text.charAt(index);
+        }
+    }
+
+    public StringTrieSearch() {
+        super(new StringTrieNode());
+    }
+
+    @Override
+    public void addPattern(@NonNull String pattern) {
+        super.addPattern(pattern, pattern.length(), null);
+    }
+
+    @Override
+    public void addPattern(@NonNull String pattern, @NonNull TriePatternMatchedCallback<String> callback) {
+        super.addPattern(pattern, pattern.length(), Objects.requireNonNull(callback));
+    }
+
+    @Override
+    public boolean matches(@NonNull String textToSearch, @Nullable Object callbackParameter) {
+        return super.matches(textToSearch, textToSearch.length(), callbackParameter);
+    }
+}

app/src/main/java/app/revanced/tiktok/download/DownloadsPatch.java

@@ -4,10 +4,10 @@ import app.revanced.tiktok.settings.SettingsEnum;
 
 public class DownloadsPatch {
     public static String getDownloadPath() {
-        return SettingsEnum.TIK_DOWN_PATH.getString();
+        return SettingsEnum.DOWNLOAD_PATH.getString();
     }
 
     public static boolean shouldRemoveWatermark() {
-        return SettingsEnum.TIK_DOWN_WATERMARK.getBoolean();
+        return SettingsEnum.DOWNLOAD_WATERMARK.getBoolean();
     }
 }

app/src/main/java/app/revanced/tiktok/feedfilter/AdsFilter.java

@@ -0,0 +1,16 @@
+package app.revanced.tiktok.feedfilter;
+
+import app.revanced.tiktok.settings.SettingsEnum;
+import com.ss.android.ugc.aweme.feed.model.Aweme;
+
+public class AdsFilter implements IFilter {
+    @Override
+    public boolean getEnabled() {
+        return SettingsEnum.REMOVE_ADS.getBoolean();
+    }
+
+    @Override
+    public boolean getFiltered(Aweme item) {
+        return item.isAd() || item.isWithPromotionalMusic();
+    }
+}

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

@@ -6,33 +6,28 @@ import com.ss.android.ugc.aweme.feed.model.FeedItemList;
 import java.util.Iterator;
 import java.util.List;
 
-import app.revanced.tiktok.settings.SettingsEnum;
-
-public class FeedItemsFilter {
+public final class FeedItemsFilter {
+    private static final List<IFilter> FILTERS = List.of(
+            new AdsFilter(),
+            new LiveFilter(),
+            new StoryFilter(),
+            new ImageVideoFilter(),
+            new ViewCountFilter(),
+            new LikeCountFilter()
+    );
 
     public static void filter(FeedItemList feedItemList) {
-        if (SettingsEnum.TIK_REMOVE_ADS.getBoolean()) removeAds(feedItemList);
-        if (SettingsEnum.TIK_HIDE_LIVE.getBoolean()) removeLive(feedItemList);
-    }
+        Iterator<Aweme> feedItemListIterator = feedItemList.items.iterator();
+        while (feedItemListIterator.hasNext()) {
+            Aweme item = feedItemListIterator.next();
+            if (item == null) continue;
 
-    private static void removeAds(FeedItemList feedItemList) {
-        List<Aweme> items = feedItemList.items;
-        Iterator<Aweme> it = items.iterator();
-        while (it.hasNext()) {
-            Aweme item = it.next();
-            if (item != null && (item.isAd() || item.isWithPromotionalMusic())) {
-                it.remove();
-            }
-        }
-    }
-
-    private static void removeLive(FeedItemList feedItemList) {
-        List<Aweme> items = feedItemList.items;
-        Iterator<Aweme> it = items.iterator();
-        while (it.hasNext()) {
-            Aweme item = it.next();
-            if (item != null && (item.isLive() || item.isLiveReplay())) {
-                it.remove();
+            for (IFilter filter : FILTERS) {
+                boolean enabled = filter.getEnabled();
+                if (enabled && filter.getFiltered(item)) {
+                    feedItemListIterator.remove();
+                    break;
+                }
             }
         }
     }

app/src/main/java/app/revanced/tiktok/feedfilter/IFilter.java

@@ -0,0 +1,9 @@
+package app.revanced.tiktok.feedfilter;
+
+import com.ss.android.ugc.aweme.feed.model.Aweme;
+
+public interface IFilter {
+    boolean getEnabled();
+
+    boolean getFiltered(Aweme item);
+}

app/src/main/java/app/revanced/tiktok/feedfilter/ImageVideoFilter.java

@@ -0,0 +1,16 @@
+package app.revanced.tiktok.feedfilter;
+
+import app.revanced.tiktok.settings.SettingsEnum;
+import com.ss.android.ugc.aweme.feed.model.Aweme;
+
+public class ImageVideoFilter implements IFilter {
+    @Override
+    public boolean getEnabled() {
+        return SettingsEnum.HIDE_IMAGE.getBoolean();
+    }
+
+    @Override
+    public boolean getFiltered(Aweme item) {
+        return item.isImage() || item.isPhotoMode();
+    }
+}

app/src/main/java/app/revanced/tiktok/feedfilter/LikeCountFilter.java

@@ -0,0 +1,32 @@
+package app.revanced.tiktok.feedfilter;
+
+import app.revanced.tiktok.settings.SettingsEnum;
+import com.ss.android.ugc.aweme.feed.model.Aweme;
+import com.ss.android.ugc.aweme.feed.model.AwemeStatistics;
+
+import static app.revanced.tiktok.utils.ReVancedUtils.parseMinMax;
+
+public final class LikeCountFilter implements IFilter {
+    final long minLike;
+    final long maxLike;
+
+    LikeCountFilter() {
+        long[] minMax = parseMinMax(SettingsEnum.MIN_MAX_LIKES);
+        minLike = minMax[0];
+        maxLike = minMax[1];
+    }
+
+    @Override
+    public boolean getEnabled() {
+        return true;
+    }
+
+    @Override
+    public boolean getFiltered(Aweme item) {
+        AwemeStatistics statistics = item.getStatistics();
+        if (statistics == null) return false;
+
+        long likeCount = statistics.getDiggCount();
+        return likeCount < minLike || likeCount > maxLike;
+    }
+}