chore(release): 1.8.0-dev.6 [skip ci]

# [1.8.0-dev.6](https://github.com/ReVanced/revanced-integrations/compare/v1.8.0-dev.5...v1.8.0-dev.6) (2024-04-12)

### Bug Fixes

* **YouTube - Hide Shorts components:** Do not show Shorts suggestions in video player, if all hide Shorts options are enabled ([#613](https://github.com/ReVanced/revanced-integrations/issues/613)) ([c132670](c132670400))

.editorconfig

@@ -0,0 +1,3 @@
+[*.{kt,kts}]
+ktlint_code_style = intellij_idea
+ktlint_standard_no-wildcard-imports = disabled

.github/dependabot.yml

@@ -0,0 +1,22 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    labels: []
+    directory: /
+    target-branch: dev
+    schedule:
+      interval: monthly
+
+  - package-ecosystem: npm
+    labels: []
+    directory: /
+    target-branch: dev
+    schedule:
+      interval: monthly
+
+  - package-ecosystem: gradle
+    labels: []
+    directory: /
+    target-branch: dev
+    schedule:
+      interval: monthly

.github/workflows/build_pull_request.yml

@@ -0,0 +1,28 @@
+name: Build pull request
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - dev
+
+jobs:
+  release:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Cache Gradle
+        uses: burrunan/gradle-cache-action@v1
+
+      - name: Setup Java
+        run: echo "JAVA_HOME=$JAVA_HOME_17_X64" >> $GITHUB_ENV
+
+      - name: Build
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew build --no-daemon

.github/workflows/release.yml

@@ -6,10 +6,6 @@ on:
     branches:
       - main
       - dev
-  pull_request:
-    branches:
-      - main
-      - dev
 
 jobs:
   release:
@@ -24,27 +20,33 @@ jobs:
           persist-credentials: false
           fetch-depth: 0
 
-      - name: Cache Node modules
-        uses: actions/cache@v3
-        with:
-          path: |
-            node_modules
-          key: npm-${{ hashFiles('package-lock.json') }}
-
       - name: Cache Gradle
         uses: burrunan/gradle-cache-action@v1
 
       - name: Setup Java
         run: echo "JAVA_HOME=$JAVA_HOME_17_X64" >> $GITHUB_ENV
 
-      - name: Build with Gradle
+      - name: Build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew build clean
 
-      - name: Setup semantic-release
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "lts/*"
+          cache: 'npm'
+
+      - name: Install dependencies
         run: npm install
 
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          fingerprint: ${{ env.GPG_FINGERPRINT }}
+
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}

.gitignore

@@ -1,17 +1,12 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+/.idea
+/.vscode
+.DS_Store
 /build
 /captures
 .externalNativeBuild
 .cxx
-/.idea
-/.vscode
-/*.log
-node_modules
+local.properties
+node_modules

.releaserc

@@ -25,7 +25,7 @@
       {
         "assets": [
           {
-            "path": "app/build/outputs/apk/release/*.apk"
+            "path": "app/build/outputs/apk/release/revanced-integrations*"
           }
         ],
         successComment: false

app/.gitignore

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

app/build.gradle.kts

@@ -1,18 +1,27 @@
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin)
+    publishing
 }
 
 android {
-    compileSdk = 33
     namespace = "app.revanced.integrations"
+    compileSdk = 33
+
+    applicationVariants.all {
+        outputs.all {
+            this as com.android.build.gradle.internal.api.ApkVariantOutputImpl
+
+            outputFileName = "${rootProject.name}-$versionName.apk"
+        }
+    }
 
     defaultConfig {
         applicationId = "app.revanced.integrations"
         minSdk = 23
         targetSdk = 33
         multiDexEnabled = false
-        versionName = project.version as String
+        versionName = version as String
     }
 
     buildTypes {
@@ -20,32 +29,52 @@ android {
             isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
         }
-        applicationVariants.all {
-            outputs.all {
-                this as com.android.build.gradle.internal.api.ApkVariantOutputImpl
+    }
 
-                outputFileName = "${rootProject.name}-$versionName.apk"
-            }
-        }
-    }
     compileOptions {
-        sourceCompatibility(JavaVersion.VERSION_11)
-        targetCompatibility(JavaVersion.VERSION_11)
+        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.7.0")
-    compileOnly("androidx.appcompat:appcompat:1.7.0-alpha03")
-    compileOnly("com.squareup.okhttp3:okhttp:5.0.0-alpha.11")
-    compileOnly("com.squareup.retrofit2:retrofit:2.9.0")
+    compileOnly(libs.appcompat)
+    compileOnly(libs.annotation)
+    compileOnly(libs.okhttp)
+    compileOnly(libs.retrofit)
+
+    compileOnly(project(":stub"))
 }
 
-tasks.register("publish") { dependsOn("build") }
+tasks {
+    // Because the signing plugin doesn't support signing APKs, do it manually.
+    register("sign") {
+        group = "signing"
+
+        dependsOn(build)
+
+        doLast {
+            val outputDirectory = layout.buildDirectory.dir("outputs/apk/release").get().asFile
+            val integrationsApk = outputDirectory.resolve("${rootProject.name}-$version.apk")
+
+            org.gradle.security.internal.gnupg.GnupgSignatoryFactory().createSignatory(project).sign(
+                integrationsApk.inputStream(),
+                outputDirectory.resolve("${integrationsApk.name}.asc").outputStream(),
+            )
+        }
+    }
+
+    // Needed by gradle-semantic-release-plugin.
+    // Tracking: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
+    publish {
+        dependsOn(build)
+        dependsOn("sign")
+    }
+}

app/proguard-rules.pro

@@ -1,27 +1,6 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
 -dontobfuscate
 -dontoptimize
--keepattributes *  # https://www.guardsquare.com/manual/configuration/attributes
+-keepattributes *
 -keep class app.revanced.** {
   *;
 }

app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
 </manifest>

app/src/main/java/app/revanced/integrations/all/connectivity/wifi/spoof/SpoofWifiPatch.java

@@ -1,4 +1,4 @@
-package app.revanced.all.connectivity.wifi.spoof;
+package app.revanced.integrations.all.connectivity.wifi.spoof;
 
 import android.app.PendingIntent;
 import android.content.Context;

app/src/main/java/app/revanced/integrations/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch.java

@@ -1,4 +1,4 @@
-package app.revanced.all.screencapture.removerestriction;
+package app.revanced.integrations.all.screencapture.removerestriction;
 
 import android.media.AudioAttributes;
 import android.os.Build;

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

@@ -1,4 +1,4 @@
-package app.revanced.all.screenshot.removerestriction;
+package app.revanced.integrations.all.screenshot.removerestriction;
 
 import android.view.Window;
 import android.view.WindowManager;

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

@@ -1,10 +0,0 @@
-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.AUTO_REPEAT.getBoolean();
-    }
-}

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

@@ -1,16 +0,0 @@
-package app.revanced.integrations.patches;
-
-import android.content.Intent;
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
-
-@SuppressWarnings("unused")
-public final class ChangeStartPagePatch {
-    public static void changeIntent(Intent intent) {
-        final var startPage = SettingsEnum.START_PAGE.getString();
-        if (startPage.isEmpty()) return;
-
-        LogHelper.printDebug(() -> "Changing start page to " + startPage);
-        intent.setAction("com.google.android.youtube.action." + startPage);
-    }
-}

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

@@ -1,22 +0,0 @@
-package app.revanced.integrations.patches;
-
-import android.widget.ImageView;
-
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.ReVancedUtils;
-
-public class CustomPlayerOverlayOpacityPatch {
-    private static final int DEFAULT_OPACITY = (int) SettingsEnum.PLAYER_OVERLAY_OPACITY.defaultValue;
-
-    public static void changeOpacity(ImageView imageView) {
-        int opacity = SettingsEnum.PLAYER_OVERLAY_OPACITY.getInt();
-
-        if (opacity < 0 || opacity > 100) {
-            ReVancedUtils.showToastLong("Player overlay opacity must be between 0-100");
-            SettingsEnum.PLAYER_OVERLAY_OPACITY.saveValue(DEFAULT_OPACITY);
-            opacity = DEFAULT_OPACITY;
-        }
-
-        imageView.setImageAlpha((opacity * 255) / 100);
-    }
-}

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

@@ -1,10 +0,0 @@
-package app.revanced.integrations.patches;
-
-import app.revanced.integrations.settings.SettingsEnum;
-
-/** @noinspection unused*/
-public final class DisableFullscreenAmbientModePatch {
-    public static boolean enableFullScreenAmbientMode() {
-        return !SettingsEnum.DISABLE_FULLSCREEN_AMBIENT_MODE.getBoolean();
-    }
-}

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

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

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

@@ -1,30 +0,0 @@
-package app.revanced.integrations.patches;
-
-import android.annotation.SuppressLint;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import app.revanced.integrations.settings.SettingsEnum;
-
-/** @noinspection unused*/
-public final class DisableSuggestedVideoEndScreenPatch {
-    @SuppressLint("StaticFieldLeak")
-    private static View lastView;
-
-    public static void closeEndScreen(final ImageView imageView) {
-        if (!SettingsEnum.DISABLE_SUGGESTED_VIDEO_END_SCREEN.getBoolean()) return;
-
-        // Get a parent view which can be listened to for layout changes.
-        final var parent = imageView.getParent().getParent();
-
-        // Prevent adding the listener multiple times.
-        if (lastView == parent) return;
-
-        lastView = (ViewGroup)parent;
-        lastView.addOnLayoutChangeListener((v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
-            // Disable sound effects to prevent the click sound.
-            imageView.setSoundEffectsEnabled(false);
-            imageView.performClick();
-        });
-    }
-}

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

@@ -1,9 +0,0 @@
-package app.revanced.integrations.patches;
-
-import app.revanced.integrations.settings.SettingsEnum;
-
-public final class EnableTabletLayoutPatch {
-    public static boolean enableTabletLayout() {
-        return SettingsEnum.TABLET_LAYOUT.getBoolean();
-    }
-}

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

@@ -1,10 +0,0 @@
-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/GmsCoreSupport.java

@@ -1,74 +0,0 @@
-package app.revanced.integrations.patches;
-
-import android.app.SearchManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.os.Build;
-import androidx.annotation.RequiresApi;
-import app.revanced.integrations.utils.LogHelper;
-import app.revanced.integrations.utils.ReVancedUtils;
-
-import java.util.Objects;
-
-import static app.revanced.integrations.utils.StringRef.str;
-
-/**
- * @noinspection unused
- */
-public class GmsCoreSupport {
-    private static final String GMS_CORE_PACKAGE_NAME
-            = getGmsCoreVendor() + ".android.gms";
-    private static final String DONT_KILL_MY_APP_LINK
-            = "https://dontkillmyapp.com";
-    private static final Uri GMS_CORE_PROVIDER
-            = Uri.parse("content://" + getGmsCoreVendor() + ".android.gsf.gservices/prefix");
-
-    private static void search(Context context, String uriString, String message) {
-        ReVancedUtils.showToastLong(message);
-
-        var intent = new Intent(Intent.ACTION_WEB_SEARCH);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra(SearchManager.QUERY, uriString);
-        context.startActivity(intent);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    public static void checkAvailability() {
-        var context = Objects.requireNonNull(ReVancedUtils.getContext());
-
-        try {
-            context.getPackageManager().getPackageInfo(GMS_CORE_PACKAGE_NAME, PackageManager.GET_ACTIVITIES);
-        } catch (PackageManager.NameNotFoundException exception) {
-            LogHelper.printInfo(() -> "GmsCore was not found", exception);
-            search(context, getGmsCoreDownloadLink(), str("gms_core_not_installed_warning"));
-
-            // Gracefully exit the app, so it does not crash.
-            System.exit(0);
-        }
-
-        try (var client = context.getContentResolver().acquireContentProviderClient(GMS_CORE_PROVIDER)) {
-            if (client != null) return;
-            LogHelper.printInfo(() -> "GmsCore is not running in the background");
-            search(context, DONT_KILL_MY_APP_LINK, str("gms_core_not_running_warning"));
-        }
-    }
-
-    private static String getGmsCoreDownloadLink() {
-        final var vendor = getGmsCoreVendor();
-        switch (vendor) {
-            case "com.mgoogle":
-                return "https://github.com/TeamVanced/VancedMicroG/releases/latest";
-            case "app.revanced":
-                return "https://github.com/revanced/gmscore/releases/latest";
-            default:
-                return vendor + ".android.gms";
-        }
-    }
-
-    // Modified by a patch. Do not touch.
-    private static String getGmsCoreVendor() {
-        return "app.revanced";
-    }
-}

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

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

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

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

@@ -1,28 +0,0 @@
-package app.revanced.integrations.patches;
-
-import android.view.View;
-
-import app.revanced.integrations.patches.spoof.SpoofAppVersionPatch;
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.ReVancedUtils;
-
-public class HideBreakingNewsPatch {
-
-    /**
-     * When spoofing to app versions 17.31.00 and older, 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 final boolean isSpoofingOldVersionWithHorizontalCardListWatchHistory =
-            SpoofAppVersionPatch.isSpoofingToEqualOrLessThan("17.31.00");
-
-    /**
-     * 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

@@ -1,13 +0,0 @@
-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/HideCrowdfundingBoxPatch.java

@@ -1,14 +0,0 @@
-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/HideFilterBarPatch.java

@@ -1,25 +0,0 @@
-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;
-    }
-}