From 0975ac6c10a15d26dd991e343606a8387422598e Mon Sep 17 00:00:00 2001 From: siritami <102145692+FiorenMas@users.noreply.github.com> Date: Tue, 5 Sep 2023 23:29:45 +0700 Subject: [PATCH] rollback Revanced Extended Rollback Revanced Extended because project contiuned Fix some bugs about youtube music --- .github/workflows/patch-discontinued.yml | 41 ------------------ .github/workflows/patch.yml | 40 +++++++++++++++++- README.md | 42 +++++++++---------- src/build/ReX.sh | 5 ++- ...a-discontinued.sh => Revanced-Extended.sh} | 15 +++---- src/build/Revanced.sh | 1 + .../youtube-revanced-extended/exclude-patches | 35 +++++++--------- 7 files changed, 87 insertions(+), 92 deletions(-) delete mode 100644 .github/workflows/patch-discontinued.yml rename src/build/{Revanced-Extended-inotia-discontinued.sh => Revanced-Extended.sh} (73%) diff --git a/.github/workflows/patch-discontinued.yml b/.github/workflows/patch-discontinued.yml deleted file mode 100644 index a10b56c..0000000 --- a/.github/workflows/patch-discontinued.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Patch discontinued Revanced Extended -on: - workflow_dispatch: -jobs: - patch2: - name: Patch Revanced Extended by Inotia00 (discontinued) - permissions: write-all - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - name: Set up jdk - uses: actions/setup-java@v3.11.0 - with: - distribution: 'zulu' - java-version: '17' - - - name: Patch apk - run: bash src/build/Revanced-Extended-inotia-discontinued.sh - env: - repository: ${{ github.repository }} - - - name: Generate release info - run: | - echo " - **Change log** :point_down: - [Revanced](https://github.com/revanced/revanced-patches/releases/latest) - [Revanced Extended](https://github.com/inotia00/revanced-patches/releases/latest) - [Revanced Extended for Android 6 & 7](https://github.com/kitadai31/revanced-patches-android6-7/releases/latest) - "> ${{ github.workspace }}-CHANGELOG.txt - - - name: Release - uses: softprops/action-gh-release@v0.1.15 - with: - files: | - ./build/* - name: Revanced & Revanced Extended - tag_name: all - body_path: ${{ github.workspace }}-CHANGELOG.txt - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml index 744ce7c..481f77f 100644 --- a/.github/workflows/patch.yml +++ b/.github/workflows/patch.yml @@ -61,6 +61,44 @@ jobs: keep_minimum_runs: 10 patch2: + name: Patch Revanced Extended + permissions: write-all + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Set up jdk + uses: actions/setup-java@v3.11.0 + with: + distribution: 'zulu' + java-version: '17' + + - name: Patch apk + run: bash src/build/Revanced-Extended.sh + env: + repository: ${{ github.repository }} + + - name: Generate release info + run: | + echo " + **Change log** :point_down: + [Revanced](https://github.com/revanced/revanced-patches/releases/latest) + [Revanced Extended](https://github.com/inotia00/revanced-patches/releases/latest) + [Revanced Extended for Android 6 & 7](https://github.com/kitadai31/revanced-patches-android6-7/releases/latest) + "> ${{ github.workspace }}-CHANGELOG.txt + + - name: Release + uses: softprops/action-gh-release@v0.1.15 + with: + files: | + ./build/* + name: Revanced & Revanced Extended + tag_name: all + body_path: ${{ github.workspace }}-CHANGELOG.txt + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + patch3: name: Patch ReX permissions: write-all runs-on: ubuntu-latest @@ -115,7 +153,7 @@ jobs: retain_days: 0 keep_minimum_runs: 15 - patch3: + patch4: name: Patch Revanced Extended for Android 6 & 7 permissions: write-all runs-on: ubuntu-latest diff --git a/README.md b/README.md index bba12a3..dd388a6 100644 --- a/README.md +++ b/README.md @@ -43,19 +43,7 @@ Download [x86_64](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-x86_64-revanced.apk) -### [ReX: (The contiuned Revanced Extended)](https://github.com/YT-Advanced/ReX-patches) - -[All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-ReX.apk) - -[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-arm64-v8a-ReX.apk) - -[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-armeabi-v7a-ReX.apk) - -[x86](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-x86-ReX.apk) - -[x86_64](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-x86_64-ReX.apk) - -### Revanced Extended: (Support Dropped 05/08/2023) +### Revanced Extended: [All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-extended-inotia-discontinued.apk) @@ -67,6 +55,18 @@ Download [x86_64](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-x86_64-revanced-extended-inotia-discontinued.apk) +### [ReX:](https://github.com/YT-Advanced/ReX-patches) + +[All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-ReX.apk) + +[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-arm64-v8a-ReX.apk) + +[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-armeabi-v7a-ReX.apk) + +[x86](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-x86-ReX.apk) + +[x86_64](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-x86_64-ReX.apk) + ### Revanced Extended For Android 6 & 7: [All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-extended-android-6-7.apk) @@ -89,18 +89,18 @@ Download [Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-music-armeabi-v7a-revanced.apk) -### [ReX: (The contiuned Revanced Extended)](https://github.com/YT-Advanced/ReX-patches) - -[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-music-arm64-v8a-ReX.apk) - -[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-music-armeabi-v7a-ReX.apk) - -### Revanced Extended: (Support Dropped 05/08/2023) +### Revanced Extended: [Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-music-arm64-v8a-revanced-extended-inotia-discontinued.apk) [Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-music-armeabi-v7a-revanced-extended-inotia-discontinued.apk) +### [ReX:](https://github.com/YT-Advanced/ReX-patches) + +[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-music-arm64-v8a-ReX.apk) + +[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-music-armeabi-v7a-ReX.apk) + --- ## [MicroG:](https://github.com/inotia00/VancedMicroG) @@ -160,7 +160,7 @@ Download [All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/reddit-revanced.apk) -### Revanced Extended: (Support Dropped 05/08/2023) +### Revanced Extended: [All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/reddit-revanced-extended-inotia-discontinued.apk) diff --git a/src/build/ReX.sh b/src/build/ReX.sh index 25a7a68..c2e5a14 100644 --- a/src/build/ReX.sh +++ b/src/build/ReX.sh @@ -16,7 +16,7 @@ dl_htmlq ################################################# -# Patch YouTube Extended: +# Patch YouTube ReX: get_patches_key "youtube-ReX" get_ver "Hide general ads" "com.google.android.youtube" get_apk "youtube" "youtube" "google-inc/youtube/youtube" @@ -24,9 +24,10 @@ patch "youtube" "ReX" ################################################# -# Patch YouTube Music Extended: +# Patch YouTube Music ReX: # Arm64-v8a get_patches_key "youtube-music-ReX" +version="6.17.52" get_apk "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" patch "youtube-music-arm64-v8a" "ReX" # Armeabi-v7a diff --git a/src/build/Revanced-Extended-inotia-discontinued.sh b/src/build/Revanced-Extended.sh similarity index 73% rename from src/build/Revanced-Extended-inotia-discontinued.sh rename to src/build/Revanced-Extended.sh index 3c475f0..34d66e8 100644 --- a/src/build/Revanced-Extended-inotia-discontinued.sh +++ b/src/build/Revanced-Extended.sh @@ -5,7 +5,7 @@ source src/build/utils.sh ################################################# # Checking new patch -checker "inotia00/revanced-patches" "revanced-extended-inotia-discontinued" +checker "inotia00/revanced-patches" "revanced-extended" ################################################# @@ -19,27 +19,28 @@ dl_htmlq get_patches_key "youtube-revanced-extended" get_ver "Hide general ads" "com.google.android.youtube" get_apk "youtube" "youtube" "google-inc/youtube/youtube" -_patch "youtube" "revanced-extended-inotia-discontinued" +patch "youtube" "revanced-extended" ################################################# # Patch YouTube Music Extended: # Arm64-v8a get_patches_key "youtube-music-revanced-extended" +get_ver "Hide music ads" "com.google.android.apps.youtube.music" get_apk "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" -_patch "youtube-music-arm64-v8a" "revanced-extended-inotia-discontinued" +patch "youtube-music-arm64-v8a" "revanced-extended" # Armeabi-v7a get_patches_key "youtube-music-revanced-extended" -version="6.08.51" +get_ver "Hide music ads" "com.google.android.apps.youtube.music" get_apk "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" -_patch "youtube-music-armeabi-v7a" "revanced-extended-inotia-discontinued" +patch "youtube-music-armeabi-v7a" "revanced-extended" ################################################# # Patch Reddit: get_patches_key "reddit" get_apk "reddit" "reddit" "redditinc/reddit/reddit" -_patch "reddit" "reddit-revanced-extended-inotia-discontinued" +patch "reddit" "reddit-revanced-extended-inotia-discontinued" ################################################# @@ -49,7 +50,7 @@ dl_gh "revanced-cli" "j-hc" "latest" dl_gh "revanced-patches" "revanced" "latest" # Split architecture Youtube: for i in {0..3}; do - split_arch "youtube-revanced-extended-inotia-discontinued" "youtube-${archs[i]}-revanced-extended-inotia-discontinued" "$(gen_rip_libs ${libs[i]})" + split_arch "youtube-revanced-extended" "youtube-${archs[i]}-revanced-extended" "$(gen_rip_libs ${libs[i]})" done ################################################# diff --git a/src/build/Revanced.sh b/src/build/Revanced.sh index 72c569d..95f1619 100644 --- a/src/build/Revanced.sh +++ b/src/build/Revanced.sh @@ -26,6 +26,7 @@ patch "youtube" "revanced" # Patch YouTube Music: # Arm64-v8a get_patches_key "youtube-music-revanced" +version="6.17.52" get_apk "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" patch "youtube-music-arm64-v8a" "revanced" # Armeabi-v7a diff --git a/src/patches/youtube-revanced-extended/exclude-patches b/src/patches/youtube-revanced-extended/exclude-patches index 7641864..b5d107c 100644 --- a/src/patches/youtube-revanced-extended/exclude-patches +++ b/src/patches/youtube-revanced-extended/exclude-patches @@ -1,29 +1,24 @@ custom-branding-icon-afn-red debugging -custom-seekbar-color -disable-startup-shorts-player -disable-quic-protocol -disable-hdr-video -enable-old-quality-layout -force-premium-heading -force-vp9-codec -force-opus-codec -header-switch +enable-compact-controls-overlay hide-cast-button +disable-QUIC-protocol +disable-auto-captions +enable-force-shuffle +enable-old-quality-layout +enable-zen-mode hide-account-menu -hide-auto-captions hide-autoplay-button hide-autoplay-preview +hide-button-container hide-captions-button -hide-email-address -hide-endscreen-cards -hide-endscreen-overlay -hide-filmstrip-overlay -hide-mix-playlists -hide-seekbar -hide-search-terms +hide-cast-button +hide-description-components +hide-handle +hide-latest-videos-button hide-load-more-button -hide-quick-actions +hide-mix-playlists hide-previous-next-button -theme -spoof-app-version +hide-quick-actions +higher-fullscreen-seekbar-height +Custom-seekbar-color