chore(release): 0.103.1-dev.1 [skip ci]

## [0.103.1-dev.1](https://github.com/revanced/revanced-integrations/compare/v0.103.0...v0.103.1-dev.1) (2023-04-22)

### Bug Fixes

* **youtube/sponsorblock:** Include milliseconds in the voting menu ([#362](https://github.com/revanced/revanced-integrations/issues/362)) ([1ada30d](1ada30d5c9))

.gitattributes

@@ -1,9 +0,0 @@
-#
-# 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/config.yml

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

.github/workflows/release.yml

@@ -16,31 +16,28 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     steps:
-      - 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
-            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 build clean
-      - name: Setup semantic-release
-        run: npm install
-      - name: Release
-        env:
-          GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
-        run: npm exec semantic-release
+    - 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

README.md

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

app/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
 
 android {
     compileSdk = 33
+    buildToolsVersion = "33.0.1"
     namespace = "app.revanced.integrations"
 
     defaultConfig {
@@ -43,7 +44,7 @@ android {
 dependencies {
     compileOnly(project(mapOf("path" to ":dummy")))
     compileOnly("androidx.annotation:annotation:1.6.0")
-    compileOnly("androidx.appcompat:appcompat:1.7.0-alpha03")
+    compileOnly("androidx.appcompat:appcompat:1.6.1")
     compileOnly("com.squareup.okhttp3:okhttp:5.0.0-alpha.11")
     compileOnly("com.squareup.retrofit2:retrofit:2.9.0")
 }

app/src/main/java/app/revanced/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch.java

@@ -1,21 +0,0 @@
-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

@@ -0,0 +1,42 @@
+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.AUTO_REPEAT.getBoolean();
+        return SettingsEnum.PREFERRED_AUTO_REPEAT.getBoolean();
     }
 }

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

@@ -0,0 +1,30 @@
+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_ACTION_BUTTONS, "ContainerType|video_action_button")
+        );
+    }
+
+    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

@@ -0,0 +1,31 @@
+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,46 +2,22 @@ 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 {
-            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");
-                }
+            String url = String.format("https://youtu.be/%s", VideoInformation.getCurrentVideoId());
+            if (withTimestamp) {
+                long seconds = VideoInformation.getVideoTime() / 1000;
+                url += String.format("?t=%s", seconds);
             }
 
-            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"));
-            }
+            ReVancedUtils.setClipboard(url);
+            ReVancedUtils.showToastShort(str("share_copy_url_success"));
         } catch (Exception e) {
             LogHelper.printException(() -> "Failed to generate video url", e);
         }
     }
-
 }

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

@@ -1,22 +0,0 @@
-package app.revanced.integrations.patches;
-
-import android.widget.ImageView;
-
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.ReVancedUtils;
-
-public class CustomPlayerOverlayOpacityPatch {
-    private static final int DEFAULT_OPACITY = (int) SettingsEnum.PLAYER_OVERLAY_OPACITY.defaultValue;
-
-    public static void changeOpacity(ImageView imageView) {
-        int opacity = SettingsEnum.PLAYER_OVERLAY_OPACITY.getInt();
-
-        if (opacity < 0 || opacity > 100) {
-            ReVancedUtils.showToastLong("Player overlay opacity must be between 0-100");
-            SettingsEnum.PLAYER_OVERLAY_OPACITY.saveValue(DEFAULT_OPACITY);
-            opacity = DEFAULT_OPACITY;
-        }
-
-        imageView.setImageAlpha((opacity * 255) / 100);
-    }
-}

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

@@ -4,13 +4,10 @@ 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.AUTO_CAPTIONS.getBoolean();
+        return SettingsEnum.CAPTIONS_ENABLED.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_RESUMING_SHORTS_PLAYER.getBoolean();
+        return SettingsEnum.DISABLE_STARTUP_SHORTS_PLAYER.getBoolean();
     }
 }

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

@@ -1,9 +0,0 @@
-package app.revanced.integrations.patches;
-
-import app.revanced.integrations.settings.SettingsEnum;
-
-public final class EnableTabletLayoutPatch {
-    public static boolean enableTabletLayout() {
-        return SettingsEnum.TABLET_LAYOUT.getBoolean();
-    }
-}

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

@@ -0,0 +1,189 @@
+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 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",
+                "feature_grid_interstitial",
+                "product_details",
+                "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,
+                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.HDR_AUTO_BRIGHTNESS.getBoolean()) {
+        if (!SettingsEnum.USE_HDR_AUTO_BRIGHTNESS.getBoolean()) {
             return original;
         }
 

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

@@ -2,12 +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 HideAlbumCardsPatch {
-    public static void hideAlbumCard(View view) {
+    //Used by app.revanced.patches.youtube.layout.hidealbumcards.patch.HideAlbumCardsPatch
+    public static void hideAlbumCards(View view) {
         if (!SettingsEnum.HIDE_ALBUM_CARDS.getBoolean()) return;
-        ReVancedUtils.hideViewByLayoutParams(view);
+        AdRemoverAPI.HideViewWithLayout1dp(view);
     }
 }

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

@@ -2,28 +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 HideBreakingNewsPatch {
-
-    /**
-     * 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.
-     */
+    //Used by app.revanced.patches.youtube.layout.homepage.breakingnews.patch.BreakingNewsPatch
     public static void hideBreakingNews(View view) {
-        if (!SettingsEnum.HIDE_BREAKING_NEWS.getBoolean()
-                || isSpoofingOldVersionWithHorizontalCardListWatchHistory()) return;
-        ReVancedUtils.hideViewByLayoutParams(view);
+        if (!SettingsEnum.HIDE_BREAKING_NEWS.getBoolean()) return;
+        AdRemoverAPI.HideViewWithLayout1dp(view);
     }
 }

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

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

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

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

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

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

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

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

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

@@ -1,13 +0,0 @@
-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/HideMixPlaylistsPatch.java

@@ -0,0 +1,14 @@
+package app.revanced.integrations.patches;
+
+import android.view.View;
+
+import app.revanced.integrations.adremover.AdRemoverAPI;
+import app.revanced.integrations.settings.SettingsEnum;
+
+public class HideMixPlaylistsPatch {
+
+    public static void hideMixPlaylists(View view) {
+        if (!SettingsEnum.HIDE_MIX_PLAYLISTS.getBoolean()) return;
+        AdRemoverAPI.HideViewWithLayout1dp(view);
+    }
+}

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

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

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

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

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

@@ -0,0 +1,13 @@
+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/HideWatchInVRPatch.java

@@ -0,0 +1,9 @@
+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/LithoFilterPatch.java

@@ -0,0 +1,140 @@
+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;
+    }
+}
+