chore(release): 0.92.1-dev.2 [skip ci]

## [0.92.1-dev.2](https://github.com/revanced/revanced-integrations/compare/v0.92.1-dev.1...v0.92.1-dev.2) (2023-01-07)

### Bug Fixes

* load numeric preferences as type String ([212d3a7](212d3a72d8))

.github/config.yml

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

.github/workflows/pull_request.yml

@@ -11,7 +11,6 @@ env:
 
 jobs:
   pull-request:
-    name: Open pull request
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -21,10 +20,5 @@ jobs:
         with:
           destination_branch: 'main'
           pr_title: 'chore: ${{ env.MESSAGE }}'
-          pr_body: |
-            This pull request will ${{ env.MESSAGE }}.
-            
-            ## Dependencies before merge
-
-            - [ ] https://github.com/revanced/revanced-patches
-          pr_draft: true
+          pr_body: 'This pull request will ${{ env.MESSAGE }}.'
+          pr_draft: true

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Release
 on:
   workflow_dispatch:
   push:
-    branches:
+    branches: 
       - main
       - dev
   pull_request:
@@ -12,19 +12,13 @@ on:
       - dev
 
 jobs:
-  release:
-    name: Release
+  build:
     runs-on: ubuntu-latest
     steps:
-    - name: Cancel previous runs
+    - name: Cancel previou runs
       uses: styfle/cancel-workflow-action@0.11.0
     - name: Checkout
       uses: actions/checkout@v3
-      with:
-        # Make sure the release step uses its own credentials:
-        # https://github.com/cycjimmy/semantic-release-action#private-packages
-        persist-credentials: false
-        fetch-depth: 0
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
@@ -33,11 +27,11 @@ jobs:
     - name: Setup Node.js
       uses: actions/setup-node@v3
       with:
-        node-version: "18"
+        node-version: "latest"
         cache: 'npm'
     - name: Setup semantic-release
-      run: npm install
+      run: npm install semantic-release @saithodev/semantic-release-backmerge @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D
     - name: Release
       env:
-        GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
-      run: npm exec semantic-release
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: npx semantic-release

.releaserc

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

app/build.gradle.kts

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

app/proguard-rules.pro

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

app/src/main/java/app/revanced/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch.java

@@ -1,11 +0,0 @@
-package app.revanced.all.screenshot.removerestriction;
-
-import android.view.Window;
-import android.view.WindowManager;
-
-public class RemoveScreenshotRestrictionPatch {
-
-    public static void setFlags(Window window, int flags, int mask) {
-        window.setFlags(flags & ~WindowManager.LayoutParams.FLAG_SECURE, mask & ~WindowManager.LayoutParams.FLAG_SECURE);
-    }
-}

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

@@ -1,31 +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");
-        pathRegister.registerAll(
-                new BlockRule(SettingsEnum.HIDE_LIKE_DISLIKE_BUTTON, "|like_button", "dislike_button"),
-                new BlockRule(SettingsEnum.HIDE_DOWNLOAD_BUTTON, "download_button"),
-                new BlockRule(SettingsEnum.HIDE_PLAYLIST_BUTTON, "save_to_playlist_button"),
-                new BlockRule(SettingsEnum.HIDE_CLIP_BUTTON, "|clip_button.eml|"),
-                new BlockRule(SettingsEnum.HIDE_ACTION_BUTTONS, "ContainerType|video_action_button", "|CellType|CollectionType|CellType|ContainerType|button.eml|")
+
+        this.pathRegister.registerAll(
+                like,
+                dislikeRule,
+                download,
+                playlist
         );
     }
 
-    private boolean canHideActionBar() {
-        for (BlockRule rule : pathRegister) if (!rule.isEnabled()) return false;
+    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 everything is hidden, then also hide the video bar itself.
-        if (canHideActionBar() && actionBarRule.check(identifier).isBlocked()) return true;
+        if (hideActionBar() && actionBarRule.check(identifier).isBlocked()) return true;
 
-        return pathRegister.contains(path);
+        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

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

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

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

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

@@ -1,10 +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.HIDE_FULLSCREEN_PANELS.getBoolean() ? View.GONE : View.VISIBLE;
     }
+
 }

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

@@ -1,6 +1,7 @@
 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;
@@ -26,30 +27,24 @@ public final class GeneralAdsPatch extends Filter {
         var subscribersCommunityGuidelines = new BlockRule(SettingsEnum.ADREMOVER_SUBSCRIBERS_COMMUNITY_GUIDELINES_REMOVAL, "sponsorships_comments_upsell");
         var channelMemberShelf = new BlockRule(SettingsEnum.ADREMOVER_CHANNEL_MEMBER_SHELF_REMOVAL, "member_recognition_shelf");
         var compactBanner = new BlockRule(SettingsEnum.ADREMOVER_COMPACT_BANNER_REMOVAL, "compact_banner");
-        var inFeedSurvey = new BlockRule(SettingsEnum.ADREMOVER_FEED_SURVEY_REMOVAL, "in_feed_survey", "slimline_survey");
+        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_CARDS, "official_card");
+        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", "macro_markers_carousel");
-        var viewProducts = new BlockRule(SettingsEnum.ADREMOVER_VIEW_PRODUCTS, "product_item", "products_in_video");
-        var webLinkPanel = new BlockRule(SettingsEnum.ADREMOVER_WEB_SEARCH_RESULTS, "web_link_panel");
-        var channelBar = new BlockRule(SettingsEnum.ADREMOVER_CHANNEL_BAR, "channel_bar");
-        var relatedVideos = new BlockRule(SettingsEnum.ADREMOVER_RELATED_VIDEOS, "fullscreen_related_videos");
-        var quickActions = new BlockRule(SettingsEnum.ADREMOVER_QUICK_ACTIONS, "quick_actions");
-        var imageShelf = new BlockRule(SettingsEnum.ADREMOVER_IMAGE_SHELF, "image_shelf");
+        var 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,
-                "_buttoned_layout",
+                "video_display_full_buttoned_layout",
                 "full_width_square_image_layout",
                 "_ad_with",
-                "video_display_button_group_layout",
                 "landscape_image_wide_button_layout"
         );
         var generalAds = new BlockRule(
@@ -58,15 +53,7 @@ public final class GeneralAdsPatch extends Filter {
                 "banner_text_icon",
                 "square_image_layout",
                 "watch_metadata_app_promo",
-                "video_display_full_layout",
-                "hero_promo_image",
-                "statement_banner",
-                "carousel_footered_layout",
-                "text_image_button_layout",
-                "primetime_promo",
-                "feature_grid_interstitial",
-                "product_details",
-                "brand_video_shelf"
+                "video_display_full_layout"
         );
         var movieAds = new BlockRule(
                 SettingsEnum.ADREMOVER_MOVIE_REMOVAL,
@@ -74,33 +61,27 @@ public final class GeneralAdsPatch extends Filter {
                 "compact_movie",
                 "horizontal_movie_shelf",
                 "movie_and_show_upsell_card",
-                "compact_tvfilm_item",
-                "offer_module_root"
+                "compact_tvfilm_item"
         );
 
         this.pathRegister.registerAll(
                 generalAds,
                 buttonedAd,
-                channelBar,
                 communityPosts,
                 paidContent,
+                suggestions,
                 latestPosts,
                 movieAds,
                 chapterTeaser,
                 communityGuidelines,
-                quickActions,
-                relatedVideos,
                 compactBanner,
                 inFeedSurvey,
-                viewProducts,
                 medicalPanel,
                 merchandise,
                 infoPanel,
                 channelGuidelines,
                 artistCard,
                 selfSponsor,
-                webLinkPanel,
-                imageShelf,
                 subscribersCommunityGuidelines,
                 channelMemberShelf
         );
@@ -134,7 +115,7 @@ public final class GeneralAdsPatch extends Filter {
         else
             result = BlockResult.UNBLOCKED;
 
-        LogHelper.printDebug(() -> String.format("%s (ID: %s): %s", result.message, identifier, path));
+        log(String.format("%s (ID: %s): %s", result.message, identifier, path));
 
         return result.filter;
     }
@@ -163,7 +144,7 @@ public final class GeneralAdsPatch extends Filter {
     private static void hideView(SettingsEnum condition, View view) {
         if (!condition.getBoolean()) return;
 
-        LogHelper.printDebug(() -> "Hiding view with setting: " + condition);
+        log("Hiding view with setting: " + condition);
 
         AdRemoverAPI.HideViewWithLayout1dp(view);
     }
@@ -186,4 +167,7 @@ public final class GeneralAdsPatch extends Filter {
         hideView(SettingsEnum.ADREMOVER_SHORTS_REMOVAL, view);
     }
 
+    private static void log(String message) {
+        LogHelper.printDebug(() -> message);
+    }
 }

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

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

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

@@ -10,7 +10,8 @@ public class HideCreateButtonPatch {
     //Used by app.revanced.patches.youtube.layout.createbutton.patch.CreateButtonRemoverPatch
     public static void hideCreateButton(View view) {
         boolean hidden = SettingsEnum.HIDE_CREATE_BUTTON.getBoolean();
-        LogHelper.printDebug(() -> "Create button: " + (hidden ? "hidden" : "shown"));
+        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/HideFloatingMicrophoneButtonPatch.java

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

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

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

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

@@ -1,15 +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) {
+public class HideInfocardsPatch {
+    public static void hideInfocardsIncognito(View view) {
         if (!SettingsEnum.HIDE_INFO_CARDS.getBoolean()) return;
         view.setVisibility(View.GONE);
     }
 
-    public static boolean hideInfoCardsMethodCall() {
+    public static boolean hideInfocardsMethodCall() {
         return SettingsEnum.HIDE_INFO_CARDS.getBoolean();
     }
 }

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

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

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

@@ -1,11 +0,0 @@
-package app.revanced.integrations.patches;
-
-
-import app.revanced.integrations.settings.SettingsEnum;
-
-public final class HidePlayerButtonsPatch {
-
-    public static boolean hideButtons() {
-        return SettingsEnum.HIDE_PLAYER_BUTTONS.getBoolean();
-    }
-}

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

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

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

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

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

@@ -12,9 +12,10 @@ public class HideShortsButtonPatch {
     public static void hideShortsButton(View view) {
         if (lastPivotTab != null && lastPivotTab.name() == "TAB_SHORTS") {
             boolean hide = SettingsEnum.HIDE_SHORTS_BUTTON.getBoolean();
-            LogHelper.printDebug(() -> hide ? "Shorts button: hidden" : "Shorts button: shown");
+            String message = hide ? "Shorts button: hidden" : "Shorts button: shown";
+            LogHelper.printDebug(() -> message);
             if (hide) {
-                view.setVisibility(View.GONE);
+                view.setVisibility(hide ? View.GONE : View.VISIBLE);
             }
         }
     }

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

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

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

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

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

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

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

@@ -1,6 +1,9 @@
 package app.revanced.integrations.patches;
 
-import app.revanced.integrations.utils.ReVancedUtils;
+import static app.revanced.integrations.utils.ReVancedUtils.getContext;
+
+import android.content.Context;
+
 import app.revanced.integrations.utils.ThemeHelper;
 
 public class LithoThemePatch {
@@ -41,15 +44,29 @@ public class LithoThemePatch {
     }
 
     private static int getBlackColor() {
-        if (blackColor == 0) blackColor = ReVancedUtils.getResourceColor("yt_black1");
+        if (blackColor == 0) blackColor = getColor("yt_black1");
         return blackColor;
     }
 
     private static int getWhiteColor() {
-        if (whiteColor == 0) whiteColor = ReVancedUtils.getResourceColor("yt_white1");
+        if (whiteColor == 0) whiteColor = getColor("yt_white1");
         return whiteColor;
     }
 
+    /**
+     * Determines the color for a color resource.
+     *
+     * @param name The color resource name.
+     * @return The value of the color.
+     */
+    private static int getColor(String name) {
+        Context context = getContext();
+
+        return context != null ? context.getColor(context.getResources()
+                .getIdentifier(name, "color", context.getPackageName())
+        ) : 0;
+    }
+
     private static boolean anyEquals(int value, int... of) {
         for (int v : of) if (value == v) return true;
         return false;

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

@@ -1,53 +1,33 @@
 package app.revanced.integrations.patches;
 
-import static app.revanced.integrations.utils.StringRef.str;
+import static app.revanced.integrations.sponsorblock.StringRef.str;
 
-import android.annotation.TargetApi;
-import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
-
-import java.util.Objects;
+import android.widget.Toast;
 
 import app.revanced.integrations.utils.LogHelper;
 import app.revanced.integrations.utils.ReVancedUtils;
 
 public class MicroGSupport {
     private static final String MICROG_VENDOR = "com.mgoogle";
-    private static final String MICROG_PACKAGE_NAME = MICROG_VENDOR + ".android.gms";
+    private static final String MICROG_PACKAGE_NAME = "com.mgoogle.android.gms";
     private static final String VANCED_MICROG_DOWNLOAD_LINK = "https://github.com/TeamVanced/VancedMicroG/releases/latest";
-    private static final String DONT_KILL_MY_APP_LINK = "https://dontkillmyapp.com";
-    private static final Uri VANCED_MICROG_PROVIDER = Uri.parse("content://" + MICROG_VENDOR + ".android.gsf.gservices/prefix");
 
-    private static void startIntent(Context context, String uriString, String message) {
-        ReVancedUtils.showToastLong(message);
-
-        var intent = new Intent(Intent.ACTION_VIEW);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.setData(Uri.parse(uriString));
-        context.startActivity(intent);
-    }
-
-    @TargetApi(26)
     public static void checkAvailability() {
-        var context = Objects.requireNonNull(ReVancedUtils.getContext());
-
+        var context = ReVancedUtils.getContext();
+        assert context != null;
         try {
             context.getPackageManager().getPackageInfo(MICROG_PACKAGE_NAME, PackageManager.GET_ACTIVITIES);
+            LogHelper.printDebug(() -> "MicroG is installed on the device");
         } catch (PackageManager.NameNotFoundException exception) {
-            LogHelper.printInfo(() -> "Vanced MicroG was not found", exception);
-            startIntent(context, VANCED_MICROG_DOWNLOAD_LINK, str("microg_not_installed_warning"));
+            LogHelper.printException(() -> ("MicroG was not found"), exception);
+            Toast.makeText(context, str("microg_not_installed_warning"), Toast.LENGTH_LONG).show();
 
-            // Gracefully exit the app, so it does not crash.
-            System.exit(0);
-        }
-
-
-        try (var client = context.getContentResolver().acquireContentProviderClient(VANCED_MICROG_PROVIDER)) {
-            if (client != null) return;
-            LogHelper.printInfo(() -> "Vanced MicroG is not running in the background");
-            startIntent(context, DONT_KILL_MY_APP_LINK, str("microg_not_running_warning"));
+            var intent = new Intent(Intent.ACTION_VIEW);
+            intent.setData(Uri.parse(VANCED_MICROG_DOWNLOAD_LINK));
+            context.startActivity(intent);
         }
     }
-}
+}

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

@@ -1,17 +1,11 @@
 package app.revanced.integrations.patches;
 
-import app.revanced.integrations.shared.PlayerType;
+import app.revanced.integrations.settings.SettingsEnum;
 
 public class MinimizedPlaybackPatch {
 
-    public static boolean isPlaybackNotShort() {
-        return !PlayerType.getCurrent().isNoneOrHidden();
-    }
-
-    public static boolean overrideMinimizedPlaybackAvailable() {
-        // This could be done entirely in the patch,
-        // but having a unique method to search for makes manually inspecting the patched apk much easier.
-        return true;
+    public static boolean isMinimizedPlaybackEnabled() {
+        return SettingsEnum.ENABLE_MINIMIZED_PLAYBACK.getBoolean();
     }
 
 }

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

@@ -0,0 +1,12 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public class NewActionbarPatch {
+
+    //Used by app.revanced.patches.youtube.layout.widesearchbar.patch.WideSearchbarPatch
+    public static boolean getNewActionBar() {
+        return SettingsEnum.WIDE_SEARCHBAR.getBoolean(); // TODO: maybe this has to be inverted
+    }
+
+}