From 4ff4281034e4e20a0aac62eaf78203d8868a77d5 Mon Sep 17 00:00:00 2001
From: siritami <102145692+FiorenMas@users.noreply.github.com>
Date: Fri, 12 Jul 2024 15:40:49 +0700
Subject: [PATCH] add some apps

Added apps:
Bilibili chinese from BiliRoamingX
Rar from Revanced
Tasker, Nova launcher from Dropped Patch
Removed app:
Windy
---
 .github/actions/release/action.yml            |  3 +-
 .github/workflows/ci.yml                      | 12 +++
 .github/workflows/manual-patch.yml            | 76 +++++++++++++++----
 src/build/BiliRoamingX.sh                     | 16 ++++
 src/build/Dropped-Patches-Revanced.sh         | 26 +++++++
 src/build/Revanced-2.sh                       |  1 -
 src/build/Revanced-3.sh                       | 16 ++--
 src/build/Revanced-Beta-2.sh                  |  1 -
 src/build/Revanced-Beta-3.sh                  | 16 ++--
 src/options/BiliRoamingX.json                 |  1 +
 src/options/indrastorms.json                  |  1 +
 .../exclude-patches                           |  0
 .../include-patches                           |  0
 .../exclude-patches                           |  0
 .../include-patches                           |  0
 src/patches/{windy => rar}/exclude-patches    |  0
 src/patches/{windy => rar}/include-patches    |  0
 .../tasker-indrastorms/exclude-patches        |  1 +
 .../tasker-indrastorms/include-patches        |  1 +
 19 files changed, 135 insertions(+), 36 deletions(-)
 create mode 100644 src/build/BiliRoamingX.sh
 create mode 100644 src/build/Dropped-Patches-Revanced.sh
 create mode 100644 src/options/BiliRoamingX.json
 create mode 100644 src/options/indrastorms.json
 rename src/patches/{nova-launcher => bilibili-BiliRoamingX}/exclude-patches (100%)
 rename src/patches/{nova-launcher => bilibili-BiliRoamingX}/include-patches (100%)
 rename src/patches/{tasker => nova-launcher-indrastorms}/exclude-patches (100%)
 rename src/patches/{tasker => nova-launcher-indrastorms}/include-patches (100%)
 rename src/patches/{windy => rar}/exclude-patches (100%)
 rename src/patches/{windy => rar}/include-patches (100%)
 create mode 100644 src/patches/tasker-indrastorms/exclude-patches
 create mode 100644 src/patches/tasker-indrastorms/include-patches

diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml
index 67d1bb3..889c56c 100644
--- a/.github/actions/release/action.yml
+++ b/.github/actions/release/action.yml
@@ -9,8 +9,7 @@ runs:
         **Change log** :point_down:
         [Revanced](https://github.com/revanced/revanced-patches/releases)
         [Revanced Extended](https://github.com/inotia00/revanced-patches/releases)
-        [ReX](https://github.com/YT-Advanced/ReX-patches/releases)
-        [ReX forked by anddea](https://github.com/anddea/revanced-patches/releases)
+        [Revanced Extended anddea](https://github.com/anddea/revanced-patches/releases)
         [Revanced Extended for Android 6 & 7](https://github.com/kitadai31/revanced-patches-android6-7/releases)
         [Revanced Extended For Android 5:](https://github.com/d4n3436/revanced-patches-android5/releases)
         "> ${{ github.workspace }}-CHANGELOG.txt
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a432278..9c20a24 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -65,6 +65,10 @@ jobs:
         id: check-rve5
         if: steps.check-gh.outputs.internet_error == '0'
         run: bash src/etc/ci.sh d4n3436/revanced-patches-android5 latest youtube-revanced-extended-android-5.apk
+      - name: Check new patch BiliRoamingX
+        id: check-BiliRoamingX
+        if: steps.check-gh.outputs.internet_error == '0'
+        run: bash src/etc/ci.sh BiliRoamingX/BiliRoamingX latest bilibili-BiliRoamingX.apk 
       - name: Keep workflow run
         if: steps.check-gh.outputs.internet_error == '0'
         uses: gautamkrishnar/keepalive-workflow@v1
@@ -103,6 +107,7 @@ jobs:
       check_twitter_piko_beta: ${{ steps.check-twitter-piko-beta.outputs.new_patch }}
       check_rve67: ${{ steps.check-rve67.outputs.new_patch }}
       check_rve5: ${{ steps.check-rve5.outputs.new_patch }}
+      check_BiliRoamingX: ${{ steps.check-BiliRoamingX.outputs.new_patch }}
 
   Patch-Revanced:
     name: Patch Revanced Stable
@@ -181,3 +186,10 @@ jobs:
     uses: ./.github/workflows/manual-patch.yml
     with:
       org: "Revanced Extended Android 5"
+  Patch-BiliRoamingX:
+    name: Patch BiliRoamingX
+    needs: check
+    if: ${{ needs.check.outputs.check_BiliRoamingX == 1 }}
+    uses: ./.github/workflows/manual-patch.yml
+    with:
+      org: "BiliRoamingX"
\ No newline at end of file
diff --git a/.github/workflows/manual-patch.yml b/.github/workflows/manual-patch.yml
index 70d51ed..054ec0c 100644
--- a/.github/workflows/manual-patch.yml
+++ b/.github/workflows/manual-patch.yml
@@ -16,7 +16,6 @@ on:
         default: 'Revanced'
         type: choice
         options:
-          - 'All'
           - 'Revanced'
           - 'Revanced Beta'
           - 'Revanced Extended'
@@ -28,6 +27,8 @@ on:
           - 'Twitter Piko Beta'
           - 'Revanced Extended Android 6,7'
           - 'Revanced Extended Android 5'
+          - 'BiliRoamingX'
+          - 'Dropped Patches - indrastorms'
           - 'ReX'
           - 'RVE-rufusin'
       retry_count:
@@ -42,7 +43,7 @@ on:
 jobs:
   patch_rv:
     name: Patch Revanced Stable
-    if: ${{ github.event.inputs.org == 'Revanced' || github.event.inputs.org == 'All' || inputs.org == 'Revanced' }}
+    if: ${{ github.event.inputs.org == 'Revanced' || inputs.org == 'Revanced' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -74,7 +75,7 @@ jobs:
         uses: ./.github/actions/re-run
   patch_rv_beta:
     name: Patch Revanced Beta
-    if: ${{ github.event.inputs.org == 'Revanced Beta' || github.event.inputs.org == 'All' || inputs.org == 'Revanced Beta' }}
+    if: ${{ github.event.inputs.org == 'Revanced Beta' || inputs.org == 'Revanced Beta' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -106,7 +107,7 @@ jobs:
         uses: ./.github/actions/re-run
   patch_rex:
     name: Patch ReX
-    if: ${{ github.event.inputs.org == 'ReX' || github.event.inputs.org == 'All' || inputs.org == 'ReX' }}
+    if: ${{ github.event.inputs.org == 'ReX' || inputs.org == 'ReX' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -129,7 +130,7 @@ jobs:
         uses: ./.github/actions/re-run
   patch_rve_anddea_stable:
     name: Patch RVX Anddea Stable
-    if: ${{ github.event.inputs.org == 'RVE-anddea-stable' || github.event.inputs.org == 'All' || inputs.org == 'RVE-anddea-stable' }}
+    if: ${{ github.event.inputs.org == 'RVE-anddea-stable' || inputs.org == 'RVE-anddea-stable' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -152,7 +153,7 @@ jobs:
         uses: ./.github/actions/re-run
   patch_rve_anddea_beta:
     name: Patch RVX Anddea Beta version
-    if: ${{ github.event.inputs.org == 'RVE-anddea-beta' || github.event.inputs.org == 'All' || inputs.org == 'RVE-anddea-beta' }}
+    if: ${{ github.event.inputs.org == 'RVE-anddea-beta' || inputs.org == 'RVE-anddea-beta' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -175,7 +176,7 @@ jobs:
         uses: ./.github/actions/re-run
   patch_rve_rufusin_stable:
     name: Patch RVX Rufusin Stable
-    if: ${{ github.event.inputs.org == 'RVE-rufusin' || github.event.inputs.org == 'All' || inputs.org == 'RVE-rufusin' }}
+    if: ${{ github.event.inputs.org == 'RVE-rufusin' || inputs.org == 'RVE-rufusin' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -198,7 +199,7 @@ jobs:
         uses: ./.github/actions/re-run       
   patch_rve:
     name: Patch Revanced Extended Stable
-    if: ${{ github.event.inputs.org == 'Revanced Extended' || github.event.inputs.org == 'All' || inputs.org == 'Revanced Extended' }}
+    if: ${{ github.event.inputs.org == 'Revanced Extended' || inputs.org == 'Revanced Extended' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -221,7 +222,7 @@ jobs:
         uses: ./.github/actions/re-run
   patch_rve_beta:
     name: Patch Revanced Extended Beta
-    if: ${{ github.event.inputs.org == 'Revanced Extended Beta' || github.event.inputs.org == 'All' || inputs.org == 'Revanced Extended Beta' }}
+    if: ${{ github.event.inputs.org == 'Revanced Extended Beta' || inputs.org == 'Revanced Extended Beta' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -244,7 +245,7 @@ jobs:
         uses: ./.github/actions/re-run
   patch_rve_reddit:
     name: Patch Revanced Extended Reddit
-    if: ${{ github.event.inputs.org == 'Revanced Extended Reddit' || github.event.inputs.org == 'All' || inputs.org == 'Revanced Extended Reddit' }}
+    if: ${{ github.event.inputs.org == 'Revanced Extended Reddit' || inputs.org == 'Revanced Extended Reddit' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -267,7 +268,7 @@ jobs:
         uses: ./.github/actions/re-run
   patch_twitter_piko_stable:
     name: Patch Twitter Piko Stable
-    if: ${{ github.event.inputs.org == 'Twitter Piko Stable' || github.event.inputs.org == 'All' || inputs.org == 'Twitter Piko Stable' }}
+    if: ${{ github.event.inputs.org == 'Twitter Piko Stable' || inputs.org == 'Twitter Piko Stable' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -290,7 +291,7 @@ jobs:
         uses: ./.github/actions/re-run
   patch_twitter_piko_beta:
     name: Patch Twitter Piko Beta
-    if: ${{ github.event.inputs.org == 'Twitter Piko Beta' || github.event.inputs.org == 'All' || inputs.org == 'Twitter Piko Beta' }}
+    if: ${{ github.event.inputs.org == 'Twitter Piko Beta' || inputs.org == 'Twitter Piko Beta' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -313,7 +314,7 @@ jobs:
         uses: ./.github/actions/re-run
   patch_rve67:
     name: Patch RVX Android 6,7
-    if: ${{ github.event.inputs.org == 'Revanced Extended Android 6,7' || github.event.inputs.org == 'All' || inputs.org == 'Revanced Extended Android 6,7' }}
+    if: ${{ github.event.inputs.org == 'Revanced Extended Android 6,7' || inputs.org == 'Revanced Extended Android 6,7' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -336,7 +337,7 @@ jobs:
         uses: ./.github/actions/re-run
   patch_rve5:
     name: Patch RVX Android 5
-    if: ${{ github.event.inputs.org == 'Revanced Extended Android 5' || github.event.inputs.org == 'All' || inputs.org == 'Revanced Extended Android 5' }}
+    if: ${{ github.event.inputs.org == 'Revanced Extended Android 5' || inputs.org == 'Revanced Extended Android 5' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -357,3 +358,50 @@ jobs:
       - name: Re-run workflow if github connection not stable
         if: always() && steps.patch-rve5.outcome == 'skipped' || steps.release-rve5.outcome == 'skipped' && env.retry_count < env.max_retries
         uses: ./.github/actions/re-run
+  patch_BiliRoamingX:
+    name: Patch BiliRoamingX
+    if: ${{ github.event.inputs.org == 'BiliRoamingX' || inputs.org == 'BiliRoamingX' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.1.1
+      - name: Preparing to patch
+        uses: ./.github/actions/preparing
+      - name: Check github connection
+        id: check-gh-BiliRoamingX
+        run: bash src/etc/connection.sh
+      - name: Patch apk
+        id: patch-BiliRoamingX
+        if: steps.check-gh-BiliRoamingX.outputs.internet_error == '0'
+        run: bash src/build/BiliRoamingX.sh
+      - name: Releasing APK files
+        id: release-BiliRoamingX
+        if: steps.check-gh-BiliRoamingX.outputs.internet_error == '0'
+        uses: ./.github/actions/release
+      - name: Re-run workflow if github connection not stable
+        if: always() && steps.patch-BiliRoamingX.outcome == 'skipped' || steps.release-BiliRoamingX.outcome == 'skipped' && env.retry_count < env.max_retries
+        uses: ./.github/actions/re-run
+  patch_Dropped_Patches:
+    name: Dropped Patches Revanced - indrastorms
+    if: ${{ github.event.inputs.org == 'Dropped Patches - indrastorms' || inputs.org == 'Dropped Patches - indrastorms' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.1.1
+      - name: Preparing to patch
+        uses: ./.github/actions/preparing
+      - name: Check github connection
+        id: check-gh-Dropped-Patches-indrastorms
+        run: bash src/etc/connection.sh
+      - name: Patch apk
+        id: patch-Dropped-Patches-indrastorms
+        if: steps.check-gh-Dropped-Patches-indrastorms.outputs.internet_error == '0'
+        run: bash src/build/Dropped-Patches-Revanced.sh
+      - name: Releasing APK files
+        id: release-Dropped-Patches-indrastorms
+        if: steps.check-gh-Dropped-Patches-indrastorms.outputs.internet_error == '0'
+        uses: ./.github/actions/release
+      - name: Re-run workflow if github connection not stable
+        if: always() && steps.patch-Dropped-Patches-indrastorms.outcome == 'skipped' || steps.release-Dropped-Patches-indrastorms.outcome == 'skipped' && env.retry_count < env.max_retries
+        uses: ./.github/actions/re-run
+
diff --git a/src/build/BiliRoamingX.sh b/src/build/BiliRoamingX.sh
new file mode 100644
index 0000000..ff2be64
--- /dev/null
+++ b/src/build/BiliRoamingX.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+# BiliRoamingX build for chinese only
+source ./src/build/utils.sh
+
+#################################################
+
+# Download requirements
+dl_gh "revanced-cli" "revanced" "latest"
+dl_gh "BiliRoamingX" "BiliRoamingX" "latest"
+
+#################################################
+
+# Patch bilibili:
+get_patches_key "bilibili-BiliRoamingX"
+get_apk "com.bilibili.app.in" "bilibili" "bilibili" "bilibili/bilibili/bilibili"
+patch "bilibili" "BiliRoamingX"
\ No newline at end of file
diff --git a/src/build/Dropped-Patches-Revanced.sh b/src/build/Dropped-Patches-Revanced.sh
new file mode 100644
index 0000000..2244bb1
--- /dev/null
+++ b/src/build/Dropped-Patches-Revanced.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+# Dropped Patches by indrastorms
+source ./src/build/utils.sh
+
+#################################################
+
+# Download requirements
+dl_gh "Dropped-Patches" "indrastorms" "latest"
+dl_gh "revanced-integrations" "revanced" "v1.8.0"
+dl_gh "revanced-cli" "revanced" "latest"
+
+#################################################
+
+# Patch Tasker:
+get_patches_key "tasker-indrastorms"
+get_apk "net.dinglisch.android.taskerm" "tasker" "tasker" "joaomgcd/tasker/tasker"
+patch "tasker" "indrastorms"
+
+#################################################
+
+#Patch Nova Launcher:
+get_patches_key "nova-launcher-indrastorms"
+get_apk "com.teslacoilsw.launcher" "nova-launcher" "nova-launcher" "teslacoil-software/nova-launcher/nova-launcher"
+patch "nova-launcher" "indrastorms"
+
+#################################################
diff --git a/src/build/Revanced-2.sh b/src/build/Revanced-2.sh
index 1bffd7c..bef97b6 100644
--- a/src/build/Revanced-2.sh
+++ b/src/build/Revanced-2.sh
@@ -12,7 +12,6 @@ dl_gh "revanced-patches revanced-cli revanced-integrations" "revanced" "latest"
 # Patch Instagram:
 # Arm64-v8a
 get_patches_key "instagram"
-version="332.0.0.38.90"
 get_apk "com.instagram.android" "instagram-arm64-v8a" "instagram-instagram" "instagram/instagram-instagram/instagram-instagram" "arm64-v8a" "nodpi"
 patch "instagram-arm64-v8a" "revanced"
 
diff --git a/src/build/Revanced-3.sh b/src/build/Revanced-3.sh
index 55241c9..4c7855f 100644
--- a/src/build/Revanced-3.sh
+++ b/src/build/Revanced-3.sh
@@ -12,7 +12,6 @@ dl_gh "revanced-patches revanced-cli revanced-integrations" "revanced" "latest"
 # Patch Facebook:
 # Arm64-v8a
 get_patches_key "facebook"
-version="449.0.0.44.115"
 get_apk "com.facebook.katana" "facebook-arm64-v8a" "facebook" "facebook-2/facebook/facebook" "arm64-v8a" "nodpi" "Android 11+"
 patch "facebook-arm64-v8a" "revanced"
 
@@ -33,17 +32,16 @@ patch "lightroom" "revanced"
 
 #################################################
 
-# Patch Windy:
-get_patches_key "windy"
-version="34.0.2"
-get_apk "co.windyapp.android" "windy" "windy-wind-weather-forecast" "windy-weather-world-inc/windy-wind-weather-forecast/windy-wind-weather-forecast"
-patch "windy" "revanced"
-
-#################################################
-
 # Patch Tumblr:
 get_patches_key "tumblr"
 get_apk "com.tumblr" "tumblr" "tumblr" "tumblr-inc/tumblr/tumblr"
 patch "tumblr" "revanced"
 
+#################################################
+
+# Patch RAR:
+get_patches_key "rar"
+get_apk "com.rarlab.rar" "rar" "rar" "rarlab-published-by-win-rar-gmbh/rar/rar" "arm64-v8a"
+patch "rar" "revanced"
+
 #################################################
\ No newline at end of file
diff --git a/src/build/Revanced-Beta-2.sh b/src/build/Revanced-Beta-2.sh
index 8e02043..1bf30b9 100644
--- a/src/build/Revanced-Beta-2.sh
+++ b/src/build/Revanced-Beta-2.sh
@@ -13,7 +13,6 @@ dl_gh "revanced-cli" "revanced" "latest"
 # Patch Instagram:
 # Arm64-v8a
 get_patches_key "instagram"
-version="332.0.0.38.90"
 get_apk "com.instagram.android" "instagram-arm64-v8a-beta" "instagram-instagram" "instagram/instagram-instagram/instagram-instagram" "arm64-v8a" "nodpi"
 patch "instagram-arm64-v8a-beta" "revanced"
 
diff --git a/src/build/Revanced-Beta-3.sh b/src/build/Revanced-Beta-3.sh
index d0fbaf8..c2806b2 100644
--- a/src/build/Revanced-Beta-3.sh
+++ b/src/build/Revanced-Beta-3.sh
@@ -13,7 +13,6 @@ dl_gh "revanced-cli" "revanced" "latest"
 # Patch Facebook:
 # Arm64-v8a
 get_patches_key "facebook"
-version="449.0.0.44.115"
 get_apk "com.facebook.katana" "facebook-arm64-v8a-beta" "facebook" "facebook-2/facebook/facebook" "arm64-v8a" "nodpi" "Android 11+"
 patch "facebook-arm64-v8a-beta" "revanced"
 
@@ -34,17 +33,16 @@ patch "lightroom-beta" "revanced"
 
 #################################################
 
-# Patch Windy:
-get_patches_key "windy"
-version="34.0.2"
-get_apk "co.windyapp.android" "windy" "windy-wind-weather-forecast" "windy-weather-world-inc/windy-wind-weather-forecast/windy-wind-weather-forecast"
-patch "windy" "revanced"
-
-#################################################
-
 # Patch Tumblr:
 get_patches_key "tumblr"
 get_apk "com.tumblr" "tumblr-beta" "tumblr" "tumblr-inc/tumblr/tumblr"
 patch "tumblr-beta" "revanced"
 
+#################################################
+
+# Patch RAR:
+get_patches_key "rar"
+get_apk "com.rarlab.rar" "rar-beta" "rar" "rarlab-published-by-win-rar-gmbh/rar/rar" "arm64-v8a"
+patch "rar-beta" "revanced"
+
 #################################################
\ No newline at end of file
diff --git a/src/options/BiliRoamingX.json b/src/options/BiliRoamingX.json
new file mode 100644
index 0000000..0637a08
--- /dev/null
+++ b/src/options/BiliRoamingX.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/src/options/indrastorms.json b/src/options/indrastorms.json
new file mode 100644
index 0000000..0637a08
--- /dev/null
+++ b/src/options/indrastorms.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/src/patches/nova-launcher/exclude-patches b/src/patches/bilibili-BiliRoamingX/exclude-patches
similarity index 100%
rename from src/patches/nova-launcher/exclude-patches
rename to src/patches/bilibili-BiliRoamingX/exclude-patches
diff --git a/src/patches/nova-launcher/include-patches b/src/patches/bilibili-BiliRoamingX/include-patches
similarity index 100%
rename from src/patches/nova-launcher/include-patches
rename to src/patches/bilibili-BiliRoamingX/include-patches
diff --git a/src/patches/tasker/exclude-patches b/src/patches/nova-launcher-indrastorms/exclude-patches
similarity index 100%
rename from src/patches/tasker/exclude-patches
rename to src/patches/nova-launcher-indrastorms/exclude-patches
diff --git a/src/patches/tasker/include-patches b/src/patches/nova-launcher-indrastorms/include-patches
similarity index 100%
rename from src/patches/tasker/include-patches
rename to src/patches/nova-launcher-indrastorms/include-patches
diff --git a/src/patches/windy/exclude-patches b/src/patches/rar/exclude-patches
similarity index 100%
rename from src/patches/windy/exclude-patches
rename to src/patches/rar/exclude-patches
diff --git a/src/patches/windy/include-patches b/src/patches/rar/include-patches
similarity index 100%
rename from src/patches/windy/include-patches
rename to src/patches/rar/include-patches
diff --git a/src/patches/tasker-indrastorms/exclude-patches b/src/patches/tasker-indrastorms/exclude-patches
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/patches/tasker-indrastorms/exclude-patches
@@ -0,0 +1 @@
+
diff --git a/src/patches/tasker-indrastorms/include-patches b/src/patches/tasker-indrastorms/include-patches
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/patches/tasker-indrastorms/include-patches
@@ -0,0 +1 @@
+