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

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

### Features

* **youtube:** support version `18.19.35` ([b47a781](b47a781ba7))

.github/config.yml

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

.github/workflows/pull_request.yml

@@ -0,0 +1,30 @@
+name: PR to main
+
+on:
+  push:
+    branches:
+      - dev
+  workflow_dispatch:
+
+env:
+  MESSAGE: merge branch `${{ github.head_ref || github.ref_name }}` to `main`
+
+jobs:
+  pull-request:
+    name: Open pull request
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Open pull request
+        uses: repo-sync/pull-request@v2
+        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

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Release
 on:
   workflow_dispatch:
   push:
-    branches: 
+    branches:
       - main
       - dev
   pull_request:
@@ -12,29 +12,32 @@ on:
       - dev
 
 jobs:
-  build:
+  release:
+    name: Release
     runs-on: ubuntu-latest
     steps:
-    - name: Cancel Previous Runs
-      uses: styfle/cancel-workflow-action@0.9.0
-      with:
-        access_token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Checkout Repo
+    - name: Cancel previous runs
+      uses: styfle/cancel-workflow-action@0.11.0
+    - name: Checkout
       uses: actions/checkout@v3
-    - name: Set up JDK 11
+      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:
-        java-version: '11'
+        java-version: '17'
         distribution: 'zulu'
     - name: Setup Node.js
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
-        node-version: "lts/*"
-    - name: Build with Gradle
-      run: ./gradlew --no-daemon build
+        node-version: "18"
+        cache: 'npm'
     - name: Setup semantic-release
-      run: npm install -g semantic-release @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D
+      run: npm install
     - name: Release
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: npx semantic-release
+        GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
+      run: npm exec semantic-release

.releaserc

@@ -7,11 +7,7 @@
     }
   ],
   "plugins": [
-     ["@semantic-release/commit-analyzer", {
-      "releaseRules": [
-        {"type": "build", "release": "patch"}
-      ]
-    }],
+    "@semantic-release/commit-analyzer",
     "@semantic-release/release-notes-generator",
     "@semantic-release/changelog",
     "gradle-semantic-release-plugin",
@@ -31,7 +27,15 @@
           {
             "path": "app/build/outputs/apk/release/*.apk"
           }
-        ]
+        ],
+        successComment: false
+      }
+    ],
+    [
+      "@saithodev/semantic-release-backmerge",
+      {
+        backmergeBranches: [{"from": "main", "to": "dev"}],
+        clearWorkspace: true
       }
     ]
   ]

README.md

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

app/build.gradle.kts

@@ -1,6 +1,3 @@
-import java.io.FileInputStream
-import java.util.Properties
-
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
@@ -8,29 +5,31 @@ plugins {
 
 android {
     compileSdk = 33
-    buildToolsVersion = "33.0.0"
+    buildToolsVersion = "33.0.1"
     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", "")}\"")
+        versionName = project.version as String
     }
 
     buildTypes {
         release {
             isMinifyEnabled = true
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+        applicationVariants.all {
+            outputs.all {
+                this as com.android.build.gradle.internal.api.ApkVariantOutputImpl
+
+                outputFileName = "${rootProject.name}-$versionName.apk"
+            }
         }
     }
     compileOptions {
@@ -44,5 +43,10 @@ android {
 
 dependencies {
     compileOnly(project(mapOf("path" to ":dummy")))
-    compileOnly("androidx.annotation:annotation:1.5.0")
+    compileOnly("androidx.annotation:annotation:1.6.0")
+    compileOnly("androidx.appcompat:appcompat:1.7.0-alpha02")
+    compileOnly("com.squareup.okhttp3:okhttp:5.0.0-alpha.11")
+    compileOnly("com.squareup.retrofit2:retrofit:2.9.0")
 }
+
+tasks.register("publish") { dependsOn("build") }

app/proguard-rules.pro

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

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

@@ -0,0 +1,11 @@
+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/adremover/AdRemoverAPI.java

@@ -1,44 +0,0 @@
-package app.revanced.integrations.adremover;
-
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.Toolbar;
-
-import app.revanced.integrations.patches.HideShortsButtonPatch;
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
-
-public class AdRemoverAPI {
-
-    /**
-     * Removes Reels and Home ads
-     *
-     * @param view
-     */
-    //ToDo: refactor this
-    public static void HideViewWithLayout1dp(View view) {
-        if (view instanceof LinearLayout) {
-            LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(1, 1);
-            view.setLayoutParams(layoutParams);
-        } else if (view instanceof FrameLayout) {
-            FrameLayout.LayoutParams layoutParams2 = new FrameLayout.LayoutParams(1, 1);
-            view.setLayoutParams(layoutParams2);
-        } else if (view instanceof RelativeLayout) {
-            RelativeLayout.LayoutParams layoutParams3 = new RelativeLayout.LayoutParams(1, 1);
-            view.setLayoutParams(layoutParams3);
-        } else if (view instanceof Toolbar) {
-            Toolbar.LayoutParams layoutParams4 = new Toolbar.LayoutParams(1, 1);
-            view.setLayoutParams(layoutParams4);
-        } else if (view instanceof ViewGroup) {
-            ViewGroup.LayoutParams layoutParams5 = new ViewGroup.LayoutParams(1, 1);
-            view.setLayoutParams(layoutParams5);
-        } else {
-            LogHelper.debug(AdRemoverAPI.class, "HideViewWithLayout1dp - Id: " + view.getId() + " Type: " + view.getClass().getName());
-        }
-    }
-
-}

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

@@ -5,6 +5,6 @@ import app.revanced.integrations.settings.SettingsEnum;
 public class AutoRepeatPatch {
     //Used by app.revanced.patches.youtube.layout.autorepeat.patch.AutoRepeatPatch
     public static boolean shouldAutoRepeat() {
-        return SettingsEnum.PREFERRED_AUTO_REPEAT.getBoolean();
+        return SettingsEnum.AUTO_REPEAT.getBoolean();
     }
 }

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

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

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

@@ -0,0 +1,23 @@
+package app.revanced.integrations.patches;
+
+import static app.revanced.integrations.utils.StringRef.str;
+
+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());
+            if (withTimestamp) {
+                long seconds = VideoInformation.getVideoTime() / 1000;
+                url += String.format("?t=%s", seconds);
+            }
+
+            ReVancedUtils.setClipboard(url);
+            ReVancedUtils.showToastShort(str("share_copy_url_success"));
+        } catch (Exception e) {
+            LogHelper.printException(() -> "Failed to generate video url", e);
+        }
+    }
+}

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

@@ -4,10 +4,13 @@ import app.revanced.integrations.settings.SettingsEnum;
 
 public class DisableAutoCaptionsPatch {
 
+    /**
+     * Used by injected code. Do not delete.
+     */
     public static boolean captionsButtonDisabled;
 
     public static boolean autoCaptionsEnabled() {
-        return SettingsEnum.CAPTIONS_ENABLED.getBoolean();
+        return SettingsEnum.AUTO_CAPTIONS.getBoolean();
     }
 
 }

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

@@ -5,6 +5,6 @@ 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();
+        return SettingsEnum.DISABLE_RESUMING_SHORTS_PLAYER.getBoolean();
     }
 }

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

@@ -0,0 +1,42 @@
+package app.revanced.integrations.patches;
+
+import com.google.android.apps.youtube.app.watchwhile.WatchWhileActivity;
+import app.revanced.integrations.utils.LogHelper;
+
+public class FixBackToExitGesturePatch {
+    /**
+     * State whether the scroll position reaches the top.
+     */
+    public static boolean isTopView = false;
+
+    /**
+     * Handle the event after clicking the back button.
+     *
+     * @param activity The activity, the app is launched with to finish.
+     */
+    public static void onBackPressed(WatchWhileActivity activity) {
+        if (!isTopView) return;
+
+        LogHelper.printDebug(() -> "Activity is closed");
+
+        activity.finish();
+    }
+
+    /**
+     * Handle the event when the homepage list of views is being scrolled.
+     */
+    public static void onScrollingViews() {
+        LogHelper.printDebug(() -> "Views are scrolling");
+
+        isTopView = false;
+    }
+
+    /**
+     * Handle the event when the homepage list of views reached the top.
+     */
+    public static void onTopView() {
+        LogHelper.printDebug(() -> "Scrolling reached the top");
+
+        isTopView = true;
+    }
+}

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

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

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

@@ -21,7 +21,7 @@ public class HDRAutoBrightnessPatch {
      */
     public static float getHDRBrightness(float original) {
         // do nothing if disabled
-        if (!SettingsEnum.USE_HDR_AUTO_BRIGHTNESS.getBoolean()) {
+        if (!SettingsEnum.HDR_AUTO_BRIGHTNESS.getBoolean()) {
             return original;
         }
 

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

@@ -0,0 +1,13 @@
+package app.revanced.integrations.patches;
+
+import android.view.View;
+
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.ReVancedUtils;
+
+public class HideAlbumCardsPatch {
+    public static void hideAlbumCard(View view) {
+        if (!SettingsEnum.HIDE_ALBUM_CARDS.getBoolean()) return;
+        ReVancedUtils.hideViewByLayoutParams(view);
+    }
+}

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

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

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

@@ -0,0 +1,29 @@
+package app.revanced.integrations.patches;
+
+import android.view.View;
+
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.ReVancedUtils;
+
+public class HideBreakingNewsPatch {
+
+    /**
+     * When spoofing to app versions older than 17.30.35, the watch history preview bar uses
+     * the same layout components as the breaking news shelf.
+     *
+     * Breaking news does not appear to be present in these older versions anyways.
+     */
+    private static boolean isSpoofingOldVersionWithHorizontalCardListWatchHistory() {
+        return SettingsEnum.SPOOF_APP_VERSION.getBoolean()
+                && SettingsEnum.SPOOF_APP_VERSION_TARGET.getString().compareTo("17.30.35") < 0;
+    }
+
+    /**
+     * Injection point.
+     */
+    public static void hideBreakingNews(View view) {
+        if (!SettingsEnum.HIDE_BREAKING_NEWS.getBoolean()
+                || isSpoofingOldVersionWithHorizontalCardListWatchHistory()) return;
+        ReVancedUtils.hideViewByLayoutParams(view);
+    }
+}

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

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

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

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

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

@@ -1,17 +0,0 @@
-package app.revanced.integrations.patches;
-
-import android.view.View;
-
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
-
-public class HideCreateButtonPatch {
-
-    //Used by app.revanced.patches.youtube.layout.createbutton.patch.CreateButtonRemoverPatch
-    public static void hideCreateButton(View view) {
-        boolean 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.settings.SettingsEnum;
+import app.revanced.integrations.utils.ReVancedUtils;
+
+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;
+        ReVancedUtils.hideViewByLayoutParams(view);
+    }
+}

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

@@ -4,7 +4,9 @@ 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();
+    public static int hideEmailAddress(int originalValue) {
+        if (SettingsEnum.HIDE_EMAIL_ADDRESS.getBoolean())
+            return 8;
+        return originalValue;
     }
 }

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

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

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

@@ -0,0 +1,25 @@
+package app.revanced.integrations.patches;
+
+import android.view.View;
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.ReVancedUtils;
+
+public final class HideFilterBarPatch {
+    public static int hideInFeed(final int height) {
+        if (SettingsEnum.HIDE_FILTER_BAR_FEED_IN_FEED.getBoolean()) return 0;
+
+        return height;
+    }
+
+    public static void hideInRelatedVideos(final View chipView) {
+        if (!SettingsEnum.HIDE_FILTER_BAR_FEED_IN_RELATED_VIDEOS.getBoolean()) return;
+
+        ReVancedUtils.hideViewByLayoutParams(chipView);
+    }
+
+    public static int hideInSearch(final int height) {
+        if (SettingsEnum.HIDE_FILTER_BAR_FEED_IN_SEARCH.getBoolean()) return 0;
+
+        return height;
+    }
+}

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

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

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

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