From 36e73061829f3ebbe8b2c13f7cc977a9ea66ec5b Mon Sep 17 00:00:00 2001 From: siritami <103488094+siritami@users.noreply.github.com> Date: Mon, 8 May 2023 11:53:37 +0700 Subject: [PATCH] +Youtube for Android 6 & 7 --- .github/workflows/BETA-patch.yml | 1 + .github/workflows/patch-6-7.yml | 61 ++++++++++++++++++ .github/workflows/patch.yml | 1 + README.md | 1 + src/Banner.png | Bin 0 -> 7630 bytes src/build/build-rve-android-6-7.sh | 30 +++++++++ src/build/tools.sh | 24 +++++++ .../exclude-patches | 25 +++++++ .../include-patches | 1 + 9 files changed, 144 insertions(+) create mode 100644 .github/workflows/patch-6-7.yml create mode 100644 src/Banner.png create mode 100644 src/build/build-rve-android-6-7.sh create mode 100644 src/patches/youtube-revanced-extended-6-7/exclude-patches create mode 100644 src/patches/youtube-revanced-extended-6-7/include-patches diff --git a/.github/workflows/BETA-patch.yml b/.github/workflows/BETA-patch.yml index 7a6bb29..a838d36 100644 --- a/.github/workflows/BETA-patch.yml +++ b/.github/workflows/BETA-patch.yml @@ -25,6 +25,7 @@ jobs: **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 diff --git a/.github/workflows/patch-6-7.yml b/.github/workflows/patch-6-7.yml new file mode 100644 index 0000000..b76f5a2 --- /dev/null +++ b/.github/workflows/patch-6-7.yml @@ -0,0 +1,61 @@ +name: Patch Revanced Extended for Android 6 & 7 +on: +# push: + schedule: + - cron: "0 10 */10 * *" + workflow_dispatch: +jobs: + + patch2: + name: Patch Revanced Extended for Android 6 & 7 + 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/build-rve-android-6-7.sh + + - name: Generate release info + run: | + echo " + [![](https://visitcount.itsvg.in/api?id=Fioren&label=Visitors&color=6&icon=5&pretty=true)](https://visitcount.itsvg.in) + **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/* + revanced-extended-version.txt + name: Revanced & Revanced Extended + tag_name: all + body_path: ${{ github.workspace }}-CHANGELOG.txt + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Delete older releases + uses: dev-drprasad/delete-older-releases@v0.2.1 + with: + keep_latest: 1 + delete_tags: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Delete workflow runs + uses: Mattraks/delete-workflow-runs@v2 + with: + token: ${{ github.token }} + repository: ${{ github.repository }} + retain_days: 0 + keep_minimum_runs: 15 diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml index 521b3db..bb70066 100644 --- a/.github/workflows/patch.yml +++ b/.github/workflows/patch.yml @@ -28,6 +28,7 @@ jobs: **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 diff --git a/README.md b/README.md index a4496dd..16c0659 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ [![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/all/total?label=Revanced&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced.apk) +[![Release](https://img.shields.io/github/downloads/fiorenmas/Revanced-And-Revanced-Extended-Non-Root/all/total?label=Revanced%20Extended%20for%20Android%206%20%26%207&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-extended-android-6-7.apk) # [![YouTube Music](https://img.shields.io/badge/YouTube_Music-FF0000?style=for-the-badge&logo=youtube-music&logoColor=white)](https://play.google.com/store/apps/details?id=com.google.android.apps.youtube.music) diff --git a/src/Banner.png b/src/Banner.png new file mode 100644 index 0000000000000000000000000000000000000000..b3573655dbe98828e40c778f238079b17aaaaaf8 GIT binary patch literal 7630 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 UzIW9VegRKIOA}i}+Yf2h|r~iN{t+!sMq^|Ed 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 N6l7GT%Yi1r{{bJvq%Hse literal 0 HcmV?d00001 diff --git a/src/build/build-rve-android-6-7.sh b/src/build/build-rve-android-6-7.sh new file mode 100644 index 0000000..a0a77b4 --- /dev/null +++ b/src/build/build-rve-android-6-7.sh @@ -0,0 +1,30 @@ +#!/bin/bash +# Revanced Extended for android 6 & 7 build +source src/build/tools.sh + +release=$(curl -s "https://api.github.com/repos/kitadai31/revanced-patches-android6-7/releases/latest") +asset=$(echo "$release" | jq -r '.assets[] | select(.name | test("revanced-patches.*\\.jar$")) | .browser_download_url') +curl -sL -O "$asset" +ls revanced-patches*.jar >> new.txt +rm -f revanced-patches*.jar +release=$(curl -s "https://api.github.com/repos/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/latest") +asset=$(echo "$release" | jq -r '.assets[] | select(.name == "revanced-extended-version.txt") | .browser_download_url') +curl -sL -O "$asset" +if diff -q revanced-extended-android-6-7-version.txt new.txt >/dev/null ; then +echo "Old patch!!! Not build" +exit 0 +else +rm -f *.tx + +dl_gh2 "kitadai31" +dl_gh3 "inotia00" + +# Patch YouTube Extended +get_patches_key "youtube-revanced-extended-6-7" +#version="" +get_ver "hide-general-ads" "com.google.android.youtube" +get_apk "youtube" "youtube" "google-inc/youtube/youtube" +patch "youtube" "youtube-revanced-extended-android-6-7" + +ls revanced-patches*.jar >> revanced-extended-version.txt +fi \ No newline at end of file diff --git a/src/build/tools.sh b/src/build/tools.sh index ba291cd..ce67b71 100644 --- a/src/build/tools.sh +++ b/src/build/tools.sh @@ -22,6 +22,30 @@ dl_gh1() { done echo "All assets downloaded" } +dl_gh2() { + for repo in revanced-patches-android6-7 revanced-integrations ; do + asset_urls=$(wget -qO- "https://api.github.com/repos/$1/$repo/releases/latest" \ + | jq -r '.assets[] | "\(.browser_download_url) \(.name)"') + while read -r url names + do + echo "Downloading $names from $url" + wget -q -O "$names" $url + done <<< "$asset_urls" + done +echo "All assets downloaded" +} +dl_gh3() { + for repo in revanced-cli ; do + asset_urls=$(wget -qO- "https://api.github.com/repos/$1/$repo/releases/latest" \ + | jq -r '.assets[] | "\(.browser_download_url) \(.name)"') + while read -r url names + do + echo "Downloading $names from $url" + wget -q -O "$names" $url + done <<< "$asset_urls" + done +echo "All assets downloaded" +} dl_revanced_integrations() { curl --retry 10 --retry-max-time 60 -H "Cache-Control: no-cache" -fsSL github.com/$1/revanced-integrations/releases/download/v$2/revanced-integrations-$2.apk -o revanced-integrations-$2.apk } diff --git a/src/patches/youtube-revanced-extended-6-7/exclude-patches b/src/patches/youtube-revanced-extended-6-7/exclude-patches new file mode 100644 index 0000000..acb20da --- /dev/null +++ b/src/patches/youtube-revanced-extended-6-7/exclude-patches @@ -0,0 +1,25 @@ +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 +header-switch +hide-cast-button +hide-account-menu +hide-auto-captions +hide-autoplay-button +hide-autoplay-preview +hide-captions-button +hide-email-address +hide-endscreen-cards +hide-endscreen-overlay +hide-filmstrip-overlay +hide-mix-playlists +hide-seekbar +hide-search-terms +optimize-resource +spoof-app-version diff --git a/src/patches/youtube-revanced-extended-6-7/include-patches b/src/patches/youtube-revanced-extended-6-7/include-patches new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/patches/youtube-revanced-extended-6-7/include-patches @@ -0,0 +1 @@ +