chore(release): 0.77.0 [skip ci]

# [0.77.0](https://github.com/revanced/revanced-integrations/compare/v0.76.0...v0.77.0) (2022-11-24)

### Bug Fixes

* invalid syntax error ([d4a23ed](d4a23ed5c9))

### Features

* **youtube/general-ads:** hide movie ad from search ([767201c](767201ce05))

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -0,0 +1,59 @@
+name: 🐞 Bug report
+description: Report a very clearly broken issue.
+title: 'bug: <title>'
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # ReVanced bug report
+
+        Important to note that your issue may have already been reported before. Please check for existing issues [here](https://github.com/revanced/revanced-integrations/labels/bug).
+
+  - type: dropdown
+    attributes:
+      label: Type
+      options:
+        - Cosmetic
+        - Other
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Bug description
+      description: How did you find the bug? Any additional details that might help?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: Add the steps to reproduce this bug including your environment.
+      placeholder: Step 1. Download some files. Step 2. ...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Screenshots or videos
+      description: Add screenshots or videos that show the bug here.
+      placeholder: Drag and drop the screenshots/videos into this box.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Solution
+      description: If applicable, add a possible solution.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add additional context here.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 📃 Documentation
+    url: https://github.com/revanced/revanced-documentation/
+    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!

.github/ISSUE_TEMPLATE/feature-issue.yml

@@ -0,0 +1,46 @@
+name: ⭐ Feature request
+description: Create a detailed feature request.
+title: 'feat: <title>'
+labels: [feature-request]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # ReVanced feature request
+        
+        Do not submit requests for patches here. Please submit them [here](https://github.com/orgs/revanced/discussions/categories/patches) instead.
+        Important to note that your feature request may have already been made before. Please check for existing feature requests [here](https://github.com/revanced/revanced-integrations/labels/feature-request).
+
+  - type: dropdown
+    attributes:
+      label: Type
+      options:
+        - Functionality
+        - Cosmetic
+        - Other
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Issue
+      description: What is the current problem. Why does it require a feature request?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Feature
+      description: Describe your feature in detail. How does it solve the issue?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Motivation
+      description: Why should your feature should be considered?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add additional context here.
+    validations:
+      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

.releaserc

@@ -7,7 +7,11 @@
     }
   ],
   "plugins": [
-    "@semantic-release/commit-analyzer",
+     ["@semantic-release/commit-analyzer", {
+      "releaseRules": [
+        {"type": "build", "release": "patch"}
+      ]
+    }],
     "@semantic-release/release-notes-generator",
     "@semantic-release/changelog",
     "gradle-semantic-release-plugin",
@@ -31,4 +35,4 @@
       }
     ]
   ]
-}
+}

README.md

@@ -1 +1,8 @@
-# ReVanced Integrations
+# 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/.gitignore

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

app/build.gradle

@@ -1,39 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 32
-    namespace 'app.revanced.integrations'
-
-    defaultConfig {
-        applicationId "app.revanced.integrations"
-        minSdkVersion 23
-        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,49 @@
+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")
+}

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,13 +8,8 @@ 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;
 
-/**
- * API Class that provides the logic to the Patch classes. All methods in here should be protected/private and only be accessed from a Patch class.
- */
 public class AdRemoverAPI {
 
     /**
@@ -22,6 +17,7 @@ public class AdRemoverAPI {
      *
      * @param view
      */
+    //ToDo: refactor this
     public static void HideViewWithLayout1dp(View view) {
         if (view instanceof LinearLayout) {
             LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(1, 1);
@@ -43,101 +39,4 @@ public class AdRemoverAPI {
         }
     }
 
-    /**
-     * Removes the Create button
-     *
-     * @param view
-     */
-    public static void hideCreateButton(View view) {
-        String message = SettingsEnum.CREATE_BUTTON_SHOWN_BOOLEAN.getBoolean() ? "Create button: Shown" : "Create button: Hidden";
-        LogHelper.debug(AdRemoverAPI.class, message);
-        if (SettingsEnum.CREATE_BUTTON_SHOWN_BOOLEAN.getBoolean()) {
-            view.setVisibility(View.VISIBLE);
-        } else {
-            view.setVisibility(View.GONE);
-        }
-    }
-
-    /**
-     * Removes the shorts button
-     *
-     * @param view
-     */
-    public static void hideShortsButton(View view) {
-        if (HideShortsButtonPatch.lastPivotTab != null && HideShortsButtonPatch.lastPivotTab.name() == "TAB_SHORTS") {
-            String message = SettingsEnum.SHORTS_BUTTON_SHOWN_BOOLEAN.getBoolean() ? "Shorts button: shown" : "Shorts button: hidden";
-            LogHelper.debug(AdRemoverAPI.class, message);
-            if (!SettingsEnum.SHORTS_BUTTON_SHOWN_BOOLEAN.getBoolean()) {
-                view.setVisibility(View.GONE);
-            }
-        }
-    }
-
-    /*
-    private static void inspectComponentHost(Object item) {
-        StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
-        if (stackTraceElements.length <= 3) {
-            LogHelper.debug("Litho", "Couldn't locate the method called from.");
-        } else {
-            String sb = "Called from method: " +
-                    stackTraceElements[3].toString() + "\n";
-            LogHelper.debug("Litho", sb);
-        }
-        if (item == null) {
-            LogHelper.debug("Litho", "Item is null.");
-        } else if (item.getClass().getSimpleName().contains("cwl")) {
-            LogHelper.debug("Litho", "Item is a cwl item.");
-            LogHelper.debug("Litho", getViewHierarchy((ViewGroup) item));
-        } else {
-            LogHelper.debug("Litho", "Item is not a cwl item.");
-        }
-    }
-
-    private static String getViewHierarchy(ViewGroup v) {
-        StringBuffer buf = new StringBuffer();
-        printViews(v, buf, 0);
-        return buf.toString();
-    }
-
-    private static String printViews(ViewGroup v, StringBuffer buf, int level) {
-        int childCount = v.getChildCount();
-        v.getId();
-        indent(buf, level);
-        buf.append(v.getClass().getName());
-        buf.append(" children:");
-        buf.append(childCount);
-        buf.append("  id:").append(v.getId());
-        buf.append("\n");
-        for (int i = 0; i < childCount; i++) {
-            View child = v.getChildAt(i);
-            if (child instanceof ViewGroup) {
-                printViews((ViewGroup) child, buf, level + 1);
-            } else {
-                indent(buf, level + 1);
-                buf.append(child.getClass().getName());
-                buf.append("  id:").append(child.getId());
-                buf.append("\n");
-            }
-        }
-        return buf.toString();
-    }
-
-    private static void indent(StringBuffer buf, int level) {
-        for (int i = 0; i < level; i++) {
-            buf.append("  ");
-        }
-    }
-
-    private static void recursiveLoopChildren(ViewGroup parent) {
-        for (int i = 0; i < parent.getChildCount(); i++) {
-            View child = parent.getChildAt(i);
-            if (child instanceof ViewGroup) {
-                recursiveLoopChildren((ViewGroup) child);
-                child.setVisibility(View.GONE);
-            } else if (child != null) {
-                child.setVisibility(View.GONE);
-            }
-        }
-    }*/
-
 }

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

@@ -1,202 +0,0 @@
-package app.revanced.integrations.adremover;
-
-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 java.util.Objects;
-
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
-import app.revanced.integrations.utils.ReVancedUtils;
-import app.revanced.integrations.utils.SharedPrefHelper;
-
-public class LithoAdRemoval {
-    private static boolean getBoolean(String key, boolean _default) {
-        return SharedPrefHelper.getBoolean(Objects.requireNonNull(ReVancedUtils.getContext()), SharedPrefHelper.SharedPrefNames.YOUTUBE, key, _default);
-    }
-    
-    private static boolean isCommunityGuidelines() {
-        return getBoolean("experimental_community_guidelines", true);
-    }
-    
-    private static boolean isExperimentalAdRemoval() {
-        return getBoolean("experimental_ad_removal", true);
-    }
-    
-    private static boolean isExperimentalCommentsRemoval() {
-        return getBoolean("experimental_comments", false);
-    }
-    
-    private static boolean isExperimentalCommunityPostRemoval() {
-        return getBoolean("experimental_community_posts", false);
-    }
-    
-    private static boolean isExperimentalCompactBannerRemoval() {
-        return getBoolean("experimental_compact_banner", false);
-    }
-    
-    private static boolean isExperimentalEmergencyBoxRemoval() {
-        return getBoolean("experimental_emergency_box", true);
-    }
-    
-    private static boolean isExperimentalInfoPanelRemoval() {
-        return getBoolean("experimental_info_panel", true);
-    }
-    
-    private static boolean isExperimentalMedicalPanelRemoval() {
-        return getBoolean("experimental_medical_panel", true);
-    }
-    
-    private static boolean isExperimentalMerchandiseRemoval() {
-        return getBoolean("experimental_merchandise", true);
-    }
-    
-    private static boolean isExperimentalMovieRemoval() {
-        return getBoolean("experimental_movie", true);
-    }
-    
-    private static boolean isExperimentalPaidContentRemoval() {
-        return getBoolean("experimental_paid_content", true);
-    }
-    
-    private static boolean isExperimentalSuggestedForYou() {
-        return getBoolean("experimental_suggested_for_you", true);
-    }
-    
-    private static boolean isInFeedSurvey() {
-        return getBoolean("experimental_in_feed_survey", false);
-    }
-    
-    private static boolean isShortsShelf() {
-        return getBoolean("experimental_shorts_shelf", true);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    public static boolean containsAd(String value, ByteBuffer buffer) {
-        try {
-            if (!(isExperimentalAdRemoval() ||
-                    isExperimentalMerchandiseRemoval() ||
-                    isExperimentalPaidContentRemoval() || isExperimentalCommunityPostRemoval() ||
-                    isExperimentalMovieRemoval() ||
-                    isExperimentalCompactBannerRemoval() ||
-                    isExperimentalCommentsRemoval() ||
-                    isInFeedSurvey() ||
-                    isShortsShelf() ||
-                    isCommunityGuidelines()) ||
-                    value == null ||
-                    value.isEmpty()
-            ) {
-                return false;
-            }
-            List<String> blockList = new ArrayList<>();
-            List<String> bufferBlockList = new ArrayList<>();
-
-            if (isExperimentalAdRemoval()) {
-                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 (isExperimentalSuggestedForYou()) {
-                bufferBlockList.add("watch-vrecH");
-            }
-            if (isExperimentalMovieRemoval()) {
-                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(StandardCharsets.UTF_8.decode(buffer).toString()::contains)
-            ) return true;
-
-            if (isExperimentalCommentsRemoval()) {
-                blockList.add("comments_composite_entry_point");
-            }
-            if (isCommunityGuidelines()) {
-                blockList.add("community_guidelines");
-            }
-            if (isExperimentalCompactBannerRemoval()) {
-                blockList.add("compact_banner");
-            }
-            if (isExperimentalEmergencyBoxRemoval()) {
-                blockList.add("emergency_onebox");
-            }
-            if (isInFeedSurvey()) {
-                blockList.add("in_feed_survey");
-            }
-            if (isExperimentalMedicalPanelRemoval()) {
-                blockList.add("medical_panel");
-            }
-            if (isExperimentalPaidContentRemoval()) {
-                blockList.add("paid_content_overlay");
-            }
-            if (isExperimentalCommunityPostRemoval()) {
-                blockList.add("post_base_wrapper");
-            }
-            if (isExperimentalMerchandiseRemoval()) {
-                blockList.add("product_carousel");
-            }
-            if (isShortsShelf()) {
-                blockList.add("shorts_shelf");
-            }
-            if (isExperimentalInfoPanelRemoval()) {
-                blockList.add("publisher_transparency_panel");
-                blockList.add("single_item_information_panel");
-            }
-            
-            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(LithoAdRemoval.class, value);
-                return true;
-            }
-
-            if (!SettingsEnum.DEBUG_BOOLEAN.getBoolean()) return false;
-            if (value.contains("related_video_with_context")) {
-                LogHelper.debug(LithoAdRemoval.class, value + " | " + bytesToHex(buffer.array()));
-                return false;
-            }
-            LogHelper.debug(LithoAdRemoval.class, value);
-            return false;
-        } catch (
-                Exception ex) {
-            LogHelper.printException(LithoAdRemoval.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/adremover/whitelist/Whitelist.java

@@ -1,179 +0,0 @@
-package app.revanced.integrations.adremover.whitelist;
-
-import static app.revanced.integrations.sponsorblock.player.VideoInformation.channelName;
-import static app.revanced.integrations.sponsorblock.player.ui.SlimButtonContainer.adBlockButton;
-import static app.revanced.integrations.sponsorblock.player.ui.SlimButtonContainer.sbWhitelistButton;
-import static app.revanced.integrations.sponsorblock.StringRef.str;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import android.widget.Toast;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
-import app.revanced.integrations.sponsorblock.player.ChannelModel;
-import app.revanced.integrations.sponsorblock.player.VideoInformation;
-import app.revanced.integrations.utils.ObjectSerializer;
-import app.revanced.integrations.utils.ReVancedUtils;
-import app.revanced.integrations.utils.SharedPrefHelper;
-
-public class Whitelist {
-
-    private static final Map<WhitelistType, ArrayList<ChannelModel>> whitelistMap = parseWhitelist(ReVancedUtils.getContext());
-    private static final Map<WhitelistType, Boolean> enabledMap = parseEnabledMap(ReVancedUtils.getContext());
-
-    private Whitelist() {
-    }
-
-    // injected calls
-
-    public static boolean shouldShowAds() {
-        return isWhitelisted(WhitelistType.ADS);
-    }
-
-    public static void setChannelName(String channelName) {
-        LogHelper.debug(Whitelist.class, "channel name set to " + channelName);
-        VideoInformation.channelName = channelName;
-
-        if (enabledMap.get(WhitelistType.ADS) && adBlockButton != null) {
-            adBlockButton.changeEnabled(shouldShowAds());
-        }
-        if (enabledMap.get(WhitelistType.SPONSORBLOCK) && sbWhitelistButton != null) {
-            sbWhitelistButton.changeEnabled(isChannelSBWhitelisted());
-        }
-    }
-
-    // the rest
-
-    public static boolean isChannelSBWhitelisted() {
-        return isWhitelisted(WhitelistType.SPONSORBLOCK);
-    }
-
-    private static Map<WhitelistType, ArrayList<ChannelModel>> parseWhitelist(Context context) {
-        if (context == null) {
-            return Collections.emptyMap();
-        }
-        WhitelistType[] whitelistTypes = WhitelistType.values();
-        Map<WhitelistType, ArrayList<ChannelModel>> whitelistMap = new EnumMap<>(WhitelistType.class);
-
-        for (WhitelistType whitelistType : whitelistTypes) {
-            SharedPreferences preferences = SharedPrefHelper.getPreferences(context, whitelistType.getPreferencesName());
-            String serializedChannels = preferences.getString("channels", null);
-            if (serializedChannels == null) {
-                LogHelper.debug(Whitelist.class, String.format("channels string was null for %s whitelisting", whitelistType));
-                whitelistMap.put(whitelistType, new ArrayList<>());
-                continue;
-            }
-            try {
-                ArrayList<ChannelModel> deserializedChannels = (ArrayList<ChannelModel>) ObjectSerializer.deserialize(serializedChannels);
-                if (SettingsEnum.DEBUG_BOOLEAN.getBoolean()) {
-                    LogHelper.debug(Whitelist.class, serializedChannels);
-                    for (ChannelModel channel : deserializedChannels) {
-                        LogHelper.debug(Whitelist.class, String.format("Whitelisted channel %s (%s) for type %s", channel.getAuthor(), channel.getChannelId(), whitelistType));
-                    }
-                }
-                whitelistMap.put(whitelistType, deserializedChannels);
-            } catch (Exception ex) {
-                ex.printStackTrace();
-            }
-        }
-        return whitelistMap;
-    }
-
-    private static Map<WhitelistType, Boolean> parseEnabledMap(Context context) {
-        if (context == null) {
-            return Collections.emptyMap();
-        }
-        Map<WhitelistType, Boolean> enabledMap = new EnumMap<>(WhitelistType.class);
-        for (WhitelistType whitelistType : WhitelistType.values()) {
-            enabledMap.put(whitelistType, SharedPrefHelper.getBoolean(context, whitelistType.getSharedPreferencesName(), whitelistType.getPreferenceEnabledName()));
-        }
-        return enabledMap;
-    }
-
-    private static boolean isWhitelisted(WhitelistType whitelistType) {
-        boolean isEnabled = false;
-        if(enabledMap.containsKey(whitelistType) && enabledMap.get(whitelistType) != null) {
-            isEnabled = enabledMap.get(whitelistType);
-        }
-        if (!isEnabled) {
-            return false;
-        }
-        if (channelName == null || channelName.trim().isEmpty()) {
-            LogHelper.debug(Whitelist.class, String.format("Can't check whitelist status for %s because channel name was missing", whitelistType));
-
-            return false;
-        }
-        List<ChannelModel> whitelistedChannels = whitelistMap.get(whitelistType);
-        for (ChannelModel channel : whitelistedChannels) {
-            if (channel.getAuthor().equals(channelName)) {
-                LogHelper.debug(Whitelist.class, String.format("Whitelist for channel %s for type %s", channelName, whitelistType));
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static boolean addToWhitelist(WhitelistType whitelistType, Context context, ChannelModel channel) {
-        ArrayList<ChannelModel> whitelisted = whitelistMap.get(whitelistType);
-        for (ChannelModel whitelistedChannel : whitelisted) {
-            String channelId = channel.getChannelId();
-            if (whitelistedChannel.getChannelId().equals(channelId)) {
-                LogHelper.debug(Whitelist.class, String.format("Tried whitelisting an existing channel again. Old info (%1$s | %2$s) - New info (%3$s | %4$s)",
-                        whitelistedChannel.getAuthor(), channelId, channelName, channelId));
-                return true;
-            }
-        }
-        whitelisted.add(channel);
-        return updateWhitelist(whitelistType, whitelisted, context);
-    }
-
-    public static void removeFromWhitelist(WhitelistType whitelistType, Context context, String channelName) {
-        ArrayList<ChannelModel> channels = whitelistMap.get(whitelistType);
-        Iterator<ChannelModel> iterator = channels.iterator();
-        while (iterator.hasNext()) {
-            ChannelModel channel = iterator.next();
-            if (channel.getAuthor().equals(channelName)) {
-                iterator.remove();
-                break;
-            }
-        }
-        boolean success = updateWhitelist(whitelistType, channels, context);
-        String friendlyName = whitelistType.getFriendlyName();
-        if (success) {
-            Toast.makeText(context, str("revanced_whitelisting_removed", channelName, friendlyName), Toast.LENGTH_SHORT).show();
-        } else {
-            Toast.makeText(context, str("revanced_whitelisting_remove_failed", channelName, friendlyName), Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    private static boolean updateWhitelist(WhitelistType whitelistType, ArrayList<ChannelModel> channels, Context context) {
-        if (context == null) {
-            return false;
-        }
-        SharedPreferences preferences = SharedPrefHelper.getPreferences(context, whitelistType.getPreferencesName());
-        SharedPreferences.Editor editor = preferences.edit();
-
-        try {
-            editor.putString("channels", ObjectSerializer.serialize(channels));
-            editor.apply();
-            return true;
-        } catch (IOException e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    public static void setEnabled(WhitelistType whitelistType, boolean enabled) {
-        enabledMap.put(whitelistType, enabled);
-    }
-}

app/src/main/java/app/revanced/integrations/adremover/whitelist/WhitelistType.java

@@ -1,38 +0,0 @@
-package app.revanced.integrations.adremover.whitelist;
-
-import static app.revanced.integrations.sponsorblock.StringRef.str;
-
-import app.revanced.integrations.utils.SharedPrefHelper;
-
-public enum WhitelistType {
-    ADS(SharedPrefHelper.SharedPrefNames.YOUTUBE, "revanced_whitelist_ads_enabled"),
-    SPONSORBLOCK(SharedPrefHelper.SharedPrefNames.SPONSOR_BLOCK, "revanced_whitelist_sb_enabled");
-
-    private final String friendlyName;
-    private final String preferencesName;
-    private final String preferenceEnabledName;
-    private final SharedPrefHelper.SharedPrefNames name;
-
-    WhitelistType(SharedPrefHelper.SharedPrefNames name, String preferenceEnabledName) {
-        this.friendlyName = str("revanced_whitelisting_" + name().toLowerCase());
-        this.name = name;
-        this.preferencesName = "whitelist_" + name();
-        this.preferenceEnabledName = preferenceEnabledName;
-    }
-
-    public String getFriendlyName() {
-        return friendlyName;
-    }
-
-    public SharedPrefHelper.SharedPrefNames getSharedPreferencesName() {
-        return name;
-    }
-
-    public String getPreferencesName() {
-        return preferencesName;
-    }
-
-    public String getPreferenceEnabledName() {
-        return preferenceEnabledName;
-    }
-}

app/src/main/java/app/revanced/integrations/adremover/whitelist/requests/WhitelistRequester.java

@@ -1,103 +0,0 @@
-package app.revanced.integrations.adremover.whitelist.requests;
-
-import static app.revanced.integrations.sponsorblock.player.VideoInformation.currentVideoId;
-import static app.revanced.integrations.utils.ReVancedUtils.runOnMainThread;
-import static app.revanced.integrations.sponsorblock.StringRef.str;
-
-import android.content.Context;
-
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.Toast;
-
-import org.json.JSONObject;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.nio.charset.StandardCharsets;
-
-import app.revanced.integrations.utils.LogHelper;
-import app.revanced.integrations.sponsorblock.player.ChannelModel;
-import app.revanced.integrations.adremover.whitelist.Whitelist;
-import app.revanced.integrations.adremover.whitelist.WhitelistType;
-import app.revanced.integrations.BuildConfig;
-
-public class WhitelistRequester {
-    private static final String YT_API_URL = "https://www.youtube.com/youtubei/v1/";
-
-    private WhitelistRequester() {
-    }
-
-    public static void addChannelToWhitelist(WhitelistType whitelistType, View view, ImageView buttonIcon, Context context) {
-        try {
-            HttpURLConnection connection = getConnectionFromRoute(WhitelistRoutes.GET_CHANNEL_DETAILS, BuildConfig.YT_API_KEY);
-            connection.setRequestProperty("Content-Type", "application/json; utf-8");
-            connection.setRequestProperty("Accept", "application/json");
-            connection.setDoOutput(true);
-            connection.setConnectTimeout(2 * 1000);
-
-            String versionName = getVersionName(context);
-            String jsonInputString = "{\"context\": {\"client\": { \"clientName\": \"Android\", \"clientVersion\": \"" + versionName + "\" } }, \"videoId\": \"" + currentVideoId + "\"}";
-            try (OutputStream os = connection.getOutputStream()) {
-                byte[] input = jsonInputString.getBytes(StandardCharsets.UTF_8);
-                os.write(input, 0, input.length);
-            }
-            int responseCode = connection.getResponseCode();
-            if (responseCode == 200) {
-                JSONObject json = getJSONObject(connection);
-                JSONObject videoInfo = json.getJSONObject("videoDetails");
-                ChannelModel channelModel = new ChannelModel(videoInfo.getString("author"), videoInfo.getString("channelId"));
-                String author = channelModel.getAuthor();
-                LogHelper.debug(WhitelistRequester.class, "channelId " + channelModel.getChannelId() + " fetched for author " + author);
-
-                boolean success = Whitelist.addToWhitelist(whitelistType, context, channelModel);
-                String whitelistTypeName = whitelistType.getFriendlyName();
-                runOnMainThread(() -> {
-                    if (success) {
-                        buttonIcon.setEnabled(whitelistType != WhitelistType.SPONSORBLOCK);
-                        Toast.makeText(context, str("revanced_whitelisting_added", author, whitelistTypeName), Toast.LENGTH_SHORT).show();
-                    } else {
-                        buttonIcon.setEnabled(whitelistType == WhitelistType.SPONSORBLOCK);
-                        Toast.makeText(context, str("revanced_whitelisting_add_failed", author, whitelistTypeName), Toast.LENGTH_SHORT).show();
-                    }
-                    view.setEnabled(true);
-                });
-            } else {
-                LogHelper.debug(WhitelistRequester.class, "player fetch response was " + responseCode);
-                runOnMainThread(() -> {
-                    Toast.makeText(context, str("revanced_whitelisting_fetch_failed", responseCode), Toast.LENGTH_SHORT).show();
-                    buttonIcon.setEnabled(true);
-                    view.setEnabled(true);
-                });
-            }
-            connection.disconnect();
-        } catch (Exception ex) {
-            LogHelper.printException(WhitelistRequester.class, "Failed to fetch channelId", ex);
-            runOnMainThread(() -> view.setEnabled(true));
-        }
-    }
-
-    // helpers
-
-    private static HttpURLConnection getConnectionFromRoute(Route route, String... params) throws IOException {
-        return Requester.getConnectionFromRoute(YT_API_URL, route, params);
-    }
-
-    private static JSONObject getJSONObject(HttpURLConnection connection) throws Exception {
-        return Requester.getJSONObject(connection);
-    }
-
-    private static String getVersionName(Context context) {
-        try {
-            PackageInfo pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
-            String version = pInfo.versionName;
-            return (version);
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-        }
-        return ("17.24.34");
-    }
-}

app/src/main/java/app/revanced/integrations/adremover/whitelist/requests/WhitelistRoutes.java

@@ -1,10 +0,0 @@
-package app.revanced.integrations.adremover.whitelist.requests;
-
-import static app.revanced.integrations.adremover.whitelist.requests.Route.Method.POST;
-
-public class WhitelistRoutes {
-    public static final Route GET_CHANNEL_DETAILS = new Route(POST, "player?key={api_key}");
-
-    private WhitelistRoutes() {
-    }
-}

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

@@ -3,10 +3,8 @@ 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_BOOLEAN.getBoolean();
+        return SettingsEnum.PREFERRED_AUTO_REPEAT.getBoolean();
     }
 }

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

@@ -7,6 +7,6 @@ public class BrandingWaterMarkPatch {
 
     //Used by: app.revanced.patches.youtube.layout.watermark.patch.HideWatermarkPatch
     public static boolean isBrandingWatermarkShown() {
-        return SettingsEnum.BRANDING_SHOWN_BOOLEAN.getBoolean();
+        return SettingsEnum.BRANDING_SHOWN.getBoolean();
     }
 }

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.debug(ButtonsPatch.class, "Hiding share button");
+                return true;
+            } else return false;
+        }
+
+        if ((currentIsActionButton && ActionButton.doNotBlockCounter <= 0 && actionButtonsRule.isEnabled()) || pathRegister.contains(path)) {
+            LogHelper.debug(ButtonsPatch.class, "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.debug(CommentsPatch.class, "Blocked: " + path);
+
+        return true;
+    }
+}

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

@@ -0,0 +1,13 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+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.debug(FixPlaybackPatch.class, "Thread was interrupted");
+            }
+        });
+
+        currentThread.start();
+    }
+}

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

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

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.debug(GeneralAdsPatch.class, message);
+    }
+}

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

@@ -1,19 +0,0 @@
-package app.revanced.integrations.patches;
-
-import android.os.Build;
-
-import androidx.annotation.RequiresApi;
-
-import java.nio.ByteBuffer;
-
-import app.revanced.integrations.adremover.LithoAdRemoval;
-
-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 LithoAdRemoval.containsAd(value, buffer);
-    }
-
-}

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

@@ -0,0 +1,41 @@
+package app.revanced.integrations.patches;
+
+import android.view.WindowManager;
+
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.swipecontrols.SwipeControlsHostActivity;
+
+/**
+ * Patch class for 'hdr-auto-brightness' patch
+ *
+ * @usedBy app/revanced/patches/youtube/misc/hdrbrightness/patch/HDRBrightnessPatch
+ * @smali app/revanced/integrations/patches/HDRAutoBrightnessPatch
+ */
+public class HDRAutoBrightnessPatch {
+    /**
+     * get brightness override for HDR brightness
+     *
+     * @param original brightness youtube would normally set
+     * @return brightness to set on HRD video
+     * @smali getHDRBrightness(F)F
+     */
+    public static float getHDRBrightness(float original) {
+        // do nothing if disabled
+        if (!SettingsEnum.USE_HDR_AUTO_BRIGHTNESS.getBoolean()) {
+            return original;
+        }
+
+        // override with brightness set by swipe-controls
+        // only when swipe-controls is active and has overridden the brightness
+        final SwipeControlsHostActivity swipeControlsHost = SwipeControlsHostActivity.getCurrentHost().get();
+        if (swipeControlsHost != null
+                && swipeControlsHost.getScreen() != null
+                && swipeControlsHost.getConfig().getEnableBrightnessControl()
+                && !swipeControlsHost.getScreen().isDefaultBrightness()) {
+            return swipeControlsHost.getScreen().getRawScreenBrightness();
+        }
+
+        // otherwise, set the brightness to auto
+        return WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE;
+    }
+}

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

@@ -1,14 +0,0 @@
-package app.revanced.integrations.patches;
-
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.videoswipecontrols.helpers.BrightnessHelper;
-
-public class HDRMaxBrightnessPatch {
-
-    //Used by app/revanced/patches/youtube/misc/hdrbrightness/patch/HDRBrightnessPatch
-    public static float getHDRBrightness(float original) {
-        if (!SettingsEnum.USE_HDR_BRIGHTNESS_BOOLEAN.getBoolean()) return original;
-        return SettingsEnum.ENABLE_SWIPE_BRIGHTNESS_BOOLEAN.getBoolean() ? BrightnessHelper.getBrightness() : -1.0f;
-    }
-
-}

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);
+    }
+}