chore:fix incorrect version

faster build faster build faster build faster build faster build

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -29,7 +29,7 @@ body:
   - type: textarea
     attributes:
       label: Steps to reproduce
-      description: Add the steps to reproduce this bug including your environment.
+      description: Add the steps to reproduce this bug, including your environment.
       placeholder: Step 1. Download some files. Step 2. ...
     validations:
       required: true
@@ -74,20 +74,20 @@ body:
   - type: textarea
     attributes:
       label: Device logs (exported using Manager settings).
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so there is no need for backticks.
       render: shell
     validations:
       required: true
   - type: textarea
     attributes:
-      label: Installer logs (exported using Installer menu option) [unneeded if issue is not during patching].
+      label: Installer logs (exported using Installer menu option) [unneeded if the issue is not during patching].
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so there is no need for backticks.
       render: shell
     validations:
       required: false
   - type: textarea
     attributes:
-      label: Screenshots or videos
+      label: Screenshots or video
       description: Add screenshots or videos that show the bug here.
       placeholder: Drag and drop the screenshots/videos into this box.
     validations:
@@ -105,16 +105,16 @@ body:
     validations:
       required: false
   - type: checkboxes
-    id: acknowledgements
+    id: acknowledgments
     attributes:
-      label: Acknowledgements
+      label: Acknowledgments
       description: Your issue will be closed if you haven't done these steps.
       options:
-        - label: I have searched the existing issues and this is a new and no duplicate or related to another open issue.
+        - label: I have searched the existing issues; this is new and no duplicate or related to another open issue.
           required: true
         - label: I have written a short but informative title.
           required: true
-        - label: I filled out all of the requested information in this issue properly.
+        - label: I properly filled out all of the requested information in this issue.
           required: true
-        - label: The issue is related solely to the ReVanced Manager and not related to patching errors or patches
+        - label: The issue is solely related to ReVanced Manager and not caused by patches.
           required: true

.github/workflows/analyze.yml

@@ -2,18 +2,24 @@ name: Analyze Code
 
 on:
   push:
-    branches: [ "main", "dev" ]
+    branches: [ "dev" ]
     paths: 
       - "**.dart"
       - ".github/workflows/analyze.yml"
   pull_request:
     branches: [ "main", "dev" ]
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
     paths: 
       - "**.dart"
       - ".github/workflows/analyze.yml"
 
 jobs:
   build:
+    name: "Static analysis & format check"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

.github/workflows/pull-request-build.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '11'
           distribution: 'zulu'
           cache: 'gradle'
       - name: Setup Flutter

.github/workflows/release-build.yml

@@ -0,0 +1,50 @@
+name: "Release Build"
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set env
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: "11"
+          distribution: "zulu"
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: "stable"
+      - name: Set up Flutter
+        run: flutter pub get
+      - name: Generate files with Builder
+        run: flutter packages pub run build_runner build --delete-conflicting-outputs
+      - name: Build with Flutter
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
+          SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
+          SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_KEYSTORE_PASSWORD }}
+        run: flutter build apk
+      - name: Sign APK
+        id: sign_apk
+        uses: ilharp/sign-android-release@v1
+        with:
+          releaseDir: build/app/outputs/apk/release
+          signingKey: ${{ secrets.SIGNING_KEYSTORE }}
+          keyStorePassword: ${{ secrets.SIGNING_KEYSTORE_PASSWORD }}
+          keyAlias: ${{ secrets.SIGNING_KEY_ALIAS }}
+          keyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
+      - name: Add version to APK
+        run: mv ${{steps.sign_apk.outputs.signedFile}} revanced-manager-${{ env.RELEASE_VERSION }}.apk
+      - name: Publish release APK
+        uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          prerelease: false
+          files: revanced-manager-${{ env.RELEASE_VERSION }}.apk

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '11'
           distribution: 'zulu'
           cache: 'gradle'
       - name: Setup Node.js

.github/workflows/update-documentation.yml

@@ -0,0 +1,19 @@
+name: Update documentation
+
+on:
+  push:
+    paths:
+      - docs/**
+
+jobs:
+  trigger:
+    runs-on: ubuntu-latest
+    name: Dispatch event to documentation repository
+    if: github.ref == 'refs/heads/main'
+    steps:
+      - uses: peter-evans/repository-dispatch@v2
+        with:
+          token: ${{ secrets.DOCUMENTATION_REPO_ACCESS_TOKEN  }}
+          repository: revanced/revanced-documentation
+          event-type: update-documentation
+          client-payload: '{"repo": "${{ github.event.repository.name }}", "ref": "${{ github.ref }}"}'

.gitignore

@@ -138,4 +138,7 @@ app.*.map.json
 .firebase
 
 # Dependency directories
-node_modules/
+node_modules/
+
+# FVM
+.fvm

README.md

@@ -24,7 +24,7 @@ If you wish to translate ReVanced Manager, we're accepting translations on [Crow
 ## 🛠️ Building Manager from source
 1. Setup flutter environment for your [platform](https://docs.flutter.dev/get-started/install)
 2. Clone the repository locally
-3. Add your github token in gradle.properties like [this](https://github.com/revanced/revanced-manager/blob/docs/docs/5_building-from-source.md)
+3. Add your github token in gradle.properties like [this](/docs/4_building.md)
 4. Open the project in terminal
 5. Run `flutter pub get` in terminal
 6. Then `flutter packages pub run build_runner build --delete-conflicting-outputs` (Must be done on each git pull)

analysis_options.yaml

@@ -98,7 +98,6 @@ linter:
     - prefer_const_declarations
     - prefer_const_literals_to_create_immutables
     - prefer_contains
-    - prefer_equal_for_default_values
     - prefer_final_fields
     - prefer_final_in_for_each
     - prefer_final_locals

android/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "fastlane"

android/app/build.gradle

@@ -26,11 +26,10 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 
     compileOptions {
-        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -49,7 +48,6 @@ android {
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        multiDexEnabled true
     }
 
     buildTypes {
@@ -73,21 +71,10 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // ReVanced
-    implementation "app.revanced:revanced-patcher:7.0.0"
+    implementation "app.revanced:revanced-patcher:11.0.4"
 
     // Signing & aligning
     implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
     implementation("com.android.tools.build:apksig:7.2.2")
 
-    // MicroG cronet
-    implementation("org.microg:cronet-common:$cronetVersion")
-    implementation("org.microg:cronet-native:$cronetVersion")
-
-    // Core libraries
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
-
-    // Window
-    implementation 'androidx.window:window:1.0.0'
-    implementation 'androidx.window:window-java:1.0.0'
-
 }

android/app/src/main/AndroidManifest.xml

@@ -2,21 +2,29 @@
     package="app.revanced.manager.flutter">
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.INTERNET" />
+
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
+
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+    
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
    <application
         android:label="ReVanced Manager"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:largeHeap="true"
+        android:requestLegacyExternalStorage="true"
         android:extractNativeLibs="true"
         android:enableOnBackInvokedCallback="true">
         <activity

android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt

@@ -271,8 +271,8 @@ class MainActivity : FlutterActivity() {
                         "update",
                         mapOf(
                             "progress" to -100.0,
-                            "header" to "Aborting...",
+                            "header" to "Aborted...",
-                            "log" to "An error occurred! Aborting\nError:\n$stack"
+                            "log" to "An error occurred! Aborted\nError:\n$stack"
                         )
                     )
                 }

android/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="256"
+    android:viewportHeight="256">
+  <group android:scaleX="0.23"
+      android:scaleY="0.23"
+      android:translateX="98.56"
+      android:translateY="98.56">
+    <path
+        android:pathData="M253.85,4.9C254.32,3.82 254.22,2.57 253.58,1.58C252.93,0.6 251.83,0 250.64,0C243.29,0 230.47,0 225.95,0C224.96,0 224.06,0.59 223.66,1.5C216.03,18.88 144.1,182.7 130.29,214.16C129.89,215.07 128.99,215.66 128,215.66C127.01,215.66 126.11,215.07 125.71,214.16C111.9,182.7 39.97,18.88 32.34,1.5C31.94,0.59 31.04,0 30.05,0C25.53,0 12.71,0 5.36,0C4.17,0 3.07,0.6 2.42,1.58C1.78,2.57 1.68,3.82 2.15,4.9C16.78,38.3 101.47,231.61 111.24,253.9C111.8,255.18 113.06,256 114.45,256C120.29,256 135.71,256 141.55,256C142.94,256 144.2,255.18 144.76,253.9C154.52,231.61 239.22,38.3 253.85,4.9Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M130.59,131.75C130.06,132.68 129.07,133.25 128,133.25C126.93,133.25 125.94,132.68 125.4,131.75C113.45,111.06 63.88,25.19 51.93,4.5C51.4,3.57 51.4,2.43 51.93,1.5C52.47,0.57 53.46,-0 54.53,-0L201.47,-0C202.54,-0 203.53,0.57 204.06,1.5C204.6,2.43 204.6,3.57 204.06,4.5C192.12,25.19 142.54,111.06 130.59,131.75Z">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="128"
+            android:startY="-0"
+            android:endX="128"
+            android:endY="254.6"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFF04E98"/>
+          <item android:offset="0.5" android:color="#FF5F65D4"/>
+          <item android:offset="1" android:color="#FF4E98F0"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+  </group>
+</vector>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@drawable/ic_launcher_background"/>
+    <background android:drawable="@color/ic_launcher_background"/>
-  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-  <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
+</adaptive-icon>

android/app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#1B1B1B</color>
+</resources>

android/build.gradle

@@ -1,5 +1,4 @@
 buildscript {
-    ext.cronetVersion = '102.5005.125'
     ext.kotlin_version = '1.7.10'
     repositories {
         google()
@@ -32,6 +31,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

android/gradle.properties

@@ -1,3 +1,6 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx1536M -XX:+UseParallelGC
+org.gradle.parallel=true
+org.gradle.daemon=true
+org.gradle.caching=true
 android.useAndroidX=true
 android.enableJetifier=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionSha256Sum=a01b6587e15fe7ed120a0ee299c25982a1eee045abd6a9dd5e216b2f628ef9ac
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

assets/i18n/ar_SA.json

@@ -55,8 +55,7 @@
         "widgetSubtitle": "لم يتم اختيار أي تطبيق",
         "noAppsLabel": "لم يتم العثور على تطبيقات",
         "currentVersion": "الحالي",
-        "recommendedVersion": "موصى به",
+        "recommendedVersion": "موصى به"
-        "anyVersion": "أي"
     },
     "patchSelectorCard": {
         "widgetTitle": "اختر التعديلات",

assets/i18n/az_AZ.json

@@ -54,8 +54,7 @@
         "widgetSubtitle": "Heç bir tətbiq seçilməyib",
         "noAppsLabel": "Heç bir tətbiq tapılmadı",
         "currentVersion": "Hazırkı",
-        "recommendedVersion": "Tövsiyyə edilən",
+        "recommendedVersion": "Tövsiyyə edilən"
-        "anyVersion": "istənilən"
     },
     "patchSelectorCard": {
         "widgetTitle": "Yamaqları seçin",

assets/i18n/bg_BG.json

@@ -55,8 +55,7 @@
         "widgetSubtitle": "Няма избрано приложение",
         "noAppsLabel": "Няма намерени приложения",
         "currentVersion": "Текуща",
-        "recommendedVersion": "Препоръчана",
+        "recommendedVersion": "Препоръчана"
-        "anyVersion": "всяка"
     },
     "patchSelectorCard": {
         "widgetTitle": "Изберете модификации",

assets/i18n/bn_BD.json

@@ -54,8 +54,7 @@
         "widgetSubtitle": "কোনো অ্যাপ্লিকেশন নির্বাচন করা হয়নি",
         "noAppsLabel": "কোন অ্যাপ্লিকেশন পাওয়া যায়নি",
         "currentVersion": "বর্তমান",
-        "recommendedVersion": "প্রস্তাবিত",
+        "recommendedVersion": "প্রস্তাবিত"
-        "anyVersion": "যেকোনো সংস্করণ"
     },
     "patchSelectorCard": {
         "widgetTitle": "প্যাচ নির্বাচন করুন",

assets/i18n/cs_CZ.json

@@ -54,8 +54,7 @@
         "widgetSubtitle": "Nebyla vybrána žádná aplikace",
         "noAppsLabel": "Nebyly nalezeny žádné aplikace",
         "currentVersion": "Aktuální",
-        "recommendedVersion": "Doporučeno",
+        "recommendedVersion": "Doporučeno"
-        "anyVersion": "jakákoliv"
     },
     "patchSelectorCard": {
         "widgetTitle": "Vybrat záplaty",

assets/i18n/da_DK.json

@@ -55,8 +55,7 @@
         "widgetSubtitle": "Ingen applikation valgt",
         "noAppsLabel": "Ingen applikationer fundet",
         "currentVersion": "Nuværende",
-        "recommendedVersion": "Anbefalet",
+        "recommendedVersion": "Anbefalet"
-        "anyVersion": "enhver"
     },
     "patchSelectorCard": {
         "widgetTitle": "Vælg patches",

assets/i18n/de_DE.json

@@ -55,8 +55,7 @@
         "widgetSubtitle": "Keine App ausgewählt",
         "noAppsLabel": "Keine Apps gefunden",
         "currentVersion": "Aktuell",
-        "recommendedVersion": "Empfohlen",
+        "recommendedVersion": "Empfohlen"
-        "anyVersion": "beliebig"
     },
     "patchSelectorCard": {
         "widgetTitle": "Patches auswählen",

assets/i18n/el_GR.json

@@ -55,8 +55,7 @@
         "widgetSubtitle": "Δεν έχει επιλεχθεί εφαρμογή",
         "noAppsLabel": "Δεν βρέθηκαν εφαρμογές",
         "currentVersion": "Τρέχουσα",
-        "recommendedVersion": "Προτεινόμενη",
+        "recommendedVersion": "Προτεινόμενη"
-        "anyVersion": "οποιαδήποτε"
     },
     "patchSelectorCard": {
         "widgetTitle": "Επιλέξτε τροποποιήσεις",

assets/i18n/en_US.json

@@ -4,6 +4,8 @@
     "updateButton": "Update",
     "enabledLabel": "Enabled",
     "disabledLabel": "Disabled",
+    "installed":"Installed: {version}",
+    "suggested":"Suggested: {version}",
     "yesButton": "Yes",
     "noButton": "No",
     "warning": "Warning",
@@ -15,21 +17,33 @@
     "homeView": {
         "refreshSuccess": "Refreshed successfully",
         "widgetTitle": "Dashboard",
+
         "updatesSubtitle": "Updates",
         "patchedSubtitle": "Patched applications",
+
         "updatesAvailable": "Updates available",
         "noUpdates": "No updates available",
+
         "WIP": "Work in progress...",
+
         "noInstallations": "No patched applications installed",
         "installed": "Installed",
+        "installUpdate": "Continue to install the update?",
+
         "updateDialogTitle": "Update Manager",
         "updateChangelogTitle": "Changelog",
+
         "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."
     },
@@ -48,21 +62,27 @@
     "patcherView": {
         "widgetTitle": "Patcher",
         "patchButton": "Patch",
+
         "patchDialogText": "You have selected a resource patch and a split APK installation has been detected, so patching errors may occur.\nAre you sure you want to proceed?",
-        "armv7WarningDialogText": "Patching on ARMv7 devices is not yet supported. Proceed anyways?"
+        "armv7WarningDialogText": "Patching on ARMv7 devices is not yet supported and might fail. Proceed anyways?",
+        "splitApkWarningDialogText": "Patching a split APK is not yet supported and might fail. Proceed anyways?"
     },
     "appSelectorCard": {
         "widgetTitle": "Select an application",
         "widgetTitleSelected": "Selected application",
         "widgetSubtitle": "No application selected",
+
         "noAppsLabel": "No applications found",
+        "notInstalled":"App not installed",
+
         "currentVersion": "Current",
         "suggestedVersion": "Suggested",
-        "anyVersion": "any"
+        "allVersions": "All versions"
     },
     "patchSelectorCard": {
         "widgetTitle": "Select patches",
         "widgetTitleSelected": "Selected patches",
+
         "widgetSubtitle": "Select an application first",
         "widgetEmptySubtitle": "No patches selected"
     },
@@ -73,24 +93,33 @@
     "appSelectorView": {
         "viewTitle": "Select an application",
         "searchBarHint": "Search applications",
-        "selectFromStorageButton": "Select from storage",
+
         "storageButton": "Storage",
+        "selectFromStorageButton": "Select from storage",
+        
         "errorMessage": "Unable to use selected application",
+
         "downloadToast": "Download function is not available yet",
+
         "featureNotAvailable": "Feature not implemented",
-        "featureNotAvailableText": "This feature has not been added yet for non-root. You'll need to select APK files from storage for now."
+        "featureNotAvailableText": "This application is a split APK and cannot be selected. Unfortunately, this feature is only available for rooted users at the moment. However, you can still install the application by selecting its APK files from your device's storage instead"
     },
     "patchesSelectorView": {
         "viewTitle": "Select patches",
         "searchBarHint": "Search patches",
+
         "doneButton": "Done",
+
         "default": "Default",
         "defaultTooltip": "Select all default patches",
+
         "none": "None",
         "noneTooltip": "Deselect all patches",
+
         "loadPatchesSelection": "Load patches selection",
         "noSavedPatches": "No saved patches for the selected app.\nPress Done to save current selection.",
         "noPatchesFound": "No patches found for the selected app",
+
         "selectAllPatchesWarningContent": "You are about to select all patches, that includes non-suggested patches and can cause unwanted behavior."
     },
     "patchItem": {
@@ -103,11 +132,14 @@
         "installRootButton": "Install as Root",
         "openButton": "Open",
         "shareButton": "Share file",
+        
         "notificationTitle": "ReVanced Manager is patching",
         "notificationText": "Tap to return to the installer",
+
         "shareApkMenuOption": "Share APK",
         "exportApkMenuOption": "Export APK",
         "shareLogMenuOption": "Share log",
+
         "installErrorDialogTitle": "Error",
         "installErrorDialogText1": "Root install is not possible with the current patches selection.\nRepatch your app or choose non-root install.",
         "installErrorDialogText2": "Non-root install is not possible with the current patches selection.\nRepatch your app or choose root install if you have your device rooted.",
@@ -116,74 +148,95 @@
     },
     "settingsView": {
         "widgetTitle": "Settings",
+
         "appearanceSectionTitle": "Appearance",
         "teamSectionTitle": "Team",
         "infoSectionTitle": "Info",
         "advancedSectionTitle": "Advanced",
+        "exportSectionTitle": "Import & export",
         "logsSectionTitle": "Logs",
+
         "darkThemeLabel": "Dark mode",
         "darkThemeHint": "Welcome to the dark side",
+
         "dynamicThemeLabel": "Material You",
         "dynamicThemeHint": "Enjoy an experience closer to your device",
+
         "languageLabel": "Language",
         "englishOption": "English",
+
         "sourcesLabel": "Sources",
         "sourcesLabelHint": "Configure your custom sources",
-        "hostRepositoryLabel": "Repository API",
-        "orgPatchesLabel": "Patches organization",
-        "sourcesPatchesLabel": "Patches source",
-        "orgIntegrationsLabel": "Integrations organization",
         "sourcesIntegrationsLabel": "Integrations source",
         "sourcesResetDialogTitle": "Reset",
         "sourcesResetDialogText": "Are you sure you want to reset custom sources to their default values?",
         "apiURLResetDialogText": "Are you sure you want to reset API URL to its default value?",
-        "contributorsLabel": "Contributors",
+
-        "contributorsHint": "A list of contributors of ReVanced",
-        "logsLabel": "Logs",
-        "logsHint": "Share Manager's logs",
         "apiURLLabel": "API URL",
         "apiURLHint": "Configure your custom API URL",
         "selectApiURL": "API URL",
+        "hostRepositoryLabel": "Repository API",
+        "orgPatchesLabel": "Patches organization",
+        "sourcesPatchesLabel": "Patches source",
+        "orgIntegrationsLabel": "Integrations organization",
+        
+        "contributorsLabel": "Contributors",
+        "contributorsHint": "A list of contributors of ReVanced",
+
+        "logsLabel": "Logs",
+        "logsHint": "Share Manager's logs",
+
         "experimentalUniversalPatchesLabel": "Experimental universal patches support",
         "experimentalUniversalPatchesHint": "Display all applications to use with universal patches, loading list of apps may be slower",
         "experimentalPatchesLabel": "Experimental patches support",
         "experimentalPatchesHint": "Enable usage of unsupported patches in any app version",
         "enabledExperimentalPatches": "Experimental patches support enabled",
-        "exportSectionTitle": "Import & export",
+
         "aboutLabel": "About",
         "snackbarMessage": "Copied to clipboard",
         "restartAppForChanges": "Restart the app to apply changes",
-        "deleteKeystoreLabel": "Delete keystore",
+
-        "deleteKeystoreHint": "Delete the keystore used to sign the app",
-        "deleteKeystoreDialogText": "Are you sure you want to delete the keystore used to sign patched applications?",
-        "deletedKeystore": "Keystore deleted",
         "deleteTempDirLabel": "Delete temporary files",
         "deleteTempDirHint": "Delete unused temporary files",
         "deletedTempDir": "Temporary files deleted",
+
         "exportPatchesLabel": "Export patches selection",
         "exportPatchesHint": "Export patches selection to a JSON file",
         "exportedPatches": "Patches selection exported",
         "noExportFileFound": "No patches selection to export",
+
         "importPatchesLabel": "Import patches selection",
         "importPatchesHint": "Import patches selection from a JSON file",
         "importedPatches": "Patches selection imported",
+
         "resetStoredPatchesLabel": "Reset patches",
         "resetStoredPatchesHint": "Reset the stored patches selection",
+        "resetStoredPatchesDialogText": "Are you sure you want to reset the stored patches selection?",
         "resetStoredPatches": "Patches selection has been reset",
-        "jsonSelectorErrorMessage": "Unable to use selected JSON file",
+
         "deleteLogsLabel": "Delete logs",
         "deleteLogsHint": "Delete collected manager logs",
         "deletedLogs": "Logs deleted",
+
+        "deleteKeystoreLabel": "Delete keystore",
+        "deleteKeystoreHint": "Delete the keystore used to sign the app",
+        "deleteKeystoreDialogText": "Are you sure you want to delete the keystore used to sign patched applications?",
+        "deletedKeystore": "Keystore deleted",
+
         "exportKeystoreLabel": "Export keystore",
         "exportKeystoreHint": "Export keystore used to sign apps",
         "exportedKeystore": "Keystore exported",
         "noKeystoreExportFileFound": "No keystore to export",
+
         "importKeystoreLabel": "Import keystore",
         "importKeystoreHint": "Import keystore used to sign apps",
         "importedKeystore": "Keystore imported",
-        "keystoreSelectorErrorMessage": "Unable to use selected KEYSTORE file",
+
         "selectKeystorePassword": "Keystore Password",
-        "selectKeystorePasswordHint": "Select keystore password used to sign the apk"
+        "selectKeystorePasswordHint": "Select keystore password used to sign the apk",
+
+        "jsonSelectorErrorMessage": "Unable to use selected JSON file",
+        "keystoreSelectorErrorMessage": "Unable to use selected KEYSTORE file"
     },
     "appInfoView": {
         "widgetTitle": "App info",
@@ -191,18 +244,22 @@
         "uninstallButton": "Uninstall",
         "patchButton": "Patch",
         "unpatchButton": "Unpatch",
-        "unpatchDialogText": "Are you sure you want to unpatch this app?",
         "rootDialogTitle": "Error",
+
+        "unpatchDialogText": "Are you sure you want to unpatch this app?",
         "rootDialogText": "App was installed with superuser permissions, but currently ReVanced Manager has no permissions.\nPlease grant superuser permissions first.",
+
         "packageNameLabel": "Package name",
         "originalPackageNameLabel": "Original package name",
         "installTypeLabel": "Installation type",
         "rootTypeLabel": "Root",
         "nonRootTypeLabel": "Non-root",
         "patchedDateLabel": "Patched date",
-        "patchedDateHint": "{date} at {time}",
         "appliedPatchesLabel": "Applied patches",
+
+        "patchedDateHint": "{date} at {time}",
         "appliedPatchesHint": "{quantity} applied patches",
+        
         "updateNotImplemented": "This feature has not been implemented yet"
     },
     "contributorsView": {

assets/i18n/es_ES.json

@@ -55,8 +55,7 @@
         "widgetSubtitle": "Ninguna aplicación seleccionada",
         "noAppsLabel": "No se encontraron aplicaciones",
         "currentVersion": "Versión actual",
-        "recommendedVersion": "Versión recomendada",
+        "recommendedVersion": "Versión recomendada"
-        "anyVersion": "cualquiera"
     },
     "patchSelectorCard": {
         "widgetTitle": "Seleccionar parches",

assets/i18n/es_MX.json

@@ -54,8 +54,7 @@
         "widgetSubtitle": "Ninguna aplicación seleccionada",
         "noAppsLabel": "No se encontraron aplicaciones",
         "currentVersion": "Versión actual",
-        "recommendedVersion": "Versión recomendada",
+        "recommendedVersion": "Versión recomendada"
-        "anyVersion": "Cualquier versión"
     },
     "patchSelectorCard": {
         "widgetTitle": "Seleccionar parches",

assets/i18n/fi_FI.json

@@ -54,8 +54,7 @@
         "widgetSubtitle": "Sovellusta ei ole valittu",
         "noAppsLabel": "Sovelluksia ei löytynyt",
         "currentVersion": "Nykyinen",
-        "recommendedVersion": "Suositeltu",
+        "recommendedVersion": "Suositeltu"
-        "anyVersion": "mikä tahansa"
     },
     "patchSelectorCard": {
         "widgetTitle": "Valitse paikkaukset",

assets/i18n/fr_FR.json

@@ -55,8 +55,7 @@
         "widgetSubtitle": "Aucune application sélectionnée",
         "noAppsLabel": "Aucune application trouvée",
         "currentVersion": "Version actuelle",
-        "recommendedVersion": "Version recommandée",
+        "recommendedVersion": "Version recommandée"
-        "anyVersion": "n'importe laquelle"
     },
     "patchSelectorCard": {
         "widgetTitle": "Sélectionner les patchs",

assets/i18n/hi_IN.json

@@ -54,8 +54,7 @@
         "widgetSubtitle": "कोई ऐप्लकैशन चुना हुआ नहीं",
         "noAppsLabel": "कोई एप्लिकेशन नहीं मिला।",
         "currentVersion": "वर्तमान",
-        "recommendedVersion": "अनुशंसित",
+        "recommendedVersion": "अनुशंसित"
-        "anyVersion": "कोई"
     },
     "patchSelectorCard": {
         "widgetTitle": "पैच चुने",

assets/i18n/hu_HU.json

@@ -54,8 +54,7 @@
         "widgetSubtitle": "Nincs kiválasztott alkalmazás",
         "noAppsLabel": "Nem találhatóak alkalmazások",
         "currentVersion": "Jelenlegi",
-        "recommendedVersion": "Ajánlott",
+        "recommendedVersion": "Ajánlott"
-        "anyVersion": "bármely"
     },
     "patchSelectorCard": {
         "widgetTitle": "Patchek kiválasztása",

assets/i18n/id_ID.json

@@ -55,8 +55,7 @@
         "widgetSubtitle": "Tidak ada aplikasi yang dipilih",
         "noAppsLabel": "Aplikasi tidak ditemukan",
         "currentVersion": "Saat ini",
-        "recommendedVersion": "Rekomendasi",
+        "recommendedVersion": "Rekomendasi"
-        "anyVersion": "semua"
     },
     "patchSelectorCard": {
         "widgetTitle": "Pilih Modifikasi",

assets/i18n/it_IT.json

@@ -55,8 +55,7 @@
         "widgetSubtitle": "Nessuna applicazione selezionata",
         "noAppsLabel": "Nessuna applicazione trovata",
         "currentVersion": "Attuale",
-        "recommendedVersion": "Consigliata",
+        "recommendedVersion": "Consigliata"
-        "anyVersion": "qualsiasi"
     },
     "patchSelectorCard": {
         "widgetTitle": "Seleziona patch",

assets/i18n/ko_KR.json

@@ -54,8 +54,7 @@
         "widgetSubtitle": "선택된 앱 없음",
         "noAppsLabel": "앱이 발견되지 않음",
         "currentVersion": "현재 버전",
-        "recommendedVersion": "권장 버전",
+        "recommendedVersion": "권장 버전"
-        "anyVersion": "모든 버전"
     },
     "patchSelectorCard": {
         "widgetTitle": "패치를 선택하세요",

assets/i18n/lt_LT.json

@@ -55,8 +55,7 @@
         "widgetSubtitle": "Nepasirinkta programa",
         "noAppsLabel": "Nerastos jokios programos",
         "currentVersion": "Dabartinė",
-        "recommendedVersion": "Rekomenduojama",
+        "recommendedVersion": "Rekomenduojama"
-        "anyVersion": "bet kokia"
     },
     "patchSelectorCard": {
         "widgetTitle": "Pasirinkite modifikacijas",

assets/i18n/ms_MY.json

@@ -54,8 +54,7 @@
         "widgetSubtitle": "Tiada aplikasi dipilih",
         "noAppsLabel": "Tiada aplikasi ditemui",
         "currentVersion": "Semasa",
-        "recommendedVersion": "Disyorkan",
+        "recommendedVersion": "Disyorkan"
-        "anyVersion": "mana-mana"
     },
     "patchSelectorCard": {
         "widgetTitle": "Pilih modifikasi",

assets/i18n/pl_PL.json

@@ -55,8 +55,7 @@
         "widgetSubtitle": "Nie wybrano aplikacji",
         "noAppsLabel": "Nie znaleziono aplikacji",
         "currentVersion": "Aktualna",
-        "recommendedVersion": "Zalecana",
+        "recommendedVersion": "Zalecana"
-        "anyVersion": "dowolna"
     },
     "patchSelectorCard": {
         "widgetTitle": "Wybierz łatki",

assets/i18n/pt_BR.json

@@ -54,8 +54,7 @@
         "widgetSubtitle": "Nenhum aplicativo selecionado",
         "noAppsLabel": "Nenhum app foi encontrado",
         "currentVersion": "Atual",
-        "recommendedVersion": "Recomendado",
+        "recommendedVersion": "Recomendado"
-        "anyVersion": "todos"
     },
     "patchSelectorCard": {
         "widgetTitle": "Selecionar patches",

assets/i18n/pt_PT.json

@@ -55,8 +55,7 @@
         "widgetSubtitle": "Nenhuma aplicação selecionada",
         "noAppsLabel": "Não foram encontradas aplicações",
         "currentVersion": "Atual",
-        "recommendedVersion": "Recomendada",
+        "recommendedVersion": "Recomendada"
-        "anyVersion": "qualquer"
     },
     "patchSelectorCard": {
         "widgetTitle": "Selecionar modificações",

assets/i18n/ro_RO.json

@@ -55,8 +55,7 @@
         "widgetSubtitle": "Nicio aplicație selectată",
         "noAppsLabel": "Nu s-au găsit aplicații",
         "currentVersion": "Actual",
-        "recommendedVersion": "Recomandat",
+        "recommendedVersion": "Recomandat"
-        "anyVersion": "oricare"
     },
     "patchSelectorCard": {
         "widgetTitle": "Selectați patch-urile",

assets/i18n/ru_RU.json

@@ -55,8 +55,7 @@
         "widgetSubtitle": "Не выбрано приложение",
         "noAppsLabel": "Приложения не найдены",
         "currentVersion": "Текущая",
-        "recommendedVersion": "Рекомендуемая",
+        "recommendedVersion": "Рекомендуемая"
-        "anyVersion": "любая"
     },
     "patchSelectorCard": {
         "widgetTitle": "Выберите патчи",

assets/i18n/sk_SK.json

@@ -55,8 +55,7 @@
         "widgetSubtitle": "Nie je vybraná žiadna aplikácia",
         "noAppsLabel": "Nebola nájdená žiadna aplikácia",
         "currentVersion": "Aktuálne",
-        "recommendedVersion": "Odporúčané",
+        "recommendedVersion": "Odporúčané"
-        "anyVersion": "akákoľvek"
     },
     "patchSelectorCard": {
         "widgetTitle": "Vyberte záplaty",

assets/i18n/sr_CS.json

@@ -54,8 +54,7 @@
         "widgetSubtitle": "Nijedna aplikacija nije izabrana",
         "noAppsLabel": "Nijedna aplikacija nije pronađena",
         "currentVersion": "Trenutna",
-        "recommendedVersion": "Preporučena",
+        "recommendedVersion": "Preporučena"
-        "anyVersion": "bilo koja"
     },
     "patchSelectorCard": {
         "widgetTitle": "Izaberite pečeve",

assets/i18n/sr_SP.json

@@ -54,8 +54,7 @@
         "widgetSubtitle": "Ниједна апликација није изабрана",
         "noAppsLabel": "Ниједна апликација није пронађена",
         "currentVersion": "Тренутна",
-        "recommendedVersion": "Препоручена",
+        "recommendedVersion": "Препоручена"
-        "anyVersion": "било која"
     },
     "patchSelectorCard": {
         "widgetTitle": "Изаберите печеве",

assets/i18n/sv_SE.json

@@ -54,8 +54,7 @@
         "widgetSubtitle": "Ingen app vald",
         "noAppsLabel": "Inga applikationer hittades",
         "currentVersion": "Nuvarande",
-        "recommendedVersion": "Rekommenderad",
+        "recommendedVersion": "Rekommenderad"
-        "anyVersion": "alla"
     },
     "patchSelectorCard": {
         "widgetTitle": "Välj patchar",

assets/i18n/sw_KE.json

@@ -55,8 +55,7 @@
         "widgetSubtitle": "Hakuna programu iliyochaguliwa",
         "noAppsLabel": "Hakuna programu zilizopatikana",
         "currentVersion": "Sasa",
-        "recommendedVersion": "Imependekezwa",
+        "recommendedVersion": "Imependekezwa"
-        "anyVersion": "yoyote"
     },
     "patchSelectorCard": {
         "widgetTitle": "Chagua viraka",

assets/i18n/tr_TR.json

@@ -55,8 +55,7 @@
         "widgetSubtitle": "Hiçbir uygulama seçilmedi",
         "noAppsLabel": "Hiçbir uygulama bulunamadı",
         "currentVersion": "Şu anki",
-        "recommendedVersion": "Önerilen",
+        "recommendedVersion": "Önerilen"
-        "anyVersion": "herhangi"
     },
     "patchSelectorCard": {
         "widgetTitle": "Yamaları Seçin",

assets/i18n/ur_PK.json

@@ -54,8 +54,7 @@
         "widgetSubtitle": "کوئی ایپلیکیشن منتخب نہیں",
         "noAppsLabel": "کوئی ایپلیکیشن نہیں ملی",
         "currentVersion": "موجودہ",
-        "recommendedVersion": "تجویز کردہ",
+        "recommendedVersion": "تجویز کردہ"
-        "anyVersion": "کوئی بھی"
     },
     "patchSelectorCard": {
         "widgetTitle": "پیچز منتخب کریں",

assets/i18n/vi_VN.json

@@ -55,8 +55,7 @@
         "widgetSubtitle": "Chưa chọn ứng dụng nào",
         "noAppsLabel": "Không tìm thấy ứng dụng nào",
         "currentVersion": "Hiện tại",
-        "recommendedVersion": "Đề xuất",
+        "recommendedVersion": "Đề xuất"
-        "anyVersion": "bất kỳ"
     },
     "patchSelectorCard": {
         "widgetTitle": "Chọn bản vá",

assets/i18n/zh_CN.json

@@ -54,8 +54,7 @@
         "widgetSubtitle": "未选择应用程序",
         "noAppsLabel": "未发现应用程序。",
         "currentVersion": "当前",
-        "recommendedVersion": "推荐",
+        "recommendedVersion": "推荐"
-        "anyVersion": "任意"
     },
     "patchSelectorCard": {
         "widgetTitle": "选择补丁",

assets/i18n/zh_HK.json

@@ -54,8 +54,7 @@
         "widgetSubtitle": "沒有選擇應用程式",
         "noAppsLabel": "找不到應用程式",
         "currentVersion": "目前版本",
-        "recommendedVersion": "推薦版本",
+        "recommendedVersion": "推薦版本"
-        "anyVersion": "任何版本"
     },
     "patchSelectorCard": {
         "widgetTitle": "選擇補丁",

assets/i18n/zh_TW.json

@@ -55,8 +55,7 @@
         "widgetSubtitle": "未選取應用程式",
         "noAppsLabel": "找不到應用程式",
         "currentVersion": "目前",
-        "recommendedVersion": "建議",
+        "recommendedVersion": "建議"
-        "anyVersion": "任何"
     },
     "patchSelectorCard": {
         "widgetTitle": "選取修補檔",

docs/0_prerequisites.md

@@ -0,0 +1,16 @@
+# 💼 Prerequisites
+
+In order to use ReVanced Manager, certain requirements must be met.
+
+## 🤝 Requirements
+
+- An Android device running Android 8 or higher
+- Any device architecture except ARMv7[^1]
+
+[^1]: This constraint only applies to patches, that require patching APK resources which is why some patches may or may not work on ARMv7 architecture. You can find out, which architectures your device supports here: [⚙️ Configuring ReVanced Manager](2_4_settings.md#%E2%84%B9%EF%B8%8F-about).
+
+## ⏭️ What's next
+
+The next page will guide you through patching an app.
+
+Continue: [⬇️ Installation](1_installation.md)

docs/1_installation.md

@@ -0,0 +1,14 @@
+# ⬇️ Installation
+
+In order to use ReVanced on your Android device, ReVanced Manager must be installed.
+
+## 🪜 Installation steps
+
+1. Download the latest version of ReVanced Manager from [here](https://github.com/revanced/revanced-manager/releases/latest)
+2. Install ReVanced Manager
+
+## ⏭️ What's next
+
+The next page will guide you through using ReVanced Manager.
+
+Continue: [🪛 Usage](2_usage.md)

docs/2_1_patching.md

@@ -0,0 +1,27 @@
+# 🧩 Patching apps
+
+The following pages will guide you through using ReVanced Manager to patch apps.
+
+## 🪜 Steps to patch apps
+
+1. Navigate to the **Patcher** tab from the bottom navigation bar
+2. Tap on the **Select an app** card
+3. Choose an app to patch[^1]
+   > **Note**: The suggested version is visible in each app's card.
+4. Tap on the **Select patches** card and select the patches you want to apply[^2]
+   > **Warning**: If you see a warning you can click on it for more information.
+5. Tap on the **Done** then **Patch** button
+   > **Warning**: The patching process may take ~5 minutes. Exiting the app may increase the time it takes to patch.
+6. Tap on the **Install** button
+   > **Note**: If you are rooted, you can mount the patched app on top of the original app.[^3]
+   > Optionally, you may export the patched app to storage using the options in the top right corner.
+
+[^1]: Non-root users may be prompted to select an APK from storage, in which case you have to source the APK file yourself. ReVanced does not provide any APK files.
+[^2]: It is suggested to use the default set of patches by tapping on the **Default** button above the list of patches.
+[^3]: Mounting the patched app on top of the original app will only work if the installed app version matches the version of the app selected in step 3. above.
+
+## ⏭️ What's next
+
+The next page will bring you back to the usage page.
+
+Continue: [🛠️ Usage](2_usage.md)

docs/2_2_managing.md

@@ -0,0 +1,16 @@
+# 🧰 Managing patched apps
+
+After patching an app, you may want to manage it. This page will guide you through managing patched apps.
+
+## 🪜 Steps to manage patched apps
+
+1. Tap on the **Dashboard** tab in the bottom navigation bar
+2. Select the **Installed** chip
+3. Tap on the **Info** button for the app you want to manage
+4. Choose one of the options from the menu
+
+## ⏭️ What's next
+
+The next page will bring you back to the usage page.
+
+Continue: [🛠️ Usage](2_usage.md)

docs/2_3_updating.md

@@ -0,0 +1,14 @@
+# 🔄 Updating ReVanced Manager
+
+In order to keep up with the latest features and bug fixes, it is recommended to keep ReVanced Manager up to date.
+
+## 🪜 Updating steps
+
+1. Navigate to the **Dashboard** tab from the bottom navigation bar
+2. Tap on the **Update** button in the **Updates** section
+
+## ⏭️ What's next
+
+The next page will bring you back to the usage page.
+
+Continue: [🛠️ Usage](2_usage.md)

docs/2_4_settings.md

@@ -0,0 +1,39 @@
+# ⚙️ Configuring ReVanced Manager
+
+ReVanced Manager has settings that can be configured to your liking.
+
+## 🪛 Essential settings
+
+- ### 🔗 API URL
+
+  Specify the URL of the API to use. This is used to fetch ReVanced Patches and update ReVanced Manager.
+
+- ### 🧬 Sources
+
+  Override the API and change the source of ReVanced Patches.
+
+- ### 🧪 Experimental ReVanced Patches support
+
+  Lift app version constraints from ReVanced Patches. This allows you to patch any version of an app, even if the patch is not explicitly compatible with it.
+
+- ### 🧑‍🔬 Experimental universal support
+
+  This will show or hide ReVanced Patches, which are not meant for any app in particular but rather for all apps but may not work on all apps.
+
+- ### 🔑 Export, import or delete keystore
+
+  Manage the keystore used to sign patched apps.
+
+- ### 📄 Export, import or reset ReVanced Patches selection
+
+  Manage the ReVanced Patches selection. This is useful if you want to share your ReVanced Patches selection with others or reset it to the default selection.
+
+- ### ℹ️ About
+
+  View information about your device and ReVanced Manager. This includes the version of ReVanced Manager and supported architectures of your device.
+
+## ⏭️ What's next
+
+The next page will bring you back to the usage page.
+
+Continue: [🛠️ Usage](2_usage.md)

docs/2_usage.md

@@ -0,0 +1,16 @@
+# 🛠️ Usage
+
+The following pages will guide you through using ReVanced Manager to patch apps, manage patched apps, and update ReVanced Manager.
+
+## 📖 Table of contents
+
+1. [🧩 Patching apps](2_1_patching.md)
+2. [🧰 Managing patched apps](2_2_managing.md)
+3. [🔄 Updating ReVanced Manager](2_3_updating.md)
+4. [⚙️ Configuring ReVanced Manager](2_4_settings.md)
+
+## ⏭️ What's next
+
+The next page will guide you through troubleshooting ReVanced Manager.
+
+Continue: [🛟 Troubleshooting](3_troubleshooting.md)

docs/3_troubleshooting.md

@@ -0,0 +1,31 @@
+# 🛟 Troubleshooting
+
+In case you encounter any issues while using ReVanced Manager, please refer to this page for possible solutions.
+
+- 💉 Patching fails with an error
+
+  Make sure ReVanced Manager is up to date by following [🔄 Updating ReVanced Manager](2_3_updating.md) and select the **Default** button when choosing patches.
+  
+- 💥 App not installed as package conflicts with an existing package
+
+  An existing installation of the app you're trying to patch is conflicting with the patched app. Uninstall the existing app before installing the patched app.
+
+- ❗️ Error code `135`, `139` or `1` when patching the app
+
+  Your device is not supported. Refer to the [Prerequisites](0_prerequisites.md) page for supported devices.
+
+  Alternatively, you can use [ReVanced CLI](https://github.com/revanced/revanced-cli) to patch the app.
+
+- 🚫 Non-root install is not possible with the current patches selection
+
+  Select the **Default** button when choosing patches.
+
+- 🚨 Patched app crashes on launch
+
+  Select the **Default** button when choosing patches.
+
+## ⏭️ What's next
+
+The next page will teach you how to build ReVanced Manager from source.
+
+Continue: [🛠️ Building from source](4_building.md)

docs/4_building.md

@@ -0,0 +1,40 @@
+# 🛠️ Building from source
+
+This page will guide you through building ReVanced Manager from source.
+
+1. Setup the Flutter environment for your [platform](https://docs.flutter.dev/get-started/install)
+
+2. Clone the repository
+
+   ```sh
+   git clone https://github.com/revanced/revanced-manager.git && cd revanced-manager
+   ```
+
+3. Create a GitHub personal access token with the `read:packages` scope [here](https://github.com/settings/tokens/new?scopes=read:packages&description=ReVanced)
+
+4. Add your GitHub username and the token to `~/.gradle/gradle.properties`
+
+   ```properties
+   gpr.user = YourUsername
+   gpr.key = ghp_longrandomkey
+   ```
+
+5. Get dependencies
+
+   ```sh
+   flutter pub get
+   ```
+
+6. Delete conflicting outputs
+
+   ```sh
+   flutter packages pub run build_runner build --delete-conflicting-outputs
+   ```
+
+   > **Note**: Must be run every time you sync your local repository with the remote repository.
+
+7. Build the APK
+
+   ```sh
+   flutter build apk
+   ```

docs/README.md

@@ -0,0 +1,21 @@
+# 💊 ReVanced Manager
+
+This documentation explains how to use [ReVanced Manager](https://github.com/revanced/revanced-manager).
+
+## 📖 Table of contents
+
+0. [💼 Prerequisites](0_prerequisites.md)
+1. [⬇️ Installation](1_installation.md)
+2. [🛠️ Usage](2_usage.md)
+   1. [🧩 Patching apps](2_1_patching.md)
+   2. [🧰 Managing patched apps](2_2_managing.md)
+   3. [🔄 Updating ReVanced Manager](2_3_updating.md)
+   4. [⚙️ Configuring ReVanced Manager](2_4_settings.md)
+3. [🛟 Troubleshooting](3_troubleshooting.md)
+4. [🛠 Building from source](4_building.md)
+
+## ⏭️ Start here
+
+The next page will tell you about the prerequisites for using ReVanced Manager.
+
+Continue: [💼 Prerequisites](0_prerequisites.md)

fastlane/Appfile

@@ -0,0 +1,2 @@
+json_key_file("") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
+package_name("app.revanced.manager.flutter") # e.g. com.krausefx.app

fastlane/Fastfile

@@ -0,0 +1,38 @@
+# This file contains the fastlane.tools configuration
+# You can find the documentation at https://docs.fastlane.tools
+#
+# For a list of all available actions, check out
+#
+#     https://docs.fastlane.tools/actions
+#
+# For a list of all available plugins, check out
+#
+#     https://docs.fastlane.tools/plugins/available-plugins
+#
+
+# Uncomment the line if you want fastlane to automatically update itself
+# update_fastlane
+
+default_platform(:android)
+
+platform :android do
+  desc "Runs all the tests"
+  lane :test do
+    gradle(task: "test")
+  end
+
+  desc "Submit a new Beta Build to Crashlytics Beta"
+  lane :beta do
+    gradle(task: "clean assembleRelease")
+    crashlytics
+  
+    # sh "your_script.sh"
+    # You can also use other beta testing services here
+  end
+
+  desc "Deploy a new version to the Google Play"
+  lane :deploy do
+    gradle(task: "clean assembleRelease")
+    upload_to_play_store
+  end
+end

fastlane/README.md

@@ -0,0 +1,48 @@
+fastlane documentation
+----
+
+# Installation
+
+Make sure you have the latest version of the Xcode command line tools installed:
+
+```sh
+xcode-select --install
+```
+
+For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)
+
+# Available Actions
+
+## Android
+
+### android test
+
+```sh
+[bundle exec] fastlane android test
+```
+
+Runs all the tests
+
+### android beta
+
+```sh
+[bundle exec] fastlane android beta
+```
+
+Submit a new Beta Build to Crashlytics Beta
+
+### android deploy
+
+```sh
+[bundle exec] fastlane android deploy
+```
+
+Deploy a new version to the Google Play
+
+----
+
+This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
+
+More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools).
+
+The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).

fastlane/metadata/android/en-US/full_description.txt

@@ -0,0 +1 @@
+ReVanced Manager is an Android application that uses ReVanced Patcher to add, remove, and modify existing functionalities in Android applications

fastlane/metadata/android/en-US/short_description.txt

@@ -0,0 +1 @@
+Patch your favorite apps, right on your device.

fastlane/metadata/android/en-US/title.txt

@@ -0,0 +1 @@
+ReVanced Manager

lib/services/github_api.dart

@@ -1,19 +1,18 @@
 import 'dart:convert';
 import 'dart:io';
-
 import 'package:collection/collection.dart';
 import 'package:dio/dio.dart';
 import 'package:dio_cache_interceptor/dio_cache_interceptor.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:injectable/injectable.dart';
-import 'package:native_dio_adapter/native_dio_adapter.dart';
 import 'package:revanced_manager/models/patch.dart';
+import 'package:revanced_manager/services/manager_api.dart';
 
 @lazySingleton
 class GithubAPI {
   late Dio _dio = Dio();
-  
+
   final _cacheOptions = CacheOptions(
     store: MemCacheStore(),
     maxStale: const Duration(days: 1),
@@ -33,22 +32,6 @@ class GithubAPI {
 
   Future<void> initialize(String repoUrl) async {
     try {
-      if (Platform.isIOS || Platform.isMacOS || Platform.isAndroid) {
-        final CronetEngine androidCronetEngine = await CronetEngine.build(
-          userAgent: 'ReVanced Manager',
-          enableBrotli: true,
-          enableQuic: true,
-        );
-        _dio.httpClientAdapter =
-            NativeAdapter(androidCronetEngine: androidCronetEngine);
-
-        _dio = Dio(
-          BaseOptions(
-            baseUrl: repoUrl,
-          ),
-        );
-      }
-
       _dio = Dio(
         BaseOptions(
           baseUrl: repoUrl,
@@ -89,6 +72,41 @@ class GithubAPI {
     }
   }
 
+  Future<Map<String, dynamic>?> getLatestManagerRelease(
+    String repoName,
+  ) async {
+    try {
+      final response = await _dio.get(
+        '/repos/$repoName/releases',
+      );
+      final Map<String, dynamic> releases = response.data[0];
+      int updates = 0;
+      final String currentVersion =
+          await ManagerAPI().getCurrentManagerVersion();
+      while (response.data[updates]['tag_name'] != 'v$currentVersion') {
+        updates++;
+      }
+      for (int i = 1; i < updates; i++) {
+        releases.update(
+          'body',
+          (value) =>
+              value +
+              '\n' +
+              '# ' +
+              response.data[i]['tag_name'] +
+              '\n' +
+              response.data[i]['body'],
+        );
+      }
+      return releases;
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
+      return null;
+    }
+  }
+
   Future<List<String>> getCommits(
     String packageName,
     String repoName,
@@ -107,7 +125,7 @@ class GithubAPI {
       final List<dynamic> commits = response.data;
       return commits
           .map(
-            (commit) => (commit['commit']['message']).split('\n')[0] +
+            (commit) => commit['commit']['message'].split('\n')[0] +
                 ' - ' +
                 commit['commit']['author']['name'] +
                 '\n' as String,
@@ -126,8 +144,7 @@ class GithubAPI {
     String repoName,
   ) async {
     try {
-      final Map<String, dynamic>? release =
+      final Map<String, dynamic>? release = await getLatestRelease(repoName);
-          await getLatestRelease(repoName);
       if (release != null) {
         final Map<String, dynamic>? asset =
             (release['assets'] as List<dynamic>).firstWhereOrNull(
@@ -166,8 +183,7 @@ class GithubAPI {
 
   Future<String> getLastestReleaseVersion(String repoName) async {
     try {
-      final Map<String, dynamic>? release =
+      final Map<String, dynamic>? release = await getLatestRelease(repoName);
-          await getLatestRelease(repoName);
       if (release != null) {
         return release['tag_name'];
       } else {

lib/services/manager_api.dart

@@ -300,13 +300,12 @@ class ManagerAPI {
     if (isDefaultPatchesRepo()) {
       patchesVersion = await getLatestPatchesVersion();
       // print('Patches version: $patchesVersion');
-      return patchesVersion ?? '0.0.0';
     } else {
       // fetch from github
       patchesVersion =
           await _githubAPI.getLastestReleaseVersion(getPatchesRepo());
     }
-    return null;
+    return patchesVersion ?? '0.0.0';
   }
 
   Future<List<PatchedApplication>> getAppsToRemove(

lib/services/patcher_api.dart

@@ -1,12 +1,12 @@
 import 'dart:io';
 
-import 'package:app_installer/app_installer.dart';
 import 'package:collection/collection.dart';
 import 'package:cr_file_saver/file_saver.dart';
 import 'package:device_apps/device_apps.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:injectable/injectable.dart';
+import 'package:install_plugin/install_plugin.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patch.dart';
@@ -144,30 +144,23 @@ class PatcherAPI {
     );
   }
 
-  Future<String> getOriginalFilePath(
+  Future<String> getOriginalFilePath(String packageName) async {
-    String packageName,
-    String originalFilePath,
-  ) async {
     try {
       final bool hasRootPermissions = await _rootAPI.hasRootPermissions();
       if (hasRootPermissions) {
-        originalFilePath = await _rootAPI.getOriginalFilePath(
+        return await _rootAPI.getOriginalFilePath(packageName);
-          packageName,
-          originalFilePath,
-        );
       }
-      return originalFilePath;
     } on Exception catch (e) {
       if (kDebugMode) {
         print(e);
       }
-      return originalFilePath;
     }
+    return '';
   }
 
   Future<void> runPatcher(
     String packageName,
-    String originalFilePath,
+    String apkFilePath,
     List<Patch> selectedPatches,
   ) async {
     final bool includeSettings = await needsSettingsPatch(selectedPatches);
@@ -198,15 +191,16 @@ class PatcherAPI {
       _outFile = File('${workDir.path}/out.apk');
       final Directory cacheDir = Directory('${workDir.path}/cache');
       cacheDir.createSync();
+      String originalFilePath = await getOriginalFilePath(packageName);
+      if (originalFilePath.isEmpty) {
+        originalFilePath = apkFilePath;
+      }
       try {
         await patcherChannel.invokeMethod(
           'runPatcher',
           {
             'patchBundleFilePath': patchBundleFile.path,
-            'originalFilePath': await getOriginalFilePath(
+            'originalFilePath': originalFilePath,
-              packageName,
-              originalFilePath,
-            ),
             'inputFilePath': inputFile.path,
             'patchedFilePath': patchedFile.path,
             'outFilePath': _outFile!.path,
@@ -238,10 +232,8 @@ class PatcherAPI {
             );
           }
         } else {
-          await AppInstaller.installApk(_outFile!.path);
+          final install = await InstallPlugin.installApk(_outFile!.path);
-          return await DeviceApps.isAppInstalled(
+          return install['isSuccess'];
-            patchedApp.packageName,
-          );
         }
       } on Exception catch (e) {
         if (kDebugMode) {

lib/services/revanced_api.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:developer';
 import 'dart:io';
 
 import 'package:collection/collection.dart';
@@ -8,9 +7,7 @@ import 'package:dio_cache_interceptor/dio_cache_interceptor.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:injectable/injectable.dart';
-import 'package:native_dio_adapter/native_dio_adapter.dart';
 import 'package:revanced_manager/models/patch.dart';
-import 'package:revanced_manager/utils/check_for_gms.dart';
 import 'package:timeago/timeago.dart';
 
 @lazySingleton
@@ -25,34 +22,12 @@ class RevancedAPI {
 
   Future<void> initialize(String apiUrl) async {
     try {
-      final bool isGMSInstalled = await checkForGMS();
+      _dio = Dio(
+        BaseOptions(
+          baseUrl: apiUrl,
+        ),
+      );
 
-      if (!isGMSInstalled) {
-        _dio = Dio(
-          BaseOptions(
-            baseUrl: apiUrl,
-          ),
-        );
-        log('ReVanced API: Using default engine + $isGMSInstalled');
-      } else {
-        if (Platform.isIOS || Platform.isMacOS || Platform.isAndroid) {
-          final CronetEngine androidCronetEngine = await CronetEngine.build(
-            userAgent: 'ReVanced Manager',
-            enableBrotli: true,
-            enableQuic: true,
-          );
-          _dio.httpClientAdapter =
-              NativeAdapter(androidCronetEngine: androidCronetEngine);
-
-          _dio = Dio(
-            BaseOptions(
-              baseUrl: apiUrl,
-            ),
-          );
-        }
-
-        log('ReVanced API: Using CronetEngine + $isGMSInstalled');
-      }
       _dio.interceptors.add(DioCacheInterceptor(options: _cacheOptions));
     } on Exception catch (e) {
       if (kDebugMode) {
@@ -165,7 +140,8 @@ class RevancedAPI {
     return null;
   }
 
-  StreamController<double> managerUpdateProgress = StreamController<double>();
+  StreamController<double> managerUpdateProgress =
+      StreamController<double>.broadcast();
 
   void updateManagerDownloadProgress(int progress) {
     managerUpdateProgress.add(progress.toDouble());
@@ -195,6 +171,7 @@ class RevancedAPI {
 
         updateManagerDownloadProgress(progress);
       } else if (result is FileInfo) {
+        disposeManagerUpdateProgress();
         // The download is complete; convert the FileInfo object to a File object
         outputFile = File(result.file.path);
       }

lib/services/root_api.dart

@@ -2,7 +2,9 @@ import 'package:flutter/foundation.dart';
 import 'package:root/root.dart';
 
 class RootAPI {
-  final String _managerDirPath = '/data/local/tmp/revanced-manager';
+  // TODO(ponces): remove in the future, keep it for now during migration.
+  final String _revancedOldDirPath = '/data/local/tmp/revanced-manager';
+  final String _revancedDirPath = '/data/adb/revanced';
   final String _postFsDataDirPath = '/data/adb/post-fs-data.d';
   final String _serviceDDirPath = '/data/adb/service.d';
 
@@ -40,55 +42,62 @@ class RootAPI {
     seLinux,
     String filePath,
   ) async {
-    if (permissions.isNotEmpty) {
-      await Root.exec(
-        cmd: 'chmod $permissions "$filePath"',
-      );
-    }
-    if (ownerGroup.isNotEmpty) {
-      await Root.exec(
-        cmd: 'chown $ownerGroup "$filePath"',
-      );
-    }
-    if (seLinux.isNotEmpty) {
-      await Root.exec(
-        cmd: 'chcon $seLinux "$filePath"',
-      );
-    }
-  }
-
-  Future<bool> isAppInstalled(String packageName) async {
-    if (packageName.isNotEmpty) {
-      String? res = await Root.exec(
-        cmd: 'ls "$_managerDirPath/$packageName"',
-      );
-      if (res != null && res.isNotEmpty) {
-        res = await Root.exec(
-          cmd: 'ls "$_serviceDDirPath/$packageName.sh"',
-        );
-        return res != null && res.isNotEmpty;
-      }
-    }
-    return false;
-  }
-
-  Future<List<String>> getInstalledApps() async {
     try {
-      final String? res = await Root.exec(
+      if (permissions.isNotEmpty) {
-        cmd: 'ls "$_managerDirPath"',
+        await Root.exec(
-      );
+          cmd: 'chmod $permissions "$filePath"',
-      if (res != null) {
+        );
-        final List<String> apps = res.split('\n');
+      }
-        apps.removeWhere((pack) => pack.isEmpty);
+      if (ownerGroup.isNotEmpty) {
-        return apps.map((pack) => pack.trim()).toList();
+        await Root.exec(
+          cmd: 'chown $ownerGroup "$filePath"',
+        );
+      }
+      if (seLinux.isNotEmpty) {
+        await Root.exec(
+          cmd: 'chcon $seLinux "$filePath"',
+        );
       }
     } on Exception catch (e) {
       if (kDebugMode) {
         print(e);
       }
-      return List.empty();
     }
-    return List.empty();
+  }
+
+  Future<bool> isAppInstalled(String packageName) async {
+    if (packageName.isNotEmpty) {
+      return fileExists('$_serviceDDirPath/$packageName.sh');
+    }
+    return false;
+  }
+
+  Future<List<String>> getInstalledApps() async {
+    final List<String> apps = List.empty(growable: true);
+    try {
+      String? res = await Root.exec(
+        cmd: 'ls "$_revancedDirPath"',
+      );
+      if (res != null) {
+        final List<String> list = res.split('\n');
+        list.removeWhere((pack) => pack.isEmpty);
+        apps.addAll(list.map((pack) => pack.trim()).toList());
+      }
+      // TODO(ponces): remove in the future, keep it for now during migration.
+      res = await Root.exec(
+        cmd: 'ls "$_revancedOldDirPath"',
+      );
+      if (res != null) {
+        final List<String> list = res.split('\n');
+        list.removeWhere((pack) => pack.isEmpty);
+        apps.addAll(list.map((pack) => pack.trim()).toList());
+      }
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
+    }
+    return apps;
   }
 
   Future<void> deleteApp(String packageName, String originalFilePath) async {
@@ -98,8 +107,12 @@ class RootAPI {
     await Root.exec(
       cmd: 'su -mm -c "umount -l $originalFilePath"',
     );
+    // TODO(ponces): remove in the future, keep it for now during migration.
     await Root.exec(
-      cmd: 'rm -rf "$_managerDirPath/$packageName"',
+      cmd: 'rm -rf "$_revancedOldDirPath/$packageName"',
+    );
+    await Root.exec(
+      cmd: 'rm -rf "$_revancedDirPath/$packageName"',
     );
     await Root.exec(
       cmd: 'rm -rf "$_serviceDDirPath/$packageName.sh"',
@@ -117,13 +130,13 @@ class RootAPI {
     try {
       await deleteApp(packageName, originalFilePath);
       await Root.exec(
-        cmd: 'mkdir -p "$_managerDirPath/$packageName"',
+        cmd: 'mkdir -p "$_revancedDirPath/$packageName"',
       );
       await setPermissions(
         '0755',
         'shell:shell',
         '',
-        '$_managerDirPath/$packageName',
+        '$_revancedDirPath/$packageName',
       );
       await saveOriginalFilePath(packageName, originalFilePath);
       await installServiceDScript(packageName);
@@ -142,7 +155,7 @@ class RootAPI {
   Future<void> installServiceDScript(String packageName) async {
     final String content = '#!/system/bin/sh\n'
         'while [ "\$(getprop sys.boot_completed | tr -d \'"\'"\'\\\\r\'"\'"\')" != "1" ]; do sleep 3; done\n'
-        'base_path=$_managerDirPath/$packageName/base.apk\n'
+        'base_path=$_revancedDirPath/$packageName/base.apk\n'
         'stock_path=\$(pm path $packageName | grep base | sed \'"\'"\'s/package://g\'"\'"\')\n'
         r'[ ! -z $stock_path ] && mount -o bind $base_path $stock_path';
     final String scriptFilePath = '$_serviceDDirPath/$packageName.sh';
@@ -164,7 +177,7 @@ class RootAPI {
   }
 
   Future<void> installApk(String packageName, String patchedFilePath) async {
-    final String newPatchedFilePath = '$_managerDirPath/$packageName/base.apk';
+    final String newPatchedFilePath = '$_revancedDirPath/$packageName/base.apk';
     await Root.exec(
       cmd: 'cp "$patchedFilePath" "$newPatchedFilePath"',
     );
@@ -177,7 +190,7 @@ class RootAPI {
   }
 
   Future<void> mountApk(String packageName, String originalFilePath) async {
-    final String newPatchedFilePath = '$_managerDirPath/$packageName/base.apk';
+    final String newPatchedFilePath = '$_revancedDirPath/$packageName/base.apk';
     await Root.exec(
       cmd: 'am force-stop "$packageName"',
     );
@@ -196,21 +209,18 @@ class RootAPI {
     return res != null && res.isNotEmpty;
   }
 
-  Future<String> getOriginalFilePath(
+  Future<String> getOriginalFilePath(String packageName) async {
-    String packageName,
+    final String originalPath = '$_revancedDirPath/$packageName/original.apk';
-    String originalFilePath,
+    final String oldOrigPath = '$_revancedOldDirPath/$packageName/original.apk';
-  ) async {
     final bool isInstalled = await isAppInstalled(packageName);
     if (isInstalled && await isMounted(packageName)) {
-      originalFilePath = '$_managerDirPath/$packageName/original.apk';
+      if (await fileExists(originalPath)) {
-      await setPermissions(
+        return originalPath;
-        '0644',
+      } else if (await fileExists(oldOrigPath)) {
-        'shell:shell',
+        return oldOrigPath;
-        'u:object_r:apk_data_file:s0',
+      }
-        originalFilePath,
-      );
     }
-    return originalFilePath;
+    return '';
   }
 
   Future<void> saveOriginalFilePath(
@@ -218,15 +228,15 @@ class RootAPI {
     String originalFilePath,
   ) async {
     final String originalRootPath =
-        '$_managerDirPath/$packageName/original.apk';
+        '$_revancedDirPath/$packageName/original.apk';
     await Root.exec(
-      cmd: 'mkdir -p "$_managerDirPath/$packageName"',
+      cmd: 'mkdir -p "$_revancedDirPath/$packageName"',
     );
     await setPermissions(
       '0755',
       'shell:shell',
       '',
-      '$_managerDirPath/$packageName',
+      '$_revancedDirPath/$packageName',
     );
     await Root.exec(
       cmd: 'cp "$originalFilePath" "$originalRootPath"',
@@ -238,4 +248,18 @@ class RootAPI {
       originalFilePath,
     );
   }
+
+  Future<bool> fileExists(String path) async {
+    try {
+      final String? res = await Root.exec(
+        cmd: 'ls $path',
+      );
+      return res != null && res.isNotEmpty;
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
+      return false;
+    }
+  }
 }

lib/ui/views/app_selector/app_selector_view.dart

@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide SearchBar;
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/ui/views/app_selector/app_selector_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/appSelectorView/app_skeleton_loader.dart';
@@ -78,7 +78,7 @@ class _AppSelectorViewState extends State<AppSelectorView> {
               child: model.noApps
                   ? Center(
                       child: I18nText(
-                        'appSelectorView.noApps',
+                        'appSelectorCard.noAppsLabel',
                         child: Text(
                           '',
                           style: TextStyle(
@@ -88,11 +88,14 @@ class _AppSelectorViewState extends State<AppSelectorView> {
                         ),
                       ),
                     )
-                  : model.apps.isEmpty
+                  : model.allApps.isEmpty
                       ? const AppSkeletonLoader()
                       : Padding(
                           padding: const EdgeInsets.symmetric(horizontal: 12.0)
-                              .copyWith(bottom: 80),
+                              .copyWith(
+                            bottom:
+                                MediaQuery.of(context).viewPadding.bottom + 8.0,
+                          ),
                           child: Column(
                             children: [
                               ...model
@@ -108,16 +111,11 @@ class _AppSelectorViewState extends State<AppSelectorView> {
                                           model.getSuggestedVersion(
                                         app.packageName,
                                       ),
-                                      onTap: () {
+                                      installedVersion: app.versionName!,
-                                        model.isRooted
+                                      onTap: () => model.canSelectInstalled(
-                                            ? model.selectApp(app).then(
+                                        context,
-                                                  (_) => Navigator.of(context)
+                                        app.packageName,
-                                                      .pop(),
+                                      ),
-                                                )
-                                            : model.showSelectFromStorageDialog(
-                                                context,
-                                              );
-                                      },
                                     ),
                                   )
                                   .toList(),