chore(release): 0.63.0 [skip ci]

# [0.63.0](https://github.com/revanced/revanced-integrations/compare/v0.62.0...v0.63.0) (2022-10-29)

### Features

* **youtube/sponsorblock:** skip segments once automatically ([#190](https://github.com/revanced/revanced-integrations/issues/190)) ([06bebd7](06bebd7017))

.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

@@ -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,48 @@
+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")
+}

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

@@ -12,9 +12,6 @@ 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 +19,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 +41,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,203 +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 isExperimentalInfoPanelRemoval() {
-        return getBoolean("experimental_info_panel", true);
-    }
-
-    private static boolean isExperimentalMedicalPanelRemoval() {
-        return getBoolean("experimental_medical_panel", true);
-    }
-
-    private static boolean isExperimentalEmergencyBoxRemoval() {
-        return getBoolean("experimental_emergency_box", true);
-    }
-
-    private static boolean isExperimentalAdRemoval() {
-        return getBoolean("experimental_ad_removal", true);
-    }
-
-    private static boolean isExperimentalMerchandiseRemoval() {
-        return getBoolean("experimental_merchandise", true);
-    }
-
-    private static boolean isExperimentalCommunityPostRemoval() {
-        return getBoolean("experimental_community_posts", false);
-    }
-
-    private static boolean isExperimentalMovieRemoval() {
-        return getBoolean("experimental_movie", true);
-    }
-
-    private static boolean isExperimentalCompactBannerRemoval() {
-        return getBoolean("experimental_compact_banner", false);
-    }
-
-    private static boolean isExperimentalPaidContentRemoval() {
-        return getBoolean("experimental_paid_content", true);
-    }
-
-    private static boolean isExperimentalCommentsRemoval() {
-        return getBoolean("experimental_comments", false);
-    }
-
-    private static boolean isInFeedSurvey() {
-        return getBoolean("experimental_in_feed_survey", false);
-    }
-
-    private static boolean isShortsShelf() {
-        return getBoolean("experimental_shorts_shelf", true);
-    }
-
-    private static boolean isCommunityGuidelines() {
-        return getBoolean("experimental_community_guidelines", true);
-    }
-    
-    private static boolean isExperimentalSuggestedForYou() {
-        return getBoolean("experimental_suggested_for_you", 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("text_search_ad_with_description_first");
-                blockList.add("shelf_header");
-                blockList.add("cell_divider");
-                blockList.add("watch_metadata_app_promo");
-                blockList.add("reels_player_overlay");
-
-                bufferBlockList.add("ad_cpn");
-            }
-            if (isExperimentalSuggestedForYou()) {
-                bufferBlockList.add("watch-vrecH");
-            }
-            if (isExperimentalMovieRemoval()) {
-                blockList.add("movie_and_show_upsell_card");
-                blockList.add("compact_movie");
-                blockList.add("horizontal_movie_shelf");
-
-                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 (isExperimentalMerchandiseRemoval()) {
-                blockList.add("product_carousel");
-            }
-            if (isExperimentalCommunityPostRemoval()) {
-                blockList.add("post_base_wrapper");
-            }
-            if (isExperimentalPaidContentRemoval()) {
-                blockList.add("paid_content_overlay");
-            }
-            if (isExperimentalEmergencyBoxRemoval()) {
-                blockList.add("emergency_onebox");
-            }
-            if (isExperimentalMedicalPanelRemoval()) {
-                blockList.add("medical_panel");
-            }
-            if (isExperimentalInfoPanelRemoval()) {
-                blockList.add("single_item_information_panel");
-                blockList.add("publisher_transparency_panel");
-            }
-            if (isExperimentalCompactBannerRemoval()) {
-                blockList.add("compact_banner");
-            }
-            if (isExperimentalCommentsRemoval()) {
-                blockList.add("comments_composite_entry_point");
-            }
-            if (isInFeedSurvey()) {
-                blockList.add("in_feed_survey");
-            }
-            if (isShortsShelf()) {
-                blockList.add("shorts_shelf");
-            }
-            if (isCommunityGuidelines()) {
-                blockList.add("community_guidelines");
-            }
-
-            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/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/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/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/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);
+    }
+}

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

@@ -0,0 +1,10 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public class HideAutoplayButtonPatch {
+
+    public static boolean isButtonShown() {
+        return SettingsEnum.AUTOPLAY_BUTTON_SHOWN.getBoolean();
+    }
+}

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

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

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

@@ -2,13 +2,16 @@ 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;
 
 public class HideCreateButtonPatch {
 
-    //Todo: Switch BooleanPreferences to Settings class
     //Used by app.revanced.patches.youtube.layout.createbutton.patch.CreateButtonRemoverPatch
     public static void hideCreateButton(View view) {
-        AdRemoverAPI.hideCreateButton(view);
+        boolean enabled = SettingsEnum.CREATE_BUTTON_ENABLED.getBoolean();
+        String message =  "Create button: " + (enabled ? "shown" : "hidden");
+        LogHelper.debug(HideCreateButtonPatch.class, message);
+        view.setVisibility(enabled ? View.VISIBLE : View.GONE);
     }
 }

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,10 @@
+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 boolean hideEmailAddress() {
+        return SettingsEnum.HIDE_EMAIL_ADDRESS.getBoolean();
+    }
+}

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

@@ -3,19 +3,18 @@ package app.revanced.integrations.patches;
 import android.view.View;
 
 import app.revanced.integrations.adremover.AdRemoverAPI;
-import app.revanced.integrations.settings.Settings;
 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_BOOLEAN.getBoolean()) {
-            AdRemoverAPI.HideViewWithLayout1dp(view);
-        }
+        if (!SettingsEnum.HOME_ADS_REMOVAL.getBoolean()) return;
+        AdRemoverAPI.HideViewWithLayout1dp(view);
     }
 
 }

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

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