Merge branch 'dev' into feat/patch-history

ReVanced · Jun 26, 2024 · 92527f9 · 92527f9
2 parents 979cbfe + a99406f
commit 92527f9
Show file tree

Hide file tree

Showing 78 changed files with 4,376 additions and 2,206 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -70,7 +70,7 @@ body:
 
         Before creating a new bug report, please keep the following in mind:
 
-        - **Do not submit a duplicate bug report**: You can review existing bug reports [here](https://github.com/ReVanced/revanced-manager/labels/Bug%20report).
+        - **Do not submit a duplicate bug report**: Search for existing bug reports [here](https://github.com/ReVanced/revanced-manager/issues?q=label%3A%22Bug+report%22).
         - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-manager/blob/main/CONTRIBUTING.md).
         - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
   - type: textarea
@@ -99,14 +99,14 @@ body:
   - type: textarea
     attributes:
       label: ReVanced Manager logs
-      description: Export logs in ReVanced Manager settings.
+      description: Export logs from the ReVanced Manager settings.
       render: shell
     validations:
       required: true
   - type: textarea
     attributes:
       label: Patch logs
-      description: Export logs in "Patcher" screen.
+      description: Export logs from the "Patcher" screen.
       render: shell
     validations:
       required: false
@@ -116,11 +116,11 @@ body:
       label: Acknowledgements
       description: Your bug report will be closed if you don't follow the checklist below.
       options:
-        - label: This issue is not a duplicate of an existing bug report.
+        - label: I have checked all open and closed bug reports and this is not a duplicate.
           required: true
         - label: I have chosen an appropriate title.
           required: true
         - label: All requested information has been provided properly.
           required: true
-        - label: The bug is only related to ReVanced Manager
+        - label: The bug is only related to ReVanced Manager.
           required: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -70,7 +70,7 @@ body:
 
         Before creating a new feature request, please keep the following in mind:
 
-        - **Do not submit a duplicate feature request**: You can review existing feature requests [here](https://github.com/ReVanced/revanced-manager//labels/Feature%20request).
+        - **Do not submit a duplicate feature request**: Search for existing feature requests [here](https://github.com/ReVanced/revanced-manager/issues?q=label%3A%22Feature+request%22).
         - **Review the contribution guidelines**: Make sure your feature request adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-manager/blob/main/CONTRIBUTING.md).
         - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
   - type: textarea
@@ -79,7 +79,6 @@ body:
       description: |
         - Describe your feature in detail
         - Add images, videos, links, examples, references, etc. if possible
-        - Add the target application name in case you request a new patch
   - type: textarea
     attributes:
       label: Motivation
@@ -98,9 +97,9 @@ body:
       label: Acknowledgements
       description: Your feature request will be closed if you don't follow the checklist below.
       options:
-        - label: This issue is not a duplicate of an existing feature request.
+        - label:  I have checked all open and closed feature requests and this is not a duplicate.
           required: true
         - label: I have chosen an appropriate title.
           required: true
-        - label: The feature request is only related to ReVanced Manager
+        - label: The feature request is only related to ReVanced Manager.
           required: true
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -14,13 +14,22 @@ updates:
     schedule:
       interval: monthly
 
+  # ReVanced Manager Flutter
   - package-ecosystem: pub
     labels: []
     directory: /
     target-branch: dev
     schedule:
       interval: monthly
 
+  - package-ecosystem: gradle
+    labels: []
+    directory: /
+    target-branch: dev
+    schedule:
+      interval: monthly
+
+  # ReVanced Manager Compose
   - package-ecosystem: gradle
     labels: [ "ReVanced Manager Compose" ]
     directory: /

diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml
@@ -61,6 +61,7 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           channel: "stable"
+          flutter-version: 3.22.x
           cache: ${{ inputs.flutter-cache }}
 
       - name: Get dependencies
@@ -83,7 +84,7 @@ jobs:
       - name: Prepare comment
         run: |
           if [[ "${{ steps.flutter-build.outcome }}" == "success" ]]; then
-            echo "MESSAGE=✅ Failed build on ${{ env.COMMIT_HASH }}." >> $GITHUB_ENV
+            echo "MESSAGE=✅ Succeeded build on ${{ env.COMMIT_HASH }}." >> $GITHUB_ENV
           else
             echo "MESSAGE=🚫 Failed build on ${{ env.COMMIT_HASH }}." >> $GITHUB_ENV
           fi

diff --git a/.github/workflows/open_pull_request.yml b/.github/workflows/open_pull_request.yml
@@ -25,3 +25,4 @@ jobs:
           pr_body: |
             This pull request will ${{ env.MESSAGE }}.
           pr_draft: true
+          github_token: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,6 +36,7 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           channel: "stable"
+          flutter-version: 3.22.x
 
       - name: Install dependencies
         run: npm install

diff --git a/.github/workflows/sync_crowdin.yml b/.github/workflows/sync_crowdin.yml
@@ -2,9 +2,14 @@ name: Sync Crowdin
 
 on:
   workflow_dispatch:
+  schedule: 
+    - cron: 00 12 * * 1
   push:
-    branches:
-      - dev
+    branches: dev
+    paths:
+      - assets/i18n/*.json
+      - assets/i18n/*.dart
+      - .github/workflows/sync_crowdin.yml
 
 jobs:
   sync:
@@ -16,8 +21,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up Dart
-        uses: dart-lang/setup-dart@v1
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          cache: true
+          flutter-version: 3.22.x
 
       - name: Sync translations from Crowdin
         uses: crowdin/github-action@v1
@@ -32,17 +40,25 @@ jobs:
           pull_request_body: "Sync translations from [crowdin.com/project/revanced](https://crowdin.com/project/revanced)"
           pull_request_base_branch_name: "dev"
           commit_message: "chore: Sync translations"
+          github_user_name: revanced-bot
+          github_user_email: [email protected]
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
           CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
           CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
 
       - name: Remove empty values from JSON
         run: |
           cd assets/i18n
-          sudo chmod 777 *
+          sudo chmod 777 *.json
           dart nuke.dart >> $GITHUB_STEP_SUMMARY
 
+      - name: Validation of Translation Strings
+        run: |
+          dart pub get
+          dart run slang
+          flutter analyze lib/gen/strings.g.dart --no-fatal-infos --no-fatal-warnings
+
       - name: Commit translations
         run: |
           git config user.name revanced-bot
@@ -51,5 +67,3 @@ jobs:
           git add assets/i18n/*.json
           git commit -m "chore: Remove empty values from JSON" assets/i18n/*.json
           git push origin HEAD:feat/translations
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -13,8 +13,8 @@
   <br>
   <a href="https://revanced.app/">
        <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo-round.svg" />
-           <img height="24px" src="assets/revanced-logo/revanced-logo-round.svg" />
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo.svg" />
+           <img height="24px" src="assets/revanced-logo/revanced-logo.svg" />
        </picture>
    </a>&nbsp;&nbsp;&nbsp;
    <a href="https://github.com/ReVanced">

diff --git a/README.md b/README.md
@@ -13,8 +13,8 @@
   <br>
   <a href="https://revanced.app/">
        <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo-round.svg" />
-           <img height="24px" src="assets/revanced-logo/revanced-logo-round.svg" />
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo.svg" />
+           <img height="24px" src="assets/revanced-logo/revanced-logo.svg" />
        </picture>
    </a>&nbsp;&nbsp;&nbsp;
    <a href="https://github.com/ReVanced">
@@ -98,10 +98,6 @@ To build a ReVanced Manager, you can follow the [documentation](/docs).
 
 You can find the documentation for ReVanced Manager [here](/docs).
 
-### 👋 Contributing
-
-Thank you for considering contributing to ReVanced Manager. You can find the contribution guidelines [here](/CONTRIBUTING.md).
-
 ## ⚖️ License
 
 ReVanced Manager is licensed under the GPLv3 license. Please see the [license file](LICENSE) for more information.

diff --git a/SECURITY.md b/SECURITY.md
@@ -13,8 +13,8 @@
   <br>
   <a href="https://revanced.app/">
        <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo-round.svg" />
-           <img height="24px" src="assets/revanced-logo/revanced-logo-round.svg" />
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo.svg" />
+           <img height="24px" src="assets/revanced-logo/revanced-logo.svg" />
        </picture>
    </a>&nbsp;&nbsp;&nbsp;
    <a href="https://github.com/ReVanced">
@@ -70,8 +70,8 @@ If a vulnerability is confirmed and accepted, you can join our [Discord](https:/
 
 ### ⏳ Supported Versions
 
-| Version                                                                                                  | Branch      | Supported          |
-| -------------------------------------------------------------------------------------------------------- | ----------- | ------------------ |
-| ![GitHub Release](https://img.shields.io/github/v/release/ReVanced/revanced-manager?style=for-the-badge) | main        | :white_check_mark: |
-| ![Static Badge](https://img.shields.io/badge/version-latest-brightgreen?style=for-the-badge)             | dev         | :white_check_mark: |
-| ![Static Badge](https://img.shields.io/badge/version-latest-brightgreen?style=for-the-badge)             | compose-dev | :white_check_mark: |
+| Version                                                                                                                                 | Branch      | Supported          |
+| --------------------------------------------------------------------------------------------------------------------------------------- | ----------- | ------------------ |
+| ![Latest stable release](https://img.shields.io/github/v/release/ReVanced/revanced-manager?style=for-the-badge "Latest stable release") | main        | :white_check_mark: |
+| ![Latest version](https://img.shields.io/badge/version-latest-brightgreen?style=for-the-badge "Latest version")                         | dev         | :white_check_mark: |
+| ![Latest version](https://img.shields.io/badge/version-latest-brightgreen?style=for-the-badge "Latest version")                         | compose-dev | :white_check_mark: |
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -23,10 +23,11 @@ if (flutterVersionName == null) {
 }
 
 android {
-    compileSdk flutter.compileSdkVersion
+    compileSdk 34
     ndkVersion flutter.ndkVersion
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
@@ -113,9 +114,7 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.22"
-
-    // ReVanced
-    implementation "app.revanced:revanced-patcher:19.3.1"
-    implementation "app.revanced:revanced-library:2.1.0"
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4") // https://pub.dev/packages/flutter_local_notifications#gradle-setup
+    implementation("app.revanced:revanced-patcher:19.3.1")
+    implementation("app.revanced:revanced-library:2.2.1")
 }
diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
@@ -5,6 +5,8 @@
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
+-dontobfuscate
+
 -keep class app.revanced.** { *; }
 -keep class com.android.tools.smali.** { *; }
 -keep class kotlin.** { *; }

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -26,7 +26,8 @@
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:largeHeap="true"
-        android:requestLegacyExternalStorage="true">
+        android:requestLegacyExternalStorage="true"
+        android:enableOnBackInvokedCallback="true">
         <activity
             android:name=".MainActivity"
             android:exported="true"

diff --git a/android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt b/android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt
@@ -9,7 +9,6 @@ import android.os.Handler
 import android.os.Looper
 import app.revanced.library.ApkUtils
 import app.revanced.library.ApkUtils.applyTo
-import app.revanced.library.ApkUtils.sign
 import app.revanced.manager.flutter.utils.Aapt
 import app.revanced.manager.flutter.utils.packageInstaller.InstallerReceiver
 import app.revanced.manager.flutter.utils.packageInstaller.UninstallerReceiver
@@ -339,16 +338,15 @@ class MainActivity : FlutterActivity() {
                     patcher.get()
                 }
 
-                inFile.copyTo(outFile)
-
                 if (cancel(patcher::close)) return@Thread
 
-                patcherResult.applyTo(outFile)
+                patcherResult.applyTo(inFile)
 
                 if (cancel(patcher::close)) return@Thread
-                updateProgress(0.8, "Signing...", "")
 
-                outFile.sign(
+                ApkUtils.sign(
+                    inFile,
+                    outFile,
                     ApkUtils.SigningOptions(
                         keyStoreFile,
                         keystorePassword,

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
-distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
+distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.1.2" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.10" apply false
+    id "com.android.application" version "8.4.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.0.0" apply false
 }
 
 include ":app"
diff --git a/assets/i18n/strings.i18n.json b/assets/i18n/strings.i18n.json
@@ -120,16 +120,18 @@
   },
   "patchOptionsView": {
     "customValue": "Custom value",
+    "setToNull": "Set to null",
+    "nullValue": "This option value is currently null",
     "resetOptionsTooltip": "Reset patch options",
     "viewTitle": "Patch options",
     "saveOptions": "Save",
     "addOptions": "Add options",
-    "deselectPatch": "Deselect patch",
+    "unselectPatch": "Unselect patch",
     "tooltip": "More input options",
     "selectFilePath": "Select file path",
     "selectFolder": "Select folder",
     "selectOption": "Select option",
-    "requiredOption": "This option is required",
+    "requiredOption": "Setting this option is required",
     "unsupportedOption": "This option is not supported",
     "requiredOptionNull": "The following options have to be set:\n\n${options}"
   },
@@ -282,12 +284,7 @@
     "updateNotImplemented": "This feature has not been implemented yet"
   },
   "contributorsView": {
-    "widgetTitle": "Contributors",
-    "patcherContributors": "ReVanced Patcher",
-    "patchesContributors": "ReVanced Patches",
-    "integrationsContributors": "ReVanced Integrations",
-    "cliContributors": "ReVanced CLI",
-    "managerContributors": "ReVanced Manager"
+    "widgetTitle": "Contributors"
   },
   "installErrorDialog": {
     "mount_version_mismatch": "Version mismatch",