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

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

### Features

* **youtube:** add `hide-filter-bar` patch ([9649c3d](9649c3dbc8))

.github/config.yml

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

.github/workflows/pull_request.yml

@@ -21,5 +21,10 @@ jobs:
         with:
           destination_branch: 'main'
           pr_title: 'chore: ${{ env.MESSAGE }}'
-          pr_body: 'This pull request will ${{ env.MESSAGE }}.'
-          pr_draft: true
+          pr_body: |
+            This pull request will ${{ env.MESSAGE }}.
+            
+            ## Dependencies before merge
+
+            - [ ] https://github.com/revanced/revanced-patches
+          pr_draft: true

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Release
 on:
   workflow_dispatch:
   push:
-    branches: 
+    branches:
       - main
       - dev
   pull_request:
@@ -16,7 +16,7 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     steps:
-    - name: Cancel previou runs
+    - name: Cancel previous runs
       uses: styfle/cancel-workflow-action@0.11.0
     - name: Checkout
       uses: actions/checkout@v3
@@ -33,11 +33,11 @@ jobs:
     - name: Setup Node.js
       uses: actions/setup-node@v3
       with:
-        node-version: "latest"
+        node-version: "18"
         cache: 'npm'
     - name: Setup semantic-release
-      run: npm install semantic-release@19.0.5 @saithodev/semantic-release-backmerge @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin@1.7.4 -D
+      run: npm install
     - name: Release
       env:
         GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
-      run: npx semantic-release
+      run: npm exec semantic-release

.releaserc

@@ -34,7 +34,7 @@
     [
       "@saithodev/semantic-release-backmerge",
       {
-        branches: [{from: "main", to: "dev"}],
+        backmergeBranches: [{"from": "main", "to": "dev"}],
         clearWorkspace: true
       }
     ]

README.md

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

app/build.gradle.kts

@@ -1,6 +1,3 @@
-import java.io.FileInputStream
-import java.util.Properties
-
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
@@ -46,8 +43,8 @@ android {
 
 dependencies {
     compileOnly(project(mapOf("path" to ":dummy")))
-    compileOnly("androidx.annotation:annotation:1.5.0")
-    compileOnly("androidx.appcompat:appcompat:1.5.1")
+    compileOnly("androidx.annotation:annotation:1.6.0")
+    compileOnly("androidx.appcompat:appcompat:1.7.0-alpha02")
     compileOnly("com.squareup.okhttp3:okhttp:5.0.0-alpha.11")
     compileOnly("com.squareup.retrofit2:retrofit:2.9.0")
 }

app/proguard-rules.pro

@@ -20,6 +20,8 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 -dontobfuscate
+-dontoptimize
+-keepattributes *  # https://www.guardsquare.com/manual/configuration/attributes
 -keep class app.revanced.** {
   *;
 }

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

@@ -1,60 +1,31 @@
 package app.revanced.integrations.patches;
 
 import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
 
 final class ButtonsPatch extends Filter {
-    private final BlockRule actionButtonsRule;
-    private final BlockRule dislikeRule;
     private final BlockRule actionBarRule;
 
-    private final BlockRule[] rules;
-
     public ButtonsPatch() {
-        BlockRule like = new BlockRule(SettingsEnum.HIDE_LIKE_BUTTON, "|like_button");
-        dislikeRule = new BlockRule(SettingsEnum.HIDE_DISLIKE_BUTTON, "dislike_button");
-        BlockRule download = new BlockRule(SettingsEnum.HIDE_DOWNLOAD_BUTTON, "download_button");
-        actionButtonsRule = new BlockRule(SettingsEnum.HIDE_ACTION_BUTTON, "ContainerType|video_action_button");
-        BlockRule playlist = new BlockRule(SettingsEnum.HIDE_PLAYLIST_BUTTON, "save_to_playlist_button");
-        rules = new BlockRule[]{like, dislikeRule, download, actionButtonsRule, playlist};
-
         actionBarRule = new BlockRule(null, "video_action_bar");
-
-        this.pathRegister.registerAll(
-                like,
-                dislikeRule,
-                download,
-                playlist
+        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 hideActionBar() {
-        for (BlockRule rule : rules) if (!rule.isEnabled()) return false;
+    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 (hideActionBar() && actionBarRule.check(identifier).isBlocked()) return true;
+        // If everything is hidden, then also hide the video bar itself.
+        if (canHideActionBar() && actionBarRule.check(identifier).isBlocked()) return true;
 
-        var currentIsActionButton = actionButtonsRule.check(path).isBlocked();
-
-        if (dislikeRule.check(path).isBlocked()) ActionButton.doNotBlockCounter = 4;
-
-        if (currentIsActionButton && ActionButton.doNotBlockCounter-- > 0) {
-            if (SettingsEnum.HIDE_SHARE_BUTTON.getBoolean()) {
-                LogHelper.printDebug(() -> "Hiding share button");
-                return true;
-            } else return false;
-        }
-
-        if ((currentIsActionButton && ActionButton.doNotBlockCounter <= 0 && actionButtonsRule.isEnabled()) || pathRegister.contains(path)) {
-            LogHelper.printDebug(() -> "Blocked: " + path);
-            return true;
-        } else return false;
-    }
-
-    static class ActionButton {
-        public static int doNotBlockCounter = 4;
+        return pathRegister.contains(path);
     }
 }

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

@@ -9,7 +9,7 @@ final class CommentsPatch extends Filter {
         var comments = new BlockRule(SettingsEnum.HIDE_COMMENTS_SECTION, "video_metadata_carousel", "_comments");
         var previewComment = new BlockRule(
                 SettingsEnum.HIDE_PREVIEW_COMMENT,
-                "carousel_item",
+                "|carousel_item",
                 "comments_entry_point_teaser",
                 "comments_entry_point_simplebox"
         );

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

@@ -1,25 +1,21 @@
 package app.revanced.integrations.patches;
 
-import android.content.Context;
-import android.widget.Toast;
+import static app.revanced.integrations.utils.StringRef.str;
 
-import app.revanced.integrations.sponsorblock.StringRef;
 import app.revanced.integrations.utils.LogHelper;
 import app.revanced.integrations.utils.ReVancedUtils;
 
 public class CopyVideoUrlPatch {
     public static void copyUrl(Boolean withTimestamp) {
         try {
-            String url = String.format("https://youtu.be/%s", VideoInformation.getCurrentVideoId());
+            String url = String.format("https://youtu.be/%s", VideoInformation.getVideoId());
             if (withTimestamp) {
                 long seconds = VideoInformation.getVideoTime() / 1000;
                 url += String.format("?t=%s", seconds);
             }
 
-            Context context = ReVancedUtils.getContext();
-
             ReVancedUtils.setClipboard(url);
-            if (context != null) Toast.makeText(context, StringRef.str("share_copy_url_success"), Toast.LENGTH_SHORT).show();
+            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/FixPlaybackPatch.java

@@ -1,40 +0,0 @@
-package app.revanced.integrations.patches;
-
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
-
-public final class FixPlaybackPatch {
-    private static Thread currentThread = null;
-    private static String videoId;
-
-    public static void newVideoLoaded(final String videoId) {
-        if (!SettingsEnum.FIX_PLAYBACK.getBoolean()) return;
-
-        if (videoId.equals(FixPlaybackPatch.videoId)) return;
-        else FixPlaybackPatch.videoId = videoId;
-
-        if (currentThread != null) {
-            currentThread.interrupt();
-        }
-
-        currentThread = new Thread(() -> {
-            try {
-                while (true) {
-                    var currentVideoTime = VideoInformation.getVideoTime();
-
-                    if (currentVideoTime > -1) {
-                        VideoInformation.seekTo(Integer.MAX_VALUE);
-                        VideoInformation.seekTo(currentVideoTime);
-                        return;
-                    }
-
-                    Thread.sleep(10);
-                }
-            } catch (InterruptedException e) {
-                LogHelper.printDebug(() -> "Thread was interrupted");
-            }
-        });
-
-        currentThread.start();
-    }
-}

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

@@ -1,13 +1,10 @@
 package app.revanced.integrations.patches;
 
 import android.view.View;
-
 import app.revanced.integrations.settings.SettingsEnum;
 
 public class FullscreenPanelsRemoverPatch {
-
     public static int getFullscreenPanelsVisibility() {
         return SettingsEnum.HIDE_FULLSCREEN_PANELS.getBoolean() ? View.GONE : View.VISIBLE;
     }
-
 }

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

@@ -1,7 +1,6 @@
 package app.revanced.integrations.patches;
 
 import android.view.View;
-
 import app.revanced.integrations.adremover.AdRemoverAPI;
 import app.revanced.integrations.settings.SettingsEnum;
 import app.revanced.integrations.utils.LogHelper;
@@ -27,24 +26,31 @@ public final class GeneralAdsPatch extends Filter {
         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");
+        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 suggestions = new BlockRule(SettingsEnum.ADREMOVER_SUGGESTIONS_REMOVAL, "horizontal_video_shelf");
         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_CARD, "official_card");
+        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");
+        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,
-                "video_display_full_buttoned_layout",
+                "_buttoned_layout",
                 "full_width_square_image_layout",
                 "_ad_with",
+                "video_display_button_group_layout",
                 "landscape_image_wide_button_layout"
         );
         var generalAds = new BlockRule(
@@ -53,7 +59,15 @@ public final class GeneralAdsPatch extends Filter {
                 "banner_text_icon",
                 "square_image_layout",
                 "watch_metadata_app_promo",
-                "video_display_full_layout"
+                "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,
@@ -61,27 +75,34 @@ public final class GeneralAdsPatch extends Filter {
                 "compact_movie",
                 "horizontal_movie_shelf",
                 "movie_and_show_upsell_card",
-                "compact_tvfilm_item"
+                "compact_tvfilm_item",
+                "offer_module_root"
         );
 
         this.pathRegister.registerAll(
                 generalAds,
                 buttonedAd,
+                channelBar,
                 communityPosts,
                 paidContent,
-                suggestions,
                 latestPosts,
                 movieAds,
                 chapterTeaser,
                 communityGuidelines,
+                quickActions,
+                relatedVideos,
                 compactBanner,
                 inFeedSurvey,
+                viewProducts,
                 medicalPanel,
                 merchandise,
                 infoPanel,
                 channelGuidelines,
+                audioTrackButton,
                 artistCard,
                 selfSponsor,
+                webLinkPanel,
+                imageShelf,
                 subscribersCommunityGuidelines,
                 channelMemberShelf
         );
@@ -90,7 +111,6 @@ public final class GeneralAdsPatch extends Filter {
                 "carousel_ad"
         );
         var shorts = new BlockRule(SettingsEnum.ADREMOVER_SHORTS_REMOVAL,
-                "reels_player_overlay",
                 "shorts_shelf",
                 "inline_shorts",
                 "shorts_grid"
@@ -115,7 +135,7 @@ public final class GeneralAdsPatch extends Filter {
         else
             result = BlockResult.UNBLOCKED;
 
-        log(String.format("%s (ID: %s): %s", result.message, identifier, path));
+        LogHelper.printDebug(() -> String.format("%s (ID: %s): %s", result.message, identifier, path));
 
         return result.filter;
     }
@@ -144,7 +164,7 @@ public final class GeneralAdsPatch extends Filter {
     private static void hideView(SettingsEnum condition, View view) {
         if (!condition.getBoolean()) return;
 
-        log("Hiding view with setting: " + condition);
+        LogHelper.printDebug(() -> "Hiding view with setting: " + condition);
 
         AdRemoverAPI.HideViewWithLayout1dp(view);
     }
@@ -167,7 +187,4 @@ public final class GeneralAdsPatch extends Filter {
         hideView(SettingsEnum.ADREMOVER_SHORTS_REMOVAL, view);
     }
 
-    private static void log(String message) {
-        LogHelper.printDebug(() -> message);
-    }
 }

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

@@ -6,8 +6,7 @@ import app.revanced.integrations.adremover.AdRemoverAPI;
 import app.revanced.integrations.settings.SettingsEnum;
 
 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);
     }

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

@@ -3,8 +3,7 @@ package app.revanced.integrations.patches;
 import app.revanced.integrations.settings.SettingsEnum;
 
 public class HideAutoplayButtonPatch {
-
     public static boolean isButtonShown() {
-        return SettingsEnum.HIDE_AUTOPLAY_BUTTON.getBoolean() == false;
+        return !SettingsEnum.HIDE_AUTOPLAY_BUTTON.getBoolean();
     }
 }

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

@@ -6,9 +6,24 @@ import app.revanced.integrations.adremover.AdRemoverAPI;
 import app.revanced.integrations.settings.SettingsEnum;
 
 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;
+        if (!SettingsEnum.HIDE_BREAKING_NEWS.getBoolean()
+                || isSpoofingOldVersionWithHorizontalCardListWatchHistory()) return;
         AdRemoverAPI.HideViewWithLayout1dp(view);
     }
 }

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

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

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.adremover.AdRemoverAPI;
+import app.revanced.integrations.settings.SettingsEnum;
+
+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;
+
+        AdRemoverAPI.HideViewWithLayout1dp(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/HideFloatingMicrophoneButtonPatch.java

@@ -0,0 +1,9 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public final class HideFloatingMicrophoneButtonPatch {
+    public static boolean hideFloatingMicrophoneButton(final boolean original) {
+        return SettingsEnum.HIDE_FLOATING_MICROPHONE_BUTTON.getBoolean() || original;
+    }
+}

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

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

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

@@ -1,16 +1,15 @@
 package app.revanced.integrations.patches;
 
 import android.view.View;
-
 import app.revanced.integrations.settings.SettingsEnum;
 
-public class HideInfocardsPatch {
-    public static void hideInfocardsIncognito(View view) {
+public class HideInfoCardsPatch {
+    public static void hideInfoCardsIncognito(View view) {
         if (!SettingsEnum.HIDE_INFO_CARDS.getBoolean()) return;
         view.setVisibility(View.GONE);
     }
 
-    public static boolean hideInfocardsMethodCall() {
+    public static boolean hideInfoCardsMethodCall() {
         return SettingsEnum.HIDE_INFO_CARDS.getBoolean();
     }
 }

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

@@ -1,14 +1,13 @@
-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);
-    }
-}
+package app.revanced.integrations.patches;
+
+import android.view.View;
+
+import app.revanced.integrations.adremover.AdRemoverAPI;
+import app.revanced.integrations.settings.SettingsEnum;
+
+public class HideLoadMoreButtonPatch {
+    public static void hideLoadMoreButton(View view){
+        if(!SettingsEnum.HIDE_LOAD_MORE_BUTTON.getBoolean()) return;
+        AdRemoverAPI.HideViewWithLayout1dp(view);
+    }
+}

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

@@ -0,0 +1,11 @@
+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();
+    }
+}

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

@@ -1,20 +0,0 @@
-package app.revanced.integrations.patches;
-
-import android.view.View;
-
-import app.revanced.integrations.adremover.AdRemoverAPI;
-import app.revanced.integrations.settings.SettingsEnum;
-
-public class HideReelsPatch {
-
-    /**
-     * Used by app.revanced.patches.youtube.layout.reels.patch.HideReelsPatch
-     *
-     * @param view
-     */
-    public static void HideReel(View view) {
-        if (SettingsEnum.HIDE_REEL_BUTTON.getBoolean()) {
-            AdRemoverAPI.HideViewWithLayout1dp(view);
-        }
-    }
-}

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

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

app/src/main/java/app/revanced/integrations/patches/HideShortsButtonPatch.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.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();
-            String message = hide ? "Shorts button: hidden" : "Shorts button: shown";
-            LogHelper.printDebug(() -> message);
-            if (hide) {
-                view.setVisibility(hide ? View.GONE : View.VISIBLE);
-            }
-        }
-    }
-
-    //Needed for the ShortsButtonRemoverPatch
-    public static Enum lastPivotTab;
-}

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

@@ -1,10 +0,0 @@
-package app.revanced.integrations.patches;
-
-import app.revanced.integrations.settings.SettingsEnum;
-
-public class HideTimeAndSeekbarPatch {
-    //Used by app.revanced.patches.youtube.layout.hidetimeandseekbar.patch.HideTimeAndSeekbarPatch
-    public static boolean hideTimeAndSeekbar() {
-        return SettingsEnum.HIDE_TIME_AND_SEEKBAR.getBoolean();
-    }
-}

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

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

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

@@ -2,9 +2,8 @@ package app.revanced.integrations.patches;
 
 import app.revanced.integrations.settings.SettingsEnum;
 
-public class HideWatchinVRPatch {
-    //Used by app.revanced.patches.youtube.layout.watchinvr.patch.HideWatchinVRPatch
-    public static boolean hideWatchinVR() {
+public class HideWatchInVRPatch {
+    public static boolean hideWatchInVR() {
         return SettingsEnum.HIDE_WATCH_IN_VR.getBoolean();
     }
 }