chore(release): 0.113.0-dev.4 [skip ci]

# [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](821a32ee40))

.gitattributes

@@ -0,0 +1,9 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# Linux start script should use lf
+/gradlew        text eol=lf
+
+# These are Windows script files and should use crlf
+*.bat           text eol=crlf
+

.github/workflows/release.yml

@@ -16,28 +16,32 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     steps:
-    - name: Cancel previous runs
-      uses: styfle/cancel-workflow-action@0.11.0
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        # Make sure the release step uses its own credentials:
-        # https://github.com/cycjimmy/semantic-release-action#private-packages
-        persist-credentials: false
-        fetch-depth: 0
-    - name: Set up JDK
-      uses: actions/setup-java@v3
-      with:
-        java-version: '17'
-        distribution: 'zulu'
-    - name: Setup Node.js
-      uses: actions/setup-node@v3
-      with:
-        node-version: "18"
-        cache: 'npm'
-    - name: Setup semantic-release
-      run: npm install
-    - name: Release
-      env:
-        GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
-      run: npm exec semantic-release
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          # Make sure the release step uses its own credentials:
+          # https://github.com/cycjimmy/semantic-release-action#private-packages
+          persist-credentials: false
+          fetch-depth: 0
+      - name: Cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ${{ 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
+        run: echo "JAVA_HOME=$JAVA_HOME_17_X64" >> $GITHUB_ENV
+      - name: Build with Gradle
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew clean --no-daemon
+      - name: Setup semantic-release
+        run: npm install
+      - name: Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
+        run: npm exec semantic-release

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/src/main/java/app/revanced/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch.java

@@ -0,0 +1,21 @@
+package app.revanced.all.screencapture.removerestriction;
+
+import android.media.AudioAttributes;
+import android.os.Build;
+
+import androidx.annotation.RequiresApi;
+
+public final class RemoveScreencaptureRestrictionPatch {
+    // Member of AudioAttributes.Builder
+    @RequiresApi(api = Build.VERSION_CODES.Q)
+    public static AudioAttributes.Builder setAllowedCapturePolicy(final AudioAttributes.Builder builder, final int capturePolicy) {
+        builder.setAllowedCapturePolicy(AudioAttributes.ALLOW_CAPTURE_BY_ALL);
+
+        return builder;
+    }
+
+    // Member of AudioManager static class
+    public static void setAllowedCapturePolicy(final int capturePolicy) {
+        // Ignore request
+    }
+}

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/ButtonsPatch.java

@@ -1,31 +0,0 @@
-package app.revanced.integrations.patches;
-
-import app.revanced.integrations.settings.SettingsEnum;
-
-final class ButtonsPatch extends Filter {
-    private final BlockRule actionBarRule;
-
-    public ButtonsPatch() {
-        actionBarRule = new BlockRule(null, "video_action_bar");
-        pathRegister.registerAll(
-                new BlockRule(SettingsEnum.HIDE_LIKE_DISLIKE_BUTTON, "|like_button", "dislike_button"),
-                new BlockRule(SettingsEnum.HIDE_DOWNLOAD_BUTTON, "download_button"),
-                new BlockRule(SettingsEnum.HIDE_PLAYLIST_BUTTON, "save_to_playlist_button"),
-                new BlockRule(SettingsEnum.HIDE_CLIP_BUTTON, "|clip_button.eml|"),
-                new BlockRule(SettingsEnum.HIDE_ACTION_BUTTONS, "ContainerType|video_action_button", "|CellType|CollectionType|CellType|ContainerType|button.eml|")
-        );
-    }
-
-    private boolean canHideActionBar() {
-        for (BlockRule rule : pathRegister) if (!rule.isEnabled()) return false;
-        return true;
-    }
-
-    @Override
-    public boolean filter(final String path, final String identifier) {
-        // If everything is hidden, then also hide the video bar itself.
-        if (canHideActionBar() && actionBarRule.check(identifier).isBlocked()) return true;
-
-        return pathRegister.contains(path);
-    }
-}

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

@@ -1,31 +0,0 @@
-package app.revanced.integrations.patches;
-
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
-
-final class CommentsPatch extends Filter {
-
-    public CommentsPatch() {
-        var comments = new BlockRule(SettingsEnum.HIDE_COMMENTS_SECTION, "video_metadata_carousel", "_comments");
-        var previewComment = new BlockRule(
-                SettingsEnum.HIDE_PREVIEW_COMMENT,
-                "|carousel_item",
-                "comments_entry_point_teaser",
-                "comments_entry_point_simplebox"
-        );
-
-        this.pathRegister.registerAll(
-                comments,
-                previewComment
-        );
-    }
-
-    @Override
-    boolean filter(String path, String _identifier) {
-        if (!pathRegister.contains(path)) return false;
-
-        LogHelper.printDebug(() -> "Blocked: " + path);
-
-        return true;
-    }
-}

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

@@ -2,22 +2,46 @@ package app.revanced.integrations.patches;
 
 import static app.revanced.integrations.utils.StringRef.str;
 
+import android.os.Build;
+
 import app.revanced.integrations.utils.LogHelper;
 import app.revanced.integrations.utils.ReVancedUtils;
 
 public class CopyVideoUrlPatch {
-    public static void copyUrl(Boolean withTimestamp) {
+
+    public static void copyUrl(boolean withTimestamp) {
         try {
-            String url = String.format("https://youtu.be/%s", VideoInformation.getVideoId());
-            if (withTimestamp) {
-                long seconds = VideoInformation.getVideoTime() / 1000;
-                url += String.format("?t=%s", seconds);
+            StringBuilder builder = new StringBuilder("https://youtu.be/");
+            builder.append(VideoInformation.getVideoId());
+            final long currentVideoTimeInSeconds = VideoInformation.getVideoTime() / 1000;
+            if (withTimestamp && currentVideoTimeInSeconds > 0) {
+                final long hour = currentVideoTimeInSeconds / (60 * 60);
+                final long minute = (currentVideoTimeInSeconds / 60) % 60;
+                final long second = currentVideoTimeInSeconds % 60;
+                builder.append("?t=");
+                if (hour > 0) {
+                    builder.append(hour).append("h");
+                }
+                if (minute > 0) {
+                    builder.append(minute).append("m");
+                }
+                if (second > 0) {
+                    builder.append(second).append("s");
+                }
             }
 
-            ReVancedUtils.setClipboard(url);
-            ReVancedUtils.showToastShort(str("share_copy_url_success"));
+            ReVancedUtils.setClipboard(builder.toString());
+            // Do not show a toast if using Android 13+ as it shows it's own toast.
+            // But if the user copied with a timestamp then show a toast.
+            // Unfortunately this will show 2 toasts on Android 13+, but no way around this.
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2 || (withTimestamp && currentVideoTimeInSeconds > 0)) {
+                ReVancedUtils.showToastShort(withTimestamp && currentVideoTimeInSeconds > 0
+                        ? str("revanced_share_copy_url_timestamp_success")
+                        : str("revanced_share_copy_url_success"));
+            }
         } catch (Exception e) {
             LogHelper.printException(() -> "Failed to generate video url", e);
         }
     }
+
 }

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,191 +0,0 @@
-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;
-
-public final class GeneralAdsPatch extends Filter {
-    private final String[] IGNORE = {
-            "home_video_with_context",
-            "related_video_with_context",
-            "comment_thread", // skip blocking anything in the comments
-            "|comment.", // skip blocking anything in the comments replies
-            "library_recent_shelf",
-    };
-
-    private final BlockRule custom = new CustomBlockRule(
-            SettingsEnum.ADREMOVER_CUSTOM_ENABLED,
-            SettingsEnum.ADREMOVER_CUSTOM_REMOVAL
-    );
-
-    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 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,
-                "cell_divider" // layout residue (gray line above the buttoned ad),
-        );
-        var buttonedAd = new BlockRule(SettingsEnum.ADREMOVER_BUTTONED_REMOVAL,
-                "_buttoned_layout",
-                "full_width_square_image_layout",
-                "_ad_with",
-                "video_display_button_group_layout",
-                "landscape_image_wide_button_layout"
-        );
-        var generalAds = new BlockRule(
-                SettingsEnum.ADREMOVER_GENERAL_ADS_REMOVAL,
-                "ads_video_with_context",
-                "banner_text_icon",
-                "square_image_layout",
-                "watch_metadata_app_promo",
-                "video_display_full_layout",
-                "hero_promo_image",
-                "statement_banner",
-                "carousel_footered_layout",
-                "text_image_button_layout",
-                "primetime_promo",
-                "product_details",
-                "full_width_portrait_image_layout",
-                "brand_video_shelf"
-        );
-        var movieAds = new BlockRule(
-                SettingsEnum.ADREMOVER_MOVIE_REMOVAL,
-                "browsy_bar",
-                "compact_movie",
-                "horizontal_movie_shelf",
-                "movie_and_show_upsell_card",
-                "compact_tvfilm_item",
-                "offer_module_root"
-        );
-
-        this.pathRegister.registerAll(
-                generalAds,
-                buttonedAd,
-                channelBar,
-                communityPosts,
-                paidContent,
-                latestPosts,
-                movieAds,
-                chapterTeaser,
-                communityGuidelines,
-                quickActions,
-                relatedVideos,
-                compactBanner,
-                inFeedSurvey,
-                viewProducts,
-                medicalPanel,
-                merchandise,
-                infoPanel,
-                channelGuidelines,
-                audioTrackButton,
-                artistCard,
-                selfSponsor,
-                webLinkPanel,
-                imageShelf,
-                subscribersCommunityGuidelines,
-                channelMemberShelf
-        );
-
-        var carouselAd = new BlockRule(SettingsEnum.ADREMOVER_GENERAL_ADS_REMOVAL,
-                "carousel_ad"
-        );
-        var shorts = new BlockRule(SettingsEnum.ADREMOVER_SHORTS_REMOVAL,
-                "reels_player_overlay",
-                "shorts_shelf",
-                "inline_shorts",
-                "shorts_grid"
-        );
-
-        this.identifierRegister.registerAll(
-                shorts,
-                graySeparator,
-                carouselAd
-        );
-    }
-
-    public boolean filter(final String path, final String identifier) {
-        BlockResult result;
-
-        if (custom.isEnabled() && custom.check(path).isBlocked())
-            result = BlockResult.CUSTOM;
-        else if (ReVancedUtils.containsAny(path, IGNORE))
-            result = BlockResult.IGNORED;
-        else if (pathRegister.contains(path) || identifierRegister.contains(identifier))
-            result = BlockResult.DEFINED;
-        else
-            result = BlockResult.UNBLOCKED;
-
-        LogHelper.printDebug(() -> String.format("%s (ID: %s): %s", result.message, identifier, path));
-
-        return result.filter;
-    }
-
-    private enum BlockResult {
-        UNBLOCKED(false, "Unblocked"),
-        IGNORED(false, "Ignored"),
-        DEFINED(true, "Blocked"),
-        CUSTOM(true, "Custom");
-
-        final Boolean filter;
-        final String message;
-
-        BlockResult(boolean filter, String message) {
-            this.filter = filter;
-            this.message = message;
-        }
-    }
-
-    /**
-     * Hide a view.
-     *
-     * @param condition The setting to check for hiding the view.
-     * @param view      The view to hide.
-     */
-    private static void hideView(SettingsEnum condition, View view) {
-        if (!condition.getBoolean()) return;
-
-        LogHelper.printDebug(() -> "Hiding view with setting: " + condition);
-
-        AdRemoverAPI.HideViewWithLayout1dp(view);
-    }
-
-    /**
-     * Hide the view, which shows ads in the homepage.
-     *
-     * @param view The view, which shows ads.
-     */
-    public static void hideAdAttributionView(View view) {
-        hideView(SettingsEnum.ADREMOVER_GENERAL_ADS_REMOVAL, view);
-    }
-
-    /**
-     * Hide the view, which shows reels in the homepage.
-     *
-     * @param view The view, which shows reels.
-     */
-    public static void hideReelView(View view) {
-        hideView(SettingsEnum.ADREMOVER_SHORTS_REMOVAL, 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/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/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/HidePlayerButtonsPatch.java

@@ -1,11 +1,16 @@
 package app.revanced.integrations.patches;
 
-
 import app.revanced.integrations.settings.SettingsEnum;
 
 public final class HidePlayerButtonsPatch {
 
-    public static boolean hideButtons() {
-        return SettingsEnum.HIDE_PLAYER_BUTTONS.getBoolean();
+    /**
+     * Injection point.
+     */
+    public static boolean previousOrNextButtonIsVisible(boolean previousOrNextButtonVisible) {
+        if (SettingsEnum.HIDE_PLAYER_BUTTONS.getBoolean()) {
+            return false;
+        }
+        return previousOrNextButtonVisible;
     }
 }

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/HideShortsCommentsButtonPatch.java

@@ -1,13 +0,0 @@
-package app.revanced.integrations.patches;
-
-import android.view.View;
-
-import app.revanced.integrations.settings.SettingsEnum;
-
-public class HideShortsCommentsButtonPatch {
-    //Used by app.revanced.patches.youtube.layout.comments.patch.CommentsPatch
-    public static void hideShortsCommentsButton(View view) {
-        if (!SettingsEnum.HIDE_SHORTS_COMMENTS_BUTTON.getBoolean()) return;
-        view.setVisibility(View.GONE);
-    }
-}

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

@@ -1,140 +0,0 @@
-package app.revanced.integrations.patches;
-
-import android.os.Build;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.RequiresApi;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Spliterator;
-import java.util.function.Consumer;
-
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
-import app.revanced.integrations.utils.ReVancedUtils;
-
-class BlockRule {
-    final static class BlockResult {
-        private final boolean blocked;
-        private final SettingsEnum setting;
-
-        public BlockResult(final SettingsEnum setting, final boolean blocked) {
-            this.setting = setting;
-            this.blocked = blocked;
-        }
-
-        public SettingsEnum getSetting() {
-            return setting;
-        }
-
-        public boolean isBlocked() {
-            return blocked;
-        }
-    }
-
-    protected final SettingsEnum setting;
-    private final String[] blocks;
-
-    /**
-     * Initialize a new rule for components.
-     *
-     * @param setting The setting which controls the blocking of this component.
-     * @param blocks  The rules to block the component on.
-     */
-    public BlockRule(final SettingsEnum setting, final String... blocks) {
-        this.setting = setting;
-        this.blocks = blocks;
-    }
-
-    public boolean isEnabled() {
-        return setting.getBoolean();
-    }
-
-    public BlockResult check(final String string) {
-        return new BlockResult(setting, string != null && ReVancedUtils.containsAny(string, blocks));
-    }
-}
-
-final class CustomBlockRule extends BlockRule {
-    /**
-     * Initialize a new rule for components.
-     *
-     * @param setting The setting which controls the blocking of the components.
-     * @param filter  The setting which contains the list of component names.
-     */
-    public CustomBlockRule(final SettingsEnum setting, final SettingsEnum filter) {
-        super(setting, filter.getString().split(","));
-    }
-}
-
-
-abstract class Filter {
-    final protected LithoBlockRegister pathRegister = new LithoBlockRegister();
-    final protected LithoBlockRegister identifierRegister = new LithoBlockRegister();
-
-    abstract boolean filter(final String path, final String identifier);
-}
-
-final class LithoBlockRegister implements Iterable<BlockRule> {
-    private final ArrayList<BlockRule> blocks = new ArrayList<>();
-
-    public void registerAll(BlockRule... blocks) {
-        this.blocks.addAll(Arrays.asList(blocks));
-    }
-
-    @NonNull
-    @Override
-    public Iterator<BlockRule> iterator() {
-        return blocks.iterator();
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    @Override
-    public void forEach(@NonNull Consumer<? super BlockRule> action) {
-        blocks.forEach(action);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    @NonNull
-    @Override
-    public Spliterator<BlockRule> spliterator() {
-        return blocks.spliterator();
-    }
-
-    public boolean contains(String path) {
-        for (var rule : this) {
-            if (!rule.isEnabled()) continue;
-
-            var result = rule.check(path);
-            if (result.isBlocked()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
-
-public final class LithoFilterPatch {
-    private static final Filter[] filters = new Filter[]{
-            new GeneralAdsPatch(),
-            new ButtonsPatch(),
-            new CommentsPatch(),
-    };
-
-    public static boolean filter(final StringBuilder pathBuilder, final String identifier) {
-        var path = pathBuilder.toString();
-        if (path.isEmpty()) return false;
-
-        LogHelper.printDebug(() -> String.format("Searching (ID: %s): %s", identifier, path));
-
-        for (var filter : filters) {
-            if (filter.filter(path, identifier)) return true;
-        }
-
-        return false;
-    }
-}
-

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/PlayerOverlaysHookPatch.java

@@ -15,7 +15,7 @@ import app.revanced.integrations.shared.PlayerOverlays;
 @SuppressWarnings("unused")
 public class PlayerOverlaysHookPatch {
     /**
-     * Hook into YouTubePlayerOverlaysLayout.onFinishInflate() method
+     * Injection point.
      *
      * @param thisRef reference to the view
      * @smali YouTubePlayerOverlaysLayout_onFinishInflateHook(Ljava / lang / Object ;)V

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

@@ -3,32 +3,25 @@ package app.revanced.integrations.patches;
 import androidx.annotation.Nullable;
 
 import app.revanced.integrations.shared.PlayerType;
-import app.revanced.integrations.utils.LogHelper;
+import app.revanced.integrations.shared.VideoState;
 
-/**
- * Hook receiver class for 'player-type-hook' patch
- *
- * @usedBy app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
- * @smali Lapp/revanced/integrations/patches/PlayerTypeHookPatch;
- */
 @SuppressWarnings("unused")
 public class PlayerTypeHookPatch {
     /**
-     * Hook into YouTubePlayerOverlaysLayout.updatePlayerLayout() method
-     *
-     * @param type the new player type
-     * @smali YouTubePlayerOverlaysLayout_updatePlayerTypeHookEX(Ljava/lang/Object;)V
+     * Injection point.
      */
-    public static void YouTubePlayerOverlaysLayout_updatePlayerTypeHookEX(@Nullable Object type) {
-        if (type == null) return;
+    public static void setPlayerType(@Nullable Enum<?> youTubePlayerType) {
+        if (youTubePlayerType == null) return;
 
-        // update current player type
-        final PlayerType newType = PlayerType.safeParseFromString(type.toString());
-        if (newType == null) {
-            LogHelper.printException(() -> "Unknown PlayerType encountered: " + type);
-        } else {
-            PlayerType.setCurrent(newType);
-            LogHelper.printDebug(() -> "PlayerType was updated to: " + newType);
-        }
+        PlayerType.setFromString(youTubePlayerType.name());
+    }
+
+    /**
+     * Injection point.
+     */
+    public static void setVideoState(@Nullable Enum<?> youTubeVideoState) {
+        if (youTubeVideoState == null) return;
+
+        VideoState.setFromString(youTubeVideoState.name());
     }
 }

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

@@ -2,11 +2,8 @@ package app.revanced.integrations.patches;
 
 import app.revanced.integrations.settings.SettingsEnum;
 
-public class SeekbarTappingPatch {
-
-    //Used by app.revanced.patches.youtube.interaction.seekbar.patch.EnableSeekbarTappingPatch
-    public static boolean isTapSeekingEnabled() {
-        return SettingsEnum.TAP_SEEKING_ENABLED.getBoolean();
+public final class SeekbarTappingPatch {
+    public static boolean seekbarTappingEnabled() {
+        return SettingsEnum.SEEKBAR_TAPPING.getBoolean();
     }
-
 }

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

@@ -2,15 +2,16 @@ package app.revanced.integrations.patches;
 
 import static app.revanced.integrations.utils.ReVancedUtils.containsAny;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import app.revanced.integrations.settings.SettingsEnum;
 import app.revanced.integrations.shared.PlayerType;
 import app.revanced.integrations.utils.LogHelper;
-import app.revanced.integrations.utils.ReVancedUtils;
 
 public class SpoofSignatureVerificationPatch {
+    /**
+     * Enable/disable all workarounds that are required due to signature spoofing.
+     */
+    private static final boolean WORKAROUND = true;
+
     /**
      * Protobuf parameters used for autoplay in scrim.
      * Prepend this parameter to mute video playback (for autoplay in feed)
@@ -18,10 +19,12 @@ public class SpoofSignatureVerificationPatch {
     private static final String PROTOBUF_PARAMETER_SCRIM = "SAFgAXgB";
 
     /**
-     * Protobuf parameter of shorts and YouTube stories.
+     * Protobuf parameter also used by
+     * <a href="https://github.com/yt-dlp/yt-dlp/blob/81ca451480051d7ce1a31c017e005358345a9149/yt_dlp/extractor/youtube.py#L3602">yt-dlp</a>
+     * <br>
      * Known issue: captions are positioned on upper area in the player.
      */
-    private static final String PROTOBUF_PARAMETER_SHORTS = "8AEB"; // "8AEByAMTuAQP"
+    private static final String PROTOBUF_PLAYER_PARAMS = "CgIQBg==";
 
     /**
      * Target Protobuf parameters.
@@ -31,28 +34,6 @@ public class SpoofSignatureVerificationPatch {
             "SAFg"  // Autoplay in scrim
     };
 
-    /**
-     * On app first start, the first video played usually contains a single non-default window setting value
-     * and all other subtitle settings for the video are (incorrect) default shorts window settings.
-     * For this situation, the shorts settings must be replaced.
-     *
-     * But some videos use multiple text positions on screen (such as https://youtu.be/3hW1rMNC89o),
-     * and by chance many of the subtitles uses window positions that match a default shorts position.
-     * To handle these videos, selectively allowing the shorts specific window settings to 'pass thru' unchanged,
-     * but only if the video contains multiple non-default subtitle window positions.
-     *
-     * Do not enable 'pass thru mode' until this many non default subtitle settings are observed for a single video.
-     */
-    private static final int NUMBER_OF_NON_DEFAULT_SUBTITLES_BEFORE_ENABLING_PASSTHRU = 2;
-
-    /**
-     * The number of non default subtitle settings encountered for the current video.
-     */
-    private static int numberOfNonDefaultSettingsObserved;
-
-    @Nullable
-    private static String currentVideoId;
-
     /**
      * Injection point.
      *
@@ -60,23 +41,24 @@ public class SpoofSignatureVerificationPatch {
      */
     public static String overrideProtobufParameter(String originalValue) {
         try {
-            if (!SettingsEnum.SIGNATURE_SPOOFING.getBoolean()) {
+            if (!SettingsEnum.SPOOF_SIGNATURE_VERIFICATION.getBoolean()) {
                 return originalValue;
             }
 
             LogHelper.printDebug(() -> "Original protobuf parameter value: " + originalValue);
 
-            // Video is Short or Story.
-            var isPlayingShorts = originalValue.contains(PROTOBUF_PARAMETER_SHORTS);
-            if (isPlayingShorts) return originalValue;
+            if (!WORKAROUND) return PROTOBUF_PLAYER_PARAMS;
+
+            var isPlayingVideo = originalValue.contains(PROTOBUF_PLAYER_PARAMS);
+            if (isPlayingVideo) return originalValue;
 
             boolean isPlayingFeed = containsAny(originalValue, PROTOBUF_PARAMETER_TARGETS) && PlayerType.getCurrent() == PlayerType.INLINE_MINIMAL;
             if (isPlayingFeed) {
                 // Videos in feed won't autoplay with sound.
-                return PROTOBUF_PARAMETER_SCRIM + PROTOBUF_PARAMETER_SHORTS;
+                return PROTOBUF_PARAMETER_SCRIM + PROTOBUF_PLAYER_PARAMS;
             } else {
                 // Spoof the parameter to prevent playback issues.
-                return PROTOBUF_PARAMETER_SHORTS;
+                return PROTOBUF_PLAYER_PARAMS;
             }
         } catch (Exception ex) {
             LogHelper.printException(() -> "overrideProtobufParameter failure", ex);
@@ -85,140 +67,4 @@ public class SpoofSignatureVerificationPatch {
         return originalValue;
     }
 
-
-    /**
-     * Injection point. Runs off the main thread.
-     * <p>
-     * Used to check the response code of video playback requests made by YouTube.
-     * Response code of interest is 403 that indicate a signature verification failure for the current request
-     *
-     * @param responseCode HTTP status code of the completed YouTube connection
-     */
-    public static void onResponse(int responseCode) {
-        try {
-            if (responseCode < 400 || responseCode >= 500) {
-                return; // everything normal
-            }
-            LogHelper.printDebug(() -> "YouTube HTTP status code: " + responseCode);
-
-            if (SettingsEnum.SIGNATURE_SPOOFING.getBoolean()) {
-                return;  // already enabled
-            }
-
-            SettingsEnum.SIGNATURE_SPOOFING.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
-
-        } catch (Exception ex) {
-            LogHelper.printException(() -> "onResponse failure", ex);
-        }
-    }
-
-    /**
-     * Last WindowsSetting constructor values. Values are checked for changes to reduce log spam.
-     */
-    private static int lastAp, lastAh, lastAv;
-    private static boolean lastVs, lastSd;
-
-    /**
-     * Injection point.  Overrides values passed into SubtitleWindowSettings constructor.
-     *
-     * @param ap anchor position. A bitmask with 6 bit fields, that appears to indicate the layout position on screen
-     * @param ah anchor horizontal. A percentage [0, 100], that appears to be a horizontal text anchor point
-     * @param av anchor vertical. A percentage [0, 100], that appears to be a vertical text anchor point
-     * @param vs appears to indicate if subtitles exist, and the value is always true.
-     * @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();
-        if (SettingsEnum.DEBUG.getBoolean()) {
-            if (ap != lastAp || ah != lastAh || av != lastAv || vs != lastVs || sd != lastSd) {
-                LogHelper.printDebug(() -> "video: " + VideoInformation.getVideoId() + " spoof: " + signatureSpoofing
-                        + " ap:" + ap + " ah:" + ah + " av:" + av + " vs:" + vs + " sd:" + sd);
-                lastAp = ap;
-                lastAh = ah;
-                lastAv = av;
-                lastVs = vs;
-                lastSd = sd;
-            }
-        }
-
-        // Videos with custom captions that specify screen positions appear to always have correct screen positions (even with spoofing).
-        // But for auto generated and most other captions, the spoof incorrectly gives various default Shorts caption settings.
-        // Check for these known default shorts captions parameters, and replace with the known correct values.
-        //
-        // If a regular video uses a custom subtitle setting that match a default short setting,
-        // then this will incorrectly replace the setting.
-        // But, if the video uses multiple subtitles in different screen locations, then detect the non-default values
-        // and do not replace any window settings for the video (regardless if they match a shorts default).
-        if (signatureSpoofing && !PlayerType.getCurrent().isNoneOrHidden()
-                && numberOfNonDefaultSettingsObserved < NUMBER_OF_NON_DEFAULT_SUBTITLES_BEFORE_ENABLING_PASSTHRU) {
-            for (SubtitleWindowReplacementSettings setting : SubtitleWindowReplacementSettings.values()) {
-                if (setting.match(ap, ah, av, vs, sd)) {
-                    return setting.replacementSetting();
-                }
-            }
-
-            numberOfNonDefaultSettingsObserved++;
-            LogHelper.printDebug(() ->
-                    numberOfNonDefaultSettingsObserved < NUMBER_OF_NON_DEFAULT_SUBTITLES_BEFORE_ENABLING_PASSTHRU
-                    ? "Non default subtitle found."
-                    : "Multiple non default subtitles found. Allowing all subtitles for this video to pass thru unchanged.");
-        }
-
-        return new int[]{ap, ah, av};
-    }
-
-    /**
-     * Injection point.
-     */
-    public static void setCurrentVideoId(@NonNull String videoId) {
-        try {
-            if (videoId.equals(currentVideoId)) {
-                return;
-            }
-            currentVideoId = videoId;
-            numberOfNonDefaultSettingsObserved = 0;
-        } catch (Exception ex) {
-            LogHelper.printException(() -> "setCurrentVideoId failure", ex);
-        }
-    }
-
-
-    /**
-     * Known incorrect default Shorts subtitle parameters, and the corresponding correct (non-Shorts) values.
-     */
-    private enum SubtitleWindowReplacementSettings {
-        DEFAULT_SHORTS_PARAMETERS_1(10, 50, 0, true, false,
-                34, 50, 95),
-        DEFAULT_SHORTS_PARAMETERS_2(9, 20, 0, true, false,
-                34, 50, 90),
-        DEFAULT_SHORTS_PARAMETERS_3(9, 20, 0, true, true,
-                33, 20, 100);
-
-        // original values
-        final int ap, ah, av;
-        final boolean vs, sd;
-
-        // replacement int values
-        final int[] replacement;
-
-        SubtitleWindowReplacementSettings(int ap, int ah, int av, boolean vs, boolean sd,
-                                          int replacementAp, int replacementAh, int replacementAv) {
-            this.ap = ap;
-            this.ah = ah;
-            this.av = av;
-            this.vs = vs;
-            this.sd = sd;
-            this.replacement = new int[]{replacementAp, replacementAh, replacementAv};
-        }
-
-        boolean match(int ap, int ah, int av, boolean vs, boolean sd) {
-            return this.ap == ap && this.ah == ah && this.av == av && this.vs == vs && this.sd == sd;
-        }
-
-        int[] replacementSetting() {
-            return replacement;
-        }
-    }
 }

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,8 +4,10 @@ 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.shared.VideoState;
 import app.revanced.integrations.utils.LogHelper;
 import app.revanced.integrations.utils.ReVancedUtils;
 
@@ -16,13 +18,13 @@ 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
     private static String videoId = "";
     private static long videoLength = 0;
-    private static volatile long videoTime = -1; // must be volatile. Value is set off main thread from high precision patch hook
+    private static long videoTime = -1;
     /**
      * The current playback speed
      */
@@ -30,17 +32,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 +58,6 @@ public final class VideoInformation {
         if (!videoId.equals(newlyLoadedVideoId)) {
             LogHelper.printDebug(() -> "New video id: " + newlyLoadedVideoId);
             videoId = newlyLoadedVideoId;
-            playbackSpeed = DEFAULT_YOUTUBE_PLAYBACK_SPEED;
         }
     }
 
@@ -97,17 +98,17 @@ public final class VideoInformation {
 
     /**
      * Injection point.
-     * Called off the main thread approximately every 50ms to 100ms
+     * Called on the main thread every 1000ms.
      *
      * @param currentPlaybackTime The current playback time of the video in milliseconds.
      */
-    public static void setVideoTimeHighPrecision(final long currentPlaybackTime) {
+    public static void setVideoTime(final long currentPlaybackTime) {
         videoTime = currentPlaybackTime;
     }
 
     /**
      * Seek on the current video.
-     * Does not function for playback of Shorts or Stories.
+     * Does not function for playback of Shorts.
      *
      * Caution: If called from a videoTimeHook() callback,
      * this will cause a recursive call into the same videoTimeHook() callback.
@@ -117,14 +118,9 @@ public final class VideoInformation {
      */
     public static boolean seekTo(final long millisecond) {
         ReVancedUtils.verifyOnMainThread();
-        if (seekMethod == null) {
-            LogHelper.printException(() -> "seekMethod was null");
-            return false;
-        }
-
         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;
@@ -136,7 +132,7 @@ public final class VideoInformation {
     }
 
     /**
-     * Id of the current video playing.  Includes Shorts and YouTube Stories.
+     * Id of the current video playing.  Includes Shorts.
      *
      * @return The id of the video. Empty string if not set yet.
      */
@@ -153,7 +149,7 @@ public final class VideoInformation {
     }
 
     /**
-     * Length of the current video playing.  Includes Shorts and YouTube Stories.
+     * Length of the current video playing.  Includes Shorts.
      *
      * @return The length of the video in milliseconds.
      *         If the video is not yet loaded, or if the video is playing in the background with no video visible,
@@ -164,14 +160,14 @@ public final class VideoInformation {
     }
 
     /**
-     * Playback time of the current video playing.
-     * Value can lag up to approximately 100ms behind the actual current video playback time.
+     * Playback time of the current video playing.  Includes Shorts.
      *
-     * Note: Code inside a videoTimeHook patch callback
-     * should use the callback video time and avoid using this method
-     * (in situations of recursive hook callbacks, the value returned here may be outdated).
+     * Value will lag behind the actual playback time by a variable amount based on the playback speed.
      *
-     * Includes Shorts and YouTube Stories.
+     * If playback speed is 2.0x, this value may be up to 2000ms behind the actual playback time.
+     * If playback speed is 1.0x, this value may be up to 1000ms behind the actual playback time.
+     * If playback speed is 0.5x, this value may be up to 500ms behind the actual playback time.
+     * Etc.
      *
      * @return The time of the video in milliseconds. -1 if not set yet.
      */
@@ -183,10 +179,15 @@ public final class VideoInformation {
      * @return If the playback is at the end of the video.
      *
      * If video is playing in the background with no video visible,
-     * this always returns false (even if the video is actually at the end)
+     * this always returns false (even if the video is actually at the end).
+     *
+     * This is equivalent to checking for {@link VideoState#ENDED},
+     * but can give a more up to date result for code calling from some hooks.
+     *
+     * @see VideoState
      */
     public static boolean isAtEndOfVideo() {
-        return videoTime > 0 && videoLength > 0 && videoTime >= videoLength;
+        return videoTime >= videoLength && videoLength > 0;
     }
 
 }

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

@@ -0,0 +1,113 @@
+package app.revanced.integrations.patches.components;
+
+
+import android.view.View;
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.ReVancedUtils;
+
+
+public final class AdsFilter extends Filter {
+    private final String[] exceptions;
+
+    public AdsFilter() {
+        exceptions = new String[]{
+                "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",
+        };
+
+        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"
+        );
+
+        final var generalAds = new StringFilterGroup(
+                SettingsEnum.HIDE_GENERAL_ADS,
+                "ads_video_with_context",
+                "banner_text_icon",
+                "square_image_layout",
+                "watch_metadata_app_promo",
+                "video_display_full_layout",
+                "hero_promo_image",
+                "statement_banner",
+                "carousel_footered_layout",
+                "text_image_button_layout",
+                "primetime_promo",
+                "product_details",
+                "carousel_headered_layout",
+                "full_width_portrait_image_layout",
+                "brand_video_shelf"
+        );
+
+        final var movieAds = new StringFilterGroup(
+                SettingsEnum.HIDE_MOVIES_SECTION,
+                "browsy_bar",
+                "compact_movie",
+                "horizontal_movie_shelf",
+                "movie_and_show_upsell_card",
+                "compact_tvfilm_item",
+                "offer_module_root"
+        );
+
+        final var carouselAd = new StringFilterGroup(
+                SettingsEnum.HIDE_GENERAL_ADS,
+                "carousel_ad"
+        );
+
+        final var viewProducts = new StringFilterGroup(
+                SettingsEnum.HIDE_PRODUCTS_BANNER,
+                "product_item",
+                "products_in_video"
+        );
+
+        final var webLinkPanel = new StringFilterGroup(
+                SettingsEnum.HIDE_WEB_SEARCH_RESULTS,
+                "web_link_panel"
+        );
+
+        final var merchandise = new StringFilterGroup(
+                SettingsEnum.HIDE_MERCHANDISE_BANNERS,
+                "product_carousel"
+        );
+
+        final var selfSponsor = new StringFilterGroup(
+                SettingsEnum.HIDE_SELF_SPONSOR,
+                "cta_shelf_card"
+        );
+
+        this.pathFilterGroups.addAll(
+                generalAds,
+                buttonedAd,
+                merchandise,
+                viewProducts,
+                selfSponsor,
+                webLinkPanel,
+                movieAds
+        );
+        this.identifierFilterGroups.addAll(carouselAd);
+    }
+
+    @Override
+    public boolean isFiltered(final String path, final String identifier, final byte[] _protobufBufferArray) {
+        if (ReVancedUtils.containsAny(path, exceptions))
+           return false;
+
+        return super.isFiltered(path, identifier, _protobufBufferArray);
+    }
+
+    /**
+     * Hide the view, which shows ads in the homepage.
+     *
+     * @param view The view, which shows ads.
+     */
+    public static void hideAdAttributionView(View view) {
+        ReVancedUtils.hideViewBy1dpUnderCondition(SettingsEnum.HIDE_GENERAL_ADS, view);
+    }
+}