diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a4d2d8..da5048e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,6 +37,10 @@ jobs: id: check-rex-rufusin if: steps.check-gh.outputs.internet_error == '0' run: bash src/etc/ci.sh rufusin/revanced-patches latest youtube-ReX-rufusin.apk + - name: Check new patch ReX forked by anddea + id: check-rex-anddea + if: steps.check-gh.outputs.internet_error == '0' + run: bash src/etc/ci.sh anddea/revanced-patches latest youtube-ReX-anddea.apk - name: Check new patch Revanced Extended id: check-rve if: steps.check-gh.outputs.internet_error == '0' @@ -80,6 +84,7 @@ jobs: check_rv_beta: ${{ steps.check-rv-beta.outputs.new_patch }} check_rex: ${{ steps.check-rex.outputs.new_patch }} check_rex_rufusin: ${{ steps.check-rex-rufusin.outputs.new_patch }} + check_rex_anddea: ${{ steps.check-rex-anddea.outputs.new_patch }} check_rve: ${{ steps.check-rve.outputs.new_patch }} check_rve67: ${{ steps.check-rve67.outputs.new_patch }} check_rve5: ${{ steps.check-rve5.outputs.new_patch }} @@ -112,6 +117,13 @@ jobs: uses: ./.github/workflows/manual-patch.yml with: org: "ReX-rufusin" + Patch-ReX-anddea: + name: Patch ReX forked by anddea + needs: check + if: ${{ needs.check.outputs.check_rex_anddea == 1 }} + uses: ./.github/workflows/manual-patch.yml + with: + org: "ReX-anddea" Patch-Revanced-Extended: name: Patch Revanced Extended needs: check diff --git a/.github/workflows/manual-patch.yml b/.github/workflows/manual-patch.yml index aad9933..2a7299e 100644 --- a/.github/workflows/manual-patch.yml +++ b/.github/workflows/manual-patch.yml @@ -19,6 +19,7 @@ on: - 'Revanced Beta' - 'ReX' - 'Rex-rufusin' + - 'Rex-anddea' - 'Revanced Extended' - 'Revanced Extended Android 6,7' - 'Revanced Extended Android 5' @@ -133,6 +134,29 @@ jobs: - name: Re-run workflow if github connection not stable if: always() && steps.patch-rex-rufusin.outcome == 'skipped' && env.retry_count < env.max_retries uses: ./.github/actions/re-run + patch_rex_anddea: + name: Patch ReX forked by anddea + if: ${{ github.event.inputs.org == 'ReX-anddea' || github.event.inputs.org == 'All' || inputs.org == 'ReX-anddea' }} + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4.1.1 + - name: Check github connection + id: check-gh-rex-anddea + run: bash src/etc/connection.sh + - name: Preparing to patch + if: steps.check-gh-rex-anddea.outputs.internet_error == '0' + uses: ./.github/actions/preparing + - name: Patch apk + id: patch-rex + if: steps.check-gh-rex-anddea.outputs.internet_error == '0' + run: bash src/build/ReX-anddea.sh + - name: Releasing APK files + if: steps.check-gh-rex-anddea.outputs.internet_error == '0' + uses: ./.github/actions/release + - name: Re-run workflow if github connection not stable + if: always() && steps.patch-rex-anddea.outcome == 'skipped' && env.retry_count < env.max_retries + uses: ./.github/actions/re-run patch_rve: name: Patch Revanced Extended if: ${{ github.event.inputs.org == 'Revanced Extended' || github.event.inputs.org == 'All' || inputs.org == 'Revanced Extended' }} diff --git a/README.md b/README.md index 0af0578..6eee1ed 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,18 @@ Download [x86_64](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-x86_64-ReX-rufusin.apk) +### [ReX forked by anddea:](https://github.com/anddea/revanced-patches) + +[All Architectures](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-ReX-anddea.apk) + +[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-arm64-v8a-ReX-anddea.apk) + +[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-armeabi-v7a-ReX-anddea.apk) + +[x86](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-x86-ReX-anddea.apk) + +[x86_64](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-x86_64-ReX-anddea.apk) + ### [Revanced Extended: (Discontinued)](https://github.com/inotia00/revanced-patches/) [All Architectures](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-extended.apk) diff --git a/src/build/ReX-anddea.sh b/src/build/ReX-anddea.sh new file mode 100644 index 0000000..8ca3099 --- /dev/null +++ b/src/build/ReX-anddea.sh @@ -0,0 +1,30 @@ +#!/bin/bash +# ReX forked by anddea build +source src/build/utils.sh + +################################################# + +# Download requirements +dl_gh " revanced-patches revanced-integrations" "anddea" "latest" +dl_gh "revanced-cli" "inotia00" "latest" + +################################################# + +# Patch YouTube ReX anddea: +get_patches_key "youtube-ReX-anddea" +get_ver "Hide general ads" "com.google.android.youtube" +get_apk "youtube" "youtube" "google-inc/youtube/youtube" +patch "youtube" "ReX-anddea" "inotia" + + +################################################# + +rm -f revanced-cli* +dl_gh "revanced-cli" "FiorenMas" "latest" +# Split architecture Youtube: +get_patches_key "youtube-ReX-anddea" +for i in {0..3}; do + split_arch "youtube" "youtube-${archs[i]}-ReX-anddea" "$(gen_rip_libs ${libs[i]})" +done + +################################################# \ No newline at end of file diff --git a/src/options/ReX-anddea.json b/src/options/ReX-anddea.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/src/options/ReX-anddea.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/src/patches/youtube-ReX-anddea/exclude-patches b/src/patches/youtube-ReX-anddea/exclude-patches new file mode 100644 index 0000000..99e8f40 --- /dev/null +++ b/src/patches/youtube-ReX-anddea/exclude-patches @@ -0,0 +1,18 @@ +Custom branding icon YouTube +Enable compact controls overlay +Disable QUIC protocol +Disable auto captions +Disable HDR video +Enable old quality layout +Enable zen mode +Hide account menu +Hide autoplay button +Hide autoplay preview +Hide captions button +Hide description components +Hide handle +Hide latest videos button +Hide load more button +Hide mix playlists +Hide previous next button +Custom seekbar color diff --git a/src/patches/youtube-ReX-anddea/include-patches b/src/patches/youtube-ReX-anddea/include-patches new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/patches/youtube-ReX-anddea/include-patches @@ -0,0 +1 @@ +