chore: Merge branch dev to main (#1857)

ReVanced · Jul 29, 2024 · d81808a · d81808a
2 parents a23f032 + ea9654e
commit d81808a
Show file tree

Hide file tree

Showing 132 changed files with 6,749 additions and 3,932 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/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

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,9 +36,10 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           channel: "stable"
+          flutter-version: 3.22.x
 
       - name: Install dependencies
-        run: npm install
+        run: npm ci
 
       - name: Get dependencies
         run: flutter pub get

diff --git a/.github/workflows/sync_crowdin.yml b/.github/workflows/sync_crowdin.yml
@@ -5,6 +5,7 @@ on:
   schedule: 
     - cron: 00 12 * * 1
   push:
+    branches: dev
     paths:
       - assets/i18n/*.json
       - assets/i18n/*.dart
@@ -20,8 +21,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup 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
@@ -43,17 +47,27 @@ jobs:
           CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
           CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
 
-      - name: Remove empty values from JSON
+      - name: Generate Translation Strings
+        run: |
+          dart pub get
+          dart run slang
+          flutter analyze lib/gen/strings.g.dart --no-fatal-infos --no-fatal-warnings
+
+      - name: Remove empty values & Validation of Translation Strings
         run: |
+          dart run slang analyze
+          dart run slang clean
+          dart run slang normalize
           cd assets/i18n
           sudo chmod 777 *.json
           dart nuke.dart >> $GITHUB_STEP_SUMMARY
+          flutter analyze lib/gen/strings.g.dart --no-fatal-infos --no-fatal-warnings
 
       - name: Commit translations
         run: |
           git config user.name revanced-bot
           git config user.email [email protected]
           sudo chown -R $USER:$USER .git
-          git add assets/i18n/*.json
-          git commit -m "chore: Remove empty values from JSON" assets/i18n/*.json
+          git add assets/i18n/strings.*.json
+          git commit -m "chore: Remove empty values from JSON" assets/i18n/strings.*.json
           git push origin HEAD:feat/translations
diff --git a/README.md b/README.md
@@ -80,7 +80,7 @@ Some of the features ReVanced Manager provides are:
 
 ## 🔽 Download
 
-You can download the most recent version of ReVanced Manager at [revanced.app/download](https://revanced.app/download) or from [GitHub releases](https://github.com/ReVanced/revanced-manager/releases).  
+You can download the most recent version of ReVanced Manager at [revanced.app/download](https://revanced.app/download) or from [GitHub releases](https://github.com/ReVanced/revanced-manager/releases/latest).  
 Learn how to use ReVanced Manager by following the [documentation](/docs).
 
 ## 📚 Everything else
@@ -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/android/app/build.gradle b/android/app/build.gradle
@@ -23,10 +23,10 @@ if (flutterVersionName == null) {
 }
 
 android {
-    compileSdk flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
+    compileSdk 34
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
@@ -113,6 +113,7 @@ flutter {
 }
 
 dependencies {
+    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/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/jniLibs/armeabi-v7a/libaapt2.so b/android/app/src/main/jniLibs/armeabi-v7a/libaapt2.so
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx1536M -XX:+UseParallelGC
+org.gradle.jvmargs=-Xmx4096m -XX:+UseParallelGC
 org.gradle.parallel=true
 org.gradle.daemon=true
 org.gradle.caching=true

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=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-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.23" apply false
+    id "com.android.application" version "8.5.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
@@ -4,14 +4,10 @@
   "dismissButton": "Dismiss",
   "quitButton": "Quit",
   "updateButton": "Update",
-  "enabledLabel": "Enabled",
-  "disabledLabel": "Disabled",
-  "installed": "Installed: ${version}",
   "suggested": "Suggested: ${version}",
   "yesButton": "Yes",
   "noButton": "No",
   "warning": "Warning",
-  "options": "Options",
   "notice": "Notice",
   "noShowAgain": "Don't show this again",
   "add": "Add",
@@ -27,10 +23,10 @@
     "refreshSuccess": "Refreshed successfully",
     "widgetTitle": "Dashboard",
     "updatesSubtitle": "Updates",
-    "patchedSubtitle": "Patched apps",
+    "lastPatchedAppSubtitle": "Last patched app",
+    "patchedSubtitle": "Installed apps",
     "changeLaterSubtitle": "You can change this in the settings at a later time.",
-    "noUpdates": "No updates available",
-    "WIP": "Work in progress...",
+    "noSavedAppFound": "No app found",
     "noInstallations": "No patched apps installed",
     "installUpdate": "Continue to install the update?",
     "updateSheetTitle": "Update ReVanced Manager",
@@ -41,32 +37,24 @@
     "downloadConsentDialogTitle": "Download necessary files?",
     "downloadConsentDialogText": "ReVanced Manager needs to download necessary files to work properly.",
     "downloadConsentDialogText2": "This will connect you to ${url}.",
-    "checkUpdateDialogTitle": "Check for updates?",
-    "checkUpdateDialogText": "Do you want ReVanced Manager to check for updates automatically?",
-    "notificationTitle": "Update downloaded",
-    "notificationText": "Tap to install the update",
     "downloadingMessage": "Downloading update...",
     "downloadedMessage": "Update downloaded",
     "installingMessage": "Installing update...",
     "errorDownloadMessage": "Unable to download update",
     "errorInstallMessage": "Unable to install update",
-    "noConnection": "No internet connection",
-    "updatesDisabled": "Updating a patched app is currently disabled. Repatch the app again."
+    "noConnection": "No internet connection"
   },
   "applicationItem": {
     "infoButton": "Info"
   },
   "latestCommitCard": {
     "loadingLabel": "Loading...",
-    "timeagoLabel": "${time} ago",
-    "patcherLabel": "Patcher: ",
-    "managerLabel": "Manager: ",
-    "updateButton": "Update Manager"
+    "timeagoLabel": "${time} ago"
   },
   "patcherView": {
     "widgetTitle": "Patcher",
     "patchButton": "Patch",
-    "armv7WarningDialogText": "Patching on ARMv7 devices is not yet supported and might fail. Continue anyways?",
+    "incompatibleArchWarningDialogText": "Patching on this architecture is not yet supported and might fail. Continue anyways?",
     "removedPatchesWarningDialogText": "The following patches have been removed since the last time you used them.\n\n${patches}\n\nContinue anyways?",
     "requiredOptionDialogText": "Some patch options have to be set."
   },
@@ -75,8 +63,6 @@
     "widgetTitleSelected": "Selected app",
     "widgetSubtitle": "No app selected",
     "noAppsLabel": "No applications found",
-    "currentVersion": "Current",
-    "suggestedVersion": "Suggested",
     "anyVersion": "Any version"
   },
   "patchSelectorCard": {
@@ -118,16 +104,15 @@
   },
   "patchOptionsView": {
     "customValue": "Custom value",
-    "resetOptionsTooltip": "Reset patch options",
+    "setToNull": "Set to null",
+    "nullValue": "This option value is currently null",
     "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}"
   },
@@ -139,7 +124,6 @@
     "patchesChangeWarningDialogButton": "Use default selection"
   },
   "installerView": {
-    "widgetTitle": "Installer",
     "installType": "Select install type",
     "installTypeDescription": "Select the installation type to continue with.",
     "installButton": "Install",
@@ -148,7 +132,6 @@
     "warning": "Disable auto updates for the patched app to avoid unexpected issues.",
     "pressBackAgain": "Press back again to cancel",
     "openButton": "Open",
-    "shareButton": "Share file",
     "notificationTitle": "ReVanced Manager is patching",
     "notificationText": "Tap to return to the installer",
     "exportApkButtonTooltip": "Export patched APK",
@@ -173,7 +156,6 @@
     "dynamicThemeHint": "Enjoy an experience closer to your device",
     "languageLabel": "Language",
     "languageUpdated": "Language updated",
-    "englishOption": "English",
     "sourcesLabel": "Alternative sources",
     "sourcesLabelHint": "Configure the alternative sources for ReVanced Patches and ReVanced Integrations",
     "sourcesIntegrationsLabel": "Integrations source",
@@ -203,6 +185,8 @@
     "showUpdateDialogHint": "Show a dialog when a new update is available",
     "universalPatchesLabel": "Show universal patches",
     "universalPatchesHint": "Display all apps and universal patches (may slow down the app list)",
+    "lastPatchedAppLabel": "Save patched app",
+    "lastPatchedAppHint": "Save the last patch to install or export later",
     "versionCompatibilityCheckLabel": "Version compatibility check",
     "versionCompatibilityCheckHint": "Prevent selecting patches that are not compatible with the selected app version",
     "requireSuggestedAppVersionLabel": "Require suggested app version",
@@ -254,18 +238,25 @@
   "appInfoView": {
     "widgetTitle": "App info",
     "openButton": "Open",
+    "installButton": "Install",
     "uninstallButton": "Uninstall",
     "unmountButton": "Unmount",
+    "exportButton": "Export",
+    "deleteButton": "Delete",
     "rootDialogTitle": "Error",
+    "lastPatchedAppDescription": "This is a backup of the app that was last patched.",
     "unmountDialogText": "Are you sure you want to unmount this app?",
     "uninstallDialogText": "Are you sure you want to uninstall this app?",
     "rootDialogText": "App was installed with superuser permissions, but currently ReVanced Manager has no permissions.\nPlease grant superuser permissions first.",
+    "removeAppDialogTitle": "Delete app?",
+    "removeAppDialogText": "Are you sure you want to delete this backup?",
     "packageNameLabel": "Package name",
     "installTypeLabel": "Installation type",
     "mountTypeLabel": "Mount",
     "regularTypeLabel": "Regular",
     "patchedDateLabel": "Patched date",
     "appliedPatchesLabel": "Applied patches",
+    "sizeLabel": "File size",
     "patchedDateHint": "${date} at ${time}",
     "appliedPatchesHint": "${quantity} applied patches",
     "updateNotImplemented": "This feature has not been implemented yet"

diff --git a/assets/i18n/strings_af_ZA.i18n.json b/assets/i18n/strings_af_ZA.i18n.json
@@ -0,0 +1,19 @@
+{
+  "navigationView": {},
+  "homeView": {},
+  "applicationItem": {},
+  "latestCommitCard": {},
+  "patcherView": {},
+  "appSelectorCard": {},
+  "patchSelectorCard": {},
+  "socialMediaCard": {},
+  "appSelectorView": {},
+  "patchesSelectorView": {},
+  "patchOptionsView": {},
+  "patchItem": {},
+  "installerView": {},
+  "settingsView": {},
+  "appInfoView": {},
+  "contributorsView": {},
+  "installErrorDialog": {}
+}