chore(release): 0.83.1 [skip ci]

## [0.83.1](https://github.com/revanced/revanced-integrations/compare/v0.83.0...v0.83.1) (2022-12-06)

### Bug Fixes

* inconsistencies in preference switches ([#235](https://github.com/revanced/revanced-integrations/issues/235)) ([d64a0f9](d64a0f9599))

.github/ISSUE_TEMPLATE/config.yml

@@ -5,4 +5,4 @@ contact_links:
     about: Don't know how or where to start? Check out our documentation!
   - name: 🗨 Discussions
     url: https://github.com/revanced/revanced-suggestions/discussions
-    about: Got something you think should change or be added? Search for or start a new discussion!
+    about: Got something you think should change or be added? Search for or start a new discussion!

.github/ISSUE_TEMPLATE/feature-issue.yml

@@ -43,4 +43,4 @@ body:
       label: Additional context
       description: Add additional context here.
     validations:
-      required: false
+      required: false

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Cancel Previous Runs
-      uses: styfle/cancel-workflow-action@0.9.0
+      uses: styfle/cancel-workflow-action@0.11.0
       with:
         access_token: ${{ secrets.GITHUB_TOKEN }}
     - name: Checkout Repo
@@ -27,7 +27,7 @@ jobs:
         java-version: '11'
         distribution: 'zulu'
     - name: Setup Node.js
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: "lts/*"
     - name: Build with Gradle
@@ -37,4 +37,4 @@ jobs:
     - name: Release
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: npx semantic-release
+      run: npx semantic-release

app/.gitignore

@@ -1 +1 @@
-/build
+/build

app/build.gradle

@@ -1,40 +0,0 @@
-apply plugin: 'com.android.application'
-apply plugin: 'org.jetbrains.kotlin.android'
-
-android {
-    compileSdkVersion 32
-    namespace 'app.revanced.integrations'
-
-    defaultConfig {
-        applicationId "app.revanced.integrations"
-        minSdkVersion 24
-        targetSdkVersion 32
-        versionCode 1
-        versionName "1.0"
-        multiDexEnabled false
-
-        Properties properties = new Properties()
-        if (rootProject.file("local.properties").exists()) {
-            properties.load(rootProject.file("local.properties").newDataInputStream())
-        }
-
-        buildConfigField "String", "YT_API_KEY", "\"${properties.getProperty("youtubeAPIKey", "")}\""
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-}
-
-dependencies {
-    compileOnly 'androidx.annotation:annotation:1.4.0'
-    compileOnly 'androidx.constraintlayout:constraintlayout:2.1.4'
-}
-

app/build.gradle.kts

@@ -0,0 +1,51 @@
+import java.io.FileInputStream
+import java.util.Properties
+
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    compileSdk = 33
+    buildToolsVersion = "33.0.0"
+    namespace = "app.revanced.integrations"
+
+    defaultConfig {
+        applicationId = "app.revanced.integrations"
+        minSdk = 23
+        targetSdk = 33
+        versionCode = 1
+        versionName = "1.0"
+        multiDexEnabled = false
+
+        val properties = Properties()
+        if (rootProject.file("local.properties").exists()) {
+            properties.load(FileInputStream(rootProject.file("local.properties")))
+        }
+
+        buildConfigField("String", "YT_API_KEY", "\"${properties.getProperty("youtubeAPIKey", "")}\"")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = true
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility(JavaVersion.VERSION_11)
+        targetCompatibility(JavaVersion.VERSION_11)
+    }
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.toString()
+    }
+}
+
+dependencies {
+    compileOnly(project(mapOf("path" to ":dummy")))
+    compileOnly("androidx.annotation:annotation:1.5.0")
+    compileOnly("androidx.appcompat:appcompat:1.5.1")
+    compileOnly("com.squareup.okhttp3:okhttp:4.10.0")
+    compileOnly("com.squareup.retrofit2:retrofit:2.9.0")
+}

app/proguard-rules.pro

@@ -18,4 +18,11 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+-dontobfuscate
+-keep class app.revanced.** {
+  *;
+}
+-keep class com.google.** {
+  *;
+}

app/src/main/AndroidManifest.xml

@@ -2,4 +2,4 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
-</manifest>
+</manifest>

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

@@ -8,8 +8,6 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.Toolbar;
 
-import app.revanced.integrations.patches.HideShortsButtonPatch;
-import app.revanced.integrations.settings.SettingsEnum;
 import app.revanced.integrations.utils.LogHelper;
 
 public class AdRemoverAPI {
@@ -37,7 +35,7 @@ public class AdRemoverAPI {
             ViewGroup.LayoutParams layoutParams5 = new ViewGroup.LayoutParams(1, 1);
             view.setLayoutParams(layoutParams5);
         } else {
-            LogHelper.debug(AdRemoverAPI.class, "HideViewWithLayout1dp - Id: " + view.getId() + " Type: " + view.getClass().getName());
+            LogHelper.printDebug(() -> "HideViewWithLayout1dp - Id: " + view.getId() + " Type: " + view.getClass().getName());
         }
     }
 

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

@@ -3,8 +3,6 @@ package app.revanced.integrations.patches;
 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();

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

@@ -1,12 +1,11 @@
 package app.revanced.integrations.patches;
 
-import app.revanced.integrations.adremover.AdRemoverAPI;
 import app.revanced.integrations.settings.SettingsEnum;
 
 public class BrandingWaterMarkPatch {
 
-    //Used by: app.revanced.patches.youtube.layout.watermark.patch.HideWatermarkPatch
+    // Used by: app.revanced.patches.youtube.layout.watermark.patch.HideWatermarkPatch
     public static boolean isBrandingWatermarkShown() {
-        return SettingsEnum.BRANDING_SHOWN.getBoolean();
+        return SettingsEnum.HIDE_VIDEO_WATERMARK.getBoolean() == false;
     }
 }

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

@@ -0,0 +1,60 @@
+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
+        );
+    }
+
+    private boolean hideActionBar() {
+        for (BlockRule rule : rules) 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;
+
+        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;
+    }
+}

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

@@ -2,9 +2,11 @@ package app.revanced.integrations.patches;
 
 import app.revanced.integrations.settings.SettingsEnum;
 
-public class ForceDisableCaptionsPatch {
-    
-    public static boolean captionsEnabled() {
+public class DisableAutoCaptionsPatch {
+
+    public static boolean captionsButtonDisabled;
+
+    public static boolean autoCaptionsEnabled() {
         return SettingsEnum.CAPTIONS_ENABLED.getBoolean();
     }
 

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

@@ -0,0 +1,10 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public class DisablePlayerPopupPanelsPatch {
+    //Used by app.revanced.patches.youtube.layout.playerpopuppanels.patch.PlayerPopupPanelsPatch
+    public static boolean disablePlayerPopupPanels() {
+        return SettingsEnum.PLAYER_POPUP_PANELS.getBoolean();
+    }
+}

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

@@ -0,0 +1,10 @@
+package app.revanced.integrations.patches;
+
+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();
+    }
+}

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

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

@@ -7,7 +7,7 @@ import app.revanced.integrations.settings.SettingsEnum;
 public class FullscreenPanelsRemoverPatch {
 
     public static int getFullscreenPanelsVisibility() {
-        return SettingsEnum.FULLSCREEN_PANELS_SHOWN.getBoolean() ? View.VISIBLE : View.GONE;
+        return SettingsEnum.HIDE_FULLSCREEN_PANELS.getBoolean() ? View.GONE : View.VISIBLE;
     }
 
 }

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

@@ -0,0 +1,173 @@
+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
+            "download_",
+            "library_recent_shelf",
+            "menu",
+            "root",
+            "-count",
+            "-space",
+            "-button",
+            "playlist_add_to_option_wrapper" // do not block on "add to playlist" flyout menu
+    };
+
+    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 compactBanner = new BlockRule(SettingsEnum.ADREMOVER_COMPACT_BANNER_REMOVAL, "compact_banner");
+        var inFeedSurvey = new BlockRule(SettingsEnum.ADREMOVER_FEED_SURVEY_REMOVAL, "in_feed_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 selfSponsor = new BlockRule(SettingsEnum.ADREMOVER_SELF_SPONSOR_REMOVAL, "cta_shelf_card");
+        var chapterTeaser = new BlockRule(SettingsEnum.ADREMOVER_CHAPTER_TEASER_REMOVAL, "expandable_metadata");
+        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",
+                "full_width_square_image_layout",
+                "_ad_with",
+                "landscape_image_wide_button_layout"
+        );
+        var generalAds = new BlockRule(
+                SettingsEnum.ADREMOVER_GENERAL_ADS_REMOVAL,
+                "ads_video_with_context",
+                "banner_text_icon",
+                "watch_metadata_app_promo",
+                "video_display_full_layout"
+        );
+        var movieAds = new BlockRule(
+                SettingsEnum.ADREMOVER_MOVIE_REMOVAL,
+                "browsy_bar",
+                "compact_movie",
+                "horizontal_movie_shelf",
+                "movie_and_show_upsell_card",
+                "compact_tvfilm_item"
+        );
+
+        this.pathRegister.registerAll(
+                generalAds,
+                buttonedAd,
+                communityPosts,
+                paidContent,
+                suggestions,
+                latestPosts,
+                movieAds,
+                chapterTeaser,
+                communityGuidelines,
+                compactBanner,
+                inFeedSurvey,
+                medicalPanel,
+                merchandise,
+                infoPanel,
+                channelGuidelines,
+                artistCard,
+                selfSponsor
+        );
+
+        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"
+        );
+
+        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;
+
+        log(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;
+
+        log("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);
+    }
+
+    private static void log(String message) {
+        LogHelper.printDebug(() -> message);
+    }
+}

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

@@ -1,154 +0,0 @@
-package app.revanced.integrations.patches;
-
-import android.os.Build;
-
-import androidx.annotation.RequiresApi;
-
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
-
-public class GeneralBytecodeAdsPatch {
-
-    //Used by app.revanced.patches.youtube.ad.general.bytecode.patch.GeneralBytecodeAdsPatch
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    public static boolean containsAd(String value, ByteBuffer buffer) {
-        return containsLithoAd(value, buffer);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    private static boolean containsLithoAd(String value, ByteBuffer buffer) {
-        boolean enabled = false;
-        for (SettingsEnum setting : SettingsEnum.getAdRemovalSettings()) {
-            if (setting.getBoolean()) {
-                enabled = true;
-                break;
-            }
-        }
-
-        try {
-            if (value == null || value.isEmpty() || !enabled) return false;
-            LogHelper.debug(GeneralBytecodeAdsPatch.class, "Searching for AD: " + value);
-
-            List<String> blockList = new ArrayList<>();
-            List<String> bufferBlockList = new ArrayList<>();
-
-            if (SettingsEnum.ADREMOVER_AD_REMOVAL.getBoolean()) {
-                blockList.add("_ad");
-                blockList.add("ad_badge");
-                blockList.add("ads_video_with_context");
-                blockList.add("cell_divider");
-                blockList.add("reels_player_overlay");
-                blockList.add("shelf_header");
-                blockList.add("text_search_ad_with_description_first");
-                blockList.add("watch_metadata_app_promo");
-
-                bufferBlockList.add("ad_cpn");
-            }
-            if (SettingsEnum.ADREMOVER_SUGGESTED_FOR_YOU_REMOVAL.getBoolean()) {
-                bufferBlockList.add("watch-vrecH");
-            }
-            if (SettingsEnum.ADREMOVER_MOVIE_REMOVAL.getBoolean()) {
-                blockList.add("browsy_bar");
-                blockList.add("compact_movie");
-                blockList.add("horizontal_movie_shelf");
-                blockList.add("movie_and_show_upsell_card");
-
-                bufferBlockList.add("YouTube Movies");
-            }
-            if (containsAny(value, "home_video_with_context", "related_video_with_context") &&
-                    bufferBlockList.stream().anyMatch(new String(buffer.array(), StandardCharsets.UTF_8)::contains)
-            ) return true;
-
-            if (SettingsEnum.ADREMOVER_COMMENTS_REMOVAL.getBoolean()) {
-                blockList.add("comments_");
-            }
-            if (SettingsEnum.ADREMOVER_COMMUNITY_GUIDELINES.getBoolean()) {
-                blockList.add("community_guidelines");
-            }
-            if (SettingsEnum.ADREMOVER_COMPACT_BANNER_REMOVAL.getBoolean()) {
-                blockList.add("compact_banner");
-            }
-            if (SettingsEnum.ADREMOVER_EMERGENCY_BOX_REMOVAL.getBoolean()) {
-                blockList.add("emergency_onebox");
-            }
-            if (SettingsEnum.ADREMOVER_FEED_SURVEY_REMOVAL.getBoolean()) {
-                blockList.add("in_feed_survey");
-            }
-            if (SettingsEnum.ADREMOVER_MEDICAL_PANEL_REMOVAL.getBoolean()) {
-                blockList.add("medical_panel");
-            }
-            if (SettingsEnum.ADREMOVER_PAID_CONTECT_REMOVAL.getBoolean()) {
-                blockList.add("paid_content_overlay");
-            }
-            if (SettingsEnum.ADREMOVER_COMMUNITY_POSTS_REMOVAL.getBoolean()) {
-                blockList.add("post_base_wrapper");
-            }
-            if (SettingsEnum.ADREMOVER_MERCHANDISE_REMOVAL.getBoolean()) {
-                blockList.add("product_carousel");
-            }
-            if (SettingsEnum.ADREMOVER_SHORTS_SHELF.getBoolean()) {
-                blockList.add("shorts_shelf");
-            }
-            if (SettingsEnum.ADREMOVER_INFO_PANEL_REMOVAL.getBoolean()) {
-                blockList.add("publisher_transparency_panel");
-                blockList.add("single_item_information_panel");
-            }
-            if (SettingsEnum.ADREMOVER_HIDE_SUGGESTIONS.getBoolean()) {
-                blockList.add("horizontal_video_shelf");
-            }
-            if (SettingsEnum.ADREMOVER_HIDE_LATEST_POSTS.getBoolean()) {
-                blockList.add("post_shelf");
-            }
-            if (SettingsEnum.ADREMOVER_HIDE_CHANNEL_GUIDELINES.getBoolean()) {
-                blockList.add("channel_guidelines_entry_banner");
-            }
-
-            if (containsAny(value,
-                    "home_video_with_context",
-                    "related_video_with_context",
-                    "search_video_with_context",
-                    "menu",
-                    "root",
-                    "-count",
-                    "-space",
-                    "-button"
-            )) return false;
-
-            if (blockList.stream().anyMatch(value::contains)) {
-                LogHelper.debug(GeneralBytecodeAdsPatch.class, "Blocking ad: " + value);
-                return true;
-            }
-
-            if (SettingsEnum.DEBUG.getBoolean()) {
-                if (value.contains("related_video_with_context")) {
-                    LogHelper.debug(GeneralBytecodeAdsPatch.class, value + " | " + bytesToHex(buffer.array()));
-                    return false;
-                }
-                LogHelper.debug(GeneralBytecodeAdsPatch.class, value + " returns false.");
-            }
-            return false;
-        } catch (Exception ex) {
-            LogHelper.printException(GeneralBytecodeAdsPatch.class, ex.getMessage(), ex);
-            return false;
-        }
-    }
-
-    private static boolean containsAny(String value, String... targets) {
-        for (String string : targets)
-            if (value.contains(string)) return true;
-        return false;
-    }
-
-    private static String bytesToHex(byte[] bytes) {
-        StringBuilder builder = new StringBuilder(bytes.length * 2);
-        for (byte b : bytes)
-            builder.append(String.format("%02x", b));
-        return builder.toString();
-    }
-
-}

app/src/main/java/app/revanced/integrations/patches/HideAlbumCardsPatch.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 HideAlbumCardsPatch {
+    //Used by app.revanced.patches.youtube.layout.hidealbumcards.patch.HideAlbumCardsPatch
+    public static void hideAlbumCards(View view) {
+        if (!SettingsEnum.HIDE_ALBUM_CARDS.getBoolean()) return;
+        AdRemoverAPI.HideViewWithLayout1dp(view);
+    }
+}

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

@@ -5,6 +5,6 @@ import app.revanced.integrations.settings.SettingsEnum;
 public class HideAutoplayButtonPatch {
 
     public static boolean isButtonShown() {
-        return SettingsEnum.AUTOPLAY_BUTTON_SHOWN.getBoolean();
+        return SettingsEnum.HIDE_AUTOPLAY_BUTTON.getBoolean() == false;
     }
 }

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

@@ -0,0 +1,13 @@
+package app.revanced.integrations.patches;
+
+import android.widget.ImageView;
+
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.LogHelper;
+
+public class HideCaptionsButtonPatch {
+    //Used by app.revanced.patches.youtube.layout.hidecaptionsbutton.patch.HideCaptionsButtonPatch
+    public static void hideCaptionsButton(ImageView imageView) {
+        imageView.setVisibility(SettingsEnum.HIDE_CAPTIONS_BUTTON.getBoolean() ? ImageView.GONE : ImageView.VISIBLE);
+    }
+}

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

@@ -6,8 +6,8 @@ import app.revanced.integrations.settings.SettingsEnum;
 
 public class HideCastButtonPatch {
 
-    //Used by app.revanced.patches.youtube.layout.castbutton.patch.HideCastButonPatch
+    // Used by app.revanced.patches.youtube.layout.castbutton.patch.HideCastButonPatch
     public static int getCastButtonOverrideV2(int original) {
-        return SettingsEnum.CAST_BUTTON_SHOWN.getBoolean() ? original : View.GONE;
+        return SettingsEnum.HIDE_CAST_BUTTON.getBoolean() ? View.GONE : original;
     }
 }

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

@@ -2,7 +2,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;
 
@@ -10,9 +9,9 @@ public class HideCreateButtonPatch {
 
     //Used by app.revanced.patches.youtube.layout.createbutton.patch.CreateButtonRemoverPatch
     public static void hideCreateButton(View view) {
-        boolean show = SettingsEnum.CREATE_BUTTON_SHOWN.getBoolean();
-        String message = show ? "Create button: Shown" : "Create button: Hidden";
-        LogHelper.debug(HideCreateButtonPatch.class, message);
-        view.setVisibility(show ? View.VISIBLE : View.GONE);
+        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/HideCrowdfundingBoxPatch.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 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);
+    }
+}

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

@@ -0,0 +1,12 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public class HideEmailAddressPatch {
+    //Used by app.revanced.patches.youtube.layout.personalinformation.patch.HideEmailAddressPatch
+    public static int hideEmailAddress(int originalValue) {
+        if (SettingsEnum.HIDE_EMAIL_ADDRESS.getBoolean())
+            return 8;
+        return originalValue;
+    }
+}

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

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

app/src/main/java/app/revanced/integrations/patches/HideHomeAdsPatch.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 HideHomeAdsPatch {
-
-    /**
-     * Used by package app.revanced.extensions.Extensions
-     * @param view
-     */
-    public static void HideHomeAds(View view) {
-        if (!SettingsEnum.HOME_ADS_SHOWN.getBoolean()) {
-            AdRemoverAPI.HideViewWithLayout1dp(view);
-        }
-    }
-
-}

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

@@ -1,14 +0,0 @@
-package app.revanced.integrations.patches;
-
-import android.view.View;
-
-import app.revanced.integrations.settings.SettingsEnum;
-
-public class HideInfoCardSuggestionsPatch {
-
-    public static void hideInfoCardSuggestions(View view) {
-        if (!SettingsEnum.INFO_CARDS_SHOWN.getBoolean()) {
-            view.setVisibility(View.GONE);
-        }
-    }
-}

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

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